diff options
| author | Geoff Berry <gcb@gnu.org> | 1999-04-08 13:22:59 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1999-04-08 13:22:59 +0000 |
| commit | 825bd5ae6fcf0304921a2bbc5a2c99d75ec41b8e (patch) | |
| tree | 778821236e2bff227ef0adabb0a7c698ddc0b733 /libjava | |
| parent | 3fc5037bd1f8b59ab08315ff0fa3318b6324e3ba (diff) | |
| download | gcc-825bd5ae6fcf0304921a2bbc5a2c99d75ec41b8e.zip gcc-825bd5ae6fcf0304921a2bbc5a2c99d75ec41b8e.tar.gz gcc-825bd5ae6fcf0304921a2bbc5a2c99d75ec41b8e.tar.bz2 | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/net/natInetAddress.cc | 2 | ||||
| -rw-r--r-- | libjava/java/net/natPlainSocketImpl.cc | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c97368a..e44147f 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 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); |