zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Transport: Fix GeoIPv6 (ticket #1096)

Browse Source 
due to int/long problem, they were being corrupted
   and then looked up as IPv4
This commit is contained in:
zzz
2013-11-01 01:44:29 +00:00
parent 8c4b0b7c00
commit 777e08c8b6
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 18; public final static long BUILD = 19;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";

11
router/java/src/net/i2p/router/transport/GeoIP.java
View File

@@ -381,7 +381,7 @@ class GeoIP {
/** see above for ip-to-long mapping */ /** see above for ip-to-long mapping */
private static long toLong(byte ip[]) { private static long toLong(byte ip[]) {
int rv = 0; long rv = 0;
if (ip.length == 16) { if (ip.length == 16) {
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
rv |= (ip[i] & 0xffL) << ((7-i)*8); rv |= (ip[i] & 0xffL) << ((7-i)*8);
@@ -402,13 +402,16 @@ class GeoIP {
return _codeToName.get(code); return _codeToName.get(code);
} }
/*** doesn't work since switched to RouterContext above /***
public static void main(String args[]) { public static void main(String args[]) {
GeoIP g = new GeoIP(new I2PAppContext()); GeoIP g = new GeoIP(new Router().getContext());
String tests[] = {"0.0.0.0", "0.0.0.1", "0.0.0.2", "0.0.0.255", "1.0.0.0", String tests[] = {"0.0.0.0", "0.0.0.1", "0.0.0.2", "0.0.0.255", "1.0.0.0",
"94.3.3.3", "77.1.2.3", "127.0.0.0", "127.127.127.127", "128.0.0.0", "94.3.3.3", "77.1.2.3", "127.0.0.0", "127.127.127.127", "128.0.0.0",
"89.8.9.3", "72.5.6.8", "217.4.9.7", "175.107.027.107", "135.6.5.2", "89.8.9.3", "72.5.6.8", "217.4.9.7", "175.107.027.107", "135.6.5.2",
"129.1.2.3", "255.255.255.254", "255.255.255.255"}; "129.1.2.3", "255.255.255.254", "255.255.255.255",
"::", "1", "2000:1:2:3::", "2001:200:1:2:3:4:5:6", "2001:208:7:8:9::",
"2c0f:fff0:1234:5678:90ab:cdef:0:0", "2c0f:fff1:0::"
};
for (int i = 0; i < tests.length; i++) for (int i = 0; i < tests.length; i++)
g.add(tests[i]); g.add(tests[i]);
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();

4
router/java/src/net/i2p/router/transport/GeoIPv6.java
View File

@@ -327,13 +327,13 @@ class GeoIPv6 {
/** /**
* Merge and compress CSV files to I2P compressed format * Merge and compress CSV files to I2P compressed format
* *
* GeoIP infile1.csv[.gz] [infile2.csv[.gz]...] outfile.dat.gz * GeoIPv6 infile1.csv[.gz] [infile2.csv[.gz]...] outfile.dat.gz
* *
* Used to create the file for distribution, do not comment out * Used to create the file for distribution, do not comment out
*/ */
public static void main(String args[]) { public static void main(String args[]) {
if (args.length < 2) { if (args.length < 2) {
System.err.println("Usage: GeoIP infile1.csv [infile2.csv...] outfile.dat.gz"); System.err.println("Usage: GeoIPv6 infile1.csv [infile2.csv...] outfile.dat.gz");
System.exit(1); System.exit(1);
} }
List<File> infiles = new ArrayList(); List<File> infiles = new ArrayList();