2002-10-03 Michael Koch <konqueror@gmx.de>
* java/net/DatagramPacket.java (setLength): Fixed typo and be HTML-aware. * java/net/InetSocketAddress.java (InetSocketAddress): Correct initialization of hostname, fixed typo. (equals): Added comment about equality of InetSocketAddress objects. * java/net/ServerSocket.java (accept): Added checks. (isClosed): New stubbed method. * java/net/SocketOptions.java: Reindention. * java/net/SocketPermission (SocketPermission): Documentation fixed. From-SVN: r57776
This commit is contained in:
parent
4c9c9a3da5
commit
a8e8f5c359
6 changed files with 46 additions and 19 deletions
|
@ -1,4 +1,18 @@
|
||||||
2002-09-30 Michael Koch <konqueror@gmx.de>
|
2002-10-03 Michael Koch <konqueror@gmx.de>
|
||||||
|
|
||||||
|
* java/net/DatagramPacket.java
|
||||||
|
(setLength): Fixed typo and be HTML-aware.
|
||||||
|
* java/net/InetSocketAddress.java
|
||||||
|
(InetSocketAddress): Correct initialization of hostname, fixed typo.
|
||||||
|
(equals): Added comment about equality of InetSocketAddress objects.
|
||||||
|
* java/net/ServerSocket.java
|
||||||
|
(accept): Added checks.
|
||||||
|
(isClosed): New stubbed method.
|
||||||
|
* java/net/SocketOptions.java: Reindention.
|
||||||
|
* java/net/SocketPermission
|
||||||
|
(SocketPermission): Documentation fixed.
|
||||||
|
|
||||||
|
2002-10-03 Michael Koch <konqueror@gmx.de>
|
||||||
|
|
||||||
* java/net/DatagramSocket.java
|
* java/net/DatagramSocket.java
|
||||||
(receive): Check with SecurityManager AFTER the packet is received,
|
(receive): Check with SecurityManager AFTER the packet is received,
|
||||||
|
|
|
@ -402,9 +402,9 @@ public final class DatagramPacket
|
||||||
/**
|
/**
|
||||||
* Sets the length of the data in the buffer.
|
* Sets the length of the data in the buffer.
|
||||||
*
|
*
|
||||||
* @param length The new length. (Where len <= buf.length)
|
* @param length The new length. (Where len <= buf.length)
|
||||||
*
|
*
|
||||||
* @exception IllegalArgumentException f the length is negative or
|
* @exception IllegalArgumentException If the length is negative or
|
||||||
* if the length is greater than the packet's data buffer length
|
* if the length is greater than the packet's data buffer length
|
||||||
*
|
*
|
||||||
* @since 1.1
|
* @since 1.1
|
||||||
|
|
|
@ -57,7 +57,7 @@ public class InetSocketAddress extends SocketAddress
|
||||||
* @param addr Address of the socket
|
* @param addr Address of the socket
|
||||||
* @param port Port if the socket
|
* @param port Port if the socket
|
||||||
*
|
*
|
||||||
* @exception IllegalArgumentException If the port number is illegal
|
* @exception IllegalArgumentException If the port number is illegel
|
||||||
*/
|
*/
|
||||||
public InetSocketAddress(InetAddress addr, int port)
|
public InetSocketAddress(InetAddress addr, int port)
|
||||||
throws IllegalArgumentException
|
throws IllegalArgumentException
|
||||||
|
@ -67,15 +67,7 @@ public class InetSocketAddress extends SocketAddress
|
||||||
|
|
||||||
this.addr = addr;
|
this.addr = addr;
|
||||||
this.port = port;
|
this.port = port;
|
||||||
|
this.hostname = addr.getHostName ();
|
||||||
try
|
|
||||||
{
|
|
||||||
this.hostname = addr.getHostName ();
|
|
||||||
}
|
|
||||||
catch (UnknownHostException e)
|
|
||||||
{
|
|
||||||
this.hostname = "";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -140,6 +132,9 @@ public class InetSocketAddress extends SocketAddress
|
||||||
*/
|
*/
|
||||||
public final boolean equals (Object obj)
|
public final boolean equals (Object obj)
|
||||||
{
|
{
|
||||||
|
// InetSocketAddress objects are equal when addr and port are equal.
|
||||||
|
// The hostname may differ.
|
||||||
|
|
||||||
if (obj instanceof InetSocketAddress)
|
if (obj instanceof InetSocketAddress)
|
||||||
{
|
{
|
||||||
InetSocketAddress a = (InetSocketAddress) obj;
|
InetSocketAddress a = (InetSocketAddress) obj;
|
||||||
|
|
|
@ -287,6 +287,13 @@ public class ServerSocket
|
||||||
*/
|
*/
|
||||||
public Socket accept () throws IOException
|
public Socket accept () throws IOException
|
||||||
{
|
{
|
||||||
|
if (impl == null)
|
||||||
|
throw new IOException ("Cannot initialize Socket implementation");
|
||||||
|
|
||||||
|
SecurityManager sm = System.getSecurityManager ();
|
||||||
|
if (sm != null)
|
||||||
|
sm.checkListen (impl.getLocalPort ());
|
||||||
|
|
||||||
Socket s = new Socket();
|
Socket s = new Socket();
|
||||||
implAccept (s);
|
implAccept (s);
|
||||||
|
|
||||||
|
@ -358,6 +365,17 @@ public class ServerSocket
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns true if the socket is closed, otherwise false
|
||||||
|
*
|
||||||
|
* @since 1.4
|
||||||
|
*/
|
||||||
|
public boolean isClosed()
|
||||||
|
{
|
||||||
|
// FIXME: implement this
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the value of SO_TIMEOUT. A value of 0 implies that SO_TIMEOUT is
|
* Sets the value of SO_TIMEOUT. A value of 0 implies that SO_TIMEOUT is
|
||||||
* disabled (ie, operations never time out). This is the number of
|
* disabled (ie, operations never time out). This is the number of
|
||||||
|
|
|
@ -60,7 +60,7 @@ public interface SocketOptions
|
||||||
* @since 1.3
|
* @since 1.3
|
||||||
*/
|
*/
|
||||||
static final int SO_KEEPALIVE = 0x8;
|
static final int SO_KEEPALIVE = 0x8;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Option id for the SO_LINGER value
|
* Option id for the SO_LINGER value
|
||||||
*/
|
*/
|
||||||
|
@ -106,13 +106,13 @@ public interface SocketOptions
|
||||||
static final int SO_OOBINLINE = 0x1003; // 4099
|
static final int SO_OOBINLINE = 0x1003; // 4099
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Option id for the TCP_NODELAY value
|
* Option id for the TCP_NODELAY value
|
||||||
*/
|
*/
|
||||||
static final int TCP_NODELAY = 0x01; // 1
|
static final int TCP_NODELAY = 0x01; // 1
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Options id for the IP_MULTICAST_IF value
|
* Options id for the IP_MULTICAST_IF value
|
||||||
*/
|
*/
|
||||||
static final int IP_MULTICAST_IF = 0x10; // 16
|
static final int IP_MULTICAST_IF = 0x10; // 16
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -121,7 +121,7 @@ public final class SocketPermission extends Permission
|
||||||
* specified host/port combination and actions string.
|
* specified host/port combination and actions string.
|
||||||
*
|
*
|
||||||
* @param hostport The hostname/port number combination
|
* @param hostport The hostname/port number combination
|
||||||
* @param perms The actions string
|
* @param actions The actions string
|
||||||
*/
|
*/
|
||||||
public SocketPermission(String hostport, String actions)
|
public SocketPermission(String hostport, String actions)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue