From c9b4ab5a13ebda204b63c813c1b2cba0390e89dc Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 22 Jun 2016 17:28:55 +0000
Subject: [PATCH] Prep for IPv6 SSU Peer Testing

---
 history.txt                                    | 18 +++++++++++++++++-
 .../java/src/net/i2p/router/RouterVersion.java |  2 +-
 .../i2p/router/transport/TransportImpl.java    |  7 +++++++
 .../i2p/router/transport/TransportUtil.java    | 10 ++++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/history.txt b/history.txt
index 4c6a785676..0986643340 100644
--- a/history.txt
+++ b/history.txt
@@ -1,7 +1,23 @@
+2016-06-22 zzz
+ * SSU peer testing:
+   - Forget the test and don't keep retransmitting to Charlie
+     if we receive the Bob reply after the 2nd Charlie reply
+   - Only fire a peer test on connection if address has changed
+
+2016-06-16 zzz
+ * Console: Split up configclients, add configi2cp,
+   configplugins, configwebapps (ticket #1804)
+
+2016-06-15 zzz
+ * Utils: Add method to set language in standalone app context
+ * i2psnark:
+   - Add form to set language in standalone context
+   - Add Ukrainian and Japanese translations
+
 2016-06-11 zzz
 Prop from i2p.i2p.zzz.test2:
  * CPUID: Add CLI output for new AMD tests
- * i2psnark standalone:
+ * i2psnark standalone (ticket #1191):
    - Cherry-pick fixes from psi's github i2psnark_rpc branch
    - Fix up Jetty XML file for Jetty 8
    - Start with JettyStart
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 87e5bffca0..282c18b422 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 1;
+    public final static long BUILD = 2;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java
index 176c21c0f7..866d3bed7b 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -819,6 +819,13 @@ public abstract class TransportImpl implements Transport {
         return TransportUtil.isIPv4Firewalled(_context, getStyle());
     }
 
+    /**
+     *  @since 0.9.27
+     */
+    protected boolean isIPv6Firewalled() {
+        return TransportUtil.isIPv4Firewalled(_context, getStyle());
+    }
+
     public boolean isBacklogged(Hash peer) { return false; }
     public boolean isEstablished(Hash peer) { return false; }
 
diff --git a/router/java/src/net/i2p/router/transport/TransportUtil.java b/router/java/src/net/i2p/router/transport/TransportUtil.java
index c583a21e3d..8019c74f02 100644
--- a/router/java/src/net/i2p/router/transport/TransportUtil.java
+++ b/router/java/src/net/i2p/router/transport/TransportUtil.java
@@ -92,6 +92,16 @@ public abstract class TransportUtil {
         return ctx.getBooleanProperty(PROP_IPV4_FIREWALLED);
     }
 
+    /**
+     *  @param transportStyle ignored
+     *  @since 0.9.27
+     */
+    public static boolean isIPv6Firewalled(RouterContext ctx, String transportStyle) {
+        // TODO
+        //return ctx.getBooleanProperty(PROP_IPV6_FIREWALLED);
+        return false;
+    }
+
     /**
      *  Addresses without a host (i.e. w/introducers)
      *  are assumed to be IPv4