diff options
Diffstat (limited to 'libjava/java')
-rw-r--r-- | libjava/java/net/natInetAddress.cc | 2 | ||||
-rw-r--r-- | libjava/java/net/natPlainSocketImpl.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libjava/java/net/natInetAddress.cc b/libjava/java/net/natInetAddress.cc index 7f7d953..9d5f93e 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 076ee71..c2c61fc 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); |