Changeset 0519ea4

Timestamp:

Nov 27, 2015 5:34:36 PM (5 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

3a25a91

Parents:

48d7f49

Message:

Add v3 datagram and raw to sink

File:

• apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java (modified) (6 diffs)

apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java

@@ -1 +1 @@
 package net.i2p.sam.client;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -6 +7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
 import java.net.Socket;
 import java.security.GeneralSecurityException;
@@ -52 +55 @@
                                         "       -s: use SSL\n" +
                                         "       multiple -o session options are allowed";
+    private static final int V3DGPORT=9999;
 
     public static void main(String args[]) {
@@ -177 +181 @@
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug("Handshake2 complete.");
+            } else if (_isV3 && (mode == DG || mode == RAW)) {
+                // set up a listening DatagramSocket
+                (new DGRcvr(mode)).start();
             }
             writeDest(ourDest);
         } catch (IOException e) {
             _log.error("Unable to connect to SAM at " + _samHost + ":" + _samPort, e);
+        }
+    }
+
+    private class DGRcvr extends I2PAppThread {
+        private final int _mode;
+
+        public DGRcvr(int mode) { _mode = mode; }
+
+        public void run() {
+            byte[] buf = new byte[32768];
+            try {
+                Sink sink = new Sink("FAKE", "FAKEFROM");
+                DatagramSocket dg = new DatagramSocket(V3DGPORT);
+                while (true) {
+                    DatagramPacket p = new DatagramPacket(buf, 32768);
+                    dg.receive(p);
+                    int len = p.getLength();
+                    int off = p.getOffset();
+                    byte[] data = p.getData();
+                    _log.info("Got datagram length " + len);
+                    if (_mode == DG) {
+                        ByteArrayInputStream bais = new ByteArrayInputStream(data, off, len);
+                        String line = DataHelper.readLine(bais);
+                        if (line == null) {
+                            _log.error("DGRcvr no header line");
+                            continue;
+                        }
+                        if (line.length() < 516) {
+                            _log.error("DGRcvr line too short: \"" + line + '\n');
+                            continue;
+                        }
+                        String[] parts = line.split(" ");
+                        String dest = parts[0];
+                        _log.info("DG is from " + dest);
+                        for (int i = 1; i < parts.length; i++) {
+                            _log.info("Parameter: " + parts[i]);
+                        }
+                        int left = bais.available();
+                        sink.received(data, off + len - left, left);
+                    } else {
+                        sink.received(data, off, len);
+                    }
+                }
+            } catch (IOException ioe) {
+                _log.error("DGRcvr", ioe);
+            }
         }
     }
@@ -472 +525 @@
                 if (mode == STREAM)
                     style = "STREAM";
-                else if (mode == DG || mode == V1DG)
+                else if (mode == V1DG)
                     style = "DATAGRAM";
+                else if (mode == DG)
+                    style = "DATAGRAM PORT=" + V3DGPORT;
+                else if (mode == V1RAW)
+                    style = "RAW";
                 else
-                    style = "RAW";
+                    style = "RAW PORT=" + V3DGPORT;
                 String req = "SESSION CREATE STYLE=" + style + " DESTINATION=" + dest + ' ' + _conOptions + ' ' + sopts + '\n';
                 samOut.write(req.getBytes());
@@ -502 +559 @@
                 if (_log.shouldInfo())
                     _log.info(_destFile + " is located at " + destination);
-                if (mode != STREAM) {
+                if (mode == V1DG || mode == V1RAW) {
                     // fake it so the sink starts
                     eventHandler.streamConnectedReceived(destination, "FAKE");