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

merge of 'b2b4c1ba1f799d81d6d164698cb28aa9b837d390'

Browse Source 
and 'c2b60a59c73835b51357a706da377862d8bd5ebc'
This commit is contained in:
zzz
2012-10-30 15:06:38 +00:00
parent 513821123e f56c804e86
commit d92f5e6508
20 changed files with 101 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Slackware/i2p/i2p.SlackBuild
View File

@@ -128,7 +128,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG cd $PKG
# #
# requiredbuilder fucks up REALLY bad, and thinks java is perl?! # requiredbuilder messes up REALLY bad, and thinks java is perl?!
# It also did not catch the shell requirements! BOOOOOOOOOOO! HISSSSSSSS! # It also did not catch the shell requirements! BOOOOOOOOOOO! HISSSSSSSS!
# #
# requiredbuilder -v -y -s $CWD $PKG # requiredbuilder -v -y -s $CWD $PKG

14
apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB.Demos.echo.echoclient; package net.i2p.BOB.Demos.echo.echoclient;
@@ -55,7 +47,7 @@ public class Main {
// exit on anything not legal // exit on anything not legal
break; break;
} }
c = (char)(b & 0x7f); // We only really give a fuck about ASCII c = (char)(b & 0x7f); // We only care about ASCII
S = new String(S + c); S = new String(S + c);
} }
return S; return S;

14
apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB.Demos.echo.echoserver; package net.i2p.BOB.Demos.echo.echoserver;
@@ -52,7 +44,7 @@ public class Main {
if(b < 20) { if(b < 20) {
break; break;
} }
c = (char)(b & 0x7f); // We only really give a fuck about ASCII c = (char)(b & 0x7f); // We only care about ASCII
S = new String(S + c); S = new String(S + c);
} }
return S; return S;

12
apps/BOB/src/net/i2p/BOB/BOB.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB; package net.i2p.BOB;

12
apps/BOB/src/net/i2p/BOB/DoCMDS.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB; package net.i2p.BOB;

12
apps/BOB/src/net/i2p/BOB/I2Plistener.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB; package net.i2p.BOB;

12
apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB; package net.i2p.BOB;

12
apps/BOB/src/net/i2p/BOB/Lifted.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB; package net.i2p.BOB;

