From 816495ba8a53fb9889f78054806a32694ac18ab0 Mon Sep 17 00:00:00 2001 From: tromey Date: Thu, 8 Apr 1999 13:22:59 +0000 Subject: 1999-04-08 Geoff Berry * 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 --- libjava/java/net/natInetAddress.cc | 2 +- libjava/java/net/natPlainSocketImpl.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'libjava/java') diff --git a/libjava/java/net/natInetAddress.cc b/libjava/java/net/natInetAddress.cc index 7f7d953b9c1..9d5f93e857f 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 076ee711948..c2c61fcb651 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); -- cgit v1.2.3