[asterisk-commits] file: trunk r41769 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Sep  1 17:51:46 2006
New Revision: 41769

URL: http://svn.digium.com/view/asterisk?rev=41769&view=rev
Log:
Merged revisions 41768 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r41768 | file | 2006-09-01 18:49:07 -0400 (Fri, 01 Sep 2006) | 2 lines

Only wipe the redirected audio & video IP/port if it's specified, and trigger a reinvite.

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=41769&r1=41768&r2=41769&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Sep  1 17:51:46 2006
@@ -16169,14 +16169,18 @@
 		return 0;
 	}
 
-	if (rtp) 
+	if (rtp) {
 		changed |= ast_rtp_get_peer(rtp, &p->redirip);
-	else
+	} else if (p->redirip.sin_addr.s_addr || ntohs(p->redirip.sin_port) != 0) {
 		memset(&p->redirip, 0, sizeof(p->redirip));
-	if (vrtp)
+		changed = 1;
+	}
+	if (vrtp) {
 		changed |= ast_rtp_get_peer(vrtp, &p->vredirip);
-	else
+	} else if (p->vredirip.sin_addr.s_addr || ntohs(p->vredirip.sin_port) != 0) {
 		memset(&p->vredirip, 0, sizeof(p->vredirip));
+		changed = 1;
+	}
 	if (codecs && (p->redircodecs != codecs)) {
 		p->redircodecs = codecs;
 		changed = 1;