46
apps/BOB/src/net/i2p/BOB/MUXlisten.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB; package net.i2p.BOB;
@@ -302,14 +294,14 @@ public class MUXlisten implements Runnable {
// Hopefully nuke stuff here... // Hopefully nuke stuff here...
{ {
String boner = tg.getName(); String groupName = tg.getName();
try { try {
_log.warn("destroySocketManager " + boner); _log.warn("destroySocketManager " + groupName);
socketManager.destroySocketManager(); socketManager.destroySocketManager();
_log.warn("destroySocketManager Successful" + boner); _log.warn("destroySocketManager Successful" + groupName);
} catch (Exception e) { } catch (Exception e) {
// nop // nop
_log.warn("destroySocketManager Failed" + boner); _log.warn("destroySocketManager Failed" + groupName);
_log.warn(e.toString()); _log.warn(e.toString());
} }
} }
@@ -333,25 +325,25 @@ public class MUXlisten implements Runnable {
// Wait around till all threads are collected. // Wait around till all threads are collected.
if (tg != null) { if (tg != null) {
String boner = tg.getName(); String groupName = tg.getName();
// System.out.println("BOB: MUXlisten: Starting thread collection for: " + boner); // System.out.println("BOB: MUXlisten: Starting thread collection for: " + groupName);
_log.warn("BOB: MUXlisten: Starting thread collection for: " + boner); _log.warn("BOB: MUXlisten: Starting thread collection for: " + groupName);
if (tg.activeCount() + tg.activeGroupCount() != 0) { if (tg.activeCount() + tg.activeGroupCount() != 0) {
// visit(tg, 0, boner); // visit(tg, 0, groupName);
int foo = tg.activeCount() + tg.activeGroupCount(); int foo = tg.activeCount() + tg.activeGroupCount();
// hopefully no longer needed! // hopefully no longer needed!
// int bar = lives; // int bar = lives;
// System.out.println("BOB: MUXlisten: Waiting on threads for " + boner); // System.out.println("BOB: MUXlisten: Waiting on threads for " + groupName);
// System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + boner); // System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + groupName);
// visit(tg, 0, boner); // visit(tg, 0, groupName);
// System.out.println("BOB: MUXlisten: ThreadGroup dump END " + boner + "\n"); // System.out.println("BOB: MUXlisten: ThreadGroup dump END " + groupName + "\n");
// Happily spin forever :-( // Happily spin forever :-(
while (foo != 0) { while (foo != 0) {
foo = tg.activeCount() + tg.activeGroupCount(); foo = tg.activeCount() + tg.activeGroupCount();
// if (lives != bar && lives != 0) { // if (lives != bar && lives != 0) {
// System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + boner); // System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + groupName);
// visit(tg, 0, boner); // visit(tg, 0, groupName);
// System.out.println("BOB: MUXlisten: ThreadGroup dump END " + boner + "\n"); // System.out.println("BOB: MUXlisten: ThreadGroup dump END " + groupName + "\n");
// } // }
// bar = lives; // bar = lives;
try { try {
@@ -361,8 +353,8 @@ public class MUXlisten implements Runnable {
} }
} }
} }
// System.out.println("BOB: MUXlisten: Threads went away. Success: " + boner); // System.out.println("BOB: MUXlisten: Threads went away. Success: " + groupName);
_log.warn("BOB: MUXlisten: Threads went away. Success: " + boner); _log.warn("BOB: MUXlisten: Threads went away. Success: " + groupName);
tg.destroy(); tg.destroy();
// Zap reference to the ThreadGroup so the JVM can GC it. // Zap reference to the ThreadGroup so the JVM can GC it.
tg = null; tg = null;

12
apps/BOB/src/net/i2p/BOB/Main.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB; package net.i2p.BOB;

12
apps/BOB/src/net/i2p/BOB/NamedDB.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB; package net.i2p.BOB;

12
apps/BOB/src/net/i2p/BOB/TCPio.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB; package net.i2p.BOB;

12
apps/BOB/src/net/i2p/BOB/TCPlistener.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB; package net.i2p.BOB;

14
apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB; package net.i2p.BOB;
@@ -94,7 +86,7 @@ public class TCPtoI2P implements Runnable {
// exit on anything not legal // exit on anything not legal
break; break;
} }
c = (char) (b & 0x7f); // We only really give a fuck about ASCII c = (char) (b & 0x7f); // We only care about ASCII
S = new String(S + c); S = new String(S + c);
} }
return S; return S;

12
apps/BOB/src/net/i2p/BOB/UDPIOthread.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,7 +11,7 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.BOB; package net.i2p.BOB;

13
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirProxy.java
View File

@@ -1,17 +1,9 @@
/** /**
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE * WTFPL
* Version 2, December 2004 * Version 2, December 2004
* *
* Copyright (C) sponge * Copyright (C) sponge
* Planet Earth * Planet Earth
* Everyone is permitted to copy and distribute verbatim or modified
* copies of this license document, and changing it is allowed as long
* as the name is changed.
*
* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
* TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
*
* 0. You just DO WHAT THE FUCK YOU WANT TO.
* *
* See... * See...
* *
@@ -19,9 +11,8 @@
* and * and
* http://en.wikipedia.org/wiki/WTFPL * http://en.wikipedia.org/wiki/WTFPL
* *
* ...for any additional details and liscense questions. * ...for any additional details and license questions.
*/ */
package net.i2p.i2ptunnel; package net.i2p.i2ptunnel;
// import java.util.ArrayList; // import java.util.ArrayList;

3
history.txt
View File

@@ -1,3 +1,6 @@
2012-10-30 sponge
* cleanups as requested
2012-10-28 zzz 2012-10-28 zzz
* Addresses: * Addresses:
- Add methods for connectivity detection - Add methods for connectivity detection

21
installer/resources/certificates/i2p.feared.eu.crt Normal file
View File

@@ -0,0 +1,21 @@
-----BEGIN CERTIFICATE-----
MIIDhTCCAm2gAwIBAgIJAPVgXcMcr3zqMA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNV
BAYTAkVVMQ8wDQYDVQQIDAZFdXJvcGUxDDAKBgNVBAoMA0kyUDETMBEGA1UECwwK
T3V0cHJveGllczEWMBQGA1UEAwwNaTJwLmZlYXJlZC5ldTAeFw0xMjEwMjkxNzMw
MDZaFw0yMTAxMTUxNzMwMDZaMFkxCzAJBgNVBAYTAkVVMQ8wDQYDVQQIDAZFdXJv
cGUxDDAKBgNVBAoMA0kyUDETMBEGA1UECwwKT3V0cHJveGllczEWMBQGA1UEAwwN
aTJwLmZlYXJlZC5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOUh
y2+6Q4RO+b5WPXX/cZ/9fiI7aWGe/C7z0083HOEqnkgGCYgxFWUCed6/eZbYoZ7/
PV1BAuEereNwTp+Ov7fQB2H73O9sSAEejW6O4C2PZiZWaPxpZiTJNENbLOZxJnIN
+fSqmA5pqvGkYAJ2heZH4v4tayun7Vib58GWuizhzJ4EvhOrOrLq/YHrxMn++r4e
kNNbq4QzWpfxNa7ocDY9OJh5qFzuc+6wKj1m1syK6euDqs5d6X+y0aDTMgRxey2b
tkmNx9wC0flLg1oMcv9o1zN+dENy7Inkd/SqbSjLUqDTJzdq6xURVsgLoV63pb6r
B4gbGIlriYWK/mOPTTkCAwEAAaNQME4wHQYDVR0OBBYEFOI94JZ3Rb2RVmr8QjOp
u3KfVSrNMB8GA1UdIwQYMBaAFOI94JZ3Rb2RVmr8QjOpu3KfVSrNMAwGA1UdEwQF
MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAD7bI05zg9nf9qanq4ZNw/rvEzYQRBmy
MqzZjcwBMGvbcEbS+zYAdAkfxmN3l/AT4I4z138Om0ud4ZJUQTVlRsJkMlmLD4Rt
Jbi2rl7mrY7Qupgu5hvgH+ZaEWr7LTq+tFjPycRS+zijw9NToKeAsgEex9zYIOYD
BxDUn/trvyA41ItvegWh803IsZUBb45Via+bopid9aFFkejRrck9hhcQ6fVh2yju
nuVwHrxNvGc0NmmJ7zI+nPESFS+TAYbWXikDhc5Vtyiuoz47WZU1cgXYYMejK4WA
+3GLvei7qKm4GOJSg7BngF5Iyj/n7ML1rBqTlN3KA1YOgpGCwJlKzto=
-----END CERTIFICATE-----

20
installer/resources/certificates/reseed.info.crt Normal file
View File

@@ -0,0 +1,20 @@
-----BEGIN CERTIFICATE-----
MIIDRDCCAiwCCQDCm/Zrmali9zANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJB
VTETMBEGA1UECBMKU29tZS1TdGF0ZTELMAkGA1UEBxMCSEgxDDAKBgNVBAoTA0ky
UDEPMA0GA1UECxMGcmVzZWVkMRQwEgYDVQQDEwtyZXNlZWQuaW5mbzAeFw0xMjEw
MjcxODU3NDNaFw0xNjEyMDUxODU3NDNaMGQxCzAJBgNVBAYTAkFVMRMwEQYDVQQI
EwpTb21lLVN0YXRlMQswCQYDVQQHEwJISDEMMAoGA1UEChMDSTJQMQ8wDQYDVQQL
EwZyZXNlZWQxFDASBgNVBAMTC3Jlc2VlZC5pbmZvMIIBIjANBgkqhkiG9w0BAQEF
AAOCAQ8AMIIBCgKCAQEAt9nz0iUvjdX4Hkhfk0FbBOeEP4i/FG3V4VrEdQfcviSF
XgzGYeRtGsvrFWP/5+6bcGnOkIy/jrKJfij3AjKJh8gTzqiNNNnV8VcHwFSNp+hZ
D4BM+UHPACV1Pjd3HQe6f0+LvcTs3HQgIkNkwUyqRuXOm/5Mk6SWSu1740aSwHCj
Kk0x1FByzI0YBvXCPX6TVk6sJqKkQyLzK0CSGSeqUq8GvGCq+jT9k62Su7ooxCwi
GzxaFjMdVYxuI8cuT5Cni+SUw1Ia8vhESnIy6slwzk37xNI80VuMvRT6rD2KcXDH
mK7ml1qL0rJWoF5AE+x/nen4V41mouv1W9rk3wTlTQIDAQABMA0GCSqGSIb3DQEB
BQUAA4IBAQAr6RBviBDW4bnPDTcdtstTDdaYX9yzoh+zzeGB0dUR26GKoOjpSItb
B9nrsW1eJ2wbblfGBUoXhcmNByKHXXHejMhmurHjdei2BuLbTsknN8DPKXu5UF9z
cg4cKQkxgzXOcNYlaF4+sfwFXDHJ4we/8vduVgkyo8R66543/Sh/nIMvq2slRT4w
wIBOVcMb2XxlbdwHW9XALAz9sto+4GH9GAC24f8ngluOpHijMnOOIo4dHibQ5hM9
KcDpHezP0ugMTAxS2NmtVahwAqa2IjpqR7aEQ2wLvxQzDqrXo93L93+b2FKRUQXH
Duud/n/w0kVV3DaIGikOsJayoanR+9HD
-----END CERTIFICATE-----

8
router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
View File

@@ -68,7 +68,9 @@ public class Reseeder {
"http://cowpuncher.drollette.com/netdb/" + "," + "http://cowpuncher.drollette.com/netdb/" + "," +
"http://i2p.mooo.com/netDb/" + "," + "http://i2p.mooo.com/netDb/" + "," +
"http://193.150.121.66/netDb/" + "," + "http://193.150.121.66/netDb/" + "," +
"http://netdb.i2p2.no/"; "http://netdb.i2p2.no/" + "," +
"http://reseed.info/" + "," +
"http://i2p.feared.eu/";
/** @since 0.8.2 */ /** @since 0.8.2 */
public static final String DEFAULT_SSL_SEED_URL = public static final String DEFAULT_SSL_SEED_URL =
@@ -80,7 +82,9 @@ public class Reseeder {
"https://cowpuncher.drollette.com/netdb/" + "," + "https://cowpuncher.drollette.com/netdb/" + "," +
"https://i2p.mooo.com/netDb/" + "," + "https://i2p.mooo.com/netDb/" + "," +
"https://193.150.121.66/netDb/" + "," + "https://193.150.121.66/netDb/" + "," +
"https://netdb.i2p2.no/"; "https://netdb.i2p2.no/" + "," +
"https://reseed.info/" + "," +
"https://i2p.feared.eu/";
public static final String PROP_PROXY_HOST = "router.reseedProxyHost"; public static final String PROP_PROXY_HOST = "router.reseedProxyHost";
public static final String PROP_PROXY_PORT = "router.reseedProxyPort"; public static final String PROP_PROXY_PORT = "router.reseedProxyPort";