2005-04-29 Michael Koch <konqueror@gmx.de>

	* java/net/NetworkInterface.java
	(static): Removed.
	(NetworkInterface(String,InetAddress)): Made package-private.
	(NetworkInterface(String,InetAddress[])): New constructor.
	(getRealNetworkInterfaces): Removed.
	(getByName): Use VMNetworkInterface.getInterfaces().
	(getByInetAddress): Likewise.
	(getNetworkInterfaces): Likewise.
	* java/net/VMNetworkInterface.java,
	java/net/natVMNetworkInterfaceNoNet.cc,
	java/net/natVMNetworkInterfacePosix.c,c
	java/net/natVMNetworkInterfaceWin32.cc: New files.
	* java/net/natNetworkInterfaceNoNet.cc,
	java/net/natNetworkInterfacePosix.cc,
	 java/net/natNetworkInterfaceWin32.cc: Removed.
	* configure.ac
	* Makefile.am
	* configure, Makefile.in: Regenerated.

From-SVN: r99021

5 files changed, 88 insertions, 23 deletions

diff --git a/libjava/java/net/NetworkInterface.java b/libjava/java/net/NetworkInterface.java
index 2b4da73..cd59e4e 100644
--- a/libjava/java/net/NetworkInterface.java
+++ b/libjava/java/net/NetworkInterface.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package java.net;
 
-import gnu.classpath.Configuration;
-
 import java.util.Enumeration;
 import java.util.Vector;
 
@@ -55,24 +53,24 @@ import java.util.Vector;
  */
 public final class NetworkInterface
 {
-  static
-    {
-      if (Configuration.INIT_LOAD_LIBRARY)
-	System.loadLibrary("javanet");
-    }
-
   private String name;
   private Vector inetAddresses;
 
-  private NetworkInterface(String name, InetAddress address)
+  NetworkInterface(String name, InetAddress address)
   {
     this.name = name;
     this.inetAddresses = new Vector(1, 1);
     this.inetAddresses.add(address);
   }
 
-  private static native Vector getRealNetworkInterfaces()
-    throws SocketException;
+  NetworkInterface(String name, InetAddress[] addresses)
+  {
+    this.name = name;
+    this.inetAddresses = new Vector(addresses.length, 1);
+
+    for (int i = 0; i < addresses.length; i++)
+      this.inetAddresses.add(addresses[i]);
+  }
 
   /**
    * Returns the name of the network interface
@@ -145,7 +143,7 @@ public final class NetworkInterface
   public static NetworkInterface getByName(String name)
     throws SocketException
   {
-    Vector networkInterfaces = getRealNetworkInterfaces();
+    Vector networkInterfaces = VMNetworkInterface.getInterfaces();
 
     for (Enumeration e = networkInterfaces.elements(); e.hasMoreElements();)
       {
@@ -172,7 +170,7 @@ public final class NetworkInterface
   public static NetworkInterface getByInetAddress(InetAddress addr)
     throws SocketException
   {
-    Vector networkInterfaces = getRealNetworkInterfaces();
+    Vector networkInterfaces = VMNetworkInterface.getInterfaces();
 
     for (Enumeration interfaces = networkInterfaces.elements();
          interfaces.hasMoreElements();)
@@ -199,7 +197,7 @@ public final class NetworkInterface
    */
   public static Enumeration getNetworkInterfaces() throws SocketException
   {
-    Vector networkInterfaces = getRealNetworkInterfaces();
+    Vector networkInterfaces = VMNetworkInterface.getInterfaces();
 
     if (networkInterfaces.isEmpty())
       return null;
diff --git a/libjava/java/net/VMNetworkInterface.java b/libjava/java/net/VMNetworkInterface.java
new file mode 100644
index 0000000..3aaca38
--- /dev/null
+++ b/libjava/java/net/VMNetworkInterface.java
@@ -0,0 +1,66 @@
+/* VMNetworkInterface.java --
+   Copyright (C) 2005  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.net;
+
+import gnu.classpath.Configuration;
+
+import java.util.Enumeration;
+import java.util.Vector;
+
+/**
+ * This class models a network interface on the host computer.  A network
+ * interface contains a name (typically associated with a specific
+ * hardware adapter) and a list of addresses that are bound to it.
+ * For example, an ethernet interface may be named "eth0" and have the
+ * address 192.168.1.101 assigned to it.
+ *
+ * @author Michael Koch (konqueror@gmx.de)
+ * @since 1.4
+ */
+final class VMNetworkInterface
+{
+  static
+    {
+      if (Configuration.INIT_LOAD_LIBRARY)
+	System.loadLibrary("javanet");
+    }
+
+  public static native Vector getInterfaces()
+    throws SocketException;
+}
diff --git a/libjava/java/net/natNetworkInterfaceNoNet.cc b/libjava/java/net/natVMNetworkInterfaceNoNet.cc
index 5f3c508..eda7f99 100644
--- a/libjava/java/net/natNetworkInterfaceNoNet.cc
+++ b/libjava/java/net/natVMNetworkInterfaceNoNet.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003  Free Software Foundation
+/* Copyright (C) 2003, 2005  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -9,13 +9,13 @@ details.  */
 #include <config.h>
 #include <platform.h>
 
-#include <java/net/NetworkInterface.h>
 #include <java/net/SocketException.h>
+#include <java/net/VMNetworkInterface.h>
 #include <java/util/Vector.h>
 
 ::java::util::Vector*
-java::net::NetworkInterface::getRealNetworkInterfaces ()
+java::net::VMNetworkInterface::getInterfaces ()
 {
   throw new SocketException (
-    JvNewStringLatin1 ("NetworkInterface.getrealNetworkInterfaces: unimplemented"));
+    JvNewStringLatin1 ("VMNetworkInterface.getInterfaces: unimplemented"));
 }
diff --git a/libjava/java/net/natNetworkInterfacePosix.cc b/libjava/java/net/natVMNetworkInterfacePosix.cc
index f4c5d6b..c3a222a 100644
--- a/libjava/java/net/natNetworkInterfacePosix.cc
+++ b/libjava/java/net/natVMNetworkInterfacePosix.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003  Free Software Foundation
+/* Copyright (C) 2003, 2005  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -37,13 +37,14 @@ details.  */
 
 #include <gcj/cni.h>
 #include <jvm.h>
-#include <java/net/NetworkInterface.h>
 #include <java/net/Inet4Address.h>
+#include <java/net/NetworkInterface.h>
 #include <java/net/SocketException.h>
+#include <java/net/VMNetworkInterface.h>
 #include <java/util/Vector.h>
 
 ::java::util::Vector*
-java::net::NetworkInterface::getRealNetworkInterfaces ()
+java::net::VMNetworkInterface::getInterfaces ()
 {
   int fd;
   int num_interfaces = 0;
diff --git a/libjava/java/net/natNetworkInterfaceWin32.cc b/libjava/java/net/natVMNetworkInterfaceWin32.cc
index 429066e..257e06d 100644
--- a/libjava/java/net/natNetworkInterfaceWin32.cc
+++ b/libjava/java/net/natVMNetworkInterfaceWin32.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003  Free Software Foundation
+/* Copyright (C) 2003, 2005  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -114,7 +114,7 @@ determineGetRealNetworkInterfacesFN ()
 }
 
 ::java::util::Vector*
-java::net::NetworkInterface::getRealNetworkInterfaces ()
+java::net::VMNetworkInterface::getInterfaces ()
 {
   // This next declaration used to be a static local,
   // but this introduced a dependency on libsupc++ due