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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a456444bff4b1604a1482ca2bc14fd5cce7fbf0d..dcaae77c40cc8f16e2020874ae86a6910da746d5 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -2,6 +2,14 @@
 
        * boehm.cc (_Jv_RegisterFinalizer): Cast `meth' to GC_PTR.
        * exception.cc (_Jv_Throw): Cast `_Jv_type_matcher' to __eh_matcher.
+       * 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.0' instead of
+       null.
+       * java/net/natPlainDatagramSocketImpl (bind): Expect `0.0.0.0'
+       instead of null.
 
 1999-08-01  Alexandre Oliva  <oliva@dcc.unicamp.br>
 

diff --git a/libjava/boehm.cc b/libjava/boehm.cc
index 3fc0a5d664bd0aafe1e9847479bef5cc9e45ce04..f9e72bade8efcf4345ddfe07f1665400cb42449b 100644 (file)
--- a/libjava/boehm.cc
+++ b/libjava/boehm.cc
@@ -260,7 +260,7 @@ call_finalizer (GC_PTR obj, GC_PTR client_data)
 void
 _Jv_RegisterFinalizer (void *object, _Jv_FinalizerFunc *meth)
 {
-  GC_REGISTER_FINALIZER_NO_ORDER (object, call_finalizer, (GC_PTR)meth,
+  GC_REGISTER_FINALIZER_NO_ORDER (object, call_finalizer, (GC_PTR) meth,
                                  NULL, NULL);
 }
 

diff --git a/libjava/exception.cc b/libjava/exception.cc
index 0c6553ff5bcb5c34432b7e28c17b097e3e09bd04..9a0c79628fc5d85b1892a4d3ccd0fec5a0f739f5 100644 (file)
--- a/libjava/exception.cc
+++ b/libjava/exception.cc
@@ -147,7 +147,7 @@ _Jv_Throw (void *value)
       _Jv_eh_alloc ();
       ehinfo = *(__get_eh_info ());
     }
-  ehinfo->eh_info.match_function = (__eh_matcher)_Jv_type_matcher;
+  ehinfo->eh_info.match_function = (__eh_matcher) _Jv_type_matcher;
   ehinfo->eh_info.language = EH_LANG_Java;
   ehinfo->eh_info.version = 1;
   ehinfo->value = value;

diff --git a/libjava/java/net/DatagramSocket.java b/libjava/java/net/DatagramSocket.java
index 3291efe024ad170123d5646fbb1cfa91c3330007..6f5e73549955a4b4a975564a88eeeb9b8ca4986b 100644 (file)
--- a/libjava/java/net/DatagramSocket.java
+++ b/libjava/java/net/DatagramSocket.java
@@ -28,12 +28,12 @@ public class DatagramSocket
 
   public DatagramSocket() throws SocketException
   {
-    this(0, null);
+    this(0, ServerSocket.ANY_IF);
   }
 
   public DatagramSocket(int port) throws SocketException
   {
-    this(port, null);
+    this(port, ServerSocket.ANY_IF);
   }
 
   public DatagramSocket(int port, InetAddress laddr) throws SocketException

diff --git a/libjava/java/net/ServerSocket.java b/libjava/java/net/ServerSocket.java
index 0d40bcc9bd67b29c57810b3bea295d28fcb0f19a..95c9f358c1c1997649effcac0f7cc00f712782e1 100644 (file)
--- a/libjava/java/net/ServerSocket.java
+++ b/libjava/java/net/ServerSocket.java
@@ -25,6 +25,10 @@ public class ServerSocket
   static SocketImplFactory factory;
   SocketImpl impl;
 
+  static final byte[] zeros = {0,0,0,0};
+  /* dummy InetAddress, used to bind socket to any (all) network interfaces */
+  static final InetAddress ANY_IF = new InetAddress(zeros, null);
+
   public ServerSocket (int port)
     throws java.io.IOException
   {
@@ -34,7 +38,7 @@ public class ServerSocket
   public ServerSocket (int port, int backlog)
     throws java.io.IOException
   {
-    this(port, backlog, null);
+    this(port, backlog, ANY_IF);
   }
 
   public ServerSocket (int port, int backlog, InetAddress bindAddr)

diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc
index ec08d20a64a916b7bcd84dca15087b13441d667b..8ef7fd2bd3129217d432118bdbad43703d5e2f05 100644 (file)
--- a/libjava/java/net/natPlainDatagramSocketImpl.cc
+++ b/libjava/java/net/natPlainDatagramSocketImpl.cc
@@ -101,16 +101,10 @@ java::net::PlainDatagramSocketImpl::bind (jint lport,
   // FIXME: prob. need to do a setsockopt with SO_BROADCAST to allow multicast.
   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.
-
-  if (host != NULL)
-    {
-      jbyteArray haddress = host->address;
-      bytes = elements (haddress);
-      len = haddress->length;
-    }
+  jbyteArray haddress = host->address;
+  jbyte *bytes = elements (haddress);
+  int len = haddress->length;
 
   if (len == 4)
     {

diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc
index 2e7f9d5c558130bac848edb9090cdb67ba0a60c0..d42b821614f3c6bfd1c76fee6a75d71f2417127a 100644 (file)
--- 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;