From b0e1d9ae2c3408dcf3e9b47b3371adb7daf9f088 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Mon, 17 Feb 2003 15:33:54 +0000 Subject: [PATCH] 2003-02-17 Michael Koch * java/net/DatagramSocket.java (connect): Merged with classpath. (disconnect): Merged documentation with classpath. (receice): Merged documentation with classpath. (send): Merged documentation with classpath. From-SVN: r63000 --- libjava/ChangeLog | 8 +++++ libjava/java/net/DatagramSocket.java | 44 ++++++++++++++++------------ 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b5fada9b90c..18ae7685663 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2003-02-17 Michael Koch + + * java/net/DatagramSocket.java + (connect): Merged with classpath. + (disconnect): Merged documentation with classpath. + (receice): Merged documentation with classpath. + (send): Merged documentation with classpath. + 2003-02-17 Michael Koch * java/awt/dnd/DragSourceContext.java diff --git a/libjava/java/net/DatagramSocket.java b/libjava/java/net/DatagramSocket.java index c286d650b73..334083a6f35 100644 --- a/libjava/java/net/DatagramSocket.java +++ b/libjava/java/net/DatagramSocket.java @@ -429,36 +429,38 @@ public class DatagramSocket } /** - * Connects the datagram socket to a specified address/port. - * - * @param address The address to connect to. - * @param port The port to connect to. + * This method connects this socket to the specified address and port. + * When a datagram socket is connected, it will only send or receive + * packets to and from the host to which it is connected. A multicast + * socket that is connected may only send and not receive packets. + * + * @param address The address to connect this socket to. + * @param port The port to connect this socket to. * * @exception SocketException If an error occurs. - * @exception IllegalArgumentException If address is null - * or the port number is illegal. + * @exception IllegalArgumentException If address or port are invalid. * @exception SecurityException If the caller is not allowed to send - * datagrams to and receive datagrams from the address and port. + * datagrams to or receive from this address and port. * * @since 1.2 */ public void connect(InetAddress address, int port) { if (address == null) - throw new IllegalArgumentException ("Address may not be null"); + throw new IllegalArgumentException ("Connect address may not be null"); if ((port < 1) || (port > 65535)) - throw new IllegalArgumentException ("Port number is illegal"); + throw new IllegalArgumentException ("Port number is illegal: " + port); SecurityManager sm = System.getSecurityManager(); if (sm != null) - sm.checkAccept(address.getHostName (), port); + sm.checkConnect(address.getHostName(), port); try { - impl.connect (address, port); - remoteAddress = address; - remotePort = port; + impl.connect (address, port); + remoteAddress = address; + remotePort = port; } catch (SocketException e) { @@ -466,8 +468,10 @@ public class DatagramSocket } /** - * Disconnects the datagram socket. - * + * This method disconnects this socket from the address/port it was + * conencted to. If the socket was not connected in the first place, + * this method does nothing. + * * @since 1.2 */ public void disconnect() @@ -476,8 +480,11 @@ public class DatagramSocket } /** - * Receive a datagram packet. - * + * Reads a datagram packet from the socket. Note that this method + * will block until a packet is received from the network. On return, + * the passed in DatagramPacket is populated with the data + * received and all the other information about the packet. + * * @param p The datagram packet to put the incoming data into. * * @exception IOException If an error occurs. @@ -511,7 +518,8 @@ public class DatagramSocket } /** - * Sends a datagram packet. + * Sends the specified packet. The host and port to which the packet + * are to be sent should be set inside the packet. * * @param p The datagram packet to send. * -- 2.30.2