From: Geoff Berry <gcb@gnu.org>
Date: Thu, 8 Apr 1999 13:22:59 +0000 (+0000)
Subject: natInetAddress.cc (lookup): Fix typo (AF_INET16 -> AF_INET6).
X-Git-Tag: prereleases/gcc-2.95-test~1100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=825bd5ae6fcf0304921a2bbc5a2c99d75ec41b8e;p=thirdparty%2Fgcc.git

natInetAddress.cc (lookup): Fix typo (AF_INET16 -> AF_INET6).

1999-04-08  Geoff Berry  <gcb@gnu.org>
	* natInetAddress.cc (lookup): Fix typo (AF_INET16 -> AF_INET6).
	* natPlainSocketImpl.cc (accept): Add missing else if check
	for AF_INET6.

From-SVN: r26297
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c97368a77352..e44147fc242f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+1999-04-08  Geoff Berry  <gcb@gnu.org>
+
+	* natInetAddress.cc (lookup): Fix typo (AF_INET16 -> AF_INET6).
+	* natPlainSocketImpl.cc (accept): Add missing else if check
+	for AF_INET6.
+
 1999-04-08  Tom Tromey  <tromey@cygnus.com>
 
 	* java/lang/Long.java (parseLong): Corrected overflow detection
diff --git a/libjava/java/net/natInetAddress.cc b/libjava/java/net/natInetAddress.cc
index 7f7d953b9c19..9d5f93e857fc 100644
--- a/libjava/java/net/natInetAddress.cc
+++ b/libjava/java/net/natInetAddress.cc
@@ -154,7 +154,7 @@ java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr,
       else if (len == 16)
 	{
 	  val = (char *) &chars;
-	  type = AF_INET16;
+	  type = AF_INET6;
 	}
 #endif /* HAVE_INET6 */
       else
diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc
index 076ee7119485..c2c61fcb6516 100644
--- a/libjava/java/net/natPlainSocketImpl.cc
+++ b/libjava/java/net/natPlainSocketImpl.cc
@@ -155,6 +155,7 @@ java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *s)
       rport = ntohs (u.address.sin_port);
     }
 #ifdef HAVE_INET6
+  else if (u.address.sin_family == AF_INET6)
     {
       raddr = JvNewByteArray (16);
       memcpy (elements (raddr), &u.address6.sin6_addr, 16);