Changeset c0c9582

Timestamp:

Mar 29, 2019 4:27:10 PM (2 years ago)

Author:

zab2 <zab2@…>

Branches:

master

Children:

e55702b

Parents:

fc9ad32

Message:

add logic to start and stop filter timers

Location:

apps

Files:

• i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java (modified) (5 diffs)
• i2ptunnel/java/src/net/i2p/i2ptunnel/access/AccessFilter.java (modified) (7 diffs)
• i2ptunnel/java/src/net/i2p/i2ptunnel/access/FilterFactory.java (modified) (3 diffs)
• ministreaming/java/src/net/i2p/client/streaming/StatefulConnectionFilter.java (added)

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

@@ -41 +41 @@
 import net.i2p.client.streaming.RouterRestartException;
 import net.i2p.client.streaming.IncomingConnectionFilter;
+import net.i2p.client.streaming.StatefulConnectionFilter;
 import net.i2p.crypto.SigType;
 import net.i2p.data.Base64;
@@ -97 +98 @@
     private int DEFAULT_LOCALPORT = 4488;
     protected int localPort = DEFAULT_LOCALPORT;
+
+    private volatile StatefulConnectionFilter _filter;
 
     /**
@@ -224 +227 @@
         }
 
-        IncomingConnectionFilter filter = IncomingConnectionFilter.ALLOW;
         if (getTunnel().filterDefinition != null) {
             File filterDefinition = new File(getTunnel().filterDefinition);
             I2PAppContext context = getTunnel().getContext();
             try {
-                filter = FilterFactory.createFilter(context, filterDefinition, this);
+                _filter = FilterFactory.createFilter(context, filterDefinition);
             } catch (IOException | InvalidDefinitionException bad) {
                 throw new IllegalArgumentException("Can't create socket manager", bad);
             }
-        } 
+        }
+
+        IncomingConnectionFilter filter = _filter == null ? IncomingConnectionFilter.ALLOW : _filter;
+
         try {
             I2PSocketManager rv = I2PSocketManagerFactory.createDisconnectedManager(privData, getTunnel().host,
@@ -377 +382 @@
     public synchronized void startRunning() {
         connectManager();
+        StatefulConnectionFilter filter = _filter;
+        if (filter != null)
+            filter.start();
         // prevent JVM exit when running outside the router
         boolean isDaemon = getTunnel().getContext().isRouterContext();
@@ -431 +439 @@
             task.close(forced);
         }
+        StatefulConnectionFilter filter = _filter;
+        if (filter != null)
+            filter.stop();
         synchronized (lock) {
             if (!forced && sockMgr.listSockets().size() != 0) {

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/access/AccessFilter.java

@@ -6 +6 @@
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import java.io.File;
@@ -20 +21 @@
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
-import net.i2p.i2ptunnel.I2PTunnelTask;
-import net.i2p.client.streaming.IncomingConnectionFilter;
+import net.i2p.client.streaming.StatefulConnectionFilter;
 
 /**
@@ -37 +37 @@
  * @since 0.9.40
  */
-class AccessFilter implements IncomingConnectionFilter {
+class AccessFilter implements StatefulConnectionFilter {
 
     private static final long PURGE_INTERVAL = 1000;
@@ -44 +44 @@
     private final FilterDefinition definition;
     private final I2PAppContext context;
-    private final I2PTunnelTask task;
+
+    private final AtomicBoolean timersRunning = new AtomicBoolean();
 
     /**
@@ -60 +61 @@
      * @param task the task to query for liveness of the tunnel
      */
-    AccessFilter(I2PAppContext context, FilterDefinition definition, I2PTunnelTask task) 
+    AccessFilter(I2PAppContext context, FilterDefinition definition) 
             throws IOException {
         this.context = context;
         this.definition = definition;
-        this.task = task;
 
         reload();
-
-        new Purger();
-        new Syncer();
+    }
+
+    @Override
+    public void start() {
+        if (timersRunning.compareAndSet(false, true)) {
+            new Purger();
+            new Syncer();
+        }
+    }
+
+    @Override
+    public void stop() {
+        timersRunning.set(false);
     }
 
@@ -170 +180 @@
         }
         public void timeReached() {
-            if (!task.isOpen()) {
+            if (!timersRunning.get()) {
                 synchronized(knownDests) {
                     knownDests.clear();
@@ -189 +199 @@
         }
         public void timeReached() {
-            if (!task.isOpen())
+            if (!timersRunning.get())
                 return;
             try {

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/access/FilterFactory.java

@@ -10 +10 @@
 
 import net.i2p.I2PAppContext;
-import net.i2p.i2ptunnel.I2PTunnelTask;
-import net.i2p.client.streaming.IncomingConnectionFilter;
+import net.i2p.client.streaming.StatefulConnectionFilter;
 
 /**
@@ -26 +25 @@
      * @param context the context this is running in
      * @param definition file containing the filter definition
-     * @param task the I2PTunnelTask instance to query for liveness
      */
-    public static IncomingConnectionFilter createFilter(I2PAppContext context, 
-                                                        File definition,
-                                                        I2PTunnelTask task)
+    public static StatefulConnectionFilter createFilter(I2PAppContext context, 
+                                                        File definition)
         throws IOException, InvalidDefinitionException {
         List<String> linesList = new ArrayList<String>();
@@ -51 +48 @@
 
         FilterDefinition parsedDefinition = DefinitionParser.parse(linesList.toArray(new String[0]));
-        return new AccessFilter(context, parsedDefinition, task);
+        return new AccessFilter(context, parsedDefinition);
     }
 }