diff options
| author | Terry Wilson <twilson@digium.com> | 2011-08-18 21:39:04 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2011-08-18 21:39:04 +0000 |
| commit | d2af16a86c515c6d563cbb3eb30fcfdd5b59ec6a (patch) | |
| tree | f2df3d42de9995ea95dd4c26135caa28e9411258 /main/netsock2.c | |
| parent | 75bb8797f539fcd287fd8a363360550a9fb0c95f (diff) | |
Merged revisions 332560 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r332560 | twilson | 2011-08-18 16:34:04 -0500 (Thu, 18 Aug 2011) | 12 lines
Merged revisions 332559 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r332559 | twilson | 2011-08-18 16:26:01 -0500 (Thu, 18 Aug 2011) | 5 lines
Fix possible error on stringification of IPv4-mapped addrs
The FreeBSD netsock2 test has been failing for a while. We were
pasing sa->len to getnameinfo instead of sa_tmp->len.
ASTERISK-18289
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/netsock2.c')
| -rw-r--r-- | main/netsock2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/netsock2.c b/main/netsock2.c index 4ac1d0ffb..1922ac388 100644 --- a/main/netsock2.c +++ b/main/netsock2.c @@ -85,7 +85,7 @@ char *ast_sockaddr_stringify_fmt(const struct ast_sockaddr *sa, int format) sa_tmp = sa; } - if ((e = getnameinfo((struct sockaddr *)&sa_tmp->ss, sa->len, + if ((e = getnameinfo((struct sockaddr *)&sa_tmp->ss, sa_tmp->len, format & AST_SOCKADDR_STR_ADDR ? host : NULL, format & AST_SOCKADDR_STR_ADDR ? sizeof(host) : 0, format & AST_SOCKADDR_STR_PORT ? port : 0, |