r3580 - trunk/libmsip/source

[erik at minisip.org]

Author: erik
Date: 2008-05-21 13:16:49 +0200 (Wed, 21 May 2008)
New Revision: 3580

Modified:
   trunk/libmsip/source/SipLayerTransport.cxx
Log:

 * Fix: The port in the Contact header was incorrect if 
   UDP && !stun && sip port!=5060



Modified: trunk/libmsip/source/SipLayerTransport.cxx
===================================================================
--- trunk/libmsip/source/SipLayerTransport.cxx	2008-05-21 11:07:42 UTC (rev 3579)
+++ trunk/libmsip/source/SipLayerTransport.cxx	2008-05-21 11:16:49 UTC (rev 3580)
@@ -885,11 +885,16 @@
 		contactUri.setIp( ip );
 		contactUri.setTransport( transport->getProtocol() );
 
-		if(ipv6 || socket->getType() != SOCKET_TYPE_UDP){
+//NOTE: We make the UDP and IPv4 exception for STUN reasons. However, since
+//we set the IP above, this is broken. If we make this exception, then
+//the contact uri will not have the correct port if we run on any port
+//except 5060.
+//
+//		if(ipv6 || socket->getType() != SOCKET_TYPE_UDP){
 
 			// Update port if not UDP and IPv4
 			contactUri.setPort( port );
-		}
+//		}
 
 		contactUri.removeParameter("minisip");
 		contactp->setUri( contactUri );