kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 02:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 172234 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r172234 | oej | 2009-01-29 12:19:29 +0100 (Tor, 29 Jan 2009) | 7 lines

Make sure register= line supports both port and expiry at the same time.
(closes issue #14185)
Reported by: Nick_Lewis
Patches: 
      chan_sip.c-expiryrequest6.patch uploaded by Nick (license 657)
Tested by: Nick_Lewis

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172235 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2009-01-29 11:24:30 +00:00
parent 815b9b5691
commit 3c4e4a8355
1 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
channels/chan_sip.c
View File

@@ -6476,7 +6476,6 @@ static int sip_register(const char *value, int lineno)
enum sip_transport transport = SIP_TRANSPORT_UDP; enum sip_transport transport = SIP_TRANSPORT_UDP;
char buf[256] = ""; char buf[256] = "";
char *username = NULL; char *username = NULL;
char *port = NULL;
char *hostname=NULL, *secret=NULL, *authuser=NULL, *expire=NULL; char *hostname=NULL, *secret=NULL, *authuser=NULL, *expire=NULL;
char *callback=NULL; char *callback=NULL;
@@ -6485,6 +6484,16 @@ static int sip_register(const char *value, int lineno)
ast_copy_string(buf, value, sizeof(buf)); ast_copy_string(buf, value, sizeof(buf));
/* split [/contact][~expiry] */
expire = strchr(buf, '~');
if (expire)
*expire++ = '\0';
callback = strchr(buf, '/');
if (callback)
*callback++ = '\0';
if (ast_strlen_zero(callback))
callback = "s";
sip_parse_host(buf, lineno, &username, &portnum, &transport); sip_parse_host(buf, lineno, &username, &portnum, &transport);
/* First split around the last '@' then parse the two components. */ /* First split around the last '@' then parse the two components. */
@@ -6504,25 +6513,6 @@ static int sip_register(const char *value, int lineno)
*authuser++ = '\0'; *authuser++ = '\0';
} }
/* split host[:port][/contact] */
expire = strchr(hostname, '~');
if (expire)
*expire++ = '\0';
callback = strchr(hostname, '/');
if (callback)
*callback++ = '\0';
if (ast_strlen_zero(callback))
callback = "s";
/* Separate host from port when checking for reserved characters
*/
if ((port = strchr(hostname, ':'))) {
*port = '\0';
}
/* And then re-merge the host and port so they are stored correctly
*/
if (port) {
*port = ':';
}
if (!(reg = ast_calloc(1, sizeof(*reg)))) { if (!(reg = ast_calloc(1, sizeof(*reg)))) {
ast_log(LOG_ERROR, "Out of memory. Can't allocate SIP registry entry\n"); ast_log(LOG_ERROR, "Out of memory. Can't allocate SIP registry entry\n");
return -1; return -1;