fixup after prop; history for prop; -3

history.txt

@@ -1,4 +1,129 @@
 2012-07-20 zzz
+ Prop from i2p.i2p.zzz.ipv6:
+ * Addresses:
+   - blocklist 192.88.88.0/24 6to4 anycast
+   - invalidate 2002::/16
+   - Strip scope from returned IPv6 addresses
+ * Blocklist:
+   - Add IPv6 in-memory single list
+   - Limit in-memory single list size
+   - Fix dup check in getAddresses()
+ * CSFI: Pass TransportManager instead of CSFI to GetBidsJob; remove unused methods
+ * Console:
+   - Add IPv6 column on /peers
+   - Other minor /peers cleanup
+ * FloodfillPeerSelector, ProfileOrganizer: Use 8 bytes for IPv6 check
+ * GeoIP:
+   - Use cached IP in RouterAddresses
+   - Use both NTCP and SSU addresses
+ * GeoIPv6:
+   - Handle gzipped input data in merge tool
+   - Add script to generate compressed data
+   - Add local additions
+   - Add compressed data file, generated from Maxmind data fetched 2013-05-24
+   - Include data in installer and updater
+   - Update Maxmind license info, now CC-SA 3.0
+   - Enable GeoIPv6 lookup in CSFI
+ * NetDb:
+   - Add floodfillEnabled() to NetworkDatabaseFacade so callers don't
+     have to cast to FNDF, and Dummy NDF will work
+   - Remove static FNDF.floodfillEnabled()
+ * NTCP:
+   - Move SSU address notification handling from CSFI to NTCPTransport
+   - Drop NTCPAddress, just use RouterAddress
+   - Drop _myAddress field, use super's currentAddress
+   - Bad bind config not fatal
+   - Fix publishing address when host specified but interface is not
+   - Republish even if only changing cost
+ * PacketPusher: Minor optimization
+ * Peer tests:
+   - Use only IPv4 peer for Alice and Bob in peer tests; Charlie may be an IPv6 peer.
+   - Enforce IPv4 (Alice's) address inside PeerTest packet
+ * RouterAddress and RouterInfo toString() cleanups; don't cache RI in _stringified
+ * RouterAddress:
+   - hashCode/equals tweaks
+   - Add new constructor
+   - Add add getHost() and deepEquals()
+   - Compare host string, not IP, in equals()
+   - Deprecate some setters
+   - Add warning about setCost()
+   - Change cost storage from int to short
+   - Cost range checks
+ * RouterContext: Fix disabling client manager with i2p.dummyClientFacade=true
+ * SSU:
+   - Change from single UDPEndpoint to a List of UDPEndpoints
+   - Move (single) receive queue from UDPReceiver to PacketHandler
+   - Multiple transmit queues (one for each UDPEndpoint/UDPSender),
+     select queue in PacketPusher
+   - Throw exception on UDPEndpoint.startup() failure
+   - Remove all _external* fields; use _currentAddresses in super
+   - Big rework of externalAddressReceived(), rebuildExternalAddress(),
+     needsRebuild(), and replaceAddress() for multiple addresses and IPv6
+   - Add caching in UDPAddress
+   - More IPv6 flavors of utility methods
+   - Remove two-arg replaceAddress()
+   - Fixes for i2np.udp.allowLocal, log tweaks, sender/receiver thread name tweaks
+   - Handle IPv6 in too-close checks
+   - IPv6 SSU MTU adjustments
+   - Hash IPv6 addresses in IPThrottler
+ * SSU Introduction:
+   - Document that Alice-Bob RelayRequest/RelayResponse may be IPv4 or IPv6,
+     but don't implement IPv6 yet.
+     Changes required in IntroductionManager and PacketBuilder to send Alice's
+     IPv4 address in the RelayRequest packet over IPv6, and to publish
+     IPv6 introducer IPs.
+   - Bob-Charlie RelayIntro must be IPv4
+   - Only offer/accept relay tags as Bob or Charlie if the Bob-Charlie session is IPv4
+   - Alice-Charlie communication must be IPv4
+ * SSUDemo:
+   - Configuration fixes, delete RI on exit, log tweaks, cleanups
+   - Use IPv6; don't use System properties
+   - Adapt for NTCP testing too
+ * Tests:
+   - New buildTest and prepTest targets
+   - Fix UDPEndpoint usage in unit tests: Restore receive(); Handle null UDPTransport
+   - Fix UDPEndpointTestStandalone: init context; Add unit test buildPacket() method to PacketBuilder;
+     Fix NPE in MessageHistory
+ * Transports:
+   - Add new TransportUtil for getting/setting IPv6 config
+   - Prep for supporting multiple RouterAddresses per-transport
+   - Prep for multiple address discovery
+   - Fix multiple-detection code in externalAddressReceived()
+   - Synchronize tracking of last IP/port
+   - Don't accept IPv6 address changes from peers
+   - Remove unused getLocalAddress()
+   - Pkg private getLocalPort()
+   - Start transports in a standard order to make testing easier
+   - When transports learn of interface addresses before being started, save them
+     and use them at startup
+   - Pick SSU random port before startListening() and have the TransportManager
+     pass it to NTCP before starting
+   - Only restart NTCP after changing addresses when necessary;
+     prevent thrashing at startup (ticket #459)
+   - Always bind NTCP if we have port; not just when not firewalled
+   - Only call rebuildRouterInfo() once at startup
+   - More checking of min/max SSU port config
+   - Invalid SSU bind config no longer fatal
+   - Allow "true" for ipv6 config
+   - SSU fixes for per-address and IPv6 MTU
+   - MTU.main() print all interfaces
+   - Add i2np.disable property for testing
+ * Transports:
+   - Sort multiple peer addresses by cost, with adjustment for local IPv6 preference
+   - Add default IPv6Config for ease of changing later
+   - Only treat IPv6 addresses as valid if we have a public IPv6 address
+ * Tunnel GW pumper: Limit threads when testing
+ * UDPAddress:
+   - Reduce object churn, check intro key length,
+     don't look for ihost3, reject ports < 1024, cleanups
+   - Remove dependency in console; make package private
+ * UPnP:
+   - Fix UPnP address received before startListening(), broken by isAlive() check
+   - Pass device IP back in forward port callback
+   - Only declare success if forwarded IP is public
+
+2012-07-20 zzz
+ Prop from i2p.i2p.zzz.test2:
  * DHSessionKeyBuilder: Fix for session and mac keys if DH key is between 32 and 63 bytes.
    Was: NPE. Now: mac key is hash of session key. Won't ever happen. (Ticket #963)
  * I2CP/I2PTunnel locking fixes (partial fixes for tickets 650. 722, 815, 946, 947, 953):

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 = 2;
+    public final static long BUILD = 3;
 
     /** for example "-test" */
     public final static String EXTRA = "";

router/java/src/net/i2p/router/transport/TransportImpl.java

@@ -46,6 +46,7 @@ import net.i2p.util.Log;
 import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer;
 import net.i2p.util.SystemVersion;
+import net.i2p.util.Translate;
 
 /**
  * Defines a way to send a message to another peer and start listening for messages

router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java

@@ -1219,15 +1219,6 @@ public class NTCPTransport extends TransportImpl {
         }
     }
 
-    private static final String BUNDLE_NAME = "net.i2p.router.web.messages";
-
-    /**
-     *  Translate
-     */
-    private final String _(String s) {
-        return Translate.getString(s, _context, BUNDLE_NAME);
-    }
-
     /**
      * Cache the bid to reduce object churn
      */

router/java/src/net/i2p/router/transport/udp/UDPTransport.java

@@ -2780,21 +2780,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         }
     }
     private static final DecimalFormat _pctFmt = new DecimalFormat("#0.0%");
-    private static final String BUNDLE_NAME = "net.i2p.router.web.messages";
-
-    /**
-     *  Translate
-     */
-    private final String _(String s) {
-        return Translate.getString(s, _context, BUNDLE_NAME);
-    }
-
-    /**
-     *  Translate
-     */
-    private final String _(String s, Object o) {
-        return Translate.getString(s, o, _context, BUNDLE_NAME);
-    }
 
     /*
      * Cache the bid to reduce object churn