diff options
| author | simon.perreault <simon.perreault@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-08-11 13:31:39 +0000 |
|---|---|---|
| committer | simon.perreault <simon.perreault@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-08-11 13:31:39 +0000 |
| commit | 2b70d4917f1c6e778f9700eb801a538bc28def3a (patch) | |
| tree | b1144a9f6218f2cb460171b101f58022c3a6742a /main | |
| parent | 92f6466eff47e38a66e65540f12f6dc77bda2a3e (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: http://svn.digium.com/svn/asterisk/trunk@281688 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/netsock2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/netsock2.c b/main/netsock2.c index 929f4b337..932ca57c2 100644 --- a/main/netsock2.c +++ b/main/netsock2.c @@ -118,7 +118,7 @@ char *ast_sockaddr_stringify_fmt(const struct ast_sockaddr *sa, int format) return ast_str_buffer(str); } -int static _ast_sockaddr_parse(char *str, char **host, char **port, int flags) +int ast_sockaddr_split_hostport(char *str, char **host, char **port, int flags) { char *s = str; @@ -187,7 +187,7 @@ int ast_sockaddr_parse(struct ast_sockaddr *addr, const char *str, int flags) int e; s = ast_strdupa(str); - if (!_ast_sockaddr_parse(s, &host, &port, flags)) { + if (!ast_sockaddr_split_hostport(s, &host, &port, flags)) { return 0; } @@ -233,7 +233,7 @@ int ast_sockaddr_resolve(struct ast_sockaddr **addrs, const char *str, int e, i, res_cnt; s = ast_strdupa(str); - if (!_ast_sockaddr_parse(s, &host, &port, flags)) { + if (!ast_sockaddr_split_hostport(s, &host, &port, flags)) { return 0; } |