Changeset 129b16d

Timestamp:

Jun 19, 2012 8:26:46 PM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

e383477

Parents:

48f29ff1

Message:

• Streaming:
  • Listen only on local port if set
  • Listen only for streaming protocol if configured (new option)
  • Javadocs re: ports

Files:

• apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java (modified) (1 diff)
• apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java (modified) (1 diff)
• apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptions.java (modified) (1 diff)
• apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptionsImpl.java (modified) (1 diff)
• apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java (modified) (1 diff)
• apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java (modified) (7 diffs)
• core/java/src/net/i2p/client/I2PSession.java (modified) (2 diffs)

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java

@@ -123 +123 @@
             String spoofHost;
             int ourPort = socket.getLocalPort();
-            if (ourPort != 80 && ourPort > 0 && ourPort < 65535 && opts != null) {
+            if (ourPort != 80 && ourPort > 0 && ourPort <= 65535 && opts != null) {
                 String portSpoof = opts.getProperty("spoofedHost." + ourPort);
                 if (portSpoof != null)

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java

@@ -112 +112 @@
                 String host = url.getHost();
                 int port = url.getPort();
-                if (port <= 0 || port >= 65535)
+                if (port <= 0 || port > 65535)
                     port = 80;
 

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptions.java

@@ -106 +106 @@
     /**
      *  The local port.
+     *  Zero (default) means you will receive traffic on all ports.
+     *  Nonzero means you will get traffic ONLY for that port, use with care,
+     *  as most applications do not specify a remote port.
      *  @param port 0 - 65535
      *  @since 0.8.9

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptionsImpl.java

@@ -201 +201 @@
     /**
      *  The local port.
+     *  Zero (default) means you will receive traffic on all ports.
+     *  Nonzero means you will get traffic ONLY for that port, use with care,
+     *  as most applications do not specify a remote port.
      *  @param port 0 - 65535
      *  @since 0.8.9

apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java

@@ -68 +68 @@
         // Right now we get everything, and rely on Datagram to specify PROTO_UDP.
         // PacketQueue has sent PROTO_STREAMING since the beginning of mux support (0.7.1)
-        _session.addMuxedSessionListener(_messageHandler, I2PSession.PROTO_ANY, I2PSession.PORT_ANY);
+        // As of 0.9.1, new option to enforce streaming protocol, off by default
+        // As of 0.9.1, listen on configured port (default 0 = all)
+        int protocol = defaultOptions.getEnforceProtocol() ? I2PSession.PROTO_STREAMING : I2PSession.PROTO_ANY;
+        _session.addMuxedSessionListener(_messageHandler, protocol, defaultOptions.getLocalPort());
         _outboundQueue = new PacketQueue(_context, _session, this);
         /** Socket timeout for accept() */

apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java

@@ -20 +20 @@
     private boolean _fullySigned;
     private boolean _answerPings;
+    private boolean _enforceProto;
     private volatile int _windowSize;
     private int _receiveWindow;
@@ -88 +89 @@
     public static final String PROP_MAX_TOTAL_CONNS_HOUR = "i2p.streaming.maxTotalConnsPerHour";
     public static final String PROP_MAX_TOTAL_CONNS_DAY = "i2p.streaming.maxTotalConnsPerDay";
+    /** @since 0.9.1 */
+    public static final String PROP_ENFORCE_PROTO = "i2p.streaming.enforceProtocol";
     
     private static final int TREND_COUNT = 3;
@@ -96 +99 @@
     static final int MIN_WINDOW_SIZE = 1;
     private static final boolean DEFAULT_ANSWER_PINGS = true;
+    /**
+     *  If PROTO is enforced, we cannot communicate with destinations earlier than version 0.7.1.
+     *  @since 0.9.1
+     */
+    private static final boolean DEFAULT_ENFORCE_PROTO = true;
 
     // Syncronization fix, but doing it this way causes NPE...
@@ -285 +293 @@
             //setReadTimeout(opts.getReadTimeout());
             setAnswerPings(opts.getAnswerPings());
+            setEnforceProtocol(opts.getEnforceProtocol());
             initLists(opts);
             _maxConnsPerMinute = opts.getMaxConnsPerMinute();
@@ -318 +327 @@
         setConnectTimeout(getInt(opts, PROP_CONNECT_TIMEOUT, Connection.DISCONNECT_TIMEOUT));
         setAnswerPings(getBool(opts, PROP_ANSWER_PINGS, DEFAULT_ANSWER_PINGS));
+        setEnforceProtocol(getBool(opts, PROP_ENFORCE_PROTO, DEFAULT_ENFORCE_PROTO));
         initLists(opts);
         _maxConnsPerMinute = getInt(opts, PROP_MAX_CONNS_MIN, 0);
@@ -372 +382 @@
         if (opts.containsKey(PROP_ANSWER_PINGS))
             setAnswerPings(getBool(opts, PROP_ANSWER_PINGS, DEFAULT_ANSWER_PINGS));
+        if (opts.containsKey(PROP_ENFORCE_PROTO))
+            setEnforceProtocol(getBool(opts, PROP_ENFORCE_PROTO, DEFAULT_ENFORCE_PROTO));
         initLists(opts);
         if (opts.containsKey(PROP_MAX_CONNS_MIN))
@@ -420 +432 @@
     public boolean getAnswerPings() { return _answerPings; }
     public void setAnswerPings(boolean yes) { _answerPings = yes; }
+    
+    /**
+     * Do we receive all traffic, or only traffic marked with I2PSession.PROTO_STREAMING (6) ?
+     * Default false.
+     * If PROTO is enforced, we cannot communicate with destinations earlier than version 0.7.1
+     * (released March 2009), which is when streaming started sending the PROTO_STREAMING indication.
+     * Set to true if you are running multiple protocols on a single Destination.
+     *
+     * @return if we do
+     * @since 0.9.1
+     */
+    public boolean getEnforceProtocol() { return _enforceProto; }
+    public void setEnforceProtocol(boolean yes) { _enforceProto = yes; }
     
     /** 

core/java/src/net/i2p/client/I2PSession.java

@@ -39 +39 @@
      * payload, returning true if the router feels confident that the message
      * was delivered.
+     *
+     * WARNING: It is recommended that you use a method that specifies the protocol and ports.
+     *
      * @param dest location to send the message
      * @param payload body of the message to be sent (unencrypted)
@@ -150 +153 @@
 
     /** Instruct the I2PSession where it should send event notifications
+     *
+     *  WARNING: It is recommended that you use a method that specifies the protocol and ports.
+     *
      * @param lsnr listener to retrieve events
      */