[asterisk-commits] simon.perreault: trunk r274947 - /trunk/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: simon.perreault
Date: Fri Jul  9 08:30:37 2010
New Revision: 274947

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=274947
Log:
Copy the address into the peer structure after we set the default port

Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=274947&r1=274946&r2=274947
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Jul  9 08:30:37 2010
@@ -12526,7 +12526,6 @@
 			ast_string_field_set(pvt, our_contact, "");
 			return PARSE_REGISTER_FAILED;
 		}
-		ast_sockaddr_copy(&peer->addr, &testsa);
 
 		/* If we have a port number in the given URI, make sure we do remember to not check for NAPTR/SRV records.
 		   The domain part is actually a host. */
@@ -12537,6 +12536,8 @@
 						  transport_type == SIP_TRANSPORT_TLS ?
 						  STANDARD_TLS_PORT : STANDARD_SIP_PORT);
 		}
+
+		ast_sockaddr_copy(&peer->addr, &testsa);
 	} else {
 		/* Don't trust the contact field.  Just use what they came to us
 		   with */