[svn-commits] tilghman: branch 1.6.2 r213739 - in /branches/1.6.2: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Aug 21 17:54:20 2009
New Revision: 213739

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

........
  r213738 | tilghman | 2009-08-21 17:36:39 -0500 (Fri, 21 Aug 2009) | 2 lines
  
  Clarifying comments in sip_register, and removing a dead section
........

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

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

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=213739&r1=213738&r2=213739
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Fri Aug 21 17:54:20 2009
@@ -7158,7 +7158,7 @@
 	 * host2.extension => [extension]
 	 * host1.expiry => [expiry]
 	 */
-	AST_NONSTANDARD_RAW_ARGS(host2, hostpart, '/');
+	AST_NONSTANDARD_RAW_ARGS(host2, host1.hostpart, '/');
 
 	/*!
 	 * user1.userpart => [peer?][transport://]user[@domain]
@@ -7169,14 +7169,35 @@
 	 * host2.extension => extension
 	 * host1.expiry => expiry
 	 */
-	AST_NONSTANDARD_RAW_ARGS(host3, hostpart, ':');
-
+	AST_NONSTANDARD_RAW_ARGS(host3, host2.hostpart, ':');
+
+	/*!
+	 * peername => peer
+	 * user2.userpart => [transport://]user[@domain]
+	 * user1.secret => secret
+	 * user1.authuser => authuser
+	 * host3.host => host
+	 * host3.port => port
+	 * host2.extension => extension (callback)
+	 * host1.expiry => expiry
+	 */
 	if ((tmp = strchr(user1.userpart, '?'))) {
 		*tmp = '\0';
 		peername = user1.userpart;
 		user1.userpart = tmp + 1;
 	}
 
+	/*!
+	 * peername => peer
+	 * transport_str => transport
+	 * username => user[@domain]
+	 * user1.secret => secret
+	 * user1.authuser => authuser
+	 * host3.host => host
+	 * host3.port => port
+	 * host2.extension => extension (callback)
+	 * host1.expiry => expiry
+	 */
 	if ((tmp = strstr(user1.userpart, "://"))) {
 		*tmp = '\0';
 		transport_str = user1.userpart;