Return-Path: 
 <cvs-return-6003-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org>
Delivered-To: apmail-apr-cvs-archive@www.apache.org
Received: (qmail 82510 invoked from network); 13 Jul 2004 09:15:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 13 Jul 2004 09:15:52 -0000
Received: (qmail 90302 invoked by uid 500); 13 Jul 2004 09:15:52 -0000
Delivered-To: apmail-apr-cvs-archive@apr.apache.org
Received: (qmail 90193 invoked by uid 500); 13 Jul 2004 09:15:51 -0000
Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:cvs@apr.apache.org>
List-Help: <mailto:cvs-help@apr.apache.org>
List-Unsubscribe: <mailto:cvs-unsubscribe@apr.apache.org>
List-Subscribe: <mailto:cvs-subscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
Delivered-To: mailing list cvs@apr.apache.org
Received: (qmail 90180 invoked by uid 99); 13 Jul 2004 09:15:51 -0000
X-ASF-Spam-Status: No, hits=0.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Date: 13 Jul 2004 09:15:50 -0000
Message-ID: <20040713091550.82467.qmail@minotaur.apache.org>
From: jorton@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/network_io/unix sockaddr.c
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

jorton      2004/07/13 02:15:50

  Modified:    network_io/unix sockaddr.c
  Log:
  * network_io/unix/sockaddr.c (apr_getnameinfo): Fix getnameinfo on
  v4mapped addresses for *BSD.
  
  PR: 30066
  Submitted by: Tsurutani Naoki <turutani scphys.kyoto-u.ac.jp>
  
  Revision  Changes    Path
  1.55      +3 -0      apr/network_io/unix/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sockaddr.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -d -w -u -r1.54 -r1.55
  --- sockaddr.c	5 Jul 2004 08:35:49 -0000	1.54
  +++ sockaddr.c	13 Jul 2004 09:15:50 -0000	1.55
  @@ -596,6 +596,9 @@
           struct sockaddr_in tmpsa;
           tmpsa.sin_family = AF_INET;
           tmpsa.sin_addr.s_addr = ((apr_uint32_t *)sockaddr->ipaddr_ptr)[3];
  +#ifdef SIN6_LEN
  +        tmpsa.sin_len = sizeof(tmpsa);
  +#endif
   
           rc = getnameinfo((const struct sockaddr *)&tmpsa, sizeof(tmpsa),
                            tmphostname, sizeof(tmphostname), NULL, 0,