From: Michael Koch <konqueror@gmx.de>
Date: Wed, 4 Sep 2002 05:34:12 +0000 (+0000)
Subject: SocketOptions.java: added static variables to be JDK 1.4 compatible (SO_BROADCAST...
X-Git-Tag: releases/gcc-3.3.0~3055
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=268cecf97c64915a3142f7829ad185a06eb761e1;p=thirdparty%2Fgcc.git

SocketOptions.java: added static variables to be JDK 1.4 compatible (SO_BROADCAST...

2002-09-04  Michael Koch  <konqueror@gmx.de>

       * java/net/SocketOptions.java: added static variables to be JDK 1.4
       compatible (SO_BROADCAST, SO_OOBINLINE, IP_MULTICAST_IF2,
       IP_MULTICAST_LOOP, IP_TOS)

From-SVN: r56782
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 22c7ddbd0bc7..3bdb822de8e8 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-04  Michael Koch  <konqueror@gmx.de>
+
+	* java/net/SocketOptions.java: added static variables to be JDK 1.4
+	compatible (SO_BROADCAST, SO_OOBINLINE, IP_MULTICAST_IF2,
+	IP_MULTICAST_LOOP, IP_TOS
+
 2002-09-03  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/Class.h (_getDeclaredMethod): Declare.
diff --git a/libjava/java/net/SocketOptions.java b/libjava/java/net/SocketOptions.java
index bf57450d0375..fda637e8d060 100644
--- a/libjava/java/net/SocketOptions.java
+++ b/libjava/java/net/SocketOptions.java
@@ -51,6 +51,7 @@ package java.net;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   * @author Warren Levy <warrenl@cygnus.com>
+  * @status should be completely JDK 1.4 compatible
   */
 public interface SocketOptions
 {
@@ -63,9 +64,10 @@ public interface SocketOptions
 
 /**
  * Option id for the SO_KEEPALIVE value
+ * @since 1.3
  */
 static final int SO_KEEPALIVE = 0x8;
-
+	
 /**
   * Option id for the SO_LINGER value
   */
@@ -98,6 +100,18 @@ static final int SO_RCVBUF = 0x1002; // 4098
   */
 static final int SO_REUSEADDR = 0x04; // 4
 
+/**
+ * Sets SO_BROADCAST for a socket
+ * @since 1.4
+ */
+static final int SO_BROADCAST = 0x20; // 32
+
+/**
+ * Sets SO_OOBINLINE for a socket
+ * @since 1.4
+ */
+static final int SO_OOBINLINE = 0x1003; // 4099
+
 /**
   * Option id for the TCP_NODELAY value
   */
@@ -108,6 +122,25 @@ static final int TCP_NODELAY = 0x01; // 1
   */
 static final int IP_MULTICAST_IF = 0x10; // 16
 
+/**
+ * same as above
+ * @since 1.4
+ */
+static final int IP_MULTICAST_IF2 = 0x1F; // 31
+
+/**
+ * This option enables or disables local loopback of multicast datagrams.
+ * @since 1.4
+ */
+static final int IP_MULTICAST_LOOP = 0x12; // 18
+
+/**
+ * This option sets the type-of-service or traffic class field in the
+ * IP header for a TCP or UDP socket.
+ * @since 1.4
+ */
+static final int IP_TOS = 0x03; // 3
+
 /*************************************************************************/
 
 /*