From 25fef12b66f0d50abd3d73bbd6c2e5ce96f1b78e Mon Sep 17 00:00:00 2001
From: Bryce McKinlay <bryce@albatross.co.nz>
Date: Tue, 3 Aug 1999 00:30:53 +0000
Subject: ServerSocket.java: Define ANY_IF.
* java/net/ServerSocket.java: Define ANY_IF.
(ServerSocket (int,int)): Use ANY_IF instead of null to bind to
all network interfaces.
* java/net/DatagramSocket.java (DatagramSocket): ditto.
* java/net/natPlainSocketImpl.cc (bind): Expect 0.0.0' instead of
null.
* java/net/natPlainDatagramSocketImpl (bind): Expect 0.0.0'
instead of null.
From-SVN: r28429
---
libjava/java/net/natPlainSocketImpl.cc | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
(limited to 'libjava/java/net/natPlainSocketImpl.cc')
diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc
index 2e7f9d5..d42b821 100644
--- a/libjava/java/net/natPlainSocketImpl.cc
+++ b/libjava/java/net/natPlainSocketImpl.cc
@@ -71,17 +71,10 @@ java::net::PlainSocketImpl::bind (java::net::InetAddress *host, jint lport)
{
union SockAddr u;
struct sockaddr *ptr = (struct sockaddr *) &u.address;
- jbyte *bytes = NULL;
- // FIXME: Use getaddrinfo() to get actual protocol instead of assuming ipv4.
- int len = 4; // Initialize for INADDR_ANY in case host is NULL.
+ jbyteArray haddress = host->address;
+ jbyte *bytes = elements (haddress);
+ int len = haddress->length;
- if (host != NULL)
- {
- jbyteArray haddress = host->address;
- bytes = elements (haddress);
- len = haddress->length;
- }
-
if (len == 4)
{
u.address.sin_family = AF_INET;
--
cgit v1.1