[svn-commits] twilson: trunk r332561 - in /trunk: ./ main/netsock2.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Thu Aug 18 16:39:04 2011
New Revision: 332561

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=332561
Log:
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.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/netsock2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/netsock2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/netsock2.c?view=diff&rev=332561&r1=332560&r2=332561
==============================================================================
--- trunk/main/netsock2.c (original)
+++ trunk/main/netsock2.c Thu Aug 18 16:39:04 2011
@@ -85,7 +85,7 @@
 		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,