From be362a0d5ba42bee36bd339e25374100a9f1942c Mon Sep 17 00:00:00 2001
From: Michael Koch <konqueror@gmx.de>
Date: Sat, 21 Sep 2002 06:59:20 +0000
Subject: 2002-09-21  Michael Koch  <konqueror@gmx.de>

	* java/net/Socket.java
	(sendUrgentData): New method.
	(getChannel): New method.
	* java/net/ServerSocket.java
	(getChannel): New method.
	(isBound): New method.
	* java/net/DatagramSocket.java
	(DatagramSocket): Two new methods.
	(bind): New method.
	(getChannel): New method.
	(isBound): New method.
	(send): Added newline to to make shorter lines.
	* java/net/PlainDatagramSocketImpl.java
	(mcastGrp): Added argument.
	(join): Use new mcastGrp.
	(leave): Use new mcastGrp.
	(joinGroup): New method.
	(leaveGroup): New method.
	* java/net/natPlainDatagramSocketImpl.cc
	(mcastGrp): Added argument, no yet really implemented.
	(getOption): Added newline for shorter lines.
	* java/net/natPlainSocketImpl.cc
	(read, setOption, getOption): Added newline for shorter lines.

From-SVN: r57380
---
 libjava/java/net/PlainDatagramSocketImpl.java | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'libjava/java/net/PlainDatagramSocketImpl.java')

diff --git a/libjava/java/net/PlainDatagramSocketImpl.java b/libjava/java/net/PlainDatagramSocketImpl.java
index 3a8db03627e..54f5c2eeb00 100644
--- a/libjava/java/net/PlainDatagramSocketImpl.java
+++ b/libjava/java/net/PlainDatagramSocketImpl.java
@@ -72,8 +72,8 @@ class PlainDatagramSocketImpl extends DatagramSocketImpl
   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;
+  private native void mcastGrp(InetAddress inetaddr, NetworkInterface netIf,
+		               boolean join) throws IOException;
   protected native void close();
 
   // Deprecated in JDK 1.2.
@@ -90,12 +90,24 @@ class PlainDatagramSocketImpl extends DatagramSocketImpl
 
   protected void join(InetAddress inetaddr) throws IOException
   {
-    mcastGrp(inetaddr, true);
+    mcastGrp(inetaddr, null, true);
   }
 
   protected void leave(InetAddress inetaddr) throws IOException
   {
-    mcastGrp(inetaddr, false);
+    mcastGrp(inetaddr, null, false);
+  }
+
+  protected void joinGroup (SocketAddress mcastaddr, NetworkInterface netIf)
+	  throws IOException
+  {
+    mcastGrp(((InetSocketAddress)mcastaddr).getAddress(), netIf, true);
+  }
+
+  protected void leaveGroup (SocketAddress mcastaddr, NetworkInterface netIf)
+	  throws IOException
+  {
+    mcastGrp(((InetSocketAddress)mcastaddr).getAddress(), netIf, false);
   }
 
   protected void finalize() throws Throwable
-- 
cgit v1.2.3