diff options
| author | Brett Bryant <bbryant@digium.com> | 2008-07-02 17:27:36 +0000 |
|---|---|---|
| committer | Brett Bryant <bbryant@digium.com> | 2008-07-02 17:27:36 +0000 |
| commit | b30ed551e053ada85518b479bc0cc75a386403f0 (patch) | |
| tree | 2a459dbaf5ae8926568e0fa3ec768fe28b2d3c10 /channels | |
| parent | 3cf77c4c7f14a24edfc62f9c34492e4a3818f3c1 (diff) | |
Fix to sip_parse_host so that it passes the correct information to sip_registry.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 74b20dd64..17b1dfa0f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6379,7 +6379,7 @@ static int sip_register(const char *value, int lineno) 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][~expiry] 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]] */ @@ -19693,7 +19693,12 @@ static int sip_parse_host(char *line, int lineno, char **hostname, int *portnum, *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)) { |