I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Implemented support for new I2PControl API features. Password/Port of a remote I2PControl server can now be set.

Browse Source
This commit is contained in:
dev
2011-07-19 14:11:21 +00:00
parent 10b91cd5a7
commit d1ea42932f
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/net/i2p/itoopie/Main.java
View File

@ -32,9 +32,11 @@ import net.i2p.itoopie.i2pcontrol.methods.GetEcho;
import net.i2p.itoopie.i2pcontrol.methods.GetNetworkSetting;
import net.i2p.itoopie.i2pcontrol.methods.GetRateStat;
import net.i2p.itoopie.i2pcontrol.methods.GetRouterInfo;
import net.i2p.itoopie.i2pcontrol.methods.I2PControl.I2P_CONTROL;
import net.i2p.itoopie.i2pcontrol.methods.NetworkSetting.NETWORK_SETTING;
import net.i2p.itoopie.i2pcontrol.methods.RouterInfo.ROUTER_INFO;
import net.i2p.itoopie.i2pcontrol.methods.RouterRunner.ROUTER_RUNNER;
import net.i2p.itoopie.i2pcontrol.methods.SetI2PControl;
import net.i2p.itoopie.i2pcontrol.methods.SetNetworkSetting;
import net.i2p.itoopie.i2pcontrol.methods.SetRouterRunner;
import net.i2p.itoopie.security.CertificateHelper;
@ -93,7 +95,7 @@ public class Main {
// Popup Main window.
WindowHandler.toggleFrames();
//testStuff(); // Delete Me
// testStuff(); // Delete Me
}
@SuppressWarnings("static-access")
@ -126,10 +128,43 @@ public class Main {
private static void testStuff(){
_conf.parseConfigStr("server.hostname=127.0.0.1");
_conf.parseConfigStr("server.port=7650");
_conf.parseConfigStr("server.port=7888");
_conf.parseConfigStr("server.target=jsonrpc");
// Try port switching
System.out.println("\nI2PControl - Port Switch");
try {
HashMap<I2P_CONTROL, String> hm = new HashMap<I2P_CONTROL, String>();
hm.put(I2P_CONTROL.PORT, 7888+"");
SetI2PControl.execute(hm);
_conf.setConf("server.port", 7888);
Thread.sleep(10*1000);
} catch (InvalidPasswordException e) {
e.printStackTrace();
} catch (JSONRPC2SessionException e) {
System.out.println("Connection failed..");
} catch (InvalidParametersException e) {
System.out.println("Bad parameters sent..");
} catch (InterruptedException e) { }
// Try passwd switching
System.out.println("\nI2PControl - Password Switch");
try {
HashMap<I2P_CONTROL, String> hm = new HashMap<I2P_CONTROL, String>();
hm.put(I2P_CONTROL.PASSWORD, "itoopi");
SetI2PControl.execute(hm);
_conf.setConf("server.password", "itoopi");
} catch (InvalidPasswordException e) {
e.printStackTrace();
} catch (JSONRPC2SessionException e) {
System.out.println("Connection failed..");
} catch (InvalidParametersException e) {
System.out.println("Bad parameters sent..");
}
// Test basic echo method
System.out.println("\nGetEcho");
try {

2
src/net/i2p/itoopie/i2pcontrol/methods/GetRateStat.java
View File

@ -35,6 +35,8 @@ public class GetRateStat{
resp = JSONRPC2Interface.sendReq(req);
HashMap inParams = (HashMap) resp.getResult();
if (inParams == null)
return 0D;
try {
Double dbl = (Double) inParams.get("Result");