2003-09-19 Michael Koch <konqueror@gmx.de>

	* gnu/java/net/PlainDatagramSocketImpl.java,
	gnu/java/net/PlainSocketImpl.java,
	gnu/java/net/SocketInputStream.java,
	gnu/java/net/SocketOutputStream.java: Moved from java/net.
	* gnu/java/net/Makefile.am
	(EXTRA_DIST): Added new files:
	PlainDatagramSocketImpl.java, PlainSocketImpl.java,
	SocketInputStream.java, SocketOutputStream.java.
	* include/gnu_java_net_PlainDatagramSocketImpl.h,
	include/gnu_java_net_PlainSocketImpl.h: New generated JNI header.
	* include/java_net_PlainDatagramSocketImpl.h,
	include/java_net_PlainSocketImpl.h: Removed generated JNI header.
	* include/Makefile.am: Generate and install new JNI header files
	instead of the old ones.
	* java/net/PlainDatagramSocketImpl.java,
	java/net/PlainSocketImpl.java,
	java/net/SocketInputStream.java,
	java/net/SocketOutputStream.java: Moved to gnu/java/net.
	* java/net/DatagramSocket.java:
	Import gnu.java.net.PlainDatagramSocketImpl.
	* java/net/ServerSocket.java,
	java/net/Socket.java: Import gnu.java.net.PlainSocketImpl.
	* java/net/Makefile.am (EXTRA_DIST): Removed the following files:
	PlainDatagramSocketImpl.java, PlainSocketImpl.java,
	SocketInputStream.java, SocketOutputStream.java.
	* native/jni/java-net/gnu_java_net_PlainDatagramSocketImpl.c,
	native/jni/java-net/gnu_java_net_PlainSocketImpl.c,
	native/jni/java-net/java_net_PlainDatagramSocketImpl.c,
	native/jni/java-net/java_net_PlainSocketImpl.c:
	Moved from java.net namespace to gnu.java.net.
	* native/jni/java-net/Makefile.am:
	Compile new files instead of old ones.

1 files changed, 319 insertions, 0 deletions

diff --git a/gnu/java/net/PlainSocketImpl.java b/gnu/java/net/PlainSocketImpl.java
new file mode 100644
index 000000000..d39af8711
--- /dev/null
+++ b/gnu/java/net/PlainSocketImpl.java
@@ -0,0 +1,319 @@
+/* PlainSocketImpl.java -- Default socket implementation
+   Copyright (C) 1998, 1999 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 gnu.java.net;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.NetworkInterface;
+import java.net.SocketAddress;
+import java.net.SocketException;
+import java.net.SocketImpl;
+import java.net.SocketOptions;
+import gnu.classpath.Configuration;
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification, as well
+ * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
+ * Status:  Believed complete and correct.
+ */
+
+/**
+ * Unless the application installs its own SocketImplFactory, this is the
+ * default socket implemetation that will be used.  It simply uses a
+ * combination of Java and native routines to implement standard BSD
+ * style sockets of family AF_INET and types SOCK_STREAM and SOCK_DGRAM
+ *
+ * @author Per Bothner <bothner@cygnus.com>
+ * @author Nic Ferrier <nferrier@tapsellferrier.co.uk>
+ * @author Aaron M. Renn <arenn@urbanophile.com>
+ */
+public final class PlainSocketImpl extends SocketImpl
+{
+  // Static initializer to load native library.
+  static
+    {
+      if (Configuration.INIT_LOAD_LIBRARY)
+        {
+          System.loadLibrary("javanet");
+        }
+    }
+
+  /**
+   * The OS file handle representing the socket.
+   * This is used for reads and writes to/from the socket and
+   * to close it.
+   *
+   * When the socket is closed this is reset to -1.
+   */
+  protected int native_fd = -1;
+
+  /**
+   * A cached copy of the in stream for reading from the socket.
+   */
+  private InputStream in;
+
+  /**
+   * A cached copy of the out stream for writing to the socket.
+   */
+  private OutputStream out;
+
+  /**
+   * Default do nothing constructor
+   */
+  public PlainSocketImpl()
+  {
+  }
+
+  /**
+   * Sets the specified option on a socket to the passed in object.  For
+   * options that take an integer argument, the passed in object is an
+   * Integer.  The option_id parameter is one of the defined constants in
+   * this interface.
+   *
+   * @param option_id The identifier of the option
+   * @param val The value to set the option to
+   *
+   * @exception SocketException If an error occurs
+   */
+  public native void setOption(int optID, Object value) throws SocketException;
+
+  /**
+   * Returns the current setting of the specified option.  The Object returned
+   * will be an Integer for options that have integer values.  The option_id
+   * is one of the defined constants in this interface.
+   *
+   * @param option_id The option identifier
+   *
+   * @return The current value of the option
+   *
+   * @exception SocketException If an error occurs
+   */
+  public native Object getOption(int optID) throws SocketException;
+
+  public void shutdownInput()
+  {
+    throw new InternalError ("PlainSocketImpl::shutdownInput not implemented");
+  }
+
+  public void shutdownOutput()
+  {
+    throw new InternalError ("PlainSocketImpl::shutdownOutput not implemented");
+  }
+
+  /**
+   * Creates a new socket that is not bound to any local address/port and
+   * is not connected to any remote address/port.  This will be created as
+   * a stream socket if the stream parameter is true, or a datagram socket
+   * if the stream parameter is false.
+   *
+   * @param stream true for a stream socket, false for a datagram socket
+   */
+  protected native synchronized void create(boolean stream)
+    throws IOException;
+
+  /**
+   * Connects to the remote hostname and port specified as arguments.
+   *
+   * @param hostname The remote hostname to connect to
+   * @param port The remote port to connect to
+   *
+   * @exception IOException If an error occurs
+   */
+  protected synchronized void connect (String host, int port) throws IOException
+  {
+    connect (InetAddress.getByName (host), port);
+  }
+
+  /**
+   * Connects to the remote address and port specified as arguments.
+   *
+   * @param addr The remote address to connect to
+   * @param port The remote port to connect to
+   *
+   * @exception IOException If an error occurs
+   */
+  protected native void connect(InetAddress addr, int port)
+    throws IOException;
+
+  protected synchronized void connect(SocketAddress address, int timeout)
+    throws IOException
+  {
+    InetSocketAddress sockAddr = (InetSocketAddress) address;
+    InetAddress addr = sockAddr.getAddress();
+
+    if (addr == null)
+      throw new IllegalArgumentException ("address is unresolved: " + sockAddr);
+
+    int port = sockAddr.getPort();
+    
+    if (timeout < 0)
+      throw new IllegalArgumentException ("negative timeout");
+
+    Object oldTimeoutObj = null;
+    
+    try
+      {
+ 	oldTimeoutObj = this.getOption (SocketOptions.SO_TIMEOUT);
+ 	this.setOption (SocketOptions.SO_TIMEOUT, new Integer (timeout));
+ 	connect (addr, port);
+      }
+    finally
+      {
+	if (oldTimeoutObj != null)
+	  this.setOption (SocketOptions.SO_TIMEOUT, oldTimeoutObj);
+      }
+  }
+
+  /**
+   * Binds to the specified port on the specified addr.  Note that this addr
+   * must represent a local IP address.  **** How bind to INADDR_ANY? ****
+   *
+   * @param addr The address to bind to
+   * @param port The port number to bind to
+   *
+   * @exception IOException If an error occurs
+   */
+  protected native synchronized void bind(InetAddress addr, int port)
+    throws IOException;
+
+  /**
+   * Starts listening for connections on a socket. The queuelen parameter
+   * is how many pending connections will queue up waiting to be serviced
+   * before being accept'ed.  If the queue of pending requests exceeds this
+   * number, additional connections will be refused.
+   *
+   * @param queuelen The length of the pending connection queue
+   * 
+   * @exception IOException If an error occurs
+   */
+  protected native synchronized void listen(int queuelen)
+    throws IOException;
+
+  /**
+   * Accepts a new connection on this socket and returns in in the 
+   * passed in SocketImpl.
+   *
+   * @param impl The SocketImpl object to accept this connection.
+   */
+  protected native synchronized void accept(SocketImpl impl)
+    throws IOException;
+
+  /**
+   * Returns the number of bytes that the caller can read from this socket
+   * without blocking. 
+   *
+   * @return The number of readable bytes before blocking
+   *
+   * @exception IOException If an error occurs
+   */
+  protected native int available() throws IOException;
+
+  /**
+   * Closes the socket.  This will cause any InputStream or OutputStream
+   * objects for this Socket to be closed as well.
+   * <p>
+   * Note that if the SO_LINGER option is set on this socket, then the
+   * operation could block.
+   *
+   * @exception IOException If an error occurs
+   */
+  protected native void close () throws IOException;
+
+  public void sendUrgentData(int data)
+  {
+    throw new InternalError ("PlainSocketImpl::sendUrgentData not implemented");
+  }
+
+  /**
+   * Internal method used by SocketInputStream for reading data from
+   * the connection.  Reads up to len bytes of data into the buffer
+   * buf starting at offset bytes into the buffer.
+   *
+   * @return The actual number of bytes read or -1 if end of stream.
+   *
+   * @exception IOException If an error occurs
+   */
+  protected native int read(byte[] buf, int offset, int len)
+    throws IOException;
+
+  /**
+   * Internal method used by SocketOuputStream for writing data to
+   * the connection.  Writes up to len bytes of data from the buffer
+   * buf starting at offset bytes into the buffer.
+   *
+   * @exception IOException If an error occurs
+   */
+  protected native void write(byte[] buf, int offset, int len)
+    throws IOException;
+
+  /**
+   * Returns an InputStream object for reading from this socket.  This will
+   * be an instance of SocketInputStream.
+   *
+   * @return An input stream attached to the socket.
+   *
+   * @exception IOException If an error occurs
+   */
+  protected synchronized InputStream getInputStream() throws IOException
+  {
+    if (in == null)
+      in = new SocketInputStream (this);
+    
+    return in;
+  }
+
+  /**
+   * Returns an OutputStream object for writing to this socket.  This will
+   * be an instance of SocketOutputStream.
+   *
+   * @return An output stream attached to the socket.
+   *
+   * @exception IOException If an error occurs
+   */
+  protected synchronized OutputStream getOutputStream() throws IOException
+  {
+    if (out == null)
+      out = new SocketOutputStream (this);
+    
+    return out;
+  }
+}