Changeset 476

Timestamp:

07/23/07 22:43:26 (1 year ago)

Author:

blackhedd

Message:

datagram support

Files:

• version_0/java/src/com/rubyeventmachine/Application.java (modified) (3 diffs)
• version_0/java/src/com/rubyeventmachine/Connection.java (modified) (2 diffs)
• version_0/java/src/com/rubyeventmachine/EmReactor.java (modified) (2 diffs)
• version_0/java/src/com/rubyeventmachine/tests/TestDatagrams.java (added)

version_0/java/src/com/rubyeventmachine/Application.java

@@ -36 +36 @@
-import java.util.*;
-import java.io.*;
+import java.net.*;
-import java.net.SocketAddress;
-
@@ -166 +167 @@
-                } catch (IOException e) {}
-        }
+        
+        public void sendDatagram (String sig, ByteBuffer bb, InetSocketAddress target) {
+                reactor.sendDatagram(sig, bb, target.getHostName(), target.getPort());
+        }
+        
-        public void closeConnection (String sig, boolean afterWriting) {
-                try {
@@ -171 +177 @@
-                } catch (ClosedChannelException e) {}
-        }
+        
+        public void openDatagramSocket (Connection c) {
+                openDatagramSocket (new InetSocketAddress ("0.0.0.0", 0), c);
+        }
+        public void openDatagramSocket (InetSocketAddress addr, Connection c) {
+                try {
+                        String s = reactor.openUdpSocket(addr);
+                        c.application = this;
+                        c.signature = s;
+                        reactor.connections.put(s, c);
+                        c.postInit();
+                } catch (ClosedChannelException e) {
+                } catch (IOException e) {
+                        System.out.println ("Bad Datagram socket "+e+" "+addr);
+                        /* TODO, can't catch this here, because it can happen on a bad address */
+                }
+        }
-}

version_0/java/src/com/rubyeventmachine/Connection.java

@@ -33 +33 @@
-//import java.io.*;
-import java.nio.*;
+import java.net.*;
-//import java.nio.channels.*;
-
@@ -67 +68 @@
-                application.closeConnection(signature, true);
-        }
+        
+        public void sendDatagram (ByteBuffer bb, InetSocketAddress addr) {
+                application.sendDatagram (signature, bb, addr);
+        }
-}

version_0/java/src/com/rubyeventmachine/EmReactor.java

@@ -285 +285 @@
-        
-
+        public String openUdpSocket (String address, int port) throws IOException {
+                return openUdpSocket (new InetSocketAddress (address, port));
+        }
-        /**
-         * 
@@ -292 +295 @@
-         * @throws IOException
-         */
-
+
+
-                DatagramChannel dg = DatagramChannel.open();
-                dg.configureBlocking(false);
- new InetSocketAddress(address,port)
+address
-                String b = createBinding();
-                EventableChannel ec = new EventableDatagramChannel (dg, b, mySelector);