sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@162664 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson 2008-12-10 16:34:35 +00:00
parent bc3d3a25b5
commit d659ec3cd2
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
channels/chan_sip.c
View File

@ -6813,7 +6813,6 @@ static int sip_register(const char *value, int lineno)
char *port = NULL;
char *hostname=NULL, *secret=NULL, *authuser=NULL, *expire=NULL;
char *callback=NULL;
char *reserved = NULL;
if (!value)
return -1;
@ -6838,15 +6837,7 @@ static int sip_register(const char *value, int lineno)
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)
@ -6861,9 +6852,6 @@ static int sip_register(const char *value, int lineno)
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
*/
if (port) {
@ -6902,10 +6890,6 @@ static int sip_register(const char *value, int lineno)
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 mwi=> line in sip.conf and add to list */