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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26297 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c97368a..e44147f 100644 (file)
--- 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 7f7d953..9d5f93e 100644 (file)
--- 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 076ee71..c2c61fc 100644 (file)
--- 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);