From b8eb97d11e9ec4bb88e8d29516f3474647c25524 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Thu, 18 Aug 2011 21:34:04 +0000 Subject: [PATCH] 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/branches/10@332560 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/netsock2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/netsock2.c b/main/netsock2.c index 4ac1d0ffb2..1922ac3881 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, -- 2.47.2