[svn-commits] file: branch 1.6.1 r211349 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Aug 10 09:12:18 2009
New Revision: 211349

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=211349
Log:
Merged revisions 211347 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r211347 | file | 2009-08-10 11:07:44 -0300 (Mon, 10 Aug 2009) | 5 lines
  
  Fix retrieval of the port used for the video stream when adding SDP to a SIP message.
  
  (closes issue #15121)
  Reported by: jsmith
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=211349&r1=211348&r2=211349
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Mon Aug 10 09:12:18 2009
@@ -8878,6 +8878,15 @@
 			p->sessionversion++;
 	}
 
+	/* Check if we need video in this call */
+	if (add_audio && (capability & AST_FORMAT_VIDEO_MASK) && !p->novideo) {
+		if (p->vrtp) {
+			needvideo = TRUE;
+			ast_debug(2, "This call needs video offers!\n");
+		} else
+			ast_debug(2, "This call needs video offers, but there's no video support enabled!\n");
+	}
+
 	get_our_media_address(p, needvideo, &sin, &vsin, &tsin, &dest, &vdest);
 
 	snprintf(owner, sizeof(owner), "o=%s %d %d IN IP4 %s\r\n", ast_strlen_zero(global_sdpowner) ? "-" : global_sdpowner, p->sessionid, p->sessionversion, ast_inet_ntoa(dest.sin_addr));
@@ -8895,15 +8904,6 @@
 		if (capability & AST_FORMAT_AUDIO_MASK)
 			needaudio = TRUE;
 
-		/* Check if we need video in this call */
-		if ((capability & AST_FORMAT_VIDEO_MASK) && !p->novideo) {
-			if (p->vrtp) {
-				needvideo = TRUE;
-				ast_debug(2, "This call needs video offers!\n");
-			} else
-				ast_debug(2, "This call needs video offers, but there's no video support enabled!\n");
-		}
-
 		if (debug) 
 			ast_verbose("Audio is at %s port %d\n", ast_inet_ntoa(p->ourip.sin_addr), ntohs(sin.sin_port));	
 
@@ -8916,7 +8916,7 @@
 			if (p->maxcallbitrate)
 				snprintf(bandwidth, sizeof(bandwidth), "b=CT:%d\r\n", p->maxcallbitrate);
 			if (debug) 
-				ast_verbose("Video is at %s port %d\n", ast_inet_ntoa(p->ourip.sin_addr), ntohs(vsin.sin_port));	
+				ast_verbose("Video is at %s port %d\n", ast_inet_ntoa(p->ourip.sin_addr), ntohs(vdest.sin_port));	
 		}
 
 		/* Check if we need text in this call */