From 6c922b3157924b7a3939785420cf18b038cf8ab7 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Fri, 25 Aug 2017 17:05:06 -0500 Subject: [PATCH] res_rtp_asterisk.c: Check RTP packet version earlier. Change-Id: Ic6493a7d79683f3e5845dff1cee49445fd5a0adf --- res/res_rtp_asterisk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index b6cef97d30..77027aafe2 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -5070,6 +5070,11 @@ static struct ast_frame *ast_rtp_read(struct ast_rtp_instance *instance, int rtc return &ast_null_frame; } + /* If the version is not what we expected by this point then just drop the packet */ + if (version != 2) { + return &ast_null_frame; + } + /* If strict RTP protection is enabled see if we need to learn the remote address or if we need to drop the packet */ if (rtp->strict_rtp_state == STRICT_RTP_LEARN) { if (!ast_sockaddr_cmp(&rtp->strict_rtp_address, &addr)) { @@ -5116,11 +5121,6 @@ static struct ast_frame *ast_rtp_read(struct ast_rtp_instance *instance, int rtc } } - /* If the version is not what we expected by this point then just drop the packet */ - if (version != 2) { - return &ast_null_frame; - } - /* Pull out the various other fields we will need */ payloadtype = (seqno & 0x7f0000) >> 16; padding = seqno & (1 << 29);