FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2003-06-08 Michael Koch <konqueror@gmx.de>

Browse source 
* java/net/DatagramSocket.java
	(DatagramSocket): No need to set SO_REUSEADDRESS here. This belongs
	into the Multicast constructors.
	* java/net/DatagramSocketImpl.java
	(getOption): Removed.
	(setOption): Removed.
	* java/net/MulticastSocket.java
	(MulticastSocket): Call setReuseAddress (true).
	* java/net/SocketImpl.java
	(getOption): Removed.
	(setOption): Removed.

From-SVN: r67617
This commit is contained in:
Michael Koch 2003-06-08 09:25:54 +00:00 • committed by Michael Koch
parent 147d396eaa
commit f61e212582
5 changed files with 17 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/java/net/DatagramSocket.java
View file

@ -174,9 +174,6 @@ public class DatagramSocket
}
impl.create();
// For multicasting, set the socket to be reused (Stevens pp. 195-6).
if (this instanceof MulticastSocket)
impl.setOption(SocketOptions.SO_REUSEADDR, new Boolean(true));
impl.bind(port, laddr == null ? InetAddress.ANY_IF : laddr);
@ -293,9 +290,6 @@ public class DatagramSocket
*/
public int getLocalPort()
{
if (!isBound ())
return -1;
return impl.getLocalPort();
}

32
libjava/java/net/DatagramSocketImpl.java
View file

@ -284,36 +284,4 @@ public abstract class DatagramSocketImpl implements SocketOptions
{
return localPort;
}
/**
* 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
* <code>Integer</code>. For options that are set to on or off, the
* value passed will be a <code>Boolean</code>. The <code>optionId</code>
* parameter is one of the defined constants in the superinterface.
*
* @param optionId The identifier of the option
* @param val The value to set the option to
*
* @exception SocketException If an error occurs
* @XXX This redeclaration from SocketOptions is a workaround to a gcj bug.
*/
public abstract void setOption(int optionId, Object val)
throws SocketException;
/**
* Returns the current setting of the specified option. The
* <code>Object</code> returned will be an <code>Integer</code> for options
* that have integer values. For options that are set to on or off, a
* <code>Boolean</code> will be returned. The <code>optionId</code>
* is one of the defined constants in the superinterface.
*
* @param optionId The option identifier
*
* @return The current value of the option
*
* @exception SocketException If an error occurs
* @XXX This redeclaration from SocketOptions is a workaround to a gcj bug.
*/
public abstract Object getOption(int option_id) throws SocketException;
}

3
libjava/java/net/MulticastSocket.java
View file

@ -81,6 +81,7 @@ public class MulticastSocket extends DatagramSocket
public MulticastSocket() throws IOException
{
super(0, null);
setReuseAddress (true);
}
/**
@ -95,6 +96,7 @@ public class MulticastSocket extends DatagramSocket
public MulticastSocket(int port) throws IOException
{
super(port, null);
setReuseAddress (true);
}
/**
@ -111,6 +113,7 @@ public class MulticastSocket extends DatagramSocket
public MulticastSocket(SocketAddress address) throws IOException
{
super(address);
setReuseAddress (true);
}
/**

32
libjava/java/net/SocketImpl.java
View file

@ -276,38 +276,6 @@ public abstract class SocketImpl implements SocketOptions
+ ",localport=" + localport + "]";
}
/**
* 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
* <code>Integer</code>. For options that are set to on or off, the
* value passed will be a <code>Boolean</code>. The <code>option_id</code>
* parameter is one of the defined constants in the superinterface.
*
* @param option_id The identifier of the option
* @param val The value to set the option to
*
* @exception SocketException If an error occurs
* @XXX This redeclaration from SocketOptions is a workaround to a gcj bug.
*/
public abstract void setOption(int option_id, Object val)
throws SocketException;
/**
* Returns the current setting of the specified option. The
* <code>Object</code> returned will be an <code>Integer</code> for options
* that have integer values. For options that are set to on or off, a
* <code>Boolean</code> will be returned. The <code>option_id</code>
* is one of the defined constants in the superinterface.
*
* @param option_id The option identifier
*
* @return The current value of the option
*
* @exception SocketException If an error occurs
* @XXX This redeclaration from SocketOptions is a workaround to a gcj bug.
*/
public abstract Object getOption(int option_id) throws SocketException;
/**
* Shut down the input side of this socket. Subsequent reads will
* return end-of-file.