From: Kinsey Moore <kmoore@digium.com>
Date: Wed, 22 Jan 2014 18:27:19 +0000 (+0000)
Subject: chan_sip: Decline image streams on unsupported transports
X-Git-Tag: 1.8.27.0-rc1~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1dd94a2e19b31c333f96af9655d2255a4fe12f43;p=thirdparty%2Fasterisk.git

chan_sip: Decline image streams on unsupported transports

This change allows chan_sip to decline individual image streams over
unsupported transports in the SDP of the 200 response. Previously,
an image stream offer with RTP/AVP as the transport would cause
chan_sip to respond with a 488.

(closes issue ASTERISK-22988)
Reported by: adomjan
Original patch by: adomjan


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@406170 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4d329cdc39..1b7dd8461d 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9366,7 +9366,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
 		int image = FALSE;
 		int text = FALSE;
 		int processed_crypto = FALSE;
-		char protocol[5] = {0,};
+		char protocol[18] = {0,};
 		int x;
 
 		numberofports = 0;
@@ -9550,6 +9550,9 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
 					 * respond with the EC they want to use */
 					ast_udptl_set_error_correction_scheme(p->udptl, UDPTL_ERROR_CORRECTION_NONE);
 				}
+			} else if (sscanf(m, "image %30u %17s t38%n", &x, protocol, &len) == 2 && len > 0) {
+				ast_log(LOG_WARNING, "Declining image stream due to unsupported transport: %s\n", m);
+				continue;
 			} else {
 				ast_log(LOG_WARNING, "Rejecting image media offer due to invalid or unsupported syntax: %s\n", m);
 				return -1;