diff options
| author | <simon.perreault@viagenie.ca> | 2010-08-11 13:31:39 +0000 |
|---|---|---|
| committer | <simon.perreault@viagenie.ca> | 2010-08-11 13:31:39 +0000 |
| commit | a491cac965c0a3c70377a704bdc12c178d1d5baf (patch) | |
| tree | b1144a9f6218f2cb460171b101f58022c3a6742a /channels/sip/config_parser.c | |
| parent | 1990c4347e3f6f0afdc273e1f60f7c7a69f99423 (diff) | |
Merged revisions 281687 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r281687 | simon.perreault | 2010-08-11 09:30:59 -0400 (Wed, 11 Aug 2010) | 9 lines
Fix parsing of IPv6 address literals in outboundproxy
(closes issue #17757)
Reported by: oej
Patches:
17757.diff uploaded by sperreault (license 252)
sip.conf.diff uploaded by sperreault (license 252)
Tested by: oej
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@281688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sip/config_parser.c')
| -rw-r--r-- | channels/sip/config_parser.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/channels/sip/config_parser.c b/channels/sip/config_parser.c index 659e8cecc..0ab9ed769 100644 --- a/channels/sip/config_parser.c +++ b/channels/sip/config_parser.c @@ -661,16 +661,18 @@ int sip_parse_host(char *line, int lineno, char **hostname, int *portnum, enum s else line = *hostname; - if ((port = strrchr(line, ':'))) { - *port++ = '\0'; + if (ast_sockaddr_split_hostport(line, hostname, &port, 0) == 0) { + ast_log(LOG_WARNING, "Cannot parse host '%s' on line %d of sip.conf.\n", + line, lineno); + return -1; + } + if (port) { if (!sscanf(port, "%5u", portnum)) { ast_log(LOG_NOTICE, "'%s' is not a valid port number on line %d of sip.conf. using default.\n", port, lineno); port = NULL; } - } - - if (!port) { + } else { if (*transport & SIP_TRANSPORT_TLS) { *portnum = STANDARD_TLS_PORT; } else { |