From 34f74cd6efc715a82ddd9ee20baf7cd6a727b513 Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Fri, 1 Oct 2004 11:49:02 +0000
Subject: [PATCH] 2004-10-01  jrandom     * Explicitly refuse IPv6 addresses,
 since only some peers support       them and we want fully reachable peers.

---
 history.txt                                                 | 6 +++++-
 router/java/src/net/i2p/router/RouterVersion.java           | 4 ++--
 .../java/src/net/i2p/router/transport/tcp/TCPAddress.java   | 6 ++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/history.txt b/history.txt
index 3b96d3c90..e193fcb82 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,8 @@
-$Id: history.txt,v 1.24 2004/09/30 10:58:55 jrandom Exp $
+$Id: history.txt,v 1.25 2004/10/01 04:39:14 jrandom Exp $
+
+2004-10-01  jrandom
+    * Explicitly refuse IPv6 addresses, since only some peers support 
+      them and we want fully reachable peers.
 
 2004-10-01  jrandom
     * Additional error handling for a variety of transport layer errors.
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 3d28324c7..32107e7ea 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.34 $ $Date: 2004/09/30 10:58:55 $";
+    public final static String ID = "$Revision: 1.35 $ $Date: 2004/10/01 04:39:14 $";
     public final static String VERSION = "0.4.1";
-    public final static long BUILD = 1;
+    public final static long BUILD = 2;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);
         System.out.println("Router ID: " + RouterVersion.ID);
diff --git a/router/java/src/net/i2p/router/transport/tcp/TCPAddress.java b/router/java/src/net/i2p/router/transport/tcp/TCPAddress.java
index 99f177af7..76760052f 100644
--- a/router/java/src/net/i2p/router/transport/tcp/TCPAddress.java
+++ b/router/java/src/net/i2p/router/transport/tcp/TCPAddress.java
@@ -116,6 +116,12 @@ public class TCPAddress {
         try {
             InetAddress addr = InetAddress.getByName(_host);
             byte quad[] = addr.getAddress();
+            if (quad.length != 4) {
+                if (_log.shouldLog(Log.ERROR))
+                    _log.error("Refusing IPv6 address (" + _host + " / " + addr.getHostAddress() + ") "
+                               + " since not all peers support it, and we don't support restricted routes");
+                return false;
+            }
             if (quad[0] == (int)127) return false;
             if (quad[0] == (int)10) return false; 
             if ( (quad[0] == (int)172) && (quad[1] >= (int)16) && (quad[1] <= (int)31) ) return false;