From f2ed9e9656a375cf80b11dfb3a264a7551654ecd Mon Sep 17 00:00:00 2001 From: Warren Levy Date: Wed, 26 May 1999 17:00:06 +0000 Subject: [multiple changes] 1999-05-26 Bryce McKinlay * java/net/DatagramSocket.java (getSoTimeout): Verify class type. * java/net/DatagramSocketImpl.java (getOption): Made abstract. (setOption): Made abstract. * java/net/PlainDatagramSocketImpl.java: Mirror SocketOptions fields to avoid cpp conflicts in native code. * java/net/PlainSocketImpl.java: Mirror SocketOptions fields to avoid cpp conflicts in native code. * java/net/ServerSocket.java (toString): Prepended "ServerSocket". * java/net/Socket.java (getLocalAddress): Implemented. (setTcpNoDelay): Implemented. (getTcpNoDelay): Implemented. (setSoLinger): Implemented. (getSoLinger): Implemented. (getSoTimeout): Verify class type. (setSendBufferSize): Implemented. (getSendBufferSize): Implemented. (setReceiveBufferSize): Implemented. (getReceiveBufferSize): Implemented. (toString): Prepended "Socket". * java/net/SocketImpl.java (toString): Rewritten. (getOption): Made abstract. (setOption): Made abstract. * java/net/natPlainSocketImpl.cc (connect): Set localport properly. (setOption): Implemented. (getOption): Implemented. 1999-05-26 Warren Levy * java/net/DatagramSocket.java (DatagramSocket): Get local host address when null. Set SO_REUSEADDR for multicasts. (getSoTimeout): Implemented. (setSoTimeout): Implemented. * java/net/DatagramSocketImpl.java: Implement SocketOptions interface. * java/net/MulticastSocket.java (getInterface): Implemented. (setInterface): Implemented. (setTimeToLive): Check for invalid ttl. (joinGroup): Verify multicast address and security. (leaveGroup): Verify multicast address and security. (send): Implemented. * java/net/PlainDatagramSocketImpl.java (timeout): Added. (iface): Added. (ttl): Added. (setOption): Added. (getOption): Added. (mcastGrp): Added. (getTTL): Implemented as non-native. (setTTL): ditto. (join): ditto. (leave): ditto. * java/net/ServerSocket.java (setSoTimeout): Implemented. (getSoTimeout): Implemented. (setSocketFactory): Made synchronized. * java/net/Socket.java (setSoTimeout): Implemented. (getSoTimeout): Implemented. (close): Made synchronized. (setSocketImplFactory): Made synchronized. * java/net/SocketImpl.java: Implement SocketOptions interface. * java/net/natInetAddress.cc: Corrected module name at top of file. * java/net/natPlainDatagramSocketImpl.cc (McastReq): Added union. (bind): Added FIXME. (peek): Implemented. (setTTL): Removed. (getTTL): Removed. (join): Removed. (leave): Removed. (mcastGrp): Added. (setOption): Implemented for SO_REUSEADDR. (getOption): Implemented for SO_REUSEADDR. From-SVN: r27184 --- libjava/java/net/PlainDatagramSocketImpl.java | 47 ++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 5 deletions(-) (limited to 'libjava/java/net/PlainDatagramSocketImpl.java') diff --git a/libjava/java/net/PlainDatagramSocketImpl.java b/libjava/java/net/PlainDatagramSocketImpl.java index 7628c5087e3..2a063717cc5 100644 --- a/libjava/java/net/PlainDatagramSocketImpl.java +++ b/libjava/java/net/PlainDatagramSocketImpl.java @@ -24,13 +24,28 @@ import java.io.IOException; class PlainDatagramSocketImpl extends DatagramSocketImpl { + // These fields are mirrored for use in native code to avoid cpp conflicts + // when the #defines in system header files are the same as the public fields. + static final int _Jv_TCP_NODELAY_ = SocketOptions.TCP_NODELAY, + _Jv_SO_BINDADDR_ = SocketOptions.SO_BINDADDR, + _Jv_SO_REUSEADDR_ = SocketOptions.SO_REUSEADDR, + _Jv_IP_MULTICAST_IF_ = SocketOptions.IP_MULTICAST_IF, + _Jv_SO_LINGER_ = SocketOptions.SO_LINGER, + _Jv_SO_TIMEOUT_ = SocketOptions.SO_TIMEOUT, + _Jv_SO_SNDBUF_ = SocketOptions.SO_SNDBUF, + _Jv_SO_RCVBUF_ = SocketOptions.SO_RCVBUF; + int fnum = -1; InetAddress address; // TBD: DatagramSocket.getLocalAddress()? + // FIXME: These values are set/read by setOption/getOption. + int timeout = 0; + InetAddress iface = null; + int ttl = -1; // FIXME: Probably should have bind (and create?) calls from DatagramSocket // constuctor. If so, then same change should be made to the corresponding // Socket (non-datagram) classes. This allows the implementation more - // compleete control over how the socket is set up and used (e.g. connect, + // complete control over how the socket is set up and used (e.g. connect, // setting options, etc.). public PlainDatagramSocketImpl() { @@ -40,17 +55,39 @@ class PlainDatagramSocketImpl extends DatagramSocketImpl throws SocketException; protected native void create() throws SocketException; protected native int peek(InetAddress i) throws IOException; - protected native void setTTL(byte ttl) throws IOException; - protected native byte getTTL() throws IOException; protected native void setTimeToLive(int ttl) throws IOException; protected native int getTimeToLive() throws IOException; - protected native void join(InetAddress inetaddr) throws IOException; - protected native void leave(InetAddress inetaddr) throws IOException; protected native void send(DatagramPacket p) throws IOException; protected native void receive(DatagramPacket p) throws IOException; + public native void setOption(int optID, Object value) throws SocketException; + public native Object getOption(int optID) throws SocketException; + private native void mcastGrp(InetAddress inetaddr, boolean join) + throws IOException; protected void close() throws IOException { fd.close(); } + + // Deprecated in JDK 1.2. + protected byte getTTL() throws IOException + { + return (byte) getTimeToLive(); + } + + // Deprecated in JDK 1.2. + protected void setTTL(byte ttl) throws IOException + { + setTimeToLive(((int) ttl) & 0xFF); + } + + protected void join(InetAddress inetaddr) throws IOException + { + mcastGrp(inetaddr, true); + } + + protected void leave(InetAddress inetaddr) throws IOException + { + mcastGrp(inetaddr, false); + } } -- cgit v1.2.3