From: David Vossel <dvossel@digium.com>
Date: Tue, 28 Jun 2011 15:34:59 +0000 (+0000)
Subject: Fixes issue with video and text not being reinvited correctly with directmedia
X-Git-Tag: 11.0.0-beta1~1430
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=481269754232e9cfe5945de348b9f12f16272ae8;p=thirdparty%2Fasterisk.git

Fixes issue with video and text not being reinvited correctly with directmedia

If a SDP does not modify the session, we ignore it.  However, we were defaulting
no text and video support to true before checking to see if the sdp modified
anything or not.  This would result in process_sdp ignoring an sdp but removing
video and text from the call during direct media reinvites.


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 1bfe85bd66..f3a9693165 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8719,11 +8719,6 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
 
 	memset(p->offered_media, 0, sizeof(p->offered_media));
 
-
-	/* default: novideo and notext set */
-	p->novideo = TRUE;
-	p->notext = TRUE;
-
 	if (p->vrtp) {
 		ast_rtp_codecs_payloads_clear(&newvideortp, NULL);
 	}
@@ -8781,7 +8776,9 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
 		ast_debug(3, "Processing session-level SDP %c=%s... %s\n", type, value, (processed == TRUE)? "OK." : "UNSUPPORTED.");
 	}
 
-
+	/* default: novideo and notext set */
+	p->novideo = TRUE;
+	p->notext = TRUE;
 
 	/* Scan media stream (m=) specific parameters loop */
 	while (!ast_strlen_zero(nextm)) {