[svn-commits] bbryant: branch 1.6.0 r129041 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Tue Jul  8 09:42:03 2008
New Revision: 129041

URL: http://svn.digium.com/view/asterisk?view=rev&rev=129041
Log:
Merged revisions 127434 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r127434 | bbryant | 2008-07-02 12:27:36 -0500 (Wed, 02 Jul 2008) | 1 line

Fix to sip_parse_host so that it passes the correct information to sip_registry.
........

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

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

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=129041&r1=129040&r2=129041
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Tue Jul  8 09:42:03 2008
@@ -6056,7 +6056,7 @@
 	if (hostname)
 		*hostname++ = '\0';
 	if (ast_strlen_zero(username) || ast_strlen_zero(hostname)) {
-		ast_log(LOG_WARNING, "Format for registration is user[:secret[:authuser]]@host[:port][/contact] at line %d\n", lineno);
+		ast_log(LOG_WARNING, "Format for registration is [transport://]user[:secret[:authuser]]@host[:port][/contact][~expiry] at line %d\n", lineno);
 		return -1;
 	}
 	/* split user[:secret[:authuser]] */
@@ -18367,7 +18367,12 @@
 		*transport = SIP_TRANSPORT_UDP;
 	}
 
-	if ((port = strchr(*hostname, ':'))) {
+	if ((line = strrchr(*hostname, '@')))
+		line++;
+	else
+		line = *hostname;
+
+	if ((port = strrchr(line, ':'))) {
 		*port++ = '\0';
 
 		if (!sscanf(port, "%u", portnum)) {