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

Remove outproxy hook in context, use ClientAppManager:

Browse Source 
- Add clientAppManager() to I2PAppContext so it can be used there
  - Add routerAppManager() to RouterContext for convenience inside router

Start of SSL support in I2PTunnelHTTPClient
  - Add initialSocketData support back to I2PTunnelOutproxyRunner
  - Works for orchid (and in-net?)
  - TODO Doesn't work for in-net proxy
  - Need separate config for SSL proxy
This commit is contained in:
zzz
2014-01-06 13:57:45 +00:00
parent 0fae0640d6
commit 0bc6c23ac9
10 changed files with 103 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
router/java/src/net/i2p/router/RouterContext.java
View File

@@ -8,6 +8,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.CopyOnWriteArrayList;
import net.i2p.I2PAppContext;
import net.i2p.app.ClientAppManager;
import net.i2p.data.Hash;
import net.i2p.data.RouterInfo;
import net.i2p.internal.InternalClientManager;
@@ -586,7 +587,18 @@ public class RouterContext extends I2PAppContext {
* @return the manager
* @since 0.9.4
*/
public RouterAppManager clientAppManager() {
@Override
public ClientAppManager clientAppManager() {
return _appManager;
}
/**
* The RouterAppManager.
* For convenience, same as clientAppManager(), no cast required
* @return the manager
* @since 0.9.11
*/
public RouterAppManager routerAppManager() {
return _appManager;
}
}

4
router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
View File

@@ -267,13 +267,13 @@ public class LoadClientAppsJob extends JobImpl {
Class<?> cls = Class.forName(_className, true, _cl);
if (isRouterApp(cls)) {
Constructor<?> con = cls.getConstructor(RouterContext.class, ClientAppManager.class, String[].class);
RouterAppManager mgr = _ctx.clientAppManager();
RouterAppManager mgr = _ctx.routerAppManager();
Object[] conArgs = new Object[] {_ctx, _ctx.clientAppManager(), _args};
RouterApp app = (RouterApp) con.newInstance(conArgs);
mgr.addAndStart(app, _args);
} else if (isClientApp(cls)) {
Constructor<?> con = cls.getConstructor(I2PAppContext.class, ClientAppManager.class, String[].class);
RouterAppManager mgr = _ctx.clientAppManager();
RouterAppManager mgr = _ctx.routerAppManager();
Object[] conArgs = new Object[] {_ctx, _ctx.clientAppManager(), _args};
ClientApp app = (ClientApp) con.newInstance(conArgs);
mgr.addAndStart(app, _args);