[asterisk-commits] mmichelson: branch 1.6.1 r162666 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Dec 10 10:37:14 2008
New Revision: 162666

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

................
r162664 | mmichelson | 2008-12-10 10:34:35 -0600 (Wed, 10 Dec 2008) | 19 lines

Merged revisions 162663 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r162663 | mmichelson | 2008-12-10 10:24:56 -0600 (Wed, 10 Dec 2008) | 11 lines

Revert fix for issue 13570. It has caused more problems than
it helped to fix.

(closes issue #13783)
Reported by: navkumar


(closes issue #14025)
Reported by: ffs


........

................

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

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

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=162666&r1=162665&r2=162666
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed Dec 10 10:37:14 2008
@@ -6402,7 +6402,6 @@
 	char *port = NULL;
 	char *hostname=NULL, *secret=NULL, *authuser=NULL, *expire=NULL;
 	char *callback=NULL;
-	char *reserved = NULL;
 
 	if (!value)
 		return -1;
@@ -6427,15 +6426,7 @@
 		if (authuser)
 			*authuser++ = '\0';
 	}
-	if ((reserved = strpbrk(username, SIP_RESERVED))) {
-		goto invalid_char;
-	}
-	if (!ast_strlen_zero(secret) && (reserved = strpbrk(secret, SIP_RESERVED))) {
-		goto invalid_char;
-	}
-	if (!ast_strlen_zero(authuser) && (reserved = strpbrk(authuser, SIP_RESERVED))) {
-		goto invalid_char;
-	}
+
 	/* split host[:port][/contact] */
 	expire = strchr(hostname, '~');
 	if (expire)
@@ -6449,9 +6440,6 @@
 	 */
 	if ((port = strchr(hostname, ':'))) {
 		*port = '\0';
-	}
-	if ((reserved = strpbrk(hostname, SIP_RESERVED))) {
-		goto invalid_char;
 	}
 	/* And then re-merge the host and port so they are stored correctly
 	 */
@@ -6491,10 +6479,6 @@
 	ASTOBJ_CONTAINER_LINK(&regl, reg); /* Add the new registry entry to the list */
 	registry_unref(reg, "unref the reg pointer");	/* release the reference given by ASTOBJ_INIT. The container has another reference */
 	return 0;
-
-invalid_char:
-	ast_log(LOG_ERROR, "A reserved character ('%c') was used in a \"register\" line. This registration will not occur\n", *reserved);
-	return -1;
 }
 
 /*! \brief  Parse multiline SIP headers into one header