From 17a1b11f665f4271cc1f90423af52965fd0c86c1 Mon Sep 17 00:00:00 2001
From: shendaras <shendaras>
Date: Sat, 10 Apr 2004 11:45:02 +0000
Subject: [PATCH] beginning of format, updated imports. (shendaras)
---
.../src/net/i2p/heartbeat/ClientEngine.java | 121 +-
.../java/src/net/i2p/heartbeat/Heartbeat.java | 227 +--
.../src/net/i2p/heartbeat/I2PAdapter.java | 717 ++++-----
.../java/src/net/i2p/heartbeat/PeerData.java | 457 +++---
.../src/net/i2p/heartbeat/PeerDataWriter.java | 140 +-
.../net/i2p/heartbeat/gui/PeerPlotConfig.java | 17 +-
.../src/net/i2p/httptunnel/HTTPListener.java | 64 +-
.../net/i2p/httptunnel/HTTPSocketHandler.java | 55 +-
.../src/net/i2p/httptunnel/HTTPTunnel.java | 87 +-
.../java/src/net/i2p/httptunnel/Request.java | 167 ++-
.../i2p/httptunnel/SocketManagerProducer.java | 121 +-
.../i2p/httptunnel/filter/ChainFilter.java | 59 +-
.../src/net/i2p/httptunnel/filter/Filter.java | 2 +-
.../net/i2p/httptunnel/filter/NullFilter.java | 6 +-
.../i2p/httptunnel/handler/EepHandler.java | 118 +-
.../i2p/httptunnel/handler/ErrorHandler.java | 34 +-
.../i2p/httptunnel/handler/LocalHandler.java | 43 +-
.../i2p/httptunnel/handler/ProxyHandler.java | 40 +-
.../i2p/httptunnel/handler/RootHandler.java | 162 +-
.../src/net/i2p/i2ptunnel/BufferLogger.java | 49 +-
.../java/src/net/i2p/i2ptunnel/I2PTunnel.java | 1303 +++++++++--------
.../net/i2p/i2ptunnel/I2PTunnelClient.java | 72 +-
.../i2p/i2ptunnel/I2PTunnelClientBase.java | 323 ++--
.../src/net/i2p/i2ptunnel/I2PTunnelGUI.java | 38 +-
.../i2p/i2ptunnel/I2PTunnelHTTPClient.java | 553 ++++---
.../net/i2p/i2ptunnel/I2PTunnelRunner.java | 251 ++--
.../net/i2p/i2ptunnel/I2PTunnelServer.java | 171 +--
.../src/net/i2p/i2ptunnel/I2PTunnelTask.java | 89 +-
.../java/src/net/i2p/i2ptunnel/I2Ping.java | 335 +++--
.../java/src/net/i2p/i2ptunnel/Logging.java | 3 +-
.../src/net/i2p/i2ptunnel/TunnelManager.java | 444 +++---
.../i2ptunnel/TunnelManagerClientRunner.java | 316 ++--
.../i2p/i2ptunnel/socks/I2PSOCKSTunnel.java | 41 +-
.../net/i2p/i2ptunnel/socks/SOCKS5Server.java | 395 +++--
.../i2p/i2ptunnel/socks/SOCKSException.java | 8 +-
.../net/i2p/i2ptunnel/socks/SOCKSServer.java | 66 +-
.../i2ptunnel/socks/SOCKSServerFactory.java | 41 +-
37 files changed, 3585 insertions(+), 3550 deletions(-)
diff --git a/apps/heartbeat/java/src/net/i2p/heartbeat/ClientEngine.java b/apps/heartbeat/java/src/net/i2p/heartbeat/ClientEngine.java
index 3e08a8d83b..0f85eae8d4 100644
--- a/apps/heartbeat/java/src/net/i2p/heartbeat/ClientEngine.java
+++ b/apps/heartbeat/java/src/net/i2p/heartbeat/ClientEngine.java
@@ -24,7 +24,7 @@ class ClientEngine {
/** this engine's id, unique to the {test,sendingClient,startTime} */
private int _id;
private static PeerDataWriter writer = new PeerDataWriter();
-
+
/**
* Create a new engine that will send its pings through the given heartbeat
* system, and will coordinate the test according to the configuration specified.
@@ -32,36 +32,42 @@ class ClientEngine {
* @param config the Configuration to load configuration from =p
*/
public ClientEngine(Heartbeat heartbeat, ClientConfig config) {
- _heartbeat = heartbeat;
- _data = new PeerData(config);
- _active = false;
- _id = ++__id;
+ _heartbeat = heartbeat;
+ _data = new PeerData(config);
+ _active = false;
+ _id = ++__id;
}
-
+
/** stop sending any more pings or writing any more state */
public void stopEngine() {
- _active = false;
- if (_log.shouldLog(Log.INFO))
- _log.info("Stopping engine talking to peer " + _data.getConfig().getPeer().calculateHash().toBase64());
+ _active = false;
+ if (_log.shouldLog(Log.INFO))
+ _log.info("Stopping engine talking to peer " + _data.getConfig().getPeer().calculateHash().toBase64());
}
+
/** start up the test (this does not block, as it fires up the test thread) */
public void startEngine() {
- _active = true;
- I2PThread t = new I2PThread(new ClientRunner());
- t.setName("HeartbeatClient " + _id);
- t.start();
+ _active = true;
+ I2PThread t = new I2PThread(new ClientRunner());
+ t.setName("HeartbeatClient " + _id);
+ t.start();
}
+
/**
* Who are we testing?
* @return the Destination (peer) we're testing
*/
- public Destination getPeer() { return _data.getConfig().getPeer(); }
+ public Destination getPeer() {
+ return _data.getConfig().getPeer();
+ }
/**
* What is our series identifier (used to locally identify a test)
* @return the series identifier
*/
- public int getSeriesNum() { return _id; }
+ public int getSeriesNum() {
+ return _id;
+ }
/**
* receive notification from the heartbeat system that a pong was received in
@@ -71,53 +77,54 @@ class ClientEngine {
* @param replyOn when did the peer send the pong?
*/
public void receivePong(long sentOn, long replyOn) {
- _data.pongReceived(sentOn, replyOn);
+ _data.pongReceived(sentOn, replyOn);
}
-
+
/** fire off a new ping */
private void doSend() {
- long now = Clock.getInstance().now();
- _heartbeat.sendPing(_data.getConfig().getPeer(), _id, now, _data.getConfig().getSendSize());
- _data.addPing(now);
+ long now = Clock.getInstance().now();
+ _heartbeat.sendPing(_data.getConfig().getPeer(), _id, now, _data.getConfig().getSendSize());
+ _data.addPing(now);
}
-
+
/** our actual heartbeat pumper - this drives the test */
private class ClientRunner implements Runnable {
-
- /* (non-Javadoc)
- * @see java.lang.Runnable#run()
- */
- public void run() {
- if (_log.shouldLog(Log.INFO))
- _log.info("Starting engine talking to peer " + _data.getConfig().getPeer().calculateHash().toBase64());
-
- // when do we need to send the next PING?
- long nextSend = Clock.getInstance().now();
- // when do we need to write out the next state data?
- long nextWrite = Clock.getInstance().now();
-
- while (_active) {
-
- if (Clock.getInstance().now() >= nextSend) {
- doSend();
- nextSend = Clock.getInstance().now() + _data.getConfig().getSendFrequency()*1000;
- }
-
- if (Clock.getInstance().now() >= nextWrite) {
- boolean written = writer.persist(_data);
- if (!written) {
- if (_log.shouldLog(Log.ERROR))
- _log.error("Unable to write the client state data");
- } else {
- if (_log.shouldLog(Log.DEBUG))
- _log.debug("Client state data written");
- }
- }
-
- _data.cleanup();
-
- try { Thread.sleep(1000); } catch (InterruptedException ie) {}
- }
- }
+
+ /* (non-Javadoc)
+ * @see java.lang.Runnable#run()
+ */
+ public void run() {
+ if (_log.shouldLog(Log.INFO))
+ _log.info("Starting engine talking to peer " + _data.getConfig().getPeer().calculateHash().toBase64());
+
+ // when do we need to send the next PING?
+ long nextSend = Clock.getInstance().now();
+ // when do we need to write out the next state data?
+ long nextWrite = Clock.getInstance().now();
+
+ while (_active) {
+
+ if (Clock.getInstance().now() >= nextSend) {
+ doSend();
+ nextSend = Clock.getInstance().now() + _data.getConfig().getSendFrequency() * 1000;
+ }
+
+ if (Clock.getInstance().now() >= nextWrite) {
+ boolean written = writer.persist(_data);
+ if (!written) {
+ if (_log.shouldLog(Log.ERROR)) _log.error("Unable to write the client state data");
+ } else {
+ if (_log.shouldLog(Log.DEBUG)) _log.debug("Client state data written");
+ }
+ }
+
+ _data.cleanup();
+
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ie) {
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/apps/heartbeat/java/src/net/i2p/heartbeat/Heartbeat.java b/apps/heartbeat/java/src/net/i2p/heartbeat/Heartbeat.java
index d1ac8d73b7..70ad6313f0 100644
--- a/apps/heartbeat/java/src/net/i2p/heartbeat/Heartbeat.java
+++ b/apps/heartbeat/java/src/net/i2p/heartbeat/Heartbeat.java
@@ -55,7 +55,7 @@ import net.i2p.util.Log;
* </pre>
*
*/
-public class Heartbeat {
+public class Heartbeat {
private static final Log _log = new Log(Heartbeat.class);
/** location containing this heartbeat's config */
private String _configFile;
@@ -67,47 +67,51 @@ public class Heartbeat {
private I2PAdapter _adapter;
/** our own callback that the I2PAdapter notifies on ping or pong messages */
private PingPongAdapter _eventAdapter;
-
+
/** if there are no command line arguments, load the config from "heartbeat.config" */
public static final String CONFIG_FILE_DEFAULT = "heartbeat.config";
-
+
/**
* build up a new heartbeat manager, but don't actually do anything
* @param configFile the name of the configuration file
*/
public Heartbeat(String configFile) {
- _configFile = configFile;
- _clientConfigs = new HashMap();
- _clientEngines = new HashMap();
- _eventAdapter = new PingPongAdapter();
- _adapter = new I2PAdapter();
- _adapter.setListener(_eventAdapter);
+ _configFile = configFile;
+ _clientConfigs = new HashMap();
+ _clientEngines = new HashMap();
+ _eventAdapter = new PingPongAdapter();
+ _adapter = new I2PAdapter();
+ _adapter.setListener(_eventAdapter);
+ }
+
+ private Heartbeat() {
}
- private Heartbeat() {}
-
+
/** load up the config data (but don't build any engines or start them up) */
public void loadConfig() {
- Properties props = new Properties();
- FileInputStream fin = null;
- File configFile = new File (_configFile);
- if (configFile.exists()) {
- try {
- fin = new FileInputStream(_configFile);
- props.load(fin);
- } catch (IOException ioe) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error reading the config data", ioe);
+ Properties props = new Properties();
+ FileInputStream fin = null;
+ File configFile = new File(_configFile);
+ if (configFile.exists()) {
+ try {
+ fin = new FileInputStream(_configFile);
+ props.load(fin);
+ } catch (IOException ioe) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error reading the config data", ioe);
+ }
+ } finally {
+ if (fin != null) try {
+ fin.close();
+ } catch (IOException ioe) {
+ }
+ }
}
- } finally {
- if (fin != null) try { fin.close(); } catch (IOException ioe) {}
- }
- }
-
- loadBaseConfig(props);
- loadClientConfigs(props);
+
+ loadBaseConfig(props);
+ loadClientConfigs(props);
}
-
-
+
/**
* send a ping message to the peer
*
@@ -117,65 +121,65 @@ public class Heartbeat {
* @param size total message size to send
*/
void sendPing(Destination peer, int seriesNum, long now, int size) {
- if (_adapter.getIsConnected())
- _adapter.sendPing(peer, seriesNum, now, size);
+ if (_adapter.getIsConnected()) _adapter.sendPing(peer, seriesNum, now, size);
}
-
+
/**
* load up the base data (I2CP config, etc)
* @param props the properties to load from
*/
private void loadBaseConfig(Properties props) {
- _adapter.loadConfig(props);
+ _adapter.loadConfig(props);
}
-
+
/**
* load up all of the test config data
* @param props the properties to load from
* */
private void loadClientConfigs(Properties props) {
- int i = 0;
- while (true) {
- ClientConfig config = new ClientConfig();
- if (!config.load(props, i)) {
- break;
+ int i = 0;
+ while (true) {
+ ClientConfig config = new ClientConfig();
+ if (!config.load(props, i)) {
+ break;
+ }
+ _clientConfigs.put(new Integer(i), config);
+ i++;
}
- _clientConfigs.put(new Integer(i), config);
- i++;
- }
}
/** connect to the network */
private void connect() {
- boolean connected = _adapter.connect();
- if (!connected)
- _log.error("Unable to connect to the router");
+ boolean connected = _adapter.connect();
+ if (!connected) _log.error("Unable to connect to the router");
}
+
/** disconnect from the network */
private void disconnect() {
- _adapter.disconnect();
+ _adapter.disconnect();
}
-
+
/** start up all of the tests */
public void startEngines() {
- for (Iterator iter = _clientConfigs.values().iterator(); iter.hasNext(); ) {
- ClientConfig config = (ClientConfig)iter.next();
- ClientEngine engine = new ClientEngine(this, config);
- config.setUs(_adapter.getLocalDestination());
- config.setNumHops(_adapter.getNumHops());
- _clientEngines.put(new Integer(engine.getSeriesNum()), engine);
- engine.startEngine();
- }
+ for (Iterator iter = _clientConfigs.values().iterator(); iter.hasNext();) {
+ ClientConfig config = (ClientConfig) iter.next();
+ ClientEngine engine = new ClientEngine(this, config);
+ config.setUs(_adapter.getLocalDestination());
+ config.setNumHops(_adapter.getNumHops());
+ _clientEngines.put(new Integer(engine.getSeriesNum()), engine);
+ engine.startEngine();
+ }
}
+
/** stop all of the tests */
public void stopEngines() {
- for (Iterator iter = _clientEngines.values().iterator(); iter.hasNext(); ) {
- ClientEngine engine = (ClientEngine)iter.next();
- engine.stopEngine();
- }
- _clientEngines.clear();
+ for (Iterator iter = _clientEngines.values().iterator(); iter.hasNext();) {
+ ClientEngine engine = (ClientEngine) iter.next();
+ engine.stopEngine();
+ }
+ _clientEngines.clear();
}
-
+
/**
* Fire up a new heartbeat system, waiting until, well, forever. Builds
* a new heartbeat system, loads the config, connects to the network, starts
@@ -186,62 +190,63 @@ public class Heartbeat {
* @param args the list of args passed to the program from the command-line
*/
public static void main(String args[]) {
- String configFile = CONFIG_FILE_DEFAULT;
- if (args.length == 1) {
- configFile = args[0];
- }
-
- if (_log.shouldLog(Log.INFO)) {
- _log.info("Starting up with config file " + configFile);
- }
- Heartbeat heartbeat = new Heartbeat(configFile);
- heartbeat.loadConfig();
- heartbeat.connect();
- heartbeat.startEngines();
- Object o = new Object();
- while (true) {
- try {
- synchronized (o) {
- o.wait();
- }
- } catch (InterruptedException ie) {}
- }
+ String configFile = CONFIG_FILE_DEFAULT;
+ if (args.length == 1) {
+ configFile = args[0];
+ }
+
+ if (_log.shouldLog(Log.INFO)) {
+ _log.info("Starting up with config file " + configFile);
+ }
+ Heartbeat heartbeat = new Heartbeat(configFile);
+ heartbeat.loadConfig();
+ heartbeat.connect();
+ heartbeat.startEngines();
+ Object o = new Object();
+ while (true) {
+ try {
+ synchronized (o) {
+ o.wait();
+ }
+ } catch (InterruptedException ie) {
+ }
+ }
}
-
+
/**
* Receive event notification from the I2PAdapter
*
*/
private class PingPongAdapter implements I2PAdapter.PingPongEventListener {
- /**
- * We were pinged, so always just send a pong back.
- *
- * @param from who sent us the ping?
- * @param seriesNum what series did the sender specify?
- * @param sentOn when did the sender say they sent their ping?
- * @param data arbitrary payload data
- */
- public void receivePing(Destination from, int seriesNum, Date sentOn, byte[] data) {
- if (_adapter.getIsConnected()) {
- _adapter.sendPong(from, seriesNum, sentOn, data);
+ /**
+ * We were pinged, so always just send a pong back.
+ *
+ * @param from who sent us the ping?
+ * @param seriesNum what series did the sender specify?
+ * @param sentOn when did the sender say they sent their ping?
+ * @param data arbitrary payload data
+ */
+ public void receivePing(Destination from, int seriesNum, Date sentOn, byte[] data) {
+ if (_adapter.getIsConnected()) {
+ _adapter.sendPong(from, seriesNum, sentOn, data);
+ }
}
- }
-
- /**
- * We received a pong, so find the right client engine and tell it about the pong.
- *
- * @param from who sent us the pong
- * @param seriesNum our client ID
- * @param sentOn when did we send the ping?
- * @param replyOn when did they send their pong?
- * @param data the arbitrary data we sent in the ping (that they sent back in the pong)
- */
- public void receivePong(Destination from, int seriesNum, Date sentOn, Date replyOn, byte[] data) {
- ClientEngine engine = (ClientEngine)_clientEngines.get(new Integer(seriesNum));
- if (engine.getPeer().equals(from)) {
- engine.receivePong(sentOn.getTime(), replyOn.getTime());
+
+ /**
+ * We received a pong, so find the right client engine and tell it about the pong.
+ *
+ * @param from who sent us the pong
+ * @param seriesNum our client ID
+ * @param sentOn when did we send the ping?
+ * @param replyOn when did they send their pong?
+ * @param data the arbitrary data we sent in the ping (that they sent back in the pong)
+ */
+ public void receivePong(Destination from, int seriesNum, Date sentOn, Date replyOn, byte[] data) {
+ ClientEngine engine = (ClientEngine) _clientEngines.get(new Integer(seriesNum));
+ if (engine.getPeer().equals(from)) {
+ engine.receivePong(sentOn.getTime(), replyOn.getTime());
+ }
}
- }
}
-
+
}
\ No newline at end of file
diff --git a/apps/heartbeat/java/src/net/i2p/heartbeat/I2PAdapter.java b/apps/heartbeat/java/src/net/i2p/heartbeat/I2PAdapter.java
index cabdc2f5c6..015a968403 100644
--- a/apps/heartbeat/java/src/net/i2p/heartbeat/I2PAdapter.java
+++ b/apps/heartbeat/java/src/net/i2p/heartbeat/I2PAdapter.java
@@ -61,120 +61,129 @@ class I2PAdapter {
private static final String I2CP_PORT_PROP = "i2cpPort";
/** by default, the I2CP port is 7654 */
private static final int I2CP_PORT_DEFAULT = 7654;
-
+
/** This property defines how many hops we want in our tunnels. */
public static final String NUMHOPS_PROP = "numHops";
/** by default, use 2 hop tunnels */
public static final int NUMHOPS_DEFAULT = 2;
-
+
/**
* Constructs an I2PAdapter . . .
*/
public I2PAdapter() {
- _privateDestFile = null;
- _i2cpHost = null;
- _i2cpPort = -1;
- _localDest = null;
- _listener = null;
- _session = null;
- _numHops = 0;
+ _privateDestFile = null;
+ _i2cpHost = null;
+ _i2cpPort = -1;
+ _localDest = null;
+ _listener = null;
+ _session = null;
+ _numHops = 0;
}
-
+
/**
* who are we?
* @return the destination (us)
*/
- public Destination getLocalDestination() { return _localDest; }
-
+ public Destination getLocalDestination() {
+ return _localDest;
+ }
+
/**
* who gets notified when we receive a ping or a pong?
* @return the event listener who gets notified
*/
- public PingPongEventListener getListener() { return _listener; }
-
-
+ public PingPongEventListener getListener() {
+ return _listener;
+ }
+
/**
* Sets who gets notified when we receive a ping or a pong
* @param listener the event listener to get notified
*/
- public void setListener(PingPongEventListener listener) { _listener = listener; }
-
+ public void setListener(PingPongEventListener listener) {
+ _listener = listener;
+ }
+
/**
* how many hops do we want in our tunnels?
* @return the number of hops
*/
- public int getNumHops() { return _numHops; }
-
+ public int getNumHops() {
+ return _numHops;
+ }
+
/**
* are we connected?
* @return true or false . . .
*/
- public boolean getIsConnected() { return _session != null; }
-
+ public boolean getIsConnected() {
+ return _session != null;
+ }
+
/**
* Read in all of the config data
* @param props the properties to load from
*/
void loadConfig(Properties props) {
- String privDestFile = props.getProperty(DEST_FILE_PROP, DEST_FILE_DEFAULT);
- String host = props.getProperty(I2CP_HOST_PROP, I2CP_HOST_DEFAULT);
- String port = props.getProperty(I2CP_PORT_PROP, ""+I2CP_PORT_DEFAULT);
- String numHops = props.getProperty(NUMHOPS_PROP, ""+NUMHOPS_DEFAULT);
-
- int portNum = -1;
- try {
- portNum = Integer.parseInt(port);
- } catch (NumberFormatException nfe) {
- if (_log.shouldLog(Log.WARN)) {
- _log.warn("Invalid I2CP port specified [" + port + "]");
+ String privDestFile = props.getProperty(DEST_FILE_PROP, DEST_FILE_DEFAULT);
+ String host = props.getProperty(I2CP_HOST_PROP, I2CP_HOST_DEFAULT);
+ String port = props.getProperty(I2CP_PORT_PROP, "" + I2CP_PORT_DEFAULT);
+ String numHops = props.getProperty(NUMHOPS_PROP, "" + NUMHOPS_DEFAULT);
+
+ int portNum = -1;
+ try {
+ portNum = Integer.parseInt(port);
+ } catch (NumberFormatException nfe) {
+ if (_log.shouldLog(Log.WARN)) {
+ _log.warn("Invalid I2CP port specified [" + port + "]");
+ }
+ portNum = I2CP_PORT_DEFAULT;
}
- portNum = I2CP_PORT_DEFAULT;
- }
- int hops = -1;
- try {
- hops = Integer.parseInt(numHops);
- } catch (NumberFormatException nfe) {
- if (_log.shouldLog(Log.WARN)) {
- _log.warn("Invalid # hops specified [" + numHops + "]");
+ int hops = -1;
+ try {
+ hops = Integer.parseInt(numHops);
+ } catch (NumberFormatException nfe) {
+ if (_log.shouldLog(Log.WARN)) {
+ _log.warn("Invalid # hops specified [" + numHops + "]");
+ }
+ hops = NUMHOPS_DEFAULT;
}
- hops = NUMHOPS_DEFAULT;
- }
-
- _numHops = hops;
- _privateDestFile = privDestFile;
- _i2cpHost = host;
- _i2cpPort = portNum;
+
+ _numHops = hops;
+ _privateDestFile = privDestFile;
+ _i2cpHost = host;
+ _i2cpPort = portNum;
}
-
+
/**
* write out the config to the props
* @param props the properties to write to
*/
void storeConfig(Properties props) {
- if (_privateDestFile != null) {
- props.setProperty(DEST_FILE_PROP, _privateDestFile);
- } else {
- props.setProperty(DEST_FILE_PROP, DEST_FILE_DEFAULT);
- }
+ if (_privateDestFile != null) {
+ props.setProperty(DEST_FILE_PROP, _privateDestFile);
+ } else {
+ props.setProperty(DEST_FILE_PROP, DEST_FILE_DEFAULT);
+ }
- if (_i2cpHost != null) {
- props.setProperty(I2CP_HOST_PROP, _i2cpHost);
- } else {
- props.setProperty(I2CP_HOST_PROP, I2CP_HOST_DEFAULT);
- }
-
- if (_i2cpPort > 0) {
- props.setProperty(I2CP_PORT_PROP, ""+_i2cpPort);
- } else {
- props.setProperty(I2CP_PORT_PROP, ""+I2CP_PORT_DEFAULT);
- }
-
- props.setProperty(NUMHOPS_PROP, ""+_numHops);
+ if (_i2cpHost != null) {
+ props.setProperty(I2CP_HOST_PROP, _i2cpHost);
+ } else {
+ props.setProperty(I2CP_HOST_PROP, I2CP_HOST_DEFAULT);
+ }
+
+ if (_i2cpPort > 0) {
+ props.setProperty(I2CP_PORT_PROP, "" + _i2cpPort);
+ } else {
+ props.setProperty(I2CP_PORT_PROP, "" + I2CP_PORT_DEFAULT);
+ }
+
+ props.setProperty(NUMHOPS_PROP, "" + _numHops);
}
private static final int TYPE_PING = 0;
private static final int TYPE_PONG = 1;
-
+
/**
* send a ping message to the peer
*
@@ -186,43 +195,44 @@ class I2PAdapter {
* @throws IllegalStateException if we are not connected to the router
*/
public void sendPing(Destination peer, int seriesNum, long now, int size) {
- if (_session == null) throw new IllegalStateException("Not connected to the router");
- ByteArrayOutputStream baos = new ByteArrayOutputStream(size);
- try {
- _localDest.writeBytes(baos);
- DataHelper.writeLong(baos, 2, seriesNum);
- DataHelper.writeLong(baos, 1, TYPE_PING);
- DataHelper.writeDate(baos, new Date(now));
- int padding = size - baos.size();
- byte paddingData[] = new byte[padding];
- Arrays.fill(paddingData, (byte)0x2A);
- DataHelper.writeLong(baos, 2, padding);
- baos.write(paddingData);
- boolean sent = _session.sendMessage(peer, baos.toByteArray());
- if (!sent) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error sending the ping to " + peer.calculateHash().toBase64() + " for series " + seriesNum);
- }
- } else {
- if (_log.shouldLog(Log.INFO)) {
- _log.info("Ping sent to " + peer.calculateHash().toBase64() + " for series " + seriesNum);
- }
- }
- } catch (IOException ioe) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error sending the ping", ioe);
- }
- } catch (DataFormatException dfe) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error writing out the ping message", dfe);
+ if (_session == null) throw new IllegalStateException("Not connected to the router");
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(size);
+ try {
+ _localDest.writeBytes(baos);
+ DataHelper.writeLong(baos, 2, seriesNum);
+ DataHelper.writeLong(baos, 1, TYPE_PING);
+ DataHelper.writeDate(baos, new Date(now));
+ int padding = size - baos.size();
+ byte paddingData[] = new byte[padding];
+ Arrays.fill(paddingData, (byte) 0x2A);
+ DataHelper.writeLong(baos, 2, padding);
+ baos.write(paddingData);
+ boolean sent = _session.sendMessage(peer, baos.toByteArray());
+ if (!sent) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error sending the ping to " + peer.calculateHash().toBase64() + " for series "
+ + seriesNum);
+ }
+ } else {
+ if (_log.shouldLog(Log.INFO)) {
+ _log.info("Ping sent to " + peer.calculateHash().toBase64() + " for series " + seriesNum);
+ }
+ }
+ } catch (IOException ioe) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error sending the ping", ioe);
+ }
+ } catch (DataFormatException dfe) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error writing out the ping message", dfe);
+ }
+ } catch (I2PSessionException ise) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error writing out the ping message", ise);
+ }
}
- } catch (I2PSessionException ise) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error writing out the ping message", ise);
- }
- }
}
-
+
/**
* send a pong message to the peer
*
@@ -234,98 +244,101 @@ class I2PAdapter {
* @throws IllegalStateException if we are not connected to the router
*/
public void sendPong(Destination peer, int seriesNum, Date sentOn, byte data[]) {
- if (_session == null) throw new IllegalStateException("Not connected to the router");
- ByteArrayOutputStream baos = new ByteArrayOutputStream(data.length + 768);
- try {
- _localDest.writeBytes(baos);
- DataHelper.writeLong(baos, 2, seriesNum);
- DataHelper.writeLong(baos, 1, TYPE_PONG);
- DataHelper.writeDate(baos, sentOn);
- DataHelper.writeDate(baos, new Date(Clock.getInstance().now()));
- DataHelper.writeLong(baos, 2, data.length);
- baos.write(data);
- boolean sent = _session.sendMessage(peer, baos.toByteArray());
- if (!sent) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error sending the pong to " + peer.calculateHash().toBase64() + " for series " + seriesNum + " which was sent on " + sentOn);
- }
- } else {
- if (_log.shouldLog(Log.INFO)) {
- _log.info("Pong sent to " + peer.calculateHash().toBase64() + " for series " + seriesNum + " which was sent on " + sentOn);
- }
- }
- } catch (IOException ioe) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error sending the ping", ioe);
+ if (_session == null) throw new IllegalStateException("Not connected to the router");
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(data.length + 768);
+ try {
+ _localDest.writeBytes(baos);
+ DataHelper.writeLong(baos, 2, seriesNum);
+ DataHelper.writeLong(baos, 1, TYPE_PONG);
+ DataHelper.writeDate(baos, sentOn);
+ DataHelper.writeDate(baos, new Date(Clock.getInstance().now()));
+ DataHelper.writeLong(baos, 2, data.length);
+ baos.write(data);
+ boolean sent = _session.sendMessage(peer, baos.toByteArray());
+ if (!sent) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error sending the pong to " + peer.calculateHash().toBase64() + " for series "
+ + seriesNum + " which was sent on " + sentOn);
+ }
+ } else {
+ if (_log.shouldLog(Log.INFO)) {
+ _log.info("Pong sent to " + peer.calculateHash().toBase64() + " for series " + seriesNum
+ + " which was sent on " + sentOn);
+ }
+ }
+ } catch (IOException ioe) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error sending the ping", ioe);
+ }
+ } catch (DataFormatException dfe) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error writing out the pong message", dfe);
+ }
+ } catch (I2PSessionException ise) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error writing out the pong message", ise);
+ }
}
- } catch (DataFormatException dfe) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error writing out the pong message", dfe);
- }
- } catch (I2PSessionException ise) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error writing out the pong message", ise);
- }
- }
}
-
+
/**
* We've received this data from I2P - parse it into a ping or a pong
* and notify accordingly
* @param data the data to handle
*/
private void handleMessage(byte data[]) {
- ByteArrayInputStream bais = new ByteArrayInputStream(data);
- try {
- Destination from = new Destination();
- from.readBytes(bais);
- int series = (int)DataHelper.readLong(bais, 2);
- long type = DataHelper.readLong(bais, 1);
- Date sentOn = DataHelper.readDate(bais);
- Date receivedOn = null;
- if (type == TYPE_PONG) {
- receivedOn = DataHelper.readDate(bais);
- }
- int size = (int)DataHelper.readLong(bais, 2);
- byte payload[] = new byte[size];
- int read = DataHelper.read(bais, payload);
- if (read != size) {
- throw new IOException("Malformed payload - read " + read + " instead of " + size);
- }
-
- if (_listener == null) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Listener isn't set, but we received a valid message of type " + type + " sent from " + from.calculateHash().toBase64());
- }
- return;
- }
-
- if (type == TYPE_PING) {
- if (_log.shouldLog(Log.INFO)) {
- _log.info("Ping received from " + from.calculateHash().toBase64() + " on series " + series + " sent on " + sentOn + " containing " + size + " bytes");
- }
- _listener.receivePing(from, series, sentOn, payload);
- } else if (type == TYPE_PONG) {
- if (_log.shouldLog(Log.INFO)) {
- _log.info("Pong received from " + from.calculateHash().toBase64() + " on series " + series + " sent on " + sentOn + " with pong sent on " + receivedOn + " containing " + size + " bytes");
- }
- _listener.receivePong(from, series, sentOn, receivedOn, payload);
- } else {
- throw new IOException("Invalid message type " + type);
- }
-
- } catch (IOException ioe) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error handling the message", ioe);
- }
- } catch (DataFormatException dfe) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error parsing the message", dfe);
+ ByteArrayInputStream bais = new ByteArrayInputStream(data);
+ try {
+ Destination from = new Destination();
+ from.readBytes(bais);
+ int series = (int) DataHelper.readLong(bais, 2);
+ long type = DataHelper.readLong(bais, 1);
+ Date sentOn = DataHelper.readDate(bais);
+ Date receivedOn = null;
+ if (type == TYPE_PONG) {
+ receivedOn = DataHelper.readDate(bais);
+ }
+ int size = (int) DataHelper.readLong(bais, 2);
+ byte payload[] = new byte[size];
+ int read = DataHelper.read(bais, payload);
+ if (read != size) { throw new IOException("Malformed payload - read " + read + " instead of " + size); }
+
+ if (_listener == null) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Listener isn't set, but we received a valid message of type " + type + " sent from "
+ + from.calculateHash().toBase64());
+ }
+ return;
+ }
+
+ if (type == TYPE_PING) {
+ if (_log.shouldLog(Log.INFO)) {
+ _log.info("Ping received from " + from.calculateHash().toBase64() + " on series " + series
+ + " sent on " + sentOn + " containing " + size + " bytes");
+ }
+ _listener.receivePing(from, series, sentOn, payload);
+ } else if (type == TYPE_PONG) {
+ if (_log.shouldLog(Log.INFO)) {
+ _log.info("Pong received from " + from.calculateHash().toBase64() + " on series " + series
+ + " sent on " + sentOn + " with pong sent on " + receivedOn + " containing " + size
+ + " bytes");
+ }
+ _listener.receivePong(from, series, sentOn, receivedOn, payload);
+ } else {
+ throw new IOException("Invalid message type " + type);
+ }
+
+ } catch (IOException ioe) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error handling the message", ioe);
+ }
+ } catch (DataFormatException dfe) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error parsing the message", dfe);
+ }
}
- }
}
-
-
+
/**
* connect to the I2P router and either authenticate ourselves with the
* destination we're given, or create a new one and write that to the
@@ -334,44 +347,47 @@ class I2PAdapter {
* @return true if we connect successfully, false otherwise
*/
boolean connect() {
- I2PClient client = I2PClientFactory.createClient();
- Destination us = null;
- File destFile = new File(_privateDestFile);
- us = verifyDestination(client, destFile);
- if (us == null) return false;
-
- // if we're here, we got a destination. lets connect
- FileInputStream fin = null;
- try {
- fin = new FileInputStream(destFile);
- Properties options = getOptions();
- I2PSession session = client.createSession(fin, options);
- I2PListener lsnr = new I2PListener();
- session.setSessionListener(lsnr);
- session.connect();
- _localDest = session.getMyDestination();
- if (_log.shouldLog(Log.INFO)) {
- _log.info("I2CP Session created and connected as " + _localDest.calculateHash().toBase64());
- }
- _session = session;
- _i2pListener = lsnr;
- } catch (I2PSessionException ise) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error connecting", ise);
- }
- return false;
- } catch (IOException ioe) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error loading the destionation", ioe);
+ I2PClient client = I2PClientFactory.createClient();
+ Destination us = null;
+ File destFile = new File(_privateDestFile);
+ us = verifyDestination(client, destFile);
+ if (us == null) return false;
+
+ // if we're here, we got a destination. lets connect
+ FileInputStream fin = null;
+ try {
+ fin = new FileInputStream(destFile);
+ Properties options = getOptions();
+ I2PSession session = client.createSession(fin, options);
+ I2PListener lsnr = new I2PListener();
+ session.setSessionListener(lsnr);
+ session.connect();
+ _localDest = session.getMyDestination();
+ if (_log.shouldLog(Log.INFO)) {
+ _log.info("I2CP Session created and connected as " + _localDest.calculateHash().toBase64());
+ }
+ _session = session;
+ _i2pListener = lsnr;
+ } catch (I2PSessionException ise) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error connecting", ise);
+ }
+ return false;
+ } catch (IOException ioe) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error loading the destionation", ioe);
+ }
+ return false;
+ } finally {
+ if (fin != null) try {
+ fin.close();
+ } catch (IOException ioe) {
+ }
}
- return false;
- } finally {
- if (fin != null) try { fin.close(); } catch (IOException ioe) {}
- }
-
- return true;
+
+ return true;
}
-
+
/**
* load, verify, or create a destination
*
@@ -380,84 +396,96 @@ class I2PAdapter {
* @return the destination loaded, or null if there was an error
*/
private Destination verifyDestination(I2PClient client, File destFile) {
- Destination us = null;
- FileInputStream fin = null;
- if (destFile.exists()) {
- try {
- fin = new FileInputStream(destFile);
- us = new Destination();
- us.readBytes(fin);
- if (_log.shouldLog(Log.INFO)) {
- _log.info("Existing destination loaded: [" + us.toBase64() + "]");
- }
- } catch (IOException ioe) {
- if (fin != null) try { fin.close(); } catch (IOException ioe2) {}
- fin = null;
- destFile.delete();
- us = null;
- } catch (DataFormatException dfe) {
- if (fin != null) try { fin.close(); } catch (IOException ioe2) {}
- fin = null;
- destFile.delete();
- us = null;
- } finally {
- if (fin != null) try { fin.close(); } catch (IOException ioe2) {}
- fin = null;
- }
- }
-
- if (us == null) {
- // need to create a new one
- FileOutputStream fos = null;
- try {
- fos = new FileOutputStream(destFile);
- us = client.createDestination(fos);
- if (_log.shouldLog(Log.INFO)) {
- _log.info("New destination created: [" + us.toBase64() + "]");
+ Destination us = null;
+ FileInputStream fin = null;
+ if (destFile.exists()) {
+ try {
+ fin = new FileInputStream(destFile);
+ us = new Destination();
+ us.readBytes(fin);
+ if (_log.shouldLog(Log.INFO)) {
+ _log.info("Existing destination loaded: [" + us.toBase64() + "]");
+ }
+ } catch (IOException ioe) {
+ if (fin != null) try {
+ fin.close();
+ } catch (IOException ioe2) {
+ }
+ fin = null;
+ destFile.delete();
+ us = null;
+ } catch (DataFormatException dfe) {
+ if (fin != null) try {
+ fin.close();
+ } catch (IOException ioe2) {
+ }
+ fin = null;
+ destFile.delete();
+ us = null;
+ } finally {
+ if (fin != null) try {
+ fin.close();
+ } catch (IOException ioe2) {
+ }
+ fin = null;
+ }
}
- } catch (IOException ioe) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error writing out the destination keys being created", ioe);
- }
- return null;
- } catch (I2PException ie) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error creating the destination", ie);
+
+ if (us == null) {
+ // need to create a new one
+ FileOutputStream fos = null;
+ try {
+ fos = new FileOutputStream(destFile);
+ us = client.createDestination(fos);
+ if (_log.shouldLog(Log.INFO)) {
+ _log.info("New destination created: [" + us.toBase64() + "]");
+ }
+ } catch (IOException ioe) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error writing out the destination keys being created", ioe);
+ }
+ return null;
+ } catch (I2PException ie) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error creating the destination", ie);
+ }
+ return null;
+ } finally {
+ if (fos != null) try {
+ fos.close();
+ } catch (IOException ioe) {
+ }
+ }
}
- return null;
- } finally {
- if (fos != null) try { fos.close(); } catch (IOException ioe) {}
- }
- }
- return us;
+ return us;
}
-
+
/**
* I2PSession connect options
* @return the options as Properties
*/
- private Properties getOptions() {
- Properties props = new Properties();
- props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_BEST_EFFORT);
- props.setProperty(I2PClient.PROP_TCP_HOST, _i2cpHost);
- props.setProperty(I2PClient.PROP_TCP_PORT, _i2cpPort + "");
- props.setProperty("tunnels.depthInbound", ""+_numHops);
- props.setProperty("tunnels.depthOutbound", ""+_numHops);
- return props;
+ private Properties getOptions() {
+ Properties props = new Properties();
+ props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_BEST_EFFORT);
+ props.setProperty(I2PClient.PROP_TCP_HOST, _i2cpHost);
+ props.setProperty(I2PClient.PROP_TCP_PORT, _i2cpPort + "");
+ props.setProperty("tunnels.depthInbound", "" + _numHops);
+ props.setProperty("tunnels.depthOutbound", "" + _numHops);
+ return props;
}
-
+
/** disconnect from the I2P router */
void disconnect() {
- if (_session != null) {
- try {
- _session.destroySession();
- } catch (I2PSessionException ise) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Error destroying the session", ise);
+ if (_session != null) {
+ try {
+ _session.destroySession();
+ } catch (I2PSessionException ise) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Error destroying the session", ise);
+ }
+ }
+ _session = null;
}
- }
- _session = null;
- }
}
/**
@@ -465,70 +493,69 @@ class I2PAdapter {
*
*/
public interface PingPongEventListener {
- /**
- * receive a ping message from the peer
- *
- * @param from peer that sent us the ping
- * @param seriesNum id the peer sent us in the ping
- * @param sentOn date the peer said they sent us the message
- * @param data payload from the ping
- */
- void receivePing(Destination from, int seriesNum, Date sentOn, byte data[]);
-
- /**
- * receive a pong message from the peer
- *
- * @param from peer that sent us the pong
- * @param seriesNum id the peer sent us in the pong (that we sent them in the ping)
- * @param sentOn when we sent out the ping
- * @param replyOn when they sent out the pong
- * @param data payload from the ping/pong
- */
- void receivePong(Destination from, int seriesNum, Date sentOn, Date replyOn, byte data[]);
+ /**
+ * receive a ping message from the peer
+ *
+ * @param from peer that sent us the ping
+ * @param seriesNum id the peer sent us in the ping
+ * @param sentOn date the peer said they sent us the message
+ * @param data payload from the ping
+ */
+ void receivePing(Destination from, int seriesNum, Date sentOn, byte data[]);
+
+ /**
+ * receive a pong message from the peer
+ *
+ * @param from peer that sent us the pong
+ * @param seriesNum id the peer sent us in the pong (that we sent them in the ping)
+ * @param sentOn when we sent out the ping
+ * @param replyOn when they sent out the pong
+ * @param data payload from the ping/pong
+ */
+ void receivePong(Destination from, int seriesNum, Date sentOn, Date replyOn, byte data[]);
}
-
+
/**
* Receive data from the session and pass it along to handleMessage for parsing/dispersal
*
*/
private class I2PListener implements I2PSessionListener {
-
- /* (non-Javadoc)
- * @see net.i2p.client.I2PSessionListener#disconnected(net.i2p.client.I2PSession)
- */
- public void disconnected(I2PSession session) {
- if (_log.shouldLog(Log.ERROR)) {
- _log.error("Session disconnected");
+
+ /* (non-Javadoc)
+ * @see net.i2p.client.I2PSessionListener#disconnected(net.i2p.client.I2PSession)
+ */
+ public void disconnected(I2PSession session) {
+ if (_log.shouldLog(Log.ERROR)) {
+ _log.error("Session disconnected");
+ }
+ disconnect();
+ }
+
+ /* (non-Javadoc)
+ * @see net.i2p.client.I2PSessionListener#errorOccurred(net.i2p.client.I2PSession, java.lang.String, java.lang.Throwable)
+ */
+ public void errorOccurred(I2PSession session, String message, Throwable error) {
+ if (_log.shouldLog(Log.ERROR)) _log.error("Error occurred", error);
+ }
+
+ /* (non-Javadoc)
+ * @see net.i2p.client.I2PSessionListener#reportAbuse(net.i2p.client.I2PSession, int)
+ */
+ public void reportAbuse(I2PSession session, int severity) {
+ if (_log.shouldLog(Log.ERROR)) _log.error("Abuse reported");
+ }
+
+ /* (non-Javadoc)
+ * @see net.i2p.client.I2PSessionListener#messageAvailable(net.i2p.client.I2PSession, int, long)
+ */
+ public void messageAvailable(I2PSession session, int msgId, long size) {
+ try {
+ byte data[] = session.receiveMessage(msgId);
+ handleMessage(data);
+ } catch (I2PSessionException ise) {
+ if (_log.shouldLog(Log.ERROR)) _log.error("Error receiving the message", ise);
+ disconnect();
+ }
}
- disconnect();
- }
- /* (non-Javadoc)
- * @see net.i2p.client.I2PSessionListener#errorOccurred(net.i2p.client.I2PSession, java.lang.String, java.lang.Throwable)
- */
- public void errorOccurred(I2PSession session, String message, Throwable error) {
- if (_log.shouldLog(Log.ERROR))
- _log.error("Error occurred", error);
- }
- /* (non-Javadoc)
- * @see net.i2p.client.I2PSessionListener#reportAbuse(net.i2p.client.I2PSession, int)
- */
- public void reportAbuse(I2PSession session, int severity) {
- if (_log.shouldLog(Log.ERROR))
- _log.error("Abuse reported");
- }
-
- /* (non-Javadoc)
- * @see net.i2p.client.I2PSessionListener#messageAvailable(net.i2p.client.I2PSession, int, long)
- */
- public void messageAvailable(I2PSession session, int msgId, long size) {
- try {
- byte data[] = session.receiveMessage(msgId);
- handleMessage(data);
- } catch (I2PSessionException ise) {
- if (_log.shouldLog(Log.ERROR))
- _log.error("Error receiving the message", ise);
- disconnect();
- }
- }
}
}
\ No newline at end of file
diff --git a/apps/heartbeat/java/src/net/i2p/heartbeat/PeerData.java b/apps/heartbeat/java/src/net/i2p/heartbeat/PeerData.java
index 64273c2118..1148348e76 100644
--- a/apps/heartbeat/java/src/net/i2p/heartbeat/PeerData.java
+++ b/apps/heartbeat/java/src/net/i2p/heartbeat/PeerData.java
@@ -35,146 +35,168 @@ public class PeerData {
private RateStat _receiveRate;
/** rate averaging the frequency of lost messages over a variety of periods */
private RateStat _lostRate;
-
+
/** how long we wait before timing out pending pings (30 seconds) */
- private static final long TIMEOUT_PERIOD = 30*1000;
-
+ private static final long TIMEOUT_PERIOD = 30 * 1000;
+
/** synchronize on this when updating _dataPoints or _pendingPings */
private Object _updateLock = new Object();
-
+
/**
* Creates a PeerData . . .
* @param config configuration to load from
*/
public PeerData(ClientConfig config) {
- _peer = config;
- _dataPoints = new TreeMap();
- _pendingPings = new TreeMap();
- _sessionStart = Clock.getInstance().now();
- _lifetimeSent = 0;
- _lifetimeReceived = 0;
- _sendRate = new RateStat("sendRate", "How long it takes to send", "peer", getPeriods(config.getAveragePeriods()));
- _receiveRate = new RateStat("receiveRate", "How long it takes to receive", "peer", getPeriods(config.getAveragePeriods()));
- _lostRate = new RateStat("lostRate", "How frequently we lose messages", "peer", getPeriods(config.getAveragePeriods()));
+ _peer = config;
+ _dataPoints = new TreeMap();
+ _pendingPings = new TreeMap();
+ _sessionStart = Clock.getInstance().now();
+ _lifetimeSent = 0;
+ _lifetimeReceived = 0;
+ _sendRate = new RateStat("sendRate", "How long it takes to send", "peer",
+ getPeriods(config.getAveragePeriods()));
+ _receiveRate = new RateStat("receiveRate", "How long it takes to receive", "peer",
+ getPeriods(config.getAveragePeriods()));
+ _lostRate = new RateStat("lostRate", "How frequently we lose messages", "peer",
+ getPeriods(config.getAveragePeriods()));
}
-
+
/**
* turn the periods (# minutes) into rate periods (# milliseconds)
* @param periods (in minutes)
* @return an array of periods (in milliseconds)
*/
private static long[] getPeriods(int periods[]) {
- long rv[] = null;
- if (periods == null) periods = new int[0];
- rv = new long[periods.length];
- for (int i = 0; i < periods.length; i++)
- rv[i] = (long)periods[i] * 60*1000; // they're in minutes
- Arrays.sort(rv);
- return rv;
+ long rv[] = null;
+ if (periods == null) periods = new int[0];
+ rv = new long[periods.length];
+ for (int i = 0; i < periods.length; i++)
+ rv[i] = (long) periods[i] * 60 * 1000; // they're in minutes
+ Arrays.sort(rv);
+ return rv;
}
-
+
/**
* how many pings are still outstanding?
* @return the number of pings outstanding
*/
- public int getPendingCount() { synchronized (_updateLock) { return _pendingPings.size(); } }
-
+ public int getPendingCount() {
+ synchronized (_updateLock) {
+ return _pendingPings.size();
+ }
+ }
+
/**
* how many data points are available in the current window?
* @return the number of datapoints available
*/
- public int getDataPointCount() { synchronized (_updateLock) { return _dataPoints.size(); } }
-
+ public int getDataPointCount() {
+ synchronized (_updateLock) {
+ return _dataPoints.size();
+ }
+ }
+
/**
* when did this test begin?
* @return when the test began
*/
- public long getSessionStart() { return _sessionStart; }
-
+ public long getSessionStart() {
+ return _sessionStart;
+ }
+
/**
* how many pings have we sent for this test?
* @return the number of pings sent
*/
- public long getLifetimeSent() { return _lifetimeSent; }
-
+ public long getLifetimeSent() {
+ return _lifetimeSent;
+ }
+
/**
* how many pongs have we received for this test?
* @return the number of pings received
*/
- public long getLifetimeReceived() { return _lifetimeReceived; }
-
-
+ public long getLifetimeReceived() {
+ return _lifetimeReceived;
+ }
+
/**
* @return the client configuration
*/
- public ClientConfig getConfig() { return _peer; }
-
+ public ClientConfig getConfig() {
+ return _peer;
+ }
+
/**
* What periods are we averaging the data over (in minutes)?
* @return the periods as an array of ints (in minutes)
*/
- public int[] getAveragePeriods() { return (_peer.getAveragePeriods() != null ? _peer.getAveragePeriods() : new int[0]); }
-
+ public int[] getAveragePeriods() {
+ return (_peer.getAveragePeriods() != null ? _peer.getAveragePeriods() : new int[0]);
+ }
+
/**
* average time to send over the given period.
*
* @param period number of minutes to retrieve the average for
* @return milliseconds average, or -1 if we dont track that period
*/
- public double getAverageSendTime(int period) { return getAverage(_sendRate, period); }
-
+ public double getAverageSendTime(int period) {
+ return getAverage(_sendRate, period);
+ }
+
/**
* average time to receive over the given period.
*
* @param period number of minutes to retrieve the average for
* @return milliseconds average, or -1 if we dont track that period
*/
- public double getAverageReceiveTime(int period) { return getAverage(_receiveRate, period); }
-
+ public double getAverageReceiveTime(int period) {
+ return getAverage(_receiveRate, period);
+ }
+
/**
* number of lost messages over the given period.
*
* @param period number of minutes to retrieve the average for
* @return number of lost messages in the period, or -1 if we dont track that period
*/
- public double getLostMessages(int period) {
- Rate rate = _lostRate.getRate(period * 60*1000);
- if (rate == null)
- return -1;
- return rate.getCurrentTotalValue();
+ public double getLostMessages(int period) {
+ Rate rate = _lostRate.getRate(period * 60 * 1000);
+ if (rate == null) return -1;
+ return rate.getCurrentTotalValue();
}
-
+
private double getAverage(RateStat stat, int period) {
- Rate rate = stat.getRate(period * 60*1000);
- if (rate == null)
- return -1;
- return rate.getAverageValue();
+ Rate rate = stat.getRate(period * 60 * 1000);
+ if (rate == null) return -1;
+ return rate.getAverageValue();
}
-
+
/**
* Return an ordered list of data points in the current window (after doing a cleanup)
*
* @return list of EventDataPoint objects
*/
public List getDataPoints() {
- cleanup();
- synchronized (_updateLock) {
- return new ArrayList(_dataPoints.values());
- }
+ cleanup();
+ synchronized (_updateLock) {
+ return new ArrayList(_dataPoints.values());
+ }
}
-
+
/**
* We have sent the peer a ping on this series (using the send time as given)
* @param dateSent when the ping was sent
*/
public void addPing(long dateSent) {
- EventDataPoint sent = new EventDataPoint(dateSent);
- synchronized (_updateLock) {
- _pendingPings.put(new Long(dateSent), sent);
- }
- _lifetimeSent++;
+ EventDataPoint sent = new EventDataPoint(dateSent);
+ synchronized (_updateLock) {
+ _pendingPings.put(new Long(dateSent), sent);
+ }
+ _lifetimeSent++;
}
-
+
/**
* we have received a pong from the peer on this series
*
@@ -182,21 +204,21 @@ public class PeerData {
* @param pongSent when the peer received the ping and sent the pong
*/
public void pongReceived(long dateSent, long pongSent) {
- long now = Clock.getInstance().now();
- synchronized (_updateLock) {
- EventDataPoint data = (EventDataPoint)_pendingPings.remove(new Long(dateSent));
- if (data != null) {
- data.setPongReceived(now);
- data.setPongSent(pongSent);
- data.setWasPonged(true);
- _dataPoints.put(new Long(dateSent), data);
- }
- }
- _sendRate.addData(pongSent-dateSent, 0);
- _receiveRate.addData(now-pongSent, 0);
- _lifetimeReceived++;
+ long now = Clock.getInstance().now();
+ synchronized (_updateLock) {
+ EventDataPoint data = (EventDataPoint) _pendingPings.remove(new Long(dateSent));
+ if (data != null) {
+ data.setPongReceived(now);
+ data.setPongSent(pongSent);
+ data.setWasPonged(true);
+ _dataPoints.put(new Long(dateSent), data);
+ }
+ }
+ _sendRate.addData(pongSent - dateSent, 0);
+ _receiveRate.addData(now - pongSent, 0);
+ _lifetimeReceived++;
}
-
+
/**
* drop all datapoints outside the window we're watching, and timeout all
* pending pings not ponged in the TIMEOUT_PERIOD, both updating the lost message
@@ -204,140 +226,157 @@ public class PeerData {
*
*/
public void cleanup() {
- long dropBefore = Clock.getInstance().now() - _peer.getStatDuration() * 60*1000;
- long timeoutBefore = Clock.getInstance().now() - TIMEOUT_PERIOD;
- long numDropped = 0;
- long numTimedOut = 0;
-
- synchronized (_updateLock) {
- List toTimeout = new ArrayList(4);
- List toDrop = new ArrayList(4);
- for (Iterator iter = _pendingPings.keySet().iterator(); iter.hasNext(); ) {
- Long when = (Long)iter.next();
- if (when.longValue() < dropBefore)
- toDrop.add(when);
- else if (when.longValue() < timeoutBefore)
- toTimeout.add(when);
- else
- break; // its ordered, so once we are past timeoutBefore, no need
- }
- for (Iterator iter = toDrop.iterator(); iter.hasNext(); ) {
- _pendingPings.remove(iter.next());
- }
-
- List toAdd = new ArrayList(toTimeout.size());
- for (Iterator iter = toTimeout.iterator(); iter.hasNext(); ) {
- Long when = (Long)iter.next();
- EventDataPoint data = (EventDataPoint)_pendingPings.remove(when);
- data.setWasPonged(false);
- toAdd.add(data);
- }
-
- numDropped = toDrop.size();
- numTimedOut = toDrop.size();
- toDrop.clear();
-
- for (Iterator iter = _dataPoints.keySet().iterator(); iter.hasNext(); ) {
- Long when = (Long)iter.next();
- if (when.longValue() < dropBefore)
- toDrop.add(when);
- else
- break; // ordered
- }
- for (Iterator iter = toDrop.iterator(); iter.hasNext(); ) {
- _dataPoints.remove(iter.next());
- }
-
- numDropped += toDrop.size();
-
- for (Iterator iter = toAdd.iterator(); iter.hasNext(); ) {
- EventDataPoint data = (EventDataPoint)iter.next();
- _dataPoints.put(new Long(data.getPingSent()), data);
- }
-
- numTimedOut += toAdd.size();
- }
-
- _lostRate.addData(numTimedOut, 0);
-
- _receiveRate.coallesceStats();
- _sendRate.coallesceStats();
- _lostRate.coallesceStats();
-
- if (_log.shouldLog(Log.DEBUG))
- _log.debug("Peer data cleaned up " + numTimedOut + " timed out pings and removed " + numDropped + " old entries");
+ long dropBefore = Clock.getInstance().now() - _peer.getStatDuration() * 60 * 1000;
+ long timeoutBefore = Clock.getInstance().now() - TIMEOUT_PERIOD;
+ long numDropped = 0;
+ long numTimedOut = 0;
+
+ synchronized (_updateLock) {
+ List toTimeout = new ArrayList(4);
+ List toDrop = new ArrayList(4);
+ for (Iterator iter = _pendingPings.keySet().iterator(); iter.hasNext();) {
+ Long when = (Long) iter.next();
+ if (when.longValue() < dropBefore)
+ toDrop.add(when);
+ else if (when.longValue() < timeoutBefore)
+ toTimeout.add(when);
+ else
+ break; // its ordered, so once we are past timeoutBefore, no need
+ }
+ for (Iterator iter = toDrop.iterator(); iter.hasNext();) {
+ _pendingPings.remove(iter.next());
+ }
+
+ List toAdd = new ArrayList(toTimeout.size());
+ for (Iterator iter = toTimeout.iterator(); iter.hasNext();) {
+ Long when = (Long) iter.next();
+ EventDataPoint data = (EventDataPoint) _pendingPings.remove(when);
+ data.setWasPonged(false);
+ toAdd.add(data);
+ }
+
+ numDropped = toDrop.size();
+ numTimedOut = toDrop.size();
+ toDrop.clear();
+
+ for (Iterator iter = _dataPoints.keySet().iterator(); iter.hasNext();) {
+ Long when = (Long) iter.next();
+ if (when.longValue() < dropBefore)
+ toDrop.add(when);
+ else
+ break; // ordered
+ }
+ for (Iterator iter = toDrop.iterator(); iter.hasNext();) {
+ _dataPoints.remove(iter.next());
+ }
+
+ numDropped += toDrop.size();
+
+ for (Iterator iter = toAdd.iterator(); iter.hasNext();) {
+ EventDataPoint data = (EventDataPoint) iter.next();
+ _dataPoints.put(new Long(data.getPingSent()), data);
+ }
+
+ numTimedOut += toAdd.size();
+ }
+
+ _lostRate.addData(numTimedOut, 0);
+
+ _receiveRate.coallesceStats();
+ _sendRate.coallesceStats();
+ _lostRate.coallesceStats();
+
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Peer data cleaned up " + numTimedOut + " timed out pings and removed " + numDropped
+ + " old entries");
}
-
+
/** actual data point for the peer */
public class EventDataPoint {
- private boolean _wasPonged;
- private long _pingSent;
- private long _pongSent;
- private long _pongReceived;
-
- /**
- * Creates an EventDataPoint
- */
- public EventDataPoint() {
- this(-1);
- }
-
- /**
- * Creates an EventDataPoint with pingtime associated with it =)
- * @param pingSentOn the time a ping was sent
- */
- public EventDataPoint(long pingSentOn) {
- _wasPonged = false;
- _pingSent = pingSentOn;
- _pongSent = -1;
- _pongReceived = -1;
- }
-
- /**
- * when did we send this ping?
- * @return the time the ping was sent
- */
- public long getPingSent() { return _pingSent; }
-
- /**
- * Set the time the ping was sent
- * @param when time to set
- */
- public void setPingSent(long when) { _pingSent = when; }
-
- /**
- * when did the peer receive the ping?
- * @return the time the ping was receieved
- */
- public long getPongSent() { return _pongSent; }
-
- /**
- * Set the time the peer received the ping
- * @param when the time to set
- */
- public void setPongSent(long when) { _pongSent = when; }
-
- /**
- * when did we receive the peer's pong?
- * @return the time we receieved the pong
- */
- public long getPongReceived() { return _pongReceived; }
-
- /**
- * Set the time the peer's pong was receieved
- * @param when the time to set
- */
- public void setPongReceived(long when) { _pongReceived = when; }
-
- /**
- * did the peer reply in time?
- * @return true or false, whether we got a reply in time */
- public boolean getWasPonged() { return _wasPonged; }
-
- /**
- * Set whether we receieved the peer's reply in time
- * @param pong true or false
- */
- public void setWasPonged(boolean pong) { _wasPonged = pong; }
+ private boolean _wasPonged;
+ private long _pingSent;
+ private long _pongSent;
+ private long _pongReceived;
+
+ /**
+ * Creates an EventDataPoint
+ */
+ public EventDataPoint() {
+ this(-1);
+ }
+
+ /**
+ * Creates an EventDataPoint with pingtime associated with it =)
+ * @param pingSentOn the time a ping was sent
+ */
+ public EventDataPoint(long pingSentOn) {
+ _wasPonged = false;
+ _pingSent = pingSentOn;
+ _pongSent = -1;
+ _pongReceived = -1;
+ }
+
+ /**
+ * when did we send this ping?
+ * @return the time the ping was sent
+ */
+ public long getPingSent() {
+ return _pingSent;
+ }
+
+ /**
+ * Set the time the ping was sent
+ * @param when time to set
+ */
+ public void setPingSent(long when) {
+ _pingSent = when;
+ }
+
+ /**
+ * when did the peer receive the ping?
+ * @return the time the ping was receieved
+ */
+ public long getPongSent() {
+ return _pongSent;
+ }
+
+ /**
+ * Set the time the peer received the ping
+ * @param when the time to set
+ */
+ public void setPongSent(long when) {
+ _pongSent = when;
+ }
+
+ /**
+ * when did we receive the peer's pong?
+ * @return the time we receieved the pong
+ */
+ public long getPongReceived() {
+ return _pongReceived;
+ }
+
+ /**
+ * Set the time the peer's pong was receieved
+ * @param when the time to set
+ */
+ public void setPongReceived(long when) {
+ _pongReceived = when;
+ }
+
+ /**
+ * did the peer reply in time?
+ * @return true or false, whether we got a reply in time */
+ public boolean getWasPonged() {
+ return _wasPonged;
+ }
+
+ /**
+ * Set whether we receieved the peer's reply in time
+ * @param pong true or false
+ */
+ public void setWasPonged(boolean pong) {
+ _wasPonged = pong;
+ }
}
}
\ No newline at end of file
diff --git a/apps/heartbeat/java/src/net/i2p/heartbeat/PeerDataWriter.java b/apps/heartbeat/java/src/net/i2p/heartbeat/PeerDataWriter.java
index a2378adede..d2d6b11256 100644
--- a/apps/heartbeat/java/src/net/i2p/heartbeat/PeerDataWriter.java
+++ b/apps/heartbeat/java/src/net/i2p/heartbeat/PeerDataWriter.java
@@ -19,7 +19,7 @@ import net.i2p.util.Log;
*/
class PeerDataWriter {
private final static Log _log = new Log(PeerDataWriter.class);
-
+
/**
* persist the peer state to the location specified in the peer config
*
@@ -27,71 +27,75 @@ class PeerDataWriter {
* @return true if it was persisted correctly, false on error
*/
public boolean persist(PeerData data) {
- String filename = data.getConfig().getStatFile();
- String header = getHeader(data);
- File statFile = new File(filename);
- FileOutputStream fos = null;
- try {
- fos = new FileOutputStream(statFile);
- fos.write(header.getBytes());
- fos.write("#action\tstatus\tdate and time sent \tsendMs\treplyMs\n".getBytes());
- for (Iterator iter = data.getDataPoints().iterator(); iter.hasNext(); ) {
- PeerData.EventDataPoint point = (PeerData.EventDataPoint)iter.next();
- String line = getEvent(point);
- fos.write(line.getBytes());
- }
- } catch (IOException ioe) {
- if (_log.shouldLog(Log.ERROR))
- _log.error("Error persisting the peer data for " + data.getConfig().getPeer().calculateHash().toBase64(), ioe);
- return false;
- } finally {
- if (fos != null) try { fos.close(); } catch (IOException ioe) {}
- }
- return true;
+ String filename = data.getConfig().getStatFile();
+ String header = getHeader(data);
+ File statFile = new File(filename);
+ FileOutputStream fos = null;
+ try {
+ fos = new FileOutputStream(statFile);
+ fos.write(header.getBytes());
+ fos.write("#action\tstatus\tdate and time sent \tsendMs\treplyMs\n".getBytes());
+ for (Iterator iter = data.getDataPoints().iterator(); iter.hasNext();) {
+ PeerData.EventDataPoint point = (PeerData.EventDataPoint) iter.next();
+ String line = getEvent(point);
+ fos.write(line.getBytes());
+ }
+ } catch (IOException ioe) {
+ if (_log.shouldLog(Log.ERROR))
+ _log.error("Error persisting the peer data for "
+ + data.getConfig().getPeer().calculateHash().toBase64(), ioe);
+ return false;
+ } finally {
+ if (fos != null) try {
+ fos.close();
+ } catch (IOException ioe) {
+ }
+ }
+ return true;
}
-
- private String getHeader(PeerData data) {
- StringBuffer buf = new StringBuffer(1024);
- buf.append("peer \t").append(data.getConfig().getPeer().calculateHash().toBase64()).append('\n');
- buf.append("local \t").append(data.getConfig().getUs().calculateHash().toBase64()).append('\n');
- buf.append("peerDest \t").append(data.getConfig().getPeer().toBase64()).append('\n');
- buf.append("localDest \t").append(data.getConfig().getUs().toBase64()).append('\n');
- buf.append("numTunnelHops\t").append(data.getConfig().getNumHops()).append('\n');
- buf.append("comment \t").append(data.getConfig().getComment()).append('\n');
- buf.append("sendFrequency\t").append(data.getConfig().getSendFrequency()).append('\n');
- buf.append("sendSize \t").append(data.getConfig().getSendSize()).append('\n');
- buf.append("sessionStart \t").append(getTime(data.getSessionStart())).append('\n');
- buf.append("currentTime \t").append(getTime(Clock.getInstance().now())).append('\n');
- buf.append("numPending \t").append(data.getPendingCount()).append('\n');
- buf.append("lifetimeSent \t").append(data.getLifetimeSent()).append('\n');
- buf.append("lifetimeRecv \t").append(data.getLifetimeReceived()).append('\n');
- int periods[] = data.getAveragePeriods();
- buf.append("#averages\tminutes\tsendMs\trecvMs\tnumLost\n");
- for (int i = 0; i < periods.length; i++) {
- buf.append("periodAverage\t").append(periods[i]).append('\t');
- buf.append(getNum(data.getAverageSendTime(periods[i]))).append('\t');
- buf.append(getNum(data.getAverageReceiveTime(periods[i]))).append('\t');
- buf.append(getNum(data.getLostMessages(periods[i]))).append('\n');
- }
- return buf.toString();
+
+ private String getHeader(PeerData data) {
+ StringBuffer buf = new StringBuffer(1024);
+ buf.append("peer \t").append(data.getConfig().getPeer().calculateHash().toBase64()).append('\n');
+ buf.append("local \t").append(data.getConfig().getUs().calculateHash().toBase64()).append('\n');
+ buf.append("peerDest \t").append(data.getConfig().getPeer().toBase64()).append('\n');
+ buf.append("localDest \t").append(data.getConfig().getUs().toBase64()).append('\n');
+ buf.append("numTunnelHops\t").append(data.getConfig().getNumHops()).append('\n');
+ buf.append("comment \t").append(data.getConfig().getComment()).append('\n');
+ buf.append("sendFrequency\t").append(data.getConfig().getSendFrequency()).append('\n');
+ buf.append("sendSize \t").append(data.getConfig().getSendSize()).append('\n');
+ buf.append("sessionStart \t").append(getTime(data.getSessionStart())).append('\n');
+ buf.append("currentTime \t").append(getTime(Clock.getInstance().now())).append('\n');
+ buf.append("numPending \t").append(data.getPendingCount()).append('\n');
+ buf.append("lifetimeSent \t").append(data.getLifetimeSent()).append('\n');
+ buf.append("lifetimeRecv \t").append(data.getLifetimeReceived()).append('\n');
+ int periods[] = data.getAveragePeriods();
+ buf.append("#averages\tminutes\tsendMs\trecvMs\tnumLost\n");
+ for (int i = 0; i < periods.length; i++) {
+ buf.append("periodAverage\t").append(periods[i]).append('\t');
+ buf.append(getNum(data.getAverageSendTime(periods[i]))).append('\t');
+ buf.append(getNum(data.getAverageReceiveTime(periods[i]))).append('\t');
+ buf.append(getNum(data.getLostMessages(periods[i]))).append('\n');
+ }
+ return buf.toString();
}
-
+
private String getEvent(PeerData.EventDataPoint point) {
- StringBuffer buf = new StringBuffer(128);
- buf.append("EVENT\t");
- if (point.getWasPonged())
- buf.append("OK\t");
- else
- buf.append("LOST\t");
- buf.append(getTime(point.getPingSent())).append('\t');
- if (point.getWasPonged()) {
- buf.append(point.getPongSent() - point.getPingSent()).append('\t');
- buf.append(point.getPongReceived() - point.getPongSent()).append('\t');
- }
- buf.append('\n');
- return buf.toString();
+ StringBuffer buf = new StringBuffer(128);
+ buf.append("EVENT\t");
+ if (point.getWasPonged())
+ buf.append("OK\t");
+ else
+ buf.append("LOST\t");
+ buf.append(getTime(point.getPingSent())).append('\t');
+ if (point.getWasPonged()) {
+ buf.append(point.getPongSent() - point.getPingSent()).append('\t');
+ buf.append(point.getPongReceived() - point.getPongSent()).append('\t');
+ }
+ buf.append('\n');
+ return buf.toString();
}
-
+
private static final SimpleDateFormat _fmt = new SimpleDateFormat("yyyyMMdd.HH:mm:ss.SSS", Locale.UK);
/**
@@ -100,9 +104,9 @@ class PeerDataWriter {
* @return the textual representation
*/
public String getTime(long when) {
- synchronized (_fmt) {
- return _fmt.format(new Date(when));
- }
+ synchronized (_fmt) {
+ return _fmt.format(new Date(when));
+ }
}
private static final DecimalFormat _numFmt = new DecimalFormat("#0", new DecimalFormatSymbols(Locale.UK));
@@ -113,8 +117,8 @@ class PeerDataWriter {
* @return the textual representation
*/
public String getNum(double val) {
- synchronized (_numFmt) {
- return _numFmt.format(val);
- }
+ synchronized (_numFmt) {
+ return _numFmt.format(val);
+ }
}
}
\ No newline at end of file
diff --git a/apps/heartbeat/java/src/net/i2p/heartbeat/gui/PeerPlotConfig.java b/apps/heartbeat/java/src/net/i2p/heartbeat/gui/PeerPlotConfig.java
index 5f09b699b0..da32dfd7dc 100644
--- a/apps/heartbeat/java/src/net/i2p/heartbeat/gui/PeerPlotConfig.java
+++ b/apps/heartbeat/java/src/net/i2p/heartbeat/gui/PeerPlotConfig.java
@@ -8,16 +8,17 @@ import net.i2p.heartbeat.ClientConfig;
*/
class PeerPlotConfig {
private ClientConfig _config;
-
+
private final static void foo() {
- // bar
- if (true) {
- // baz
- }
- // baf
- }
+ // bar
+ if (true) {
+ // baz
+ }
+ // baf
+ }
+
// moo
-
+
private final static void biff() {
// b0nk
if (false) {
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/HTTPListener.java b/apps/httptunnel/java/src/net/i2p/httptunnel/HTTPListener.java
index 97e4e252dd..d613f60337 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/HTTPListener.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/HTTPListener.java
@@ -27,54 +27,51 @@ public class HTTPListener extends Thread {
* @param port A port, to connect to.
* @param listenHost A host, to connect to.
*/
-
- public HTTPListener(SocketManagerProducer smp, int port,
- String listenHost) {
- this.smp = smp;
- this.port = port;
- start();
+
+ public HTTPListener(SocketManagerProducer smp, int port, String listenHost) {
+ this.smp = smp;
+ this.port = port;
+ start();
}
-
+
/* (non-Javadoc)
* @see java.lang.Thread#run()
*/
public void run() {
- try {
- InetAddress lh = listenHost == null
- ? null
- : InetAddress.getByName(listenHost);
- ServerSocket ss = new ServerSocket(port, 0, lh);
- while(true) {
- Socket s = ss.accept();
- new HTTPSocketHandler(this, s);
- }
- } catch (IOException ex) {
- _log.error("Error while accepting connections", ex);
- }
+ try {
+ InetAddress lh = listenHost == null ? null : InetAddress.getByName(listenHost);
+ ServerSocket ss = new ServerSocket(port, 0, lh);
+ while (true) {
+ Socket s = ss.accept();
+ new HTTPSocketHandler(this, s);
+ }
+ } catch (IOException ex) {
+ _log.error("Error while accepting connections", ex);
+ }
}
- private boolean proxyUsed=false;
-
+ private boolean proxyUsed = false;
+
/**
* Query whether this is the first use of the proxy or not . . .
* @return Whether this is the first proxy use, no doubt.
*/
public boolean firstProxyUse() {
- // FIXME: check a config option here
- if (true) return false;
- if (proxyUsed) {
- return false;
- } else {
- proxyUsed=true;
- return true;
- }
+ // FIXME: check a config option here
+ if (true) return false;
+ if (proxyUsed) {
+ return false;
+ } else {
+ proxyUsed = true;
+ return true;
+ }
}
/**
* @return The SocketManagerProducer being used.
*/
public SocketManagerProducer getSMP() {
- return smp;
+ return smp;
}
/**
@@ -84,8 +81,7 @@ public class HTTPListener extends Thread {
* @throws IOException
*/
public void handleNotImplemented(OutputStream out) throws IOException {
- out.write(("HTTP/1.1 200 Document following\n\n"+
- "<h1>Feature not implemented</h1>").getBytes("ISO-8859-1"));
- out.flush();
+ out.write(("HTTP/1.1 200 Document following\n\n" + "<h1>Feature not implemented</h1>").getBytes("ISO-8859-1"));
+ out.flush();
}
-}
+}
\ No newline at end of file
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/HTTPSocketHandler.java b/apps/httptunnel/java/src/net/i2p/httptunnel/HTTPSocketHandler.java
index 5ae52223d4..b5a15e019d 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/HTTPSocketHandler.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/HTTPSocketHandler.java
@@ -27,37 +27,36 @@ public class HTTPSocketHandler extends Thread {
* @param s A socket.
*/
public HTTPSocketHandler(HTTPListener httpl, Socket s) {
- this.httpl = httpl;
- this.s=s;
- h = RootHandler.getInstance();
- start();
+ this.httpl = httpl;
+ this.s = s;
+ h = RootHandler.getInstance();
+ start();
}
-
-
+
/* (non-Javadoc)
* @see java.lang.Thread#run()
*/
public void run() {
- InputStream in = null;
- OutputStream out = null;
- try {
- in = new BufferedInputStream(s.getInputStream());
- out = new BufferedOutputStream(s.getOutputStream());
- Request req = new Request(in);
- h.handle(req, httpl, out);
- } catch (IOException ex) {
- _log.error("Error while handling data", ex);
- } finally {
- try {
- if (in != null) in.close();
- if (out != null) {
- out.flush();
- out.close();
- }
- s.close();
- } catch (IOException ex) {
- _log.error("IOException in finalizer", ex);
- }
- }
+ InputStream in = null;
+ OutputStream out = null;
+ try {
+ in = new BufferedInputStream(s.getInputStream());
+ out = new BufferedOutputStream(s.getOutputStream());
+ Request req = new Request(in);
+ h.handle(req, httpl, out);
+ } catch (IOException ex) {
+ _log.error("Error while handling data", ex);
+ } finally {
+ try {
+ if (in != null) in.close();
+ if (out != null) {
+ out.flush();
+ out.close();
+ }
+ s.close();
+ } catch (IOException ex) {
+ _log.error("IOException in finalizer", ex);
+ }
+ }
}
-}
+}
\ No newline at end of file
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/HTTPTunnel.java b/apps/httptunnel/java/src/net/i2p/httptunnel/HTTPTunnel.java
index 5052f721b0..4ff9325f0f 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/HTTPTunnel.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/HTTPTunnel.java
@@ -44,10 +44,9 @@ public class HTTPTunnel {
* @param shouldThrowAwayManagers whether to throw away a manager after use
* @param listenPort which port to listen on
*/
- public HTTPTunnel(I2PSocketManager[] initialManagers, int maxManagers,
- boolean shouldThrowAwayManagers, int listenPort) {
- this(initialManagers, maxManagers, shouldThrowAwayManagers, listenPort,
- "127.0.0.1", 7654);
+ public HTTPTunnel(I2PSocketManager[] initialManagers, int maxManagers, boolean shouldThrowAwayManagers,
+ int listenPort) {
+ this(initialManagers, maxManagers, shouldThrowAwayManagers, listenPort, "127.0.0.1", 7654);
}
/**
@@ -60,56 +59,50 @@ public class HTTPTunnel {
* @param i2cpAddress the I2CP address
* @param i2cpPort the I2CP port
*/
- public HTTPTunnel(I2PSocketManager[] initialManagers, int maxManagers,
- boolean shouldThrowAwayManagers, int listenPort,
- String i2cpAddress, int i2cpPort) {
- SocketManagerProducer smp =
- new SocketManagerProducer(initialManagers, maxManagers,
- shouldThrowAwayManagers, i2cpAddress, i2cpPort);
- new HTTPListener(smp, listenPort, "127.0.0.1");
+ public HTTPTunnel(I2PSocketManager[] initialManagers, int maxManagers, boolean shouldThrowAwayManagers,
+ int listenPort, String i2cpAddress, int i2cpPort) {
+ SocketManagerProducer smp = new SocketManagerProducer(initialManagers, maxManagers, shouldThrowAwayManagers,
+ i2cpAddress, i2cpPort);
+ new HTTPListener(smp, listenPort, "127.0.0.1");
}
-
+
/**
* The all important main function, allowing HTTPTunnel to be
* stand-alone, a program in it's own right, and all that jazz.
* @param args A list of String passed to the program
*/
public static void main(String[] args) {
- String host = "127.0.0.1";
- int port = 7654, max = 1;
- boolean throwAwayManagers = false;
- if (args.length >1) {
- if (args.length == 4) {
- host = args[2];
- port = Integer.parseInt(args[3]);
- } else if (args.length != 2) {
- showInfo(); return;
- }
- max = Integer.parseInt(args[1]);
- } else if (args.length != 1) {
- showInfo(); return;
- }
- if (max == 0) {
- max = 1;
- } else if (max <0) {
- max = -max;
- throwAwayManagers = true;
- }
- new HTTPTunnel(null, max, throwAwayManagers, Integer.parseInt(args[0]), host, port);
+ String host = "127.0.0.1";
+ int port = 7654, max = 1;
+ boolean throwAwayManagers = false;
+ if (args.length > 1) {
+ if (args.length == 4) {
+ host = args[2];
+ port = Integer.parseInt(args[3]);
+ } else if (args.length != 2) {
+ showInfo();
+ return;
+ }
+ max = Integer.parseInt(args[1]);
+ } else if (args.length != 1) {
+ showInfo();
+ return;
+ }
+ if (max == 0) {
+ max = 1;
+ } else if (max < 0) {
+ max = -max;
+ throwAwayManagers = true;
+ }
+ new HTTPTunnel(null, max, throwAwayManagers, Integer.parseInt(args[0]), host, port);
}
-
+
private static void showInfo() {
- System.out.println
- ("Usage: java HTTPTunnel <listenPort> [<max> "+
- "[<i2cphost> <i2cpport>]]\n"+
- " <listenPort> port to listen for browsers\n"+
- " <max> max number of SocketMangers in pool, "+
- "use neg. number\n"+
- " to use each SocketManager only once "+
- "(default: 1)\n"+
- " <i2cphost> host to connect to the router "+
- "(default: 127.0.0.1)\n"+
- " <i2cpport> port to connect to the router "+
- "(default: 7654)");
+ System.out.println("Usage: java HTTPTunnel <listenPort> [<max> " + "[<i2cphost> <i2cpport>]]\n"
+ + " <listenPort> port to listen for browsers\n"
+ + " <max> max number of SocketMangers in pool, " + "use neg. number\n"
+ + " to use each SocketManager only once " + "(default: 1)\n"
+ + " <i2cphost> host to connect to the router " + "(default: 127.0.0.1)\n"
+ + " <i2cpport> port to connect to the router " + "(default: 7654)");
}
-}
+}
\ No newline at end of file
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/Request.java b/apps/httptunnel/java/src/net/i2p/httptunnel/Request.java
index 0405f01ee9..b28aef795e 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/Request.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/Request.java
@@ -22,57 +22,56 @@ public class Request {
private String proto;
private String params;
private String postData;
-
+
/**
* A constructor, creating a request from an InputStream
* @param in InputStream from which we "read-in" a Request
* @throws IOException
*/
public Request(InputStream in) throws IOException {
- BufferedReader br = new BufferedReader
- (new InputStreamReader(in, "ISO-8859-1"));
- String line = br.readLine();
- if (line == null) { // no data at all
- method = null;
- _log.error("Connection but no data");
- return;
- }
- int pos = line.indexOf(" ");
- if (pos == -1) {
- method = line;
- url="";
- _log.error("Malformed HTTP request: "+line);
- } else {
- method = line.substring(0,pos);
- url=line.substring(pos+1);
- }
- proto="";
- pos = url.indexOf(" ");
- if (pos != -1) {
- proto=url.substring(pos); // leading space intended
- url = url.substring(0,pos);
- }
- StringBuffer sb = new StringBuffer(512);
- while((line=br.readLine()) != null) {
- if (line.length() == 0) break;
- sb.append(line).append("\r\n");
- }
- params = sb.toString(); // no leading empty line!
- sb = new StringBuffer();
- // hack for POST requests, ripped from HttpClient
- // this won't work for large POSTDATA
- // FIXME: do this better, please.
- if (!method.equals("GET")) {
- while (br.ready()) { // empty the buffer (POST requests)
- int i=br.read();
- if (i != -1) {
- sb.append((char)i);
- }
- }
- postData = sb.toString();
- } else {
- postData="";
- }
+ BufferedReader br = new BufferedReader(new InputStreamReader(in, "ISO-8859-1"));
+ String line = br.readLine();
+ if (line == null) { // no data at all
+ method = null;
+ _log.error("Connection but no data");
+ return;
+ }
+ int pos = line.indexOf(" ");
+ if (pos == -1) {
+ method = line;
+ url = "";
+ _log.error("Malformed HTTP request: " + line);
+ } else {
+ method = line.substring(0, pos);
+ url = line.substring(pos + 1);
+ }
+ proto = "";
+ pos = url.indexOf(" ");
+ if (pos != -1) {
+ proto = url.substring(pos); // leading space intended
+ url = url.substring(0, pos);
+ }
+ StringBuffer sb = new StringBuffer(512);
+ while ((line = br.readLine()) != null) {
+ if (line.length() == 0) break;
+ sb.append(line).append("\r\n");
+ }
+ params = sb.toString(); // no leading empty line!
+ sb = new StringBuffer();
+ // hack for POST requests, ripped from HttpClient
+ // this won't work for large POSTDATA
+ // FIXME: do this better, please.
+ if (!method.equals("GET")) {
+ while (br.ready()) { // empty the buffer (POST requests)
+ int i = br.read();
+ if (i != -1) {
+ sb.append((char) i);
+ }
+ }
+ postData = sb.toString();
+ } else {
+ postData = "";
+ }
}
/**
@@ -80,21 +79,21 @@ public class Request {
* @throws IOException
*/
public byte[] toByteArray() throws IOException {
- if (method == null) return null;
- return toISO8859_1String().getBytes("ISO-8859-1");
+ if (method == null) return null;
+ return toISO8859_1String().getBytes("ISO-8859-1");
}
private String toISO8859_1String() throws IOException {
- if (method == null) return null;
- return method+" "+url+proto+"\r\n"+params+"\r\n"+postData;
+ if (method == null) return null;
+ return method + " " + url + proto + "\r\n" + params + "\r\n" + postData;
}
/**
* @return the URL of the request
*/
public String getURL() {
- return url;
+ return url;
}
/**
@@ -102,7 +101,7 @@ public class Request {
* @param newURL the new URL
*/
public void setURL(String newURL) {
- url=newURL;
+ url = newURL;
}
/**
@@ -111,19 +110,17 @@ public class Request {
* @return The value of the param, or null
*/
public String getParam(String name) {
- try {
- BufferedReader br= new BufferedReader(new StringReader(params));
- String line;
- while ((line = br.readLine()) != null) {
- if (line.startsWith(name)) {
- return line.substring(name.length());
- }
- }
- return null;
- } catch (IOException ex) {
- _log.error("Error getting parameter", ex);
- return null;
- }
+ try {
+ BufferedReader br = new BufferedReader(new StringReader(params));
+ String line;
+ while ((line = br.readLine()) != null) {
+ if (line.startsWith(name)) { return line.substring(name.length()); }
+ }
+ return null;
+ } catch (IOException ex) {
+ _log.error("Error getting parameter", ex);
+ return null;
+ }
}
/**
@@ -132,25 +129,25 @@ public class Request {
* @param value the value to be set
*/
public void setParam(String name, String value) {
- try {
- StringBuffer sb = new StringBuffer(params.length()+value.length());
- BufferedReader br= new BufferedReader(new StringReader(params));
- String line;
- boolean replaced = false;
- while((line=br.readLine()) != null) {
- if (line.startsWith(name)) {
- replaced=true;
- if (value == null) continue; // kill param
- line = name+value;
- }
- sb.append(line).append("\r\n");
- }
- if (!replaced && value != null) {
- sb.append(name).append(value).append("\r\n");
- }
- params=sb.toString();
- } catch (IOException ex) {
- _log.error("Error getting parameter", ex);
- }
+ try {
+ StringBuffer sb = new StringBuffer(params.length() + value.length());
+ BufferedReader br = new BufferedReader(new StringReader(params));
+ String line;
+ boolean replaced = false;
+ while ((line = br.readLine()) != null) {
+ if (line.startsWith(name)) {
+ replaced = true;
+ if (value == null) continue; // kill param
+ line = name + value;
+ }
+ sb.append(line).append("\r\n");
+ }
+ if (!replaced && value != null) {
+ sb.append(name).append(value).append("\r\n");
+ }
+ params = sb.toString();
+ } catch (IOException ex) {
+ _log.error("Error getting parameter", ex);
+ }
}
-}
+}
\ No newline at end of file
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/SocketManagerProducer.java b/apps/httptunnel/java/src/net/i2p/httptunnel/SocketManagerProducer.java
index 745b73222a..ddef387f8b 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/SocketManagerProducer.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/SocketManagerProducer.java
@@ -29,55 +29,48 @@ public class SocketManagerProducer extends Thread {
* @param host which host to listen on
* @param port which port to listen on
*/
- public SocketManagerProducer(I2PSocketManager[] initialManagers,
- int maxManagers,
- boolean shouldThrowAwayManagers,
- String host, int port) {
- if (maxManagers < 1) {
- throw new IllegalArgumentException("maxManagers < 1");
- }
- this.host=host;
- this.port=port;
- this.shouldThrowAwayManagers=shouldThrowAwayManagers;
- if (initialManagers != null) {
- myManagers.addAll(Arrays.asList(initialManagers));
- }
- this.maxManagers=maxManagers;
- this.shouldThrowAwayManagers=shouldThrowAwayManagers;
- setDaemon(true);
- start();
+ public SocketManagerProducer(I2PSocketManager[] initialManagers, int maxManagers, boolean shouldThrowAwayManagers,
+ String host, int port) {
+ if (maxManagers < 1) { throw new IllegalArgumentException("maxManagers < 1"); }
+ this.host = host;
+ this.port = port;
+ this.shouldThrowAwayManagers = shouldThrowAwayManagers;
+ if (initialManagers != null) {
+ myManagers.addAll(Arrays.asList(initialManagers));
+ }
+ this.maxManagers = maxManagers;
+ this.shouldThrowAwayManagers = shouldThrowAwayManagers;
+ setDaemon(true);
+ start();
}
-
/**
* Thread producing new SocketManagers.
*/
public void run() {
- while (true) {
- synchronized(this) {
- // without mcDonalds mode, we most probably need no
- // new managers.
- while (!shouldThrowAwayManagers && myManagers.size() == maxManagers) {
- myWait();
- }
- }
- // produce a new manager, regardless whether it is needed
- // or not. Do not synchronized this part, since it can be
- // quite time-consuming.
- I2PSocketManager newManager =
- I2PSocketManagerFactory.createManager(host, port,
- new Properties());
- // when done, check if it is needed.
- synchronized(this) {
- while(myManagers.size() == maxManagers) {
- myWait();
- }
- myManagers.add(newManager);
- notifyAll();
- }
- }
+ while (true) {
+ synchronized (this) {
+ // without mcDonalds mode, we most probably need no
+ // new managers.
+ while (!shouldThrowAwayManagers && myManagers.size() == maxManagers) {
+ myWait();
+ }
+ }
+ // produce a new manager, regardless whether it is needed
+ // or not. Do not synchronized this part, since it can be
+ // quite time-consuming.
+ I2PSocketManager newManager = I2PSocketManagerFactory.createManager(host, port, new Properties());
+ // when done, check if it is needed.
+ synchronized (this) {
+ while (myManagers.size() == maxManagers) {
+ myWait();
+ }
+ myManagers.add(newManager);
+ notifyAll();
+ }
+ }
}
-
+
/**
* Get a manager for connecting to a given destination. Each
* destination will always get the same manager.
@@ -86,12 +79,12 @@ public class SocketManagerProducer extends Thread {
* @return the SocketManager to use
*/
public synchronized I2PSocketManager getManager(String dest) {
- I2PSocketManager result = (I2PSocketManager) usedManagers.get(dest);
- if (result == null) {
- result = getManager();
- usedManagers.put(dest,result);
- }
- return result;
+ I2PSocketManager result = (I2PSocketManager) usedManagers.get(dest);
+ if (result == null) {
+ result = getManager();
+ usedManagers.put(dest, result);
+ }
+ return result;
}
/**
@@ -102,26 +95,26 @@ public class SocketManagerProducer extends Thread {
* @return the SocketManager to use
*/
public synchronized I2PSocketManager getManager() {
- while (myManagers.size() == 0) {
- myWait(); // no manager here, so wait until one is produced
- }
- int which = (int)(Math.random()*myManagers.size());
- I2PSocketManager result = (I2PSocketManager) myManagers.get(which);
- if (shouldThrowAwayManagers) {
- myManagers.remove(which);
- notifyAll();
- }
- return result;
+ while (myManagers.size() == 0) {
+ myWait(); // no manager here, so wait until one is produced
+ }
+ int which = (int) (Math.random() * myManagers.size());
+ I2PSocketManager result = (I2PSocketManager) myManagers.get(which);
+ if (shouldThrowAwayManagers) {
+ myManagers.remove(which);
+ notifyAll();
+ }
+ return result;
}
/**
* Wait until InterruptedException
*/
public void myWait() {
- try {
- wait();
- } catch (InterruptedException ex) {
- ex.printStackTrace();
- }
+ try {
+ wait();
+ } catch (InterruptedException ex) {
+ ex.printStackTrace();
+ }
}
-}
+}
\ No newline at end of file
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/filter/ChainFilter.java b/apps/httptunnel/java/src/net/i2p/httptunnel/filter/ChainFilter.java
index b2c9efeaa1..b71a194699 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/filter/ChainFilter.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/filter/ChainFilter.java
@@ -13,50 +13,49 @@ import net.i2p.util.Log;
public class ChainFilter implements Filter {
private static final Log _log = new Log(ChainFilter.class);
-
- private Collection filters; // perhaps protected?
-
-
+
+ private Collection filters; // perhaps protected?
+
/**
* @param filters A collection (list) of filters to chain to
*/
public ChainFilter(Collection filters) {
- this.filters=filters;
+ this.filters = filters;
}
/* (non-Javadoc)
* @see net.i2p.httptunnel.filter.Filter#filter(byte[])
*/
public byte[] filter(byte[] toFilter) {
- byte[] buf = toFilter;
- for (Iterator it = filters.iterator(); it.hasNext();) {
- Filter f = (Filter) it.next();
- buf = f.filter(buf);
- }
- return buf;
+ byte[] buf = toFilter;
+ for (Iterator it = filters.iterator(); it.hasNext();) {
+ Filter f = (Filter) it.next();
+ buf = f.filter(buf);
+ }
+ return buf;
}
/* (non-Javadoc)
* @see net.i2p.httptunnel.filter.Filter#finish()
*/
public byte[] finish() {
- // this is a bit complicated. Think about it...
- try {
- byte[] buf = EMPTY;
- for (Iterator it = filters.iterator(); it.hasNext();) {
- Filter f = (Filter) it.next();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- if (buf.length != 0) {
- baos.write(f.filter(buf));
- }
- baos.write(f.finish());
- buf = baos.toByteArray();
- }
- return buf;
- } catch (IOException ex) {
- _log.error("Error chaining filters", ex);
- return EMPTY;
- }
+ // this is a bit complicated. Think about it...
+ try {
+ byte[] buf = EMPTY;
+ for (Iterator it = filters.iterator(); it.hasNext();) {
+ Filter f = (Filter) it.next();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ if (buf.length != 0) {
+ baos.write(f.filter(buf));
+ }
+ baos.write(f.finish());
+ buf = baos.toByteArray();
+ }
+ return buf;
+ } catch (IOException ex) {
+ _log.error("Error chaining filters", ex);
+ return EMPTY;
+ }
}
-
-}
+
+}
\ No newline at end of file
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/filter/Filter.java b/apps/httptunnel/java/src/net/i2p/httptunnel/filter/Filter.java
index 770542afcd..d0ba2b6ff7 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/filter/Filter.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/filter/Filter.java
@@ -22,4 +22,4 @@ public interface Filter {
* @return the rest of the data
*/
public byte[] finish();
-}
+}
\ No newline at end of file
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/filter/NullFilter.java b/apps/httptunnel/java/src/net/i2p/httptunnel/filter/NullFilter.java
index fc351c5a40..a609ba5f28 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/filter/NullFilter.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/filter/NullFilter.java
@@ -9,13 +9,13 @@ public class NullFilter implements Filter {
* @see net.i2p.httptunnel.filter.Filter#filter(byte[])
*/
public byte[] filter(byte[] toFilter) {
- return toFilter;
+ return toFilter;
}
/* (non-Javadoc)
* @see net.i2p.httptunnel.filter.Filter#finish()
*/
public byte[] finish() {
- return EMPTY;
+ return EMPTY;
}
-}
+}
\ No newline at end of file
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java
index 27d9da235a..f2334fb6b8 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java
@@ -1,4 +1,5 @@
package net.i2p.httptunnel.handler;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
@@ -26,11 +27,11 @@ public class EepHandler {
private static final Log _log = new Log(EepHandler.class);
protected ErrorHandler errorHandler;
-
- /* package private */ EepHandler(ErrorHandler eh) {
- errorHandler=eh;
+
+ /* package private */EepHandler(ErrorHandler eh) {
+ errorHandler = eh;
}
-
+
/**
* @param req the Request
* @param httpl an HTTPListener
@@ -40,21 +41,19 @@ public class EepHandler {
* @throws IOException
*/
public void handle(Request req, HTTPListener httpl, OutputStream out,
- /* boolean fromProxy, */ String destination)
- throws IOException {
- SocketManagerProducer smp = httpl.getSMP();
- Destination dest = NamingService.getInstance().lookup(destination);
- if (dest == null) {
- errorHandler.handle(req, httpl, out,
- "Could not lookup host: "+destination);
- return;
- }
- I2PSocketManager sm = smp.getManager(destination);
- Filter f = new NullFilter(); //FIXME: use other filter
- req.setParam("Host: ", dest.toBase64());
- if (!handle(req, f, out, dest, sm)) {
- errorHandler.handle(req, httpl, out, "Unable to reach peer");
- }
+ /* boolean fromProxy, */String destination) throws IOException {
+ SocketManagerProducer smp = httpl.getSMP();
+ Destination dest = NamingService.getInstance().lookup(destination);
+ if (dest == null) {
+ errorHandler.handle(req, httpl, out, "Could not lookup host: " + destination);
+ return;
+ }
+ I2PSocketManager sm = smp.getManager(destination);
+ Filter f = new NullFilter(); //FIXME: use other filter
+ req.setParam("Host: ", dest.toBase64());
+ if (!handle(req, f, out, dest, sm)) {
+ errorHandler.handle(req, httpl, out, "Unable to reach peer");
+ }
}
/**
@@ -66,45 +65,44 @@ public class EepHandler {
* @return boolean, true if something was written, false otherwise.
* @throws IOException
*/
- public boolean handle(Request req, Filter f, OutputStream out,
- Destination dest, I2PSocketManager sm)
- throws IOException {
- I2PSocket s = null;
- boolean written = false;
- try {
- synchronized(sm) {
- s = sm.connect(dest, new I2PSocketOptions());
- }
- InputStream in = new BufferedInputStream(s.getInputStream());
- OutputStream sout = new BufferedOutputStream(s.getOutputStream());
- sout.write(req.toByteArray());
- sout.flush();
- byte[] buffer = new byte[16384], filtered;
- int len;
- while ((len=in.read(buffer)) != -1) {
- if (len != buffer.length) {
- byte[] b2 = new byte[len];
- System.arraycopy(buffer, 0, b2, 0, len);
- filtered=f.filter(b2);
- } else {
- filtered=f.filter(buffer);
- }
- written=true;
- out.write(filtered);
- }
- filtered=f.finish();
- written=true;
- out.write(filtered);
- out.flush();
- } catch (IOException ex) {
- _log.error("Error while handling eepsite request");
- return written;
- } catch (I2PException ex) {
- _log.error("Error while handling eepsite request");
- return written;
- } finally {
- if (s != null) s.close();
- }
- return true;
+ public boolean handle(Request req, Filter f, OutputStream out, Destination dest, I2PSocketManager sm)
+ throws IOException {
+ I2PSocket s = null;
+ boolean written = false;
+ try {
+ synchronized (sm) {
+ s = sm.connect(dest, new I2PSocketOptions());
+ }
+ InputStream in = new BufferedInputStream(s.getInputStream());
+ OutputStream sout = new BufferedOutputStream(s.getOutputStream());
+ sout.write(req.toByteArray());
+ sout.flush();
+ byte[] buffer = new byte[16384], filtered;
+ int len;
+ while ((len = in.read(buffer)) != -1) {
+ if (len != buffer.length) {
+ byte[] b2 = new byte[len];
+ System.arraycopy(buffer, 0, b2, 0, len);
+ filtered = f.filter(b2);
+ } else {
+ filtered = f.filter(buffer);
+ }
+ written = true;
+ out.write(filtered);
+ }
+ filtered = f.finish();
+ written = true;
+ out.write(filtered);
+ out.flush();
+ } catch (IOException ex) {
+ _log.error("Error while handling eepsite request");
+ return written;
+ } catch (I2PException ex) {
+ _log.error("Error while handling eepsite request");
+ return written;
+ } finally {
+ if (s != null) s.close();
+ }
+ return true;
}
-}
+}
\ No newline at end of file
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/ErrorHandler.java b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/ErrorHandler.java
index 0f85b74a77..c06e6d04d3 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/ErrorHandler.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/ErrorHandler.java
@@ -1,4 +1,5 @@
package net.i2p.httptunnel.handler;
+
import java.io.IOException;
import java.io.OutputStream;
@@ -13,10 +14,10 @@ public class ErrorHandler {
private static final Log _log = new Log(ErrorHandler.class);
- /* package private */ ErrorHandler() {
+ /* package private */ErrorHandler() {
}
-
+
/**
* @param req the Request
* @param httpl an HTTPListener
@@ -24,20 +25,17 @@ public class ErrorHandler {
* @param error the error that happened
* @throws IOException
*/
- public void handle(Request req, HTTPListener httpl,
- OutputStream out, String error) throws IOException {
- // FIXME: Make nicer messages for more likely errors.
- out.write(("HTTP/1.1 500 Internal Server Error\r\n"+
- "Content-Type: text/html; charset=iso-8859-1\r\n\r\n")
- .getBytes("ISO-8859-1"));
- out.write(("<html><head><title>"+error+"</title></head><body><h1>"+
- error+"</h1>An internal error occurred while "+
- "handling a request by HTTPTunnel:<br><b>"+error+
- "</b><h2>Complete request:</h2><b>---</b><br><i><pre>\r\n")
- .getBytes("ISO-8859-1"));
- out.write(req.toByteArray());
- out.write(("</pre></i><br><b>---</b></body></html>")
- .getBytes("ISO-8859-1"));
- out.flush();
+ public void handle(Request req, HTTPListener httpl, OutputStream out, String error) throws IOException {
+ // FIXME: Make nicer messages for more likely errors.
+ out
+ .write(("HTTP/1.1 500 Internal Server Error\r\n" + "Content-Type: text/html; charset=iso-8859-1\r\n\r\n")
+ .getBytes("ISO-8859-1"));
+ out
+ .write(("<html><head><title>" + error + "</title></head><body><h1>" + error
+ + "</h1>An internal error occurred while " + "handling a request by HTTPTunnel:<br><b>" + error + "</b><h2>Complete request:</h2><b>---</b><br><i><pre>\r\n")
+ .getBytes("ISO-8859-1"));
+ out.write(req.toByteArray());
+ out.write(("</pre></i><br><b>---</b></body></html>").getBytes("ISO-8859-1"));
+ out.flush();
}
-}
+}
\ No newline at end of file
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/LocalHandler.java b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/LocalHandler.java
index f3808dda06..5726af8809 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/LocalHandler.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/LocalHandler.java
@@ -1,4 +1,5 @@
package net.i2p.httptunnel.handler;
+
import java.io.IOException;
import java.io.OutputStream;
@@ -14,9 +15,9 @@ public class LocalHandler {
private static final Log _log = new Log(LocalHandler.class);
- /* package private */ LocalHandler() {
+ /* package private */LocalHandler() {
}
-
+
/**
* @param req the Request
* @param httpl an HTTPListener
@@ -24,16 +25,16 @@ public class LocalHandler {
* @throws IOException
*/
public void handle(Request req, HTTPListener httpl, OutputStream out
- /*, boolean fromProxy */) throws IOException {
- //FIXME: separate multiple pages, not only a start page
- //FIXME: provide some info on this page
- out.write(("HTTP/1.1 200 Document following\r\n"+
- "Content-Type: text/html; charset=iso-8859-1\r\n\r\n"+
- "<html><head><title>Welcome to I2P HTTPTunnel</title>"+
- "</head><body><h1>Welcome to I2P HTTPTunnel</h1>You can "+
- "browse Eepsites by adding an eepsite name to the request."+
- "</body></html>").getBytes("ISO-8859-1"));
- out.flush();
+ /*, boolean fromProxy */) throws IOException {
+ //FIXME: separate multiple pages, not only a start page
+ //FIXME: provide some info on this page
+ out
+ .write(("HTTP/1.1 200 Document following\r\n" + "Content-Type: text/html; charset=iso-8859-1\r\n\r\n"
+ + "<html><head><title>Welcome to I2P HTTPTunnel</title>"
+ + "</head><body><h1>Welcome to I2P HTTPTunnel</h1>You can "
+ + "browse Eepsites by adding an eepsite name to the request." + "</body></html>")
+ .getBytes("ISO-8859-1"));
+ out.flush();
}
/**
@@ -43,11 +44,10 @@ public class LocalHandler {
* @param out where to write the results
* @throws IOException
*/
- public void handleProxyConfWarning(Request req, HTTPListener httpl,
- OutputStream out) throws IOException {
- //FIXME
+ public void handleProxyConfWarning(Request req, HTTPListener httpl, OutputStream out) throws IOException {
+ //FIXME
throw new IOException("jrandom ate the deprecated method. mooo");
- //httpl.handleNotImplemented(out);
+ //httpl.handleNotImplemented(out);
}
@@ -58,11 +58,10 @@ public class LocalHandler {
* @param out where to write the results
* @throws IOException
*/
- public void handleHTTPWarning(Request req, HTTPListener httpl,
- OutputStream out /*, boolean fromProxy */)
- throws IOException {
- // FIXME
+ public void handleHTTPWarning(Request req, HTTPListener httpl, OutputStream out /*, boolean fromProxy */)
+ throws IOException {
+ // FIXME
throw new IOException("jrandom ate the deprecated method. mooo");
- //httpl.handleNotImplemented(out);
+ //httpl.handleNotImplemented(out);
}
-}
+}
\ No newline at end of file
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/ProxyHandler.java b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/ProxyHandler.java
index 2541bf32e0..02f454d495 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/ProxyHandler.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/ProxyHandler.java
@@ -1,4 +1,5 @@
package net.i2p.httptunnel.handler;
+
import java.io.IOException;
import java.io.OutputStream;
@@ -19,10 +20,10 @@ public class ProxyHandler extends EepHandler {
private static final Log _log = new Log(ErrorHandler.class);
- /* package private */ ProxyHandler(ErrorHandler eh) {
- super(eh);
+ /* package private */ProxyHandler(ErrorHandler eh) {
+ super(eh);
}
-
+
/**
* @param req a Request
* @param httpl an HTTPListener
@@ -30,24 +31,23 @@ public class ProxyHandler extends EepHandler {
* @throws IOException
*/
public void handle(Request req, HTTPListener httpl, OutputStream out
- /*, boolean fromProxy */) throws IOException {
- SocketManagerProducer smp = httpl.getSMP();
- Destination dest = findProxy();
- if (dest == null) {
- errorHandler.handle(req, httpl, out,
- "Could not find proxy");
- return;
- }
- // one manager for all proxy requests
- I2PSocketManager sm = smp.getManager("--proxy--");
- Filter f = new NullFilter(); //FIXME: use other filter
- if (!handle(req, f, out, dest, sm)) {
- errorHandler.handle(req, httpl, out, "Unable to reach peer");
- }
+ /*, boolean fromProxy */) throws IOException {
+ SocketManagerProducer smp = httpl.getSMP();
+ Destination dest = findProxy();
+ if (dest == null) {
+ errorHandler.handle(req, httpl, out, "Could not find proxy");
+ return;
+ }
+ // one manager for all proxy requests
+ I2PSocketManager sm = smp.getManager("--proxy--");
+ Filter f = new NullFilter(); //FIXME: use other filter
+ if (!handle(req, f, out, dest, sm)) {
+ errorHandler.handle(req, httpl, out, "Unable to reach peer");
+ }
}
private Destination findProxy() {
- //FIXME!
- return NamingService.getInstance().lookup("squid.i2p");
+ //FIXME!
+ return NamingService.getInstance().lookup("squid.i2p");
}
-}
+}
\ No newline at end of file
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/RootHandler.java b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/RootHandler.java
index af94f5029c..d40f14c0ff 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/RootHandler.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/RootHandler.java
@@ -1,4 +1,5 @@
package net.i2p.httptunnel.handler;
+
import java.io.IOException;
import java.io.OutputStream;
@@ -14,17 +15,17 @@ public class RootHandler {
private static final Log _log = new Log(RootHandler.class);
private RootHandler() {
- errorHandler=new ErrorHandler();
- localHandler=new LocalHandler();
- proxyHandler=new ProxyHandler(errorHandler);
- eepHandler=new EepHandler(errorHandler);
+ errorHandler = new ErrorHandler();
+ localHandler = new LocalHandler();
+ proxyHandler = new ProxyHandler(errorHandler);
+ eepHandler = new EepHandler(errorHandler);
}
private ErrorHandler errorHandler;
private ProxyHandler proxyHandler;
private LocalHandler localHandler;
private EepHandler eepHandler;
-
+
private static RootHandler instance;
/**
@@ -32,12 +33,12 @@ public class RootHandler {
* @return the one and only instance, yay!
*/
public static synchronized RootHandler getInstance() {
- if (instance == null) {
- instance = new RootHandler();
- }
- return instance;
+ if (instance == null) {
+ instance = new RootHandler();
+ }
+ return instance;
}
-
+
/**
* The _ROOT_ handler: it passes its workload off to the other handlers.
* @param req a Request
@@ -45,76 +46,73 @@ public class RootHandler {
* @param out where to write the results
* @throws IOException
*/
- public void handle(Request req, HTTPListener httpl,
- OutputStream out) throws IOException {
- String url=req.getURL();
- System.out.println(url);
- /* boolean byProxy = false; */
- int pos;
- if (url.startsWith("http://")) { // access via proxy
- /* byProxy=true; */
- if (httpl.firstProxyUse()) {
- localHandler.handleProxyConfWarning(req,httpl,out);
- return;
- }
- url = url.substring(7);
- pos = url.indexOf("/");
- String host;
- String rest;
- if (pos == -1) {
- errorHandler.handle(req, httpl, out, "No host end in URL");
- return;
- } else {
- host = url.substring(0,pos);
- url = url.substring(pos);
- if ("i2p".equals(host) || "i2p.i2p".equals(host)) {
- // normal request; go on below...
- } else if (host.endsWith(".i2p")) {
- // "old" service request, send a redirect...
- out.write(("HTTP/1.1 302 Moved\r\nLocation: "+
- "http://i2p.i2p/"+host+url+
- "\r\n\r\n").getBytes("ISO-8859-1"));
- return;
- } else {
- // this is for proxying to the real web
- proxyHandler.handle(req, httpl, out /*, true */);
- return;
- }
- }
- }
- if (url.equals("/")) { // main page
- url="/_/local/index";
- } else if (!url.startsWith("/")) {
- errorHandler.handle(req, httpl, out,
- "No leading slash in URL: "+url);
- return;
- }
- String dest;
- url=url.substring(1);
- pos = url.indexOf("/");
- if (pos == -1) {
- dest=url;
- url="/";
- } else {
- dest = url.substring(0,pos);
- url=url.substring(pos);
- }
- req.setURL(url);
- if (dest.equals("_")) { // no eepsite
- if (url.startsWith("/local/")) { // local request
- req.setURL(url.substring(6));
- localHandler.handle(req, httpl, out /*, byProxy */);
- } else if (url.startsWith("/http/")) { // http warning
- localHandler.handleHTTPWarning(req, httpl, out /*, byProxy */);
- } else if (url.startsWith("/proxy/")) { // http proxying
- req.setURL("http://"+url.substring(7));
- proxyHandler.handle(req, httpl, out /*, byProxy */);
- } else {
- errorHandler.handle(req, httpl, out,
- "No local handler for this URL: "+url);
- }
- } else {
- eepHandler.handle(req, httpl, out, /* byProxy, */ dest);
- }
+ public void handle(Request req, HTTPListener httpl, OutputStream out) throws IOException {
+ String url = req.getURL();
+ System.out.println(url);
+ /* boolean byProxy = false; */
+ int pos;
+ if (url.startsWith("http://")) { // access via proxy
+ /* byProxy=true; */
+ if (httpl.firstProxyUse()) {
+ localHandler.handleProxyConfWarning(req, httpl, out);
+ return;
+ }
+ url = url.substring(7);
+ pos = url.indexOf("/");
+ String host;
+ String rest;
+ if (pos == -1) {
+ errorHandler.handle(req, httpl, out, "No host end in URL");
+ return;
+ } else {
+ host = url.substring(0, pos);
+ url = url.substring(pos);
+ if ("i2p".equals(host) || "i2p.i2p".equals(host)) {
+ // normal request; go on below...
+ } else if (host.endsWith(".i2p")) {
+ // "old" service request, send a redirect...
+ out
+ .write(("HTTP/1.1 302 Moved\r\nLocation: " + "http://i2p.i2p/" + host + url + "\r\n\r\n")
+ .getBytes("ISO-8859-1"));
+ return;
+ } else {
+ // this is for proxying to the real web
+ proxyHandler.handle(req, httpl, out /*, true */);
+ return;
+ }
+ }
+ }
+ if (url.equals("/")) { // main page
+ url = "/_/local/index";
+ } else if (!url.startsWith("/")) {
+ errorHandler.handle(req, httpl, out, "No leading slash in URL: " + url);
+ return;
+ }
+ String dest;
+ url = url.substring(1);
+ pos = url.indexOf("/");
+ if (pos == -1) {
+ dest = url;
+ url = "/";
+ } else {
+ dest = url.substring(0, pos);
+ url = url.substring(pos);
+ }
+ req.setURL(url);
+ if (dest.equals("_")) { // no eepsite
+ if (url.startsWith("/local/")) { // local request
+ req.setURL(url.substring(6));
+ localHandler.handle(req, httpl, out /*, byProxy */);
+ } else if (url.startsWith("/http/")) { // http warning
+ localHandler.handleHTTPWarning(req, httpl, out /*, byProxy */);
+ } else if (url.startsWith("/proxy/")) { // http proxying
+ req.setURL("http://" + url.substring(7));
+ proxyHandler.handle(req, httpl, out /*, byProxy */);
+ } else {
+ errorHandler.handle(req, httpl, out, "No local handler for this URL: " + url);
+ }
+ } else {
+ eepHandler.handle(req, httpl, out, /* byProxy, */dest);
+ }
}
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/BufferLogger.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/BufferLogger.java
index f61e8af515..6c4dd315a9 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/BufferLogger.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/BufferLogger.java
@@ -16,16 +16,19 @@ class BufferLogger implements Logging {
private final static Log _log = new Log(BufferLogger.class);
private ByteArrayOutputStream _baos;
private boolean _ignore;
-
+
public BufferLogger() {
- _baos = new ByteArrayOutputStream(512);
- _ignore = false;
+ _baos = new ByteArrayOutputStream(512);
+ _ignore = false;
}
private final static String EMPTY = "";
- public String getBuffer() {
- if (_ignore) return EMPTY;
- else return new String(_baos.toByteArray());
+
+ public String getBuffer() {
+ if (_ignore)
+ return EMPTY;
+ else
+ return new String(_baos.toByteArray());
}
/**
@@ -36,27 +39,27 @@ class BufferLogger implements Logging {
*
*/
public void ignoreFurtherActions() {
- _ignore = true;
- synchronized (_baos) {
- _baos.reset();
- }
- _baos = null;
+ _ignore = true;
+ synchronized (_baos) {
+ _baos.reset();
+ }
+ _baos = null;
}
-
+
/**
* Pass in some random data
* @param s String containing what we're logging.
*/
public void log(String s) {
- if (_ignore) return;
- if (s != null) {
- _log.debug("logging [" + s + "]");
- try {
- _baos.write(s.getBytes());
- _baos.write('\n');
- } catch (IOException ioe) {
- _log.error("Error logging [" + s + "]");
- }
- }
+ if (_ignore) return;
+ if (s != null) {
+ _log.debug("logging [" + s + "]");
+ try {
+ _baos.write(s.getBytes());
+ _baos.write('\n');
+ } catch (IOException ioe) {
+ _log.error("Error logging [" + s + "]");
+ }
+ }
}
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
index 07a9c7d036..ac764961aa 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
@@ -62,30 +62,27 @@ import net.i2p.util.EventDispatcher;
import net.i2p.util.EventDispatcherImpl;
import net.i2p.util.Log;
-
public class I2PTunnel implements Logging, EventDispatcher {
private final static Log _log = new Log(I2PTunnel.class);
private final EventDispatcherImpl _event = new EventDispatcherImpl();
- public static final int PACKET_DELAY=100;
+ public static final int PACKET_DELAY = 100;
public static boolean ownDest = false;
- public static String port =
- System.getProperty(I2PClient.PROP_TCP_PORT, "7654");
- public static String host = System.getProperty
- (I2PClient.PROP_TCP_HOST,"127.0.0.1");
+ public static String port = System.getProperty(I2PClient.PROP_TCP_PORT, "7654");
+ public static String host = System.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1");
public static String listenHost = host;
- private static final String nocli_args[] = {"-nocli", "-die"};
+ private static final String nocli_args[] = { "-nocli", "-die"};
- private List tasks=new ArrayList();
+ private List tasks = new ArrayList();
private int next_task_id = 1;
-
+
private Set listeners = new HashSet();
-
+
public static void main(String[] args) throws IOException {
- new I2PTunnel(args);
+ new I2PTunnel(args);
}
public I2PTunnel() {
@@ -93,137 +90,140 @@ public class I2PTunnel implements Logging, EventDispatcher {
}
public I2PTunnel(String[] args) {
- this(args, null);
+ this(args, null);
}
+
public I2PTunnel(String[] args, ConnectionEventListener lsnr) {
- addConnectionEventListener(lsnr);
- boolean gui=true;
- boolean checkRunByE = true;;
- boolean cli=true;
- boolean dontDie = true;
- for(int i=0;i<args.length;i++) {
- if (args[i].equals("-die")) {
- dontDie = false;
- gui=false;
- cli=false;
- checkRunByE=false;
- } else if (args[i].equals("-nogui")) {
- gui=false;
- _log.warn("The `-nogui' option of I2PTunnel is deprecated.\n"+
- "Use `-cli', `-nocli' (aka `-wait') or `-die' instead.");
- } else if (args[i].equals("-cli")) {
- gui=false;
- cli=true;
- checkRunByE=false;
- } else if (args[i].equals("-nocli") || args[i].equals("-wait")) {
- gui=false;
- cli=false;
- checkRunByE=false;
- } else if (args[i].equals("-e")) {
- runCommand(args[i+1], this);
- i++;
- if (checkRunByE) {
- checkRunByE = false;
- cli=false;
- }
- } else if (new File(args[i]).exists()) {
- runCommand("run "+args[i], this);
- } else {
- System.out.println("Unknown parameter "+args[i]);
- }
- }
- if (gui) {
- new I2PTunnelGUI(this);
- } else if (cli) {
- try {
- System.out.println("Enter 'help' for help.");
- BufferedReader r = new BufferedReader
- (new InputStreamReader(System.in));
- while(true) {
- System.out.print("I2PTunnel>");
- String cmd = r.readLine();
- if (cmd == null) break;
- runCommand(cmd, this);
- }
- } catch (IOException ex) {
- ex.printStackTrace();
- }
- }
-
- while (dontDie) {
- synchronized (this) {
- try { wait(); } catch (InterruptedException ie) {}
- }
- }
- }
-
- private void addtask (I2PTunnelTask tsk)
- {
- tsk.setTunnel(this);
- if (tsk.isOpen()) {
- tsk.setId(next_task_id);
- next_task_id++;
- synchronized (tasks) {
- tasks.add(tsk);
- }
- }
+ addConnectionEventListener(lsnr);
+ boolean gui = true;
+ boolean checkRunByE = true;
+ boolean cli = true;
+ boolean dontDie = true;
+ for (int i = 0; i < args.length; i++) {
+ if (args[i].equals("-die")) {
+ dontDie = false;
+ gui = false;
+ cli = false;
+ checkRunByE = false;
+ } else if (args[i].equals("-nogui")) {
+ gui = false;
+ _log.warn("The `-nogui' option of I2PTunnel is deprecated.\n"
+ + "Use `-cli', `-nocli' (aka `-wait') or `-die' instead.");
+ } else if (args[i].equals("-cli")) {
+ gui = false;
+ cli = true;
+ checkRunByE = false;
+ } else if (args[i].equals("-nocli") || args[i].equals("-wait")) {
+ gui = false;
+ cli = false;
+ checkRunByE = false;
+ } else if (args[i].equals("-e")) {
+ runCommand(args[i + 1], this);
+ i++;
+ if (checkRunByE) {
+ checkRunByE = false;
+ cli = false;
+ }
+ } else if (new File(args[i]).exists()) {
+ runCommand("run " + args[i], this);
+ } else {
+ System.out.println("Unknown parameter " + args[i]);
+ }
+ }
+ if (gui) {
+ new I2PTunnelGUI(this);
+ } else if (cli) {
+ try {
+ System.out.println("Enter 'help' for help.");
+ BufferedReader r = new BufferedReader(new InputStreamReader(System.in));
+ while (true) {
+ System.out.print("I2PTunnel>");
+ String cmd = r.readLine();
+ if (cmd == null) break;
+ runCommand(cmd, this);
+ }
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ while (dontDie) {
+ synchronized (this) {
+ try {
+ wait();
+ } catch (InterruptedException ie) {
+ }
+ }
+ }
+ }
+
+ private void addtask(I2PTunnelTask tsk) {
+ tsk.setTunnel(this);
+ if (tsk.isOpen()) {
+ tsk.setId(next_task_id);
+ next_task_id++;
+ synchronized (tasks) {
+ tasks.add(tsk);
+ }
+ }
}
/** java 1.3 vs 1.4 :)
*/
private static String[] split(String src, String delim) {
- StringTokenizer tok = new StringTokenizer(src, delim);
- String vals[] = new String[tok.countTokens()];
- for (int i = 0; i < vals.length; i++)
- vals[i] = tok.nextToken();
- return vals;
+ StringTokenizer tok = new StringTokenizer(src, delim);
+ String vals[] = new String[tok.countTokens()];
+ for (int i = 0; i < vals.length; i++)
+ vals[i] = tok.nextToken();
+ return vals;
}
+
public void runCommand(String cmd, Logging l) {
- if (cmd.indexOf(" ")== -1) cmd+=" ";
- int iii=cmd.indexOf(" ");
- String cmdname= cmd.substring(0,iii).toLowerCase();
- String allargs = cmd.substring(iii+1);
- String[] args = split(allargs, " "); // .split(" "); // java 1.4
-
- if ("help".equals(cmdname)) {
- runHelp(l);
- } else if ("server".equals(cmdname)) {
- runServer(args, l);
- } else if ("textserver".equals(cmdname)) {
- runTextServer(args, l);
- } else if ("client".equals(cmdname)) {
- runClient(args, l);
- } else if ("httpclient".equals(cmdname)) {
- runHttpClient(args, l);
- } else if ("sockstunnel".equals(cmdname)) {
- runSOCKSTunnel(args, l);
- } else if ("config".equals(cmdname)) {
- runConfig(args, l);
- } else if ("listen_on".equals(cmdname)) {
- runListenOn(args, l);
- } else if ("genkeys".equals(cmdname)) {
- runGenKeys(args, l);
- } else if ("gentextkeys".equals(cmdname)) {
- runGenTextKeys(l);
- } else if (cmdname.equals("quit")) {
- runQuit(l);
- } else if (cmdname.equals("list")) {
- runList(l);
- } else if (cmdname.equals("close")) {
- runClose(args, l);
- } else if (cmdname.equals("run")) {
- runRun(args, l);
- } else if (cmdname.equals("lookup")) {
- runLookup(args, l);
- } else if (cmdname.equals("ping")) {
- runPing(allargs, l);
- } else if (cmdname.equals("owndest")) {
- runOwnDest(args, l);
- } else {
- l.log("Unknown command [" + cmdname + "]");
- }
- }
-
+ if (cmd.indexOf(" ") == -1) cmd += " ";
+ int iii = cmd.indexOf(" ");
+ String cmdname = cmd.substring(0, iii).toLowerCase();
+ String allargs = cmd.substring(iii + 1);
+ String[] args = split(allargs, " "); // .split(" "); // java 1.4
+
+ if ("help".equals(cmdname)) {
+ runHelp(l);
+ } else if ("server".equals(cmdname)) {
+ runServer(args, l);
+ } else if ("textserver".equals(cmdname)) {
+ runTextServer(args, l);
+ } else if ("client".equals(cmdname)) {
+ runClient(args, l);
+ } else if ("httpclient".equals(cmdname)) {
+ runHttpClient(args, l);
+ } else if ("sockstunnel".equals(cmdname)) {
+ runSOCKSTunnel(args, l);
+ } else if ("config".equals(cmdname)) {
+ runConfig(args, l);
+ } else if ("listen_on".equals(cmdname)) {
+ runListenOn(args, l);
+ } else if ("genkeys".equals(cmdname)) {
+ runGenKeys(args, l);
+ } else if ("gentextkeys".equals(cmdname)) {
+ runGenTextKeys(l);
+ } else if (cmdname.equals("quit")) {
+ runQuit(l);
+ } else if (cmdname.equals("list")) {
+ runList(l);
+ } else if (cmdname.equals("close")) {
+ runClose(args, l);
+ } else if (cmdname.equals("run")) {
+ runRun(args, l);
+ } else if (cmdname.equals("lookup")) {
+ runLookup(args, l);
+ } else if (cmdname.equals("ping")) {
+ runPing(allargs, l);
+ } else if (cmdname.equals("owndest")) {
+ runOwnDest(args, l);
+ } else {
+ l.log("Unknown command [" + cmdname + "]");
+ }
+ }
+
/**
* Display help information through the given logger.
*
@@ -232,24 +232,24 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runHelp(Logging l) {
- l.log("Command list:");
- l.log("config <i2phost> <i2pport>");
- l.log("listen_on <ip>");
- l.log("owndest yes|no");
- l.log("ping <args>");
- l.log("server <host> <port> <privkeyfile>");
- l.log("textserver <host> <port> <privkey>");
- l.log("genkeys <privkeyfile> [<pubkeyfile>]");
- l.log("gentextkeys");
- l.log("client <port> <pubkey>|file:<pubkeyfile>");
- l.log("httpclient <port>");
- l.log("lookup <name>");
- l.log("quit");
- l.log("close [forced] <jobnumber>|all");
- l.log("list");
- l.log("run <commandfile>");
- }
-
+ l.log("Command list:");
+ l.log("config <i2phost> <i2pport>");
+ l.log("listen_on <ip>");
+ l.log("owndest yes|no");
+ l.log("ping <args>");
+ l.log("server <host> <port> <privkeyfile>");
+ l.log("textserver <host> <port> <privkey>");
+ l.log("genkeys <privkeyfile> [<pubkeyfile>]");
+ l.log("gentextkeys");
+ l.log("client <port> <pubkey>|file:<pubkeyfile>");
+ l.log("httpclient <port>");
+ l.log("lookup <name>");
+ l.log("quit");
+ l.log("close [forced] <jobnumber>|all");
+ l.log("list");
+ l.log("run <commandfile>");
+ }
+
/**
* Run the server pointing at the host and port specified using the private i2p
* destination loaded from the specified file. <p />
@@ -262,49 +262,47 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runServer(String args[], Logging l) {
- if (args.length==3) {
- InetAddress serverHost = null;
- int portNum = -1;
- File privKeyFile = null;
- try {
- serverHost = InetAddress.getByName(args[0]);
- } catch (UnknownHostException uhe) {
- l.log("unknown host");
- _log.error("Error resolving " + args[0], uhe);
- notifyEvent("serverTaskId", new Integer(-1));
- return;
- }
-
- try {
- portNum = Integer.parseInt(args[1]);
- } catch (NumberFormatException nfe) {
- l.log("invalid port");
- _log.error("Port specified is not valid: " + args[1], nfe);
- notifyEvent("serverTaskId", new Integer(-1));
- return;
- }
-
- privKeyFile = new File(args[2]);
- if (!privKeyFile.canRead()) {
- l.log("private key file does not exist");
- _log.error("Private key file does not exist or is not readable: " + args[2]);
- notifyEvent("serverTaskId", new Integer(-1));
- return;
- }
- I2PTunnelTask task;
- task = new I2PTunnelServer(serverHost, portNum, privKeyFile,
- args[2], l, (EventDispatcher)this);
- addtask(task);
- notifyEvent("serverTaskId", new Integer(task.getId()));
- return;
- } else {
- l.log("server <host> <port> <privkeyfile>");
- l.log(" creates a server that sends all incoming data\n"+
- " of its destination to host:port.");
- notifyEvent("serverTaskId", new Integer(-1));
- }
- }
-
+ if (args.length == 3) {
+ InetAddress serverHost = null;
+ int portNum = -1;
+ File privKeyFile = null;
+ try {
+ serverHost = InetAddress.getByName(args[0]);
+ } catch (UnknownHostException uhe) {
+ l.log("unknown host");
+ _log.error("Error resolving " + args[0], uhe);
+ notifyEvent("serverTaskId", new Integer(-1));
+ return;
+ }
+
+ try {
+ portNum = Integer.parseInt(args[1]);
+ } catch (NumberFormatException nfe) {
+ l.log("invalid port");
+ _log.error("Port specified is not valid: " + args[1], nfe);
+ notifyEvent("serverTaskId", new Integer(-1));
+ return;
+ }
+
+ privKeyFile = new File(args[2]);
+ if (!privKeyFile.canRead()) {
+ l.log("private key file does not exist");
+ _log.error("Private key file does not exist or is not readable: " + args[2]);
+ notifyEvent("serverTaskId", new Integer(-1));
+ return;
+ }
+ I2PTunnelTask task;
+ task = new I2PTunnelServer(serverHost, portNum, privKeyFile, args[2], l, (EventDispatcher) this);
+ addtask(task);
+ notifyEvent("serverTaskId", new Integer(task.getId()));
+ return;
+ } else {
+ l.log("server <host> <port> <privkeyfile>");
+ l.log(" creates a server that sends all incoming data\n" + " of its destination to host:port.");
+ notifyEvent("serverTaskId", new Integer(-1));
+ }
+ }
+
/**
* Run the server pointing at the host and port specified using the private i2p
* destination loaded from the given base64 stream. <p />
@@ -317,40 +315,38 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runTextServer(String args[], Logging l) {
- if (args.length==3) {
- InetAddress serverHost = null;
- int portNum = -1;
- try {
- serverHost = InetAddress.getByName(args[0]);
- } catch (UnknownHostException uhe) {
- l.log("unknown host");
- _log.error("Error resolving " + args[0], uhe);
- notifyEvent("serverTaskId", new Integer(-1));
- return;
- }
-
- try {
- portNum = Integer.parseInt(args[1]);
- } catch (NumberFormatException nfe) {
- l.log("invalid port");
- _log.error("Port specified is not valid: " + args[1], nfe);
- notifyEvent("serverTaskId", new Integer(-1));
- return;
- }
-
- I2PTunnelTask task;
- task = new I2PTunnelServer(serverHost, portNum, args[2], l,
- (EventDispatcher)this);
- addtask(task);
- notifyEvent("serverTaskId", new Integer(task.getId()));
- } else {
- l.log("textserver <host> <port> <privkey>");
- l.log(" creates a server that sends all incoming data\n"+
- " of its destination to host:port.");
- notifyEvent("textserverTaskId", new Integer(-1));
- }
- }
-
+ if (args.length == 3) {
+ InetAddress serverHost = null;
+ int portNum = -1;
+ try {
+ serverHost = InetAddress.getByName(args[0]);
+ } catch (UnknownHostException uhe) {
+ l.log("unknown host");
+ _log.error("Error resolving " + args[0], uhe);
+ notifyEvent("serverTaskId", new Integer(-1));
+ return;
+ }
+
+ try {
+ portNum = Integer.parseInt(args[1]);
+ } catch (NumberFormatException nfe) {
+ l.log("invalid port");
+ _log.error("Port specified is not valid: " + args[1], nfe);
+ notifyEvent("serverTaskId", new Integer(-1));
+ return;
+ }
+
+ I2PTunnelTask task;
+ task = new I2PTunnelServer(serverHost, portNum, args[2], l, (EventDispatcher) this);
+ addtask(task);
+ notifyEvent("serverTaskId", new Integer(task.getId()));
+ } else {
+ l.log("textserver <host> <port> <privkey>");
+ l.log(" creates a server that sends all incoming data\n" + " of its destination to host:port.");
+ notifyEvent("textserverTaskId", new Integer(-1));
+ }
+ }
+
/**
* Run the client on the given port number pointing at the specified destination
* (either the base64 of the destination or file:fileNameContainingDestination).
@@ -364,29 +360,28 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runClient(String args[], Logging l) {
- if (args.length==2) {
- int port = -1;
- try {
- port = Integer.parseInt(args[0]);
- } catch (NumberFormatException nfe) {
- l.log("invalid port");
- _log.error("Port specified is not valid: " + args[0], nfe);
- notifyEvent("clientTaskId", new Integer(-1));
- return;
- }
- I2PTunnelTask task;
- task = new I2PTunnelClient(port, args[1], l, ownDest,
- (EventDispatcher)this);
- addtask(task);
- notifyEvent("clientTaskId", new Integer(task.getId()));
- } else {
- l.log("client <port> <pubkey>|file:<pubkeyfile>");
- l.log(" creates a client that forwards port to the pubkey.\n"+
- " use 0 as port to get a free port assigned.");
- notifyEvent("clientTaskId", new Integer(-1));
- }
- }
-
+ if (args.length == 2) {
+ int port = -1;
+ try {
+ port = Integer.parseInt(args[0]);
+ } catch (NumberFormatException nfe) {
+ l.log("invalid port");
+ _log.error("Port specified is not valid: " + args[0], nfe);
+ notifyEvent("clientTaskId", new Integer(-1));
+ return;
+ }
+ I2PTunnelTask task;
+ task = new I2PTunnelClient(port, args[1], l, ownDest, (EventDispatcher) this);
+ addtask(task);
+ notifyEvent("clientTaskId", new Integer(task.getId()));
+ } else {
+ l.log("client <port> <pubkey>|file:<pubkeyfile>");
+ l.log(" creates a client that forwards port to the pubkey.\n"
+ + " use 0 as port to get a free port assigned.");
+ notifyEvent("clientTaskId", new Integer(-1));
+ }
+ }
+
/**
* Run an HTTP client on the given port number
*
@@ -397,34 +392,33 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runHttpClient(String args[], Logging l) {
- if (args.length >= 1 && args.length <= 2) {
- int port = -1;
- try {
- port = Integer.parseInt(args[0]);
- } catch (NumberFormatException nfe) {
- l.log("invalid port");
- _log.error("Port specified is not valid: " + args[0], nfe);
- notifyEvent("httpclientTaskId", new Integer(-1));
- return;
- }
-
- String proxy = "squid.i2p";
- if (args.length == 2) {
- proxy = args[1];
- }
- I2PTunnelTask task;
- task = new I2PTunnelHTTPClient(port, l, ownDest, proxy,
- (EventDispatcher)this);
- addtask(task);
- notifyEvent("httpclientTaskId", new Integer(task.getId()));
- } else {
- l.log("httpclient <port> [<proxy>]");
- l.log(" creates a client that distributes HTTP requests.");
- l.log(" <proxy> (optional) indicates a proxy server to be used");
- l.log(" when trying to access an address out of the .i2p domain");
- l.log(" (the default proxy is squid.i2p).");
- notifyEvent("httpclientTaskId", new Integer(-1));
- }
+ if (args.length >= 1 && args.length <= 2) {
+ int port = -1;
+ try {
+ port = Integer.parseInt(args[0]);
+ } catch (NumberFormatException nfe) {
+ l.log("invalid port");
+ _log.error("Port specified is not valid: " + args[0], nfe);
+ notifyEvent("httpclientTaskId", new Integer(-1));
+ return;
+ }
+
+ String proxy = "squid.i2p";
+ if (args.length == 2) {
+ proxy = args[1];
+ }
+ I2PTunnelTask task;
+ task = new I2PTunnelHTTPClient(port, l, ownDest, proxy, (EventDispatcher) this);
+ addtask(task);
+ notifyEvent("httpclientTaskId", new Integer(task.getId()));
+ } else {
+ l.log("httpclient <port> [<proxy>]");
+ l.log(" creates a client that distributes HTTP requests.");
+ l.log(" <proxy> (optional) indicates a proxy server to be used");
+ l.log(" when trying to access an address out of the .i2p domain");
+ l.log(" (the default proxy is squid.i2p).");
+ notifyEvent("httpclientTaskId", new Integer(-1));
+ }
}
/**
@@ -439,28 +433,28 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runSOCKSTunnel(String args[], Logging l) {
- if (args.length >= 1 && args.length <= 2) {
- int port = -1;
- try {
- port = Integer.parseInt(args[0]);
- } catch (NumberFormatException nfe) {
- l.log("invalid port");
- _log.error("Port specified is not valid: " + args[0], nfe);
- notifyEvent("sockstunnelTaskId", new Integer(-1));
- return;
- }
-
- I2PTunnelTask task;
- task = new I2PSOCKSTunnel(port, l, ownDest, (EventDispatcher)this);
- addtask(task);
- notifyEvent("sockstunnelTaskId", new Integer(task.getId()));
- } else {
- l.log("sockstunnel <port>");
- l.log(" creates a tunnel that distributes SOCKS requests.");
- notifyEvent("sockstunnelTaskId", new Integer(-1));
- }
- }
-
+ if (args.length >= 1 && args.length <= 2) {
+ int port = -1;
+ try {
+ port = Integer.parseInt(args[0]);
+ } catch (NumberFormatException nfe) {
+ l.log("invalid port");
+ _log.error("Port specified is not valid: " + args[0], nfe);
+ notifyEvent("sockstunnelTaskId", new Integer(-1));
+ return;
+ }
+
+ I2PTunnelTask task;
+ task = new I2PSOCKSTunnel(port, l, ownDest, (EventDispatcher) this);
+ addtask(task);
+ notifyEvent("sockstunnelTaskId", new Integer(task.getId()));
+ } else {
+ l.log("sockstunnel <port>");
+ l.log(" creates a tunnel that distributes SOCKS requests.");
+ notifyEvent("sockstunnelTaskId", new Integer(-1));
+ }
+ }
+
/**
* Specify the i2cp host and port
*
@@ -470,16 +464,16 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runConfig(String args[], Logging l) {
- if (args.length==2) {
- host=args[0];
- listenHost=host;
- port=args[1];
- notifyEvent("configResult", "ok");
- } else {
- l.log("config <i2phost> <i2pport>");
- l.log(" sets the connection to the i2p router.");
- notifyEvent("configResult", "error");
- }
+ if (args.length == 2) {
+ host = args[0];
+ listenHost = host;
+ port = args[1];
+ notifyEvent("configResult", "ok");
+ } else {
+ l.log("config <i2phost> <i2pport>");
+ l.log(" sets the connection to the i2p router.");
+ notifyEvent("configResult", "error");
+ }
}
/**
@@ -491,17 +485,14 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runOwnDest(String args[], Logging l) {
- if (args.length==1 &&
- (args[0].equalsIgnoreCase("yes")
- || args[0].equalsIgnoreCase("no"))) {
- ownDest = args[0].equalsIgnoreCase("yes");
- notifyEvent("owndestResult", "ok");
- } else {
- l.log("owndest yes|no");
- l.log(" Specifies whether to use its own destination \n"+
- " for each outgoing tunnel");
- notifyEvent("owndestResult", "error");
- }
+ if (args.length == 1 && (args[0].equalsIgnoreCase("yes") || args[0].equalsIgnoreCase("no"))) {
+ ownDest = args[0].equalsIgnoreCase("yes");
+ notifyEvent("owndestResult", "ok");
+ } else {
+ l.log("owndest yes|no");
+ l.log(" Specifies whether to use its own destination \n" + " for each outgoing tunnel");
+ notifyEvent("owndestResult", "error");
+ }
}
/**
@@ -513,16 +504,16 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runListenOn(String args[], Logging l) {
- if (args.length==1) {
- listenHost=args[0];
- notifyEvent("listen_onResult", "ok");
- } else {
- l.log("listen_on <ip>");
- l.log(" sets the interface to listen for the I2PClient.");
- notifyEvent("listen_onResult", "ok");
- }
- }
-
+ if (args.length == 1) {
+ listenHost = args[0];
+ notifyEvent("listen_onResult", "ok");
+ } else {
+ l.log("listen_on <ip>");
+ l.log(" sets the interface to listen for the I2PClient.");
+ notifyEvent("listen_onResult", "ok");
+ }
+ }
+
/**
* Generate a new keypair
*
@@ -532,41 +523,39 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runGenKeys(String args[], Logging l) {
- OutputStream pubdest=null;
- if (args.length == 2) {
- try {
- pubdest=new FileOutputStream(args[1]);
- } catch (IOException ioe) {
- l.log("Error opening output stream");
- _log.error("Error generating keys to out", ioe);
- notifyEvent("genkeysResult", "error");
- return;
- }
- } else if (args.length != 1) {
- l.log("genkeys <privkeyfile> [<pubkeyfile>]");
- l.log(" creates a new keypair and prints the public key.\n"+
- " if pubkeyfile is given, saves the public key there."+
- "\n"+
- " if the privkeyfile already exists, just print/save"+
- "the pubkey.");
- notifyEvent("genkeysResult", "error");
- }
- try {
- File privKeyFile = new File(args[0]);
- if (privKeyFile.exists()) {
- l.log("File already exists.");
- showKey(new FileInputStream(privKeyFile), pubdest, l);
- } else {
- makeKey(new FileOutputStream(privKeyFile), pubdest, l);
- }
- notifyEvent("genkeysResult", "ok");
- } catch (IOException ioe) {
- l.log("Error generating keys - " + ioe.getMessage());
- notifyEvent("genkeysResult", "error");
- _log.error("Error generating keys", ioe);
- }
- }
-
+ OutputStream pubdest = null;
+ if (args.length == 2) {
+ try {
+ pubdest = new FileOutputStream(args[1]);
+ } catch (IOException ioe) {
+ l.log("Error opening output stream");
+ _log.error("Error generating keys to out", ioe);
+ notifyEvent("genkeysResult", "error");
+ return;
+ }
+ } else if (args.length != 1) {
+ l.log("genkeys <privkeyfile> [<pubkeyfile>]");
+ l.log(" creates a new keypair and prints the public key.\n"
+ + " if pubkeyfile is given, saves the public key there." + "\n"
+ + " if the privkeyfile already exists, just print/save" + "the pubkey.");
+ notifyEvent("genkeysResult", "error");
+ }
+ try {
+ File privKeyFile = new File(args[0]);
+ if (privKeyFile.exists()) {
+ l.log("File already exists.");
+ showKey(new FileInputStream(privKeyFile), pubdest, l);
+ } else {
+ makeKey(new FileOutputStream(privKeyFile), pubdest, l);
+ }
+ notifyEvent("genkeysResult", "ok");
+ } catch (IOException ioe) {
+ l.log("Error generating keys - " + ioe.getMessage());
+ notifyEvent("genkeysResult", "error");
+ _log.error("Error generating keys", ioe);
+ }
+ }
+
/**
* Generate a new keypair
*
@@ -576,14 +565,14 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runGenTextKeys(Logging l) {
- ByteArrayOutputStream privkey = new ByteArrayOutputStream(512);
- ByteArrayOutputStream pubkey = new ByteArrayOutputStream(512);
- makeKey(privkey, pubkey, l);
- l.log("Private key: "+Base64.encode(privkey.toByteArray()));
- notifyEvent("privateKey", Base64.encode(privkey.toByteArray()));
- notifyEvent("publicDestination", Base64.encode(pubkey.toByteArray()));
- }
-
+ ByteArrayOutputStream privkey = new ByteArrayOutputStream(512);
+ ByteArrayOutputStream pubkey = new ByteArrayOutputStream(512);
+ makeKey(privkey, pubkey, l);
+ l.log("Private key: " + Base64.encode(privkey.toByteArray()));
+ notifyEvent("privateKey", Base64.encode(privkey.toByteArray()));
+ notifyEvent("publicDestination", Base64.encode(pubkey.toByteArray()));
+ }
+
/**
* Exit the JVM if there are no more tasks left running. If there are tunnels
* running, it returns.
@@ -594,16 +583,16 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runQuit(Logging l) {
- purgetasks(l);
- synchronized (tasks) {
- if (tasks.isEmpty()) {
- System.exit(0);
- }
- }
- l.log("There are running tasks. Try 'list'.");
- notifyEvent("quitResult", "error");
- }
-
+ purgetasks(l);
+ synchronized (tasks) {
+ if (tasks.isEmpty()) {
+ System.exit(0);
+ }
+ }
+ l.log("There are running tasks. Try 'list'.");
+ notifyEvent("quitResult", "error");
+ }
+
/**
* Retrieve a list of currently running tasks
*
@@ -613,16 +602,16 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runList(Logging l) {
- purgetasks(l);
- synchronized (tasks) {
- for (int i=0;i<tasks.size();i++) {
- I2PTunnelTask t = (I2PTunnelTask) tasks.get(i);
- l.log("[" + t.getId() + "] " + t.toString());
- }
- }
- notifyEvent("listDone", "done");
- }
-
+ purgetasks(l);
+ synchronized (tasks) {
+ for (int i = 0; i < tasks.size(); i++) {
+ I2PTunnelTask t = (I2PTunnelTask) tasks.get(i);
+ l.log("[" + t.getId() + "] " + t.toString());
+ }
+ }
+ notifyEvent("listDone", "done");
+ }
+
/**
* Close the given task (or all tasks), optionally forcing them to die a hard
* death
@@ -633,50 +622,50 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runClose(String args[], Logging l) {
- if (args.length == 0 || args.length > 2) {
- l.log("close [forced] <jobnumber>|all");
- l.log(" stop running tasks. either only one or all.\n"+
- " use 'forced' to also stop tasks with active connections.\n"+
- " use the 'list' command to show the job numbers");
- notifyEvent("closeResult", "error");
- } else {
- int argindex=0; // parse optional 'forced' keyword
- boolean forced=false;
- if (args[argindex].equalsIgnoreCase("forced")) {
- forced=true;
- argindex++;
- }
- if (args[argindex].equalsIgnoreCase("all")) {
- List curTasks = null;
- synchronized (tasks) {
- curTasks = new LinkedList(tasks);
- }
-
- boolean error = false;
- for (int i=0;i<curTasks.size();i++) {
- I2PTunnelTask t = (I2PTunnelTask)curTasks.get(i);
- if (!closetask(t, forced, l)) {
- notifyEvent("closeResult", "error");
- error = true;
- } else if (!error) { // If there's an error, don't hide it
- notifyEvent("closeResult", "ok");
- }
- }
- } else {
- try {
- if (!closetask(Integer.parseInt(args[argindex]),forced,l)){
- notifyEvent("closeResult", "error");
- } else {
- notifyEvent("closeResult", "ok");
- }
- } catch (NumberFormatException ex) {
- l.log("Incorrect job number: " + args[argindex]);
- notifyEvent("closeResult", "error");
- }
- }
- }
- }
-
+ if (args.length == 0 || args.length > 2) {
+ l.log("close [forced] <jobnumber>|all");
+ l.log(" stop running tasks. either only one or all.\n"
+ + " use 'forced' to also stop tasks with active connections.\n"
+ + " use the 'list' command to show the job numbers");
+ notifyEvent("closeResult", "error");
+ } else {
+ int argindex = 0; // parse optional 'forced' keyword
+ boolean forced = false;
+ if (args[argindex].equalsIgnoreCase("forced")) {
+ forced = true;
+ argindex++;
+ }
+ if (args[argindex].equalsIgnoreCase("all")) {
+ List curTasks = null;
+ synchronized (tasks) {
+ curTasks = new LinkedList(tasks);
+ }
+
+ boolean error = false;
+ for (int i = 0; i < curTasks.size(); i++) {
+ I2PTunnelTask t = (I2PTunnelTask) curTasks.get(i);
+ if (!closetask(t, forced, l)) {
+ notifyEvent("closeResult", "error");
+ error = true;
+ } else if (!error) { // If there's an error, don't hide it
+ notifyEvent("closeResult", "ok");
+ }
+ }
+ } else {
+ try {
+ if (!closetask(Integer.parseInt(args[argindex]), forced, l)) {
+ notifyEvent("closeResult", "error");
+ } else {
+ notifyEvent("closeResult", "ok");
+ }
+ } catch (NumberFormatException ex) {
+ l.log("Incorrect job number: " + args[argindex]);
+ notifyEvent("closeResult", "error");
+ }
+ }
+ }
+ }
+
/**
* Run all of the commands in the given file (one command per line)
*
@@ -686,29 +675,28 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runRun(String args[], Logging l) {
- if(args.length==1) {
- try {
- BufferedReader br =
- new BufferedReader(new FileReader(args[0]));
- String line;
- while((line = br.readLine()) != null) {
- runCommand(line,l);
- }
- br.close();
- notifyEvent("runResult", "ok");
- } catch (IOException ioe) {
- l.log("IO error running the file");
- _log.error("Error running the file", ioe);
- notifyEvent("runResult", "error");
- }
- } else {
- l.log("run <commandfile>");
- l.log(" loads commandfile and runs each line in it. \n"+
- " You can also give the filename on the commandline.");
- notifyEvent("runResult", "error");
- }
- }
-
+ if (args.length == 1) {
+ try {
+ BufferedReader br = new BufferedReader(new FileReader(args[0]));
+ String line;
+ while ((line = br.readLine()) != null) {
+ runCommand(line, l);
+ }
+ br.close();
+ notifyEvent("runResult", "ok");
+ } catch (IOException ioe) {
+ l.log("IO error running the file");
+ _log.error("Error running the file", ioe);
+ notifyEvent("runResult", "error");
+ }
+ } else {
+ l.log("run <commandfile>");
+ l.log(" loads commandfile and runs each line in it. \n"
+ + " You can also give the filename on the commandline.");
+ notifyEvent("runResult", "error");
+ }
+ }
+
/**
* Perform a lookup of the name specified
*
@@ -718,28 +706,28 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runLookup(String args[], Logging l) {
- if (args.length != 1) {
- l.log("lookup <name>");
- l.log(" try to resolve the name into a destination key");
- notifyEvent("lookupResult", "invalidUsage");
- } else {
- String target = args[0];
- try {
- Destination dest = destFromName(args[0]);
- if (dest == null) {
- l.log("Unknown host");
- notifyEvent("lookupResult", "unkown host");
- } else {
- l.log(dest.toBase64());
- notifyEvent("lookupResult", dest.toBase64());
- }
- } catch (DataFormatException dfe) {
- l.log("Unknown or invalid host");
- notifyEvent("lookupResult", "invalid host");
- }
- }
- }
-
+ if (args.length != 1) {
+ l.log("lookup <name>");
+ l.log(" try to resolve the name into a destination key");
+ notifyEvent("lookupResult", "invalidUsage");
+ } else {
+ String target = args[0];
+ try {
+ Destination dest = destFromName(args[0]);
+ if (dest == null) {
+ l.log("Unknown host");
+ notifyEvent("lookupResult", "unkown host");
+ } else {
+ l.log(dest.toBase64());
+ notifyEvent("lookupResult", dest.toBase64());
+ }
+ } catch (DataFormatException dfe) {
+ l.log("Unknown or invalid host");
+ notifyEvent("lookupResult", "invalid host");
+ }
+ }
+ }
+
/**
* Start up a ping task with the specified args (currently supporting -ns, -h, -l)
*
@@ -749,20 +737,19 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param l logger to receive events and output
*/
public void runPing(String allargs, Logging l) {
- if(allargs.length() != 0) {
- I2PTunnelTask task;
- // pings always use the main destination
- task = new I2Ping(allargs, l, false, (EventDispatcher)this);
- addtask(task);
- notifyEvent("pingTaskId", new Integer(task.getId()));
- } else {
- l.log("ping <opts> <dest>");
- l.log("ping <opts> -h");
- l.log("ping <opts> -l <destlistfile>");
- l.log(" Tests communication with peers.\n"+
- " opts can be -ns (nosync) or not.");
- notifyEvent("pingTaskId", new Integer(-1));
- }
+ if (allargs.length() != 0) {
+ I2PTunnelTask task;
+ // pings always use the main destination
+ task = new I2Ping(allargs, l, false, (EventDispatcher) this);
+ addtask(task);
+ notifyEvent("pingTaskId", new Integer(task.getId()));
+ } else {
+ l.log("ping <opts> <dest>");
+ l.log("ping <opts> -h");
+ l.log("ping <opts> -l <destlistfile>");
+ l.log(" Tests communication with peers.\n" + " opts can be -ns (nosync) or not.");
+ notifyEvent("pingTaskId", new Integer(-1));
+ }
}
/**
@@ -771,24 +758,23 @@ public class I2PTunnel implements Logging, EventDispatcher {
*
*/
private boolean closetask(int num, boolean forced, Logging l) {
- boolean closed = false;
-
- _log.debug("closetask(): looking for task " + num);
- synchronized (tasks) {
- for (Iterator it=tasks.iterator(); it.hasNext();) {
- I2PTunnelTask t = (I2PTunnelTask) it.next();
- int id = t.getId();
- _log.debug("closetask(): parsing task " + id + " (" +
- t.toString() + ")");
- if (id == num) {
- closed = closetask(t, forced, l);
- break;
- } else if (id > num) {
- break;
- }
- }
- }
- return closed;
+ boolean closed = false;
+
+ _log.debug("closetask(): looking for task " + num);
+ synchronized (tasks) {
+ for (Iterator it = tasks.iterator(); it.hasNext();) {
+ I2PTunnelTask t = (I2PTunnelTask) it.next();
+ int id = t.getId();
+ _log.debug("closetask(): parsing task " + id + " (" + t.toString() + ")");
+ if (id == num) {
+ closed = closetask(t, forced, l);
+ break;
+ } else if (id > num) {
+ break;
+ }
+ }
+ }
+ return closed;
}
/**
@@ -797,12 +783,12 @@ public class I2PTunnel implements Logging, EventDispatcher {
*
*/
private boolean closetask(I2PTunnelTask t, boolean forced, Logging l) {
- l.log("Closing task " + t.getId() + (forced ? " forced..." : "..."));
- if (t.close(forced)) {
- l.log("Task " + t.getId() + " closed.");
- return true;
- }
- return false;
+ l.log("Closing task " + t.getId() + (forced ? " forced..." : "..."));
+ if (t.close(forced)) {
+ l.log("Task " + t.getId() + " closed.");
+ return true;
+ }
+ return false;
}
/**
@@ -810,17 +796,15 @@ public class I2PTunnel implements Logging, EventDispatcher {
*
*/
private void purgetasks(Logging l) {
- synchronized (tasks) {
- for (Iterator it=tasks.iterator(); it.hasNext();) {
- I2PTunnelTask t = (I2PTunnelTask) it.next();
- if (!t.isOpen()) {
- _log.debug("Purging inactive tunnel: ["
- + t.getId() + "] "
- + t.toString());
- it.remove();
- }
- }
- }
+ synchronized (tasks) {
+ for (Iterator it = tasks.iterator(); it.hasNext();) {
+ I2PTunnelTask t = (I2PTunnelTask) it.next();
+ if (!t.isOpen()) {
+ _log.debug("Purging inactive tunnel: [" + t.getId() + "] " + t.toString());
+ it.remove();
+ }
+ }
+ }
}
/**
@@ -828,10 +812,10 @@ public class I2PTunnel implements Logging, EventDispatcher {
*
*/
public void log(String s) {
- System.out.println(s);
- _log.info("Display: " + s);
+ System.out.println(s);
+ _log.info("Display: " + s);
}
-
+
/**
* Create a new destination, storing the destination and its private keys where
* instructed
@@ -840,24 +824,22 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param pubDest location to store the destination
* @param l logger to send messages to
*/
- public static void makeKey(OutputStream writeTo, OutputStream pubDest,
- Logging l) {
- try {
- l.log("Generating new keys...");
- ByteArrayOutputStream priv = new ByteArrayOutputStream(),
- pub = new ByteArrayOutputStream();
- I2PClient client = I2PClientFactory.createClient();
- Destination d = client.createDestination(writeTo);
- l.log("Secret key saved.");
- l.log("Public key: "+d.toBase64());
- writeTo.flush();
- writeTo.close();
- writePubKey(d, pubDest, l);
- } catch (I2PException ex) {
- ex.printStackTrace();
- } catch (IOException ex) {
- ex.printStackTrace();
- }
+ public static void makeKey(OutputStream writeTo, OutputStream pubDest, Logging l) {
+ try {
+ l.log("Generating new keys...");
+ ByteArrayOutputStream priv = new ByteArrayOutputStream(), pub = new ByteArrayOutputStream();
+ I2PClient client = I2PClientFactory.createClient();
+ Destination d = client.createDestination(writeTo);
+ l.log("Secret key saved.");
+ l.log("Public key: " + d.toBase64());
+ writeTo.flush();
+ writeTo.close();
+ writePubKey(d, pubDest, l);
+ } catch (I2PException ex) {
+ ex.printStackTrace();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
}
/**
@@ -867,20 +849,19 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param pubDest stream to write the destination to
* @param l logger to send messages to
*/
- public static void showKey(InputStream readFrom, OutputStream pubDest,
- Logging l) {
- try {
- I2PClient client = I2PClientFactory.createClient();
- Destination d = new Destination();
- d.readBytes(readFrom);
- l.log("Public key: "+d.toBase64());
- readFrom.close();
- writePubKey(d, pubDest, l);
- } catch (I2PException ex) {
- ex.printStackTrace();
- } catch (IOException ex) {
- ex.printStackTrace();
- }
+ public static void showKey(InputStream readFrom, OutputStream pubDest, Logging l) {
+ try {
+ I2PClient client = I2PClientFactory.createClient();
+ Destination d = new Destination();
+ d.readBytes(readFrom);
+ l.log("Public key: " + d.toBase64());
+ readFrom.close();
+ writePubKey(d, pubDest, l);
+ } catch (I2PException ex) {
+ ex.printStackTrace();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
}
/**
@@ -890,13 +871,12 @@ public class I2PTunnel implements Logging, EventDispatcher {
* @param o stream to write the destination to
* @param l logger to send messages to
*/
- private static void writePubKey(Destination d, OutputStream o, Logging l)
- throws I2PException, IOException {
- if (o==null) return;
- d.writeBytes(o);
- l.log("Public key saved.");
+ private static void writePubKey(Destination d, OutputStream o, Logging l) throws I2PException, IOException {
+ if (o == null) return;
+ d.writeBytes(o);
+ l.log("Public key saved.");
}
-
+
/**
* Generates a Destination from a name. Now only supports base64
* names - may support naming servers later. "file:<filename>" is
@@ -904,95 +884,120 @@ public class I2PTunnel implements Logging, EventDispatcher {
* binary Destination structure or the Base64 encoding of that
* structure.
*/
- public static Destination destFromName(String name)
- throws DataFormatException {
-
- if ( (name == null) || (name.trim().length() <= 0) )
- throw new DataFormatException("Empty destination provided");
-
- if (name.startsWith("file:")) {
- Destination result=new Destination();
- byte content[] = null;
- FileInputStream in = null;
- try {
- in = new FileInputStream(name.substring("file:".length()));
- byte buf[] = new byte[1024];
- int read = DataHelper.read(in, buf);
- content = new byte[read];
- System.arraycopy(buf, 0, content, 0, read);
- } catch (IOException ioe) {
- System.out.println(ioe.getMessage());
- return null;
- } finally {
- if (in != null) try { in.close(); } catch (IOException io) {}
- }
- try {
- result.fromByteArray(content);
- return result;
- } catch (Exception ex) {
- if (_log.shouldLog(Log.INFO))
- _log.info("File is not a binary destination - trying base64");
- try {
- byte decoded[] = Base64.decode(new String(content));
- result.fromByteArray(decoded);
- return result;
- } catch (DataFormatException dfe) {
- if (_log.shouldLog(Log.WARN))
- _log.warn("File is not a base64 destination either - failing!");
- return null;
- }
- }
- } else {
- // ask naming service
- NamingService inst = NamingService.getInstance();
- return inst.lookup(name);
- }
- }
-
+ public static Destination destFromName(String name) throws DataFormatException {
+
+ if ((name == null) || (name.trim().length() <= 0)) throw new DataFormatException("Empty destination provided");
+
+ if (name.startsWith("file:")) {
+ Destination result = new Destination();
+ byte content[] = null;
+ FileInputStream in = null;
+ try {
+ in = new FileInputStream(name.substring("file:".length()));
+ byte buf[] = new byte[1024];
+ int read = DataHelper.read(in, buf);
+ content = new byte[read];
+ System.arraycopy(buf, 0, content, 0, read);
+ } catch (IOException ioe) {
+ System.out.println(ioe.getMessage());
+ return null;
+ } finally {
+ if (in != null) try {
+ in.close();
+ } catch (IOException io) {
+ }
+ }
+ try {
+ result.fromByteArray(content);
+ return result;
+ } catch (Exception ex) {
+ if (_log.shouldLog(Log.INFO)) _log.info("File is not a binary destination - trying base64");
+ try {
+ byte decoded[] = Base64.decode(new String(content));
+ result.fromByteArray(decoded);
+ return result;
+ } catch (DataFormatException dfe) {
+ if (_log.shouldLog(Log.WARN)) _log.warn("File is not a base64 destination either - failing!");
+ return null;
+ }
+ }
+ } else {
+ // ask naming service
+ NamingService inst = NamingService.getInstance();
+ return inst.lookup(name);
+ }
+ }
+
public void addConnectionEventListener(ConnectionEventListener lsnr) {
- if (lsnr == null) return;
- synchronized (listeners) {
- listeners.add(lsnr);
- }
+ if (lsnr == null) return;
+ synchronized (listeners) {
+ listeners.add(lsnr);
+ }
}
+
public void removeConnectionEventListener(ConnectionEventListener lsnr) {
- if (lsnr == null) return;
- synchronized (listeners) {
- listeners.remove(lsnr);
- }
+ if (lsnr == null) return;
+ synchronized (listeners) {
+ listeners.remove(lsnr);
+ }
}
-
+
/**
* Call this whenever we lose touch with the router involuntarily (aka the router
* is off / crashed / etc)
*
*/
void routerDisconnected() {
- _log.error("Router disconnected - firing notification events");
- synchronized (listeners) {
- for (Iterator iter = listeners.iterator(); iter.hasNext();) {
- ConnectionEventListener lsnr = (ConnectionEventListener)iter.next();
- if (lsnr != null)
- lsnr.routerDisconnected();
- }
- }
- }
-
+ _log.error("Router disconnected - firing notification events");
+ synchronized (listeners) {
+ for (Iterator iter = listeners.iterator(); iter.hasNext();) {
+ ConnectionEventListener lsnr = (ConnectionEventListener) iter.next();
+ if (lsnr != null) lsnr.routerDisconnected();
+ }
+ }
+ }
+
/**
* Callback routine to find out
*/
public interface ConnectionEventListener {
- public void routerDisconnected();
+ public void routerDisconnected();
}
/* Required by the EventDispatcher interface */
- public EventDispatcher getEventDispatcher() { return _event; }
- public void attachEventDispatcher(EventDispatcher e) { _event.attachEventDispatcher(e.getEventDispatcher()); }
- public void detachEventDispatcher(EventDispatcher e) { _event.detachEventDispatcher(e.getEventDispatcher()); }
- public void notifyEvent(String e, Object a) { _event.notifyEvent(e,a); }
- public Object getEventValue(String n) { return _event.getEventValue(n); }
- public Set getEvents() { return _event.getEvents(); }
- public void ignoreEvents() { _event.ignoreEvents(); }
- public void unIgnoreEvents() { _event.unIgnoreEvents(); }
- public Object waitEventValue(String n) { return _event.waitEventValue(n); }
-}
+ public EventDispatcher getEventDispatcher() {
+ return _event;
+ }
+
+ public void attachEventDispatcher(EventDispatcher e) {
+ _event.attachEventDispatcher(e.getEventDispatcher());
+ }
+
+ public void detachEventDispatcher(EventDispatcher e) {
+ _event.detachEventDispatcher(e.getEventDispatcher());
+ }
+
+ public void notifyEvent(String e, Object a) {
+ _event.notifyEvent(e, a);
+ }
+
+ public Object getEventValue(String n) {
+ return _event.getEventValue(n);
+ }
+
+ public Set getEvents() {
+ return _event.getEvents();
+ }
+
+ public void ignoreEvents() {
+ _event.ignoreEvents();
+ }
+
+ public void unIgnoreEvents() {
+ _event.unIgnoreEvents();
+ }
+
+ public Object waitEventValue(String n) {
+ return _event.waitEventValue(n);
+ }
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java
index 3780922e20..b685fd72c3 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java
@@ -18,44 +18,42 @@ public class I2PTunnelClient extends I2PTunnelClientBase {
protected Destination dest;
- public I2PTunnelClient(int localPort, String destination,
- Logging l, boolean ownDest,
- EventDispatcher notifyThis) {
- super(localPort, ownDest, l, notifyThis, "SynSender");
-
- if (waitEventValue("openBaseClientResult").equals("error")) {
- notifyEvent("openClientResult", "error");
- return;
- }
-
- try {
- dest=I2PTunnel.destFromName(destination);
- if (dest == null) {
- l.log("Could not resolve " + destination + ".");
- return;
- }
- } catch (DataFormatException e) {
- l.log("Bad format in destination \"" + destination + "\".");
- notifyEvent("openClientResult", "error");
- return;
- }
-
- setName(getLocalPort() + " -> " + destination);
-
- startRunning();
-
- notifyEvent("openClientResult", "ok");
+ public I2PTunnelClient(int localPort, String destination, Logging l, boolean ownDest, EventDispatcher notifyThis) {
+ super(localPort, ownDest, l, notifyThis, "SynSender");
+
+ if (waitEventValue("openBaseClientResult").equals("error")) {
+ notifyEvent("openClientResult", "error");
+ return;
+ }
+
+ try {
+ dest = I2PTunnel.destFromName(destination);
+ if (dest == null) {
+ l.log("Could not resolve " + destination + ".");
+ return;
+ }
+ } catch (DataFormatException e) {
+ l.log("Bad format in destination \"" + destination + "\".");
+ notifyEvent("openClientResult", "error");
+ return;
+ }
+
+ setName(getLocalPort() + " -> " + destination);
+
+ startRunning();
+
+ notifyEvent("openClientResult", "ok");
}
protected void clientConnectionRun(Socket s) {
- try {
- I2PSocket i2ps = createI2PSocket(dest);
- new I2PTunnelRunner(s, i2ps, sockLock, null);
- } catch (I2PException ex) {
- _log.info("Error connecting", ex);
- l.log("Unable to reach peer");
- // s has been initialized before the try block...
- closeSocket(s);
- }
+ try {
+ I2PSocket i2ps = createI2PSocket(dest);
+ new I2PTunnelRunner(s, i2ps, sockLock, null);
+ } catch (I2PException ex) {
+ _log.info("Error connecting", ex);
+ l.log("Unable to reach peer");
+ // s has been initialized before the try block...
+ closeSocket(s);
+ }
}
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
index 30be946029..eb80e93862 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
@@ -23,13 +23,12 @@ import net.i2p.util.EventDispatcher;
import net.i2p.util.I2PThread;
import net.i2p.util.Log;
-public abstract class I2PTunnelClientBase extends I2PTunnelTask
- implements Runnable {
-
+public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runnable {
+
private static final Log _log = new Log(I2PTunnelClientBase.class);
protected Logging l;
-
- private static final long DEFAULT_CONNECT_TIMEOUT = 60*1000;
+
+ private static final long DEFAULT_CONNECT_TIMEOUT = 60 * 1000;
protected Object sockLock = new Object(); // Guards sockMgr and mySockets
private I2PSocketManager sockMgr;
@@ -41,12 +40,12 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask
private boolean listenerReady = false;
private ServerSocket ss;
-
+
private Object startLock = new Object();
private boolean startRunning = false;
private Object closeLock = new Object();
-
+
private byte[] pubkey;
private String handlerName;
@@ -56,101 +55,96 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask
// I2PTunnelClientBase(localPort, ownDest, l, (EventDispatcher)null);
//}
- public I2PTunnelClientBase(int localPort, boolean ownDest,
- Logging l, EventDispatcher notifyThis,
- String handlerName) {
- super(localPort+" (uninitialized)", notifyThis);
- this.localPort=localPort;
- this.l = l;
- this.handlerName=handlerName;
-
- synchronized(sockLock) {
- if (ownDest) {
- sockMgr=buildSocketManager();
- } else {
- sockMgr=getSocketManager();
- }
- }
- if (sockMgr == null) throw new NullPointerException();
- l.log("I2P session created");
-
- Thread t = new I2PThread(this);
- t.setName("Client");
- listenerReady=false;
- t.start();
- open=true;
- synchronized (this) {
- while (!listenerReady) {
- try {
- wait();
- }
- catch (InterruptedException e) {
- // ignore
- }
- }
- }
-
- if (open && listenerReady) {
- l.log("Ready! Port " + getLocalPort());
- notifyEvent("openBaseClientResult", "ok");
- } else {
- l.log("Error!");
- notifyEvent("openBaseClientResult", "error");
- }
+ public I2PTunnelClientBase(int localPort, boolean ownDest, Logging l, EventDispatcher notifyThis, String handlerName) {
+ super(localPort + " (uninitialized)", notifyThis);
+ this.localPort = localPort;
+ this.l = l;
+ this.handlerName = handlerName;
+
+ synchronized (sockLock) {
+ if (ownDest) {
+ sockMgr = buildSocketManager();
+ } else {
+ sockMgr = getSocketManager();
+ }
+ }
+ if (sockMgr == null) throw new NullPointerException();
+ l.log("I2P session created");
+
+ Thread t = new I2PThread(this);
+ t.setName("Client");
+ listenerReady = false;
+ t.start();
+ open = true;
+ synchronized (this) {
+ while (!listenerReady) {
+ try {
+ wait();
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ }
+ }
+
+ if (open && listenerReady) {
+ l.log("Ready! Port " + getLocalPort());
+ notifyEvent("openBaseClientResult", "ok");
+ } else {
+ l.log("Error!");
+ notifyEvent("openBaseClientResult", "error");
+ }
}
private static I2PSocketManager socketManager;
-
+
protected static synchronized I2PSocketManager getSocketManager() {
- if (socketManager == null) {
- socketManager = buildSocketManager();
- }
- return socketManager;
+ if (socketManager == null) {
+ socketManager = buildSocketManager();
+ }
+ return socketManager;
}
-
+
protected static I2PSocketManager buildSocketManager() {
- Properties props = new Properties();
- props.putAll(System.getProperties());
- return I2PSocketManagerFactory.createManager
- (I2PTunnel.host, Integer.parseInt(I2PTunnel.port), props);
+ Properties props = new Properties();
+ props.putAll(System.getProperties());
+ return I2PSocketManagerFactory.createManager(I2PTunnel.host, Integer.parseInt(I2PTunnel.port), props);
}
-
+
public final int getLocalPort() {
return localPort;
}
protected final InetAddress getListenHost(Logging l) {
- try {
- return InetAddress.getByName(I2PTunnel.listenHost);
- } catch (UnknownHostException uhe) {
- l.log("Could not find listen host to bind to [" +
- I2PTunnel.host + "]");
- _log.error("Error finding host to bind", uhe);
- notifyEvent("openBaseClientResult", "error");
- return null;
- }
+ try {
+ return InetAddress.getByName(I2PTunnel.listenHost);
+ } catch (UnknownHostException uhe) {
+ l.log("Could not find listen host to bind to [" + I2PTunnel.host + "]");
+ _log.error("Error finding host to bind", uhe);
+ notifyEvent("openBaseClientResult", "error");
+ return null;
+ }
}
-
+
/**
* Actually start working on incoming connections. *Must* be
* called by derived classes after initialization.
*
*/
public final void startRunning() {
- synchronized (startLock) {
- startRunning = true;
- startLock.notify();
- }
+ synchronized (startLock) {
+ startRunning = true;
+ startLock.notify();
+ }
}
-
+
/**
* create the default options (using the default timeout, etc)
*
*/
private I2PSocketOptions getDefaultOptions() {
- I2PSocketOptions opts = new I2PSocketOptions();
- opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
- return opts;
+ I2PSocketOptions opts = new I2PSocketOptions();
+ opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
+ return opts;
}
/**
@@ -162,7 +156,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask
* @return a new I2PSocket
*/
public I2PSocket createI2PSocket(Destination dest) throws I2PException {
- return createI2PSocket(dest, getDefaultOptions());
+ return createI2PSocket(dest, getDefaultOptions());
}
/**
@@ -175,53 +169,53 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask
* @return a new I2PSocket
*/
public I2PSocket createI2PSocket(Destination dest, I2PSocketOptions opt) throws I2PException {
- I2PSocket i2ps;
+ I2PSocket i2ps;
- synchronized (sockLock) {
- i2ps = sockMgr.connect(dest, opt);
- mySockets.add(i2ps);
- }
+ synchronized (sockLock) {
+ i2ps = sockMgr.connect(dest, opt);
+ mySockets.add(i2ps);
+ }
- return i2ps;
+ return i2ps;
}
public final void run() {
- try {
- InetAddress addr = getListenHost(l);
- if (addr == null) return;
- ss = new ServerSocket(localPort, 0, addr);
-
- // If a free port was requested, find out what we got
- if (localPort == 0) {
- localPort = ss.getLocalPort();
- }
- notifyEvent("clientLocalPort", new Integer(ss.getLocalPort()));
- l.log("Listening for clients on port " + localPort +
- " of " + I2PTunnel.listenHost);
-
- // Notify constructor that port is ready
- synchronized(this) {
- listenerReady = true;
- notify();
- }
-
- // Wait until we are authorized to process data
- synchronized (startLock) {
- while (!startRunning) {
- try {
- startLock.wait();
- } catch (InterruptedException ie) {}
- }
- }
-
- while (true) {
- Socket s = ss.accept();
- manageConnection(s);
- }
- } catch (IOException ex) {
- _log.error("Error listening for connections", ex);
- notifyEvent("openBaseClientResult", "error");
- }
+ try {
+ InetAddress addr = getListenHost(l);
+ if (addr == null) return;
+ ss = new ServerSocket(localPort, 0, addr);
+
+ // If a free port was requested, find out what we got
+ if (localPort == 0) {
+ localPort = ss.getLocalPort();
+ }
+ notifyEvent("clientLocalPort", new Integer(ss.getLocalPort()));
+ l.log("Listening for clients on port " + localPort + " of " + I2PTunnel.listenHost);
+
+ // Notify constructor that port is ready
+ synchronized (this) {
+ listenerReady = true;
+ notify();
+ }
+
+ // Wait until we are authorized to process data
+ synchronized (startLock) {
+ while (!startRunning) {
+ try {
+ startLock.wait();
+ } catch (InterruptedException ie) {
+ }
+ }
+ }
+
+ while (true) {
+ Socket s = ss.accept();
+ manageConnection(s);
+ }
+ } catch (IOException ex) {
+ _log.error("Error listening for connections", ex);
+ notifyEvent("openBaseClientResult", "error");
+ }
}
/**
@@ -230,59 +224,58 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask
* @param s Socket to take care of
*/
protected void manageConnection(Socket s) {
- new ClientConnectionRunner(s, handlerName);
+ new ClientConnectionRunner(s, handlerName);
}
-
public boolean close(boolean forced) {
- if (!open) return true;
- // FIXME: here we might have to wait quite a long time if
- // there is a connection attempt atm. But without waiting we
- // might risk to create an orphan socket. Would be better
- // to return with an error in that situation quickly.
- synchronized(sockLock) {
- mySockets.retainAll(sockMgr.listSockets());
- if (!forced && mySockets.size() != 0) {
- l.log("There are still active connections!");
- _log.debug("can't close: there are still active connections!");
- for (Iterator it = mySockets.iterator(); it.hasNext();) {
- l.log("->"+it.next());
- }
- return false;
- }
- l.log("Closing client "+toString());
- try {
- if (ss != null) ss.close();
- } catch (IOException ex) {
- ex.printStackTrace();
- return false;
- }
- l.log("Client closed.");
- open=false;
- return true;
- }
+ if (!open) return true;
+ // FIXME: here we might have to wait quite a long time if
+ // there is a connection attempt atm. But without waiting we
+ // might risk to create an orphan socket. Would be better
+ // to return with an error in that situation quickly.
+ synchronized (sockLock) {
+ mySockets.retainAll(sockMgr.listSockets());
+ if (!forced && mySockets.size() != 0) {
+ l.log("There are still active connections!");
+ _log.debug("can't close: there are still active connections!");
+ for (Iterator it = mySockets.iterator(); it.hasNext();) {
+ l.log("->" + it.next());
+ }
+ return false;
+ }
+ l.log("Closing client " + toString());
+ try {
+ if (ss != null) ss.close();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ return false;
+ }
+ l.log("Client closed.");
+ open = false;
+ return true;
+ }
}
public static void closeSocket(Socket s) {
- try {
- s.close();
- } catch (IOException ex) {
- _log.error("Could not close socket", ex);
- }
+ try {
+ s.close();
+ } catch (IOException ex) {
+ _log.error("Could not close socket", ex);
+ }
}
public class ClientConnectionRunner extends I2PThread {
- private Socket s;
-
- public ClientConnectionRunner(Socket s, String name) {
- this.s=s;
- setName(name);
- start();
- }
-
- public void run() {
- clientConnectionRun(s);
- }
+ private Socket s;
+
+ public ClientConnectionRunner(Socket s, String name) {
+ this.s = s;
+ setName(name);
+ start();
+ }
+
+ public void run() {
+ clientConnectionRun(s);
+ }
}
/**
@@ -290,4 +283,4 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask
* you do not override manageConnection()
*/
protected abstract void clientConnectionRun(Socket s);
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelGUI.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelGUI.java
index f032558bde..198efa84d6 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelGUI.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelGUI.java
@@ -19,30 +19,30 @@ public class I2PTunnelGUI extends Frame implements ActionListener, Logging {
TextField input;
TextArea log;
I2PTunnel t;
-
+
public I2PTunnelGUI(I2PTunnel t) {
- super("I2PTunnel control panel");
- this.t=t;
- setLayout(new BorderLayout());
- add("South", input=new TextField());
- input.addActionListener(this);
- Font font = new Font("Monospaced",Font.PLAIN,12);
- add("Center",log=new TextArea("",20,80,TextArea.SCROLLBARS_VERTICAL_ONLY));
- log.setFont(font);
- log.setEditable(false);
- log("enter 'help' for help.");
- pack();
- show();
+ super("I2PTunnel control panel");
+ this.t = t;
+ setLayout(new BorderLayout());
+ add("South", input = new TextField());
+ input.addActionListener(this);
+ Font font = new Font("Monospaced", Font.PLAIN, 12);
+ add("Center", log = new TextArea("", 20, 80, TextArea.SCROLLBARS_VERTICAL_ONLY));
+ log.setFont(font);
+ log.setEditable(false);
+ log("enter 'help' for help.");
+ pack();
+ show();
}
public void log(String s) {
- log.append(s+"\n");
+ log.append(s + "\n");
}
public void actionPerformed(ActionEvent evt) {
- log("I2PTunnel>"+input.getText());
- t.runCommand(input.getText(), this);
- log("---");
- input.setText("");
+ log("I2PTunnel>" + input.getText());
+ t.runCommand(input.getText(), this);
+ log("---");
+ input.setText("");
}
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index da1024fcc5..ef9dd52f46 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -19,17 +19,18 @@ import net.i2p.util.EventDispatcher;
import net.i2p.util.I2PThread;
import net.i2p.util.Log;
-public class I2PTunnelHTTPClient extends I2PTunnelClientBase
- implements Runnable {
- private static final Log _log =
- new Log(I2PTunnelHTTPClient.class);
+public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable {
+ private static final Log _log = new Log(I2PTunnelHTTPClient.class);
private String wwwProxy;
- private final static byte[] ERR_REQUEST_DENIED = "HTTP/1.1 404 Not Found\r\nContent-Type: text/html; charset=iso-8859-1\r\nCache-control: no-cache\r\n\r\n<html><body><H1>I2P ERROR: REQUEST DENIED</H1>You attempted to connect to a non-I2P website or location.<BR>".getBytes();
- private final static byte[] ERR_DESTINATION_UNKNOWN = "HTTP/1.1 404 Not Found\r\nContent-Type: text/html; charset=iso-8859-1\r\nCache-control: no-cache\r\n\r\n<html><body><H1>I2P ERROR: NOT FOUND</H1>That Desitination was not found. Perhaps you pasted in the wrong BASE64 I2P Destination or the link you are following is bad. The host (or the WWW proxy, if you're using one) could also be temporarily offline. Could not find the following Destination:<BR><BR>".getBytes();
- private final static byte[] ERR_TIMEOUT = "HTTP/1.1 404 Not Found\r\nContent-Type: text/html; charset=iso-8859-1\r\nCache-control: no-cache\r\n\r\n<html><body><H1>I2P ERROR: TIMEOUT</H1>That Desitination was reachable, but timed out getting a response. This may be a temporary error, so you should simply try to refresh, though if the problem persists, the remote destination may have issues. Could not get a response from the following Destination:<BR><BR>".getBytes();
-
+ private final static byte[] ERR_REQUEST_DENIED = "HTTP/1.1 404 Not Found\r\nContent-Type: text/html; charset=iso-8859-1\r\nCache-control: no-cache\r\n\r\n<html><body><H1>I2P ERROR: REQUEST DENIED</H1>You attempted to connect to a non-I2P website or location.<BR>"
+ .getBytes();
+ private final static byte[] ERR_DESTINATION_UNKNOWN = "HTTP/1.1 404 Not Found\r\nContent-Type: text/html; charset=iso-8859-1\r\nCache-control: no-cache\r\n\r\n<html><body><H1>I2P ERROR: NOT FOUND</H1>That Desitination was not found. Perhaps you pasted in the wrong BASE64 I2P Destination or the link you are following is bad. The host (or the WWW proxy, if you're using one) could also be temporarily offline. Could not find the following Destination:<BR><BR>"
+ .getBytes();
+ private final static byte[] ERR_TIMEOUT = "HTTP/1.1 404 Not Found\r\nContent-Type: text/html; charset=iso-8859-1\r\nCache-control: no-cache\r\n\r\n<html><body><H1>I2P ERROR: TIMEOUT</H1>That Desitination was reachable, but timed out getting a response. This may be a temporary error, so you should simply try to refresh, though if the problem persists, the remote destination may have issues. Could not get a response from the following Destination:<BR><BR>"
+ .getBytes();
+
//public I2PTunnelHTTPClient(int localPort, Logging l,
// boolean ownDest,
// String wwwProxy) {
@@ -37,299 +38,283 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase
// (EventDispatcher)null);
//}
- public I2PTunnelHTTPClient(int localPort, Logging l,
- boolean ownDest,
- String wwwProxy, EventDispatcher notifyThis) {
- super(localPort, ownDest, l, notifyThis, "HTTPHandler");
+ public I2PTunnelHTTPClient(int localPort, Logging l, boolean ownDest, String wwwProxy, EventDispatcher notifyThis) {
+ super(localPort, ownDest, l, notifyThis, "HTTPHandler");
+
+ if (waitEventValue("openBaseClientResult").equals("error")) {
+ notifyEvent("openHTTPClientResult", "error");
+ return;
+ }
- if (waitEventValue("openBaseClientResult").equals("error")) {
- notifyEvent("openHTTPClientResult", "error");
- return;
- }
-
- this.wwwProxy = wwwProxy;
+ this.wwwProxy = wwwProxy;
- setName(getLocalPort()
- + " -> HTTPClient [WWW outproxy: " + this.wwwProxy + "]");
+ setName(getLocalPort() + " -> HTTPClient [WWW outproxy: " + this.wwwProxy + "]");
- startRunning();
+ startRunning();
- notifyEvent("openHTTPClientResult", "ok");
+ notifyEvent("openHTTPClientResult", "ok");
}
protected void clientConnectionRun(Socket s) {
- OutputStream out = null;
- String targetRequest = null;
- boolean usingWWWProxy = false;
- InactivityTimeoutThread timeoutThread = null;
- try {
- out = s.getOutputStream();
- BufferedReader br = new BufferedReader
- (new InputStreamReader(s.getInputStream(),
- "ISO-8859-1"));
- String line, method=null, protocol=null, host=null, destination=null;
- StringBuffer newRequest=new StringBuffer();
- while ((line=br.readLine()) != null) {
- if (method==null) { // first line (GET /base64/realaddr)
- int pos=line.indexOf(" ");
- if (pos == -1) break;
- method=line.substring(0, pos);
- String request = line.substring(pos+1);
- if (request.startsWith("/") &&
- System.getProperty("i2ptunnel.noproxy") != null) {
- request="http://i2p"+request;
- }
- pos = request.indexOf("//");
- if (pos == -1) {
- method=null;
- break;
- }
- protocol=request.substring(0,pos+2);
- request=request.substring(pos+2);
-
- targetRequest = request;
-
- pos = request.indexOf("/");
- if (pos == -1) {
- method=null;
- break;
- }
- host=request.substring(0,pos);
-
- // Quick hack for foo.bar.i2p
- if (host.toLowerCase().endsWith( ".i2p")) {
- destination=host;
- host=getHostName(destination);
- line=method+" "+request.substring(pos);
- } else if (host.indexOf(".") != -1) {
- // The request must be forwarded to a WWW proxy
- destination = wwwProxy;
- usingWWWProxy = true;
- } else {
- request=request.substring(pos+1);
- pos = request.indexOf("/");
- destination=request.substring(0,pos);
- line=method+" "+request.substring(pos);
- }
-
- boolean isValid = usingWWWProxy ||
- isSupportedAddress(host, protocol);
- if (!isValid) {
- if (_log.shouldLog(Log.INFO))
- _log.info("notValid(" + host + ")");
- method=null;
- destination=null;
- break;
- } else if (!usingWWWProxy) {
- if (_log.shouldLog(Log.INFO))
- _log.info("host=getHostName(" + destination + ")");
- host=getHostName(destination); // hide original host
- }
-
- if (_log.shouldLog(Log.DEBUG)) {
- _log.debug("METHOD:"+method+":");
- _log.debug("PROTOC:"+protocol+":");
- _log.debug("HOST :"+host+":");
- _log.debug("DEST :"+destination+":");
- }
-
- } else if (line.startsWith("Host: ") && !usingWWWProxy) {
- line="Host: "+host;
- if (_log.shouldLog(Log.INFO))
- _log.info("Setting host = " + host);
- }
- newRequest.append(line).append("\r\n"); // HTTP spec
- if (line.length()==0) break;
- }
- while (br.ready()) { // empty the buffer (POST requests)
- int i=br.read();
- if (i != -1) {
- newRequest.append((char)i);
- }
- }
- if (method==null || destination==null) {
- l.log("No HTTP method found in the request.");
- if (out != null) {
- out.write(ERR_REQUEST_DENIED);
- out.write("<p /><i>Generated on: ".getBytes());
- out.write(new Date().toString().getBytes());
- out.write("</i></body></html>\n".getBytes());
- out.flush();
- }
- s.close();
- return;
- }
- Destination dest=I2PTunnel.destFromName(destination);
- if (dest == null) {
- l.log("Could not resolve "+destination+".");
- writeErrorMessage(ERR_DESTINATION_UNKNOWN, out, targetRequest,
- usingWWWProxy, destination);
- s.close();
- return;
- }
- String remoteID;
- I2PSocket i2ps = createI2PSocket(dest);
- byte[] data=newRequest.toString().getBytes("ISO-8859-1");
- I2PTunnelRunner runner = new I2PTunnelRunner(s, i2ps, sockLock, data);
- timeoutThread = new InactivityTimeoutThread(runner, out, targetRequest, usingWWWProxy, s);
- timeoutThread.start();
- } catch (IOException ex) {
- if (timeoutThread != null) timeoutThread.disable();
- _log.error("Error sending syn", ex);
- handleHTTPClientException(ex, out, targetRequest,
- usingWWWProxy, wwwProxy);
- closeSocket(s);
- } catch (I2PException ex) {
- if (timeoutThread != null) timeoutThread.disable();
- _log.info("Error sending syn", ex);
- l.log("Unable to reach peer");
- handleHTTPClientException(ex, out, targetRequest,
- usingWWWProxy, wwwProxy);
- closeSocket(s);
- }
+ OutputStream out = null;
+ String targetRequest = null;
+ boolean usingWWWProxy = false;
+ InactivityTimeoutThread timeoutThread = null;
+ try {
+ out = s.getOutputStream();
+ BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream(), "ISO-8859-1"));
+ String line, method = null, protocol = null, host = null, destination = null;
+ StringBuffer newRequest = new StringBuffer();
+ while ((line = br.readLine()) != null) {
+ if (method == null) { // first line (GET /base64/realaddr)
+ int pos = line.indexOf(" ");
+ if (pos == -1) break;
+ method = line.substring(0, pos);
+ String request = line.substring(pos + 1);
+ if (request.startsWith("/") && System.getProperty("i2ptunnel.noproxy") != null) {
+ request = "http://i2p" + request;
+ }
+ pos = request.indexOf("//");
+ if (pos == -1) {
+ method = null;
+ break;
+ }
+ protocol = request.substring(0, pos + 2);
+ request = request.substring(pos + 2);
+
+ targetRequest = request;
+
+ pos = request.indexOf("/");
+ if (pos == -1) {
+ method = null;
+ break;
+ }
+ host = request.substring(0, pos);
+
+ // Quick hack for foo.bar.i2p
+ if (host.toLowerCase().endsWith(".i2p")) {
+ destination = host;
+ host = getHostName(destination);
+ line = method + " " + request.substring(pos);
+ } else if (host.indexOf(".") != -1) {
+ // The request must be forwarded to a WWW proxy
+ destination = wwwProxy;
+ usingWWWProxy = true;
+ } else {
+ request = request.substring(pos + 1);
+ pos = request.indexOf("/");
+ destination = request.substring(0, pos);
+ line = method + " " + request.substring(pos);
+ }
+
+ boolean isValid = usingWWWProxy || isSupportedAddress(host, protocol);
+ if (!isValid) {
+ if (_log.shouldLog(Log.INFO)) _log.info("notValid(" + host + ")");
+ method = null;
+ destination = null;
+ break;
+ } else if (!usingWWWProxy) {
+ if (_log.shouldLog(Log.INFO)) _log.info("host=getHostName(" + destination + ")");
+ host = getHostName(destination); // hide original host
+ }
+
+ if (_log.shouldLog(Log.DEBUG)) {
+ _log.debug("METHOD:" + method + ":");
+ _log.debug("PROTOC:" + protocol + ":");
+ _log.debug("HOST :" + host + ":");
+ _log.debug("DEST :" + destination + ":");
+ }
+
+ } else if (line.startsWith("Host: ") && !usingWWWProxy) {
+ line = "Host: " + host;
+ if (_log.shouldLog(Log.INFO)) _log.info("Setting host = " + host);
+ }
+ newRequest.append(line).append("\r\n"); // HTTP spec
+ if (line.length() == 0) break;
+ }
+ while (br.ready()) { // empty the buffer (POST requests)
+ int i = br.read();
+ if (i != -1) {
+ newRequest.append((char) i);
+ }
+ }
+ if (method == null || destination == null) {
+ l.log("No HTTP method found in the request.");
+ if (out != null) {
+ out.write(ERR_REQUEST_DENIED);
+ out.write("<p /><i>Generated on: ".getBytes());
+ out.write(new Date().toString().getBytes());
+ out.write("</i></body></html>\n".getBytes());
+ out.flush();
+ }
+ s.close();
+ return;
+ }
+ Destination dest = I2PTunnel.destFromName(destination);
+ if (dest == null) {
+ l.log("Could not resolve " + destination + ".");
+ writeErrorMessage(ERR_DESTINATION_UNKNOWN, out, targetRequest, usingWWWProxy, destination);
+ s.close();
+ return;
+ }
+ String remoteID;
+ I2PSocket i2ps = createI2PSocket(dest);
+ byte[] data = newRequest.toString().getBytes("ISO-8859-1");
+ I2PTunnelRunner runner = new I2PTunnelRunner(s, i2ps, sockLock, data);
+ timeoutThread = new InactivityTimeoutThread(runner, out, targetRequest, usingWWWProxy, s);
+ timeoutThread.start();
+ } catch (IOException ex) {
+ if (timeoutThread != null) timeoutThread.disable();
+ _log.error("Error sending syn", ex);
+ handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, wwwProxy);
+ closeSocket(s);
+ } catch (I2PException ex) {
+ if (timeoutThread != null) timeoutThread.disable();
+ _log.info("Error sending syn", ex);
+ l.log("Unable to reach peer");
+ handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, wwwProxy);
+ closeSocket(s);
+ }
}
- private static final long INACTIVITY_TIMEOUT = 120*1000;
-
+ private static final long INACTIVITY_TIMEOUT = 120 * 1000;
+
private class InactivityTimeoutThread extends I2PThread {
-
- private Socket s;
- private I2PTunnelRunner _runner;
- private OutputStream _out;
- private String _targetRequest;
- private boolean _useWWWProxy;
- private boolean _disabled;
- private Object _disableLock = new Object();
-
- public InactivityTimeoutThread(I2PTunnelRunner runner, OutputStream out, String targetRequest, boolean useWWWProxy, Socket s) {
- this.s=s;
- _runner = runner;
- _out = out;
- _targetRequest = targetRequest;
- _useWWWProxy = useWWWProxy;
- _disabled = false;
- setName("InactivityThread");
- }
- public void disable() {
- _disabled = true;
- synchronized (_disableLock) { _disableLock.notifyAll(); }
- }
- public void run() {
- while (!_disabled) {
- if (_runner.isFinished()) {
- if (_log.shouldLog(Log.INFO))
- _log.info("HTTP client request completed prior to timeout");
- return;
- }
- if (_runner.getLastActivityOn() < Clock.getInstance().now() - INACTIVITY_TIMEOUT) {
- if (_runner.getStartedOn() < Clock.getInstance().now() - INACTIVITY_TIMEOUT) {
- if (_log.shouldLog(Log.WARN))
- _log.warn("HTTP client request timed out (lastActivity: " + new Date(_runner.getLastActivityOn()) + ", startedOn: " + new Date(_runner.getLastActivityOn()) + ")");
- timeout();
- return;
- } else {
- // runner hasn't been going to long enough
- }
- } else {
- // there has been activity in the period
- }
- synchronized (_disableLock) {
- try {
- _disableLock.wait(INACTIVITY_TIMEOUT);
- } catch (InterruptedException ie) {}
- }
- }
- }
- private void timeout() {
- _log.info("Inactivity timeout reached");
- l.log("Inactivity timeout reached");
- if (_out != null) {
- try {
- if (_runner.getLastActivityOn() > 0) {
- // some data has been sent, so don't 404 it
- } else {
- writeErrorMessage(ERR_TIMEOUT, _out, _targetRequest,
- _useWWWProxy, wwwProxy);
- }
- } catch (IOException ioe) {
- _log.warn("Error writing out the 'timeout' message", ioe);
- }
- } else {
- _log.warn("Client disconnected before we could say we timed out");
- }
- closeSocket(s);
- }
+
+ private Socket s;
+ private I2PTunnelRunner _runner;
+ private OutputStream _out;
+ private String _targetRequest;
+ private boolean _useWWWProxy;
+ private boolean _disabled;
+ private Object _disableLock = new Object();
+
+ public InactivityTimeoutThread(I2PTunnelRunner runner, OutputStream out, String targetRequest,
+ boolean useWWWProxy, Socket s) {
+ this.s = s;
+ _runner = runner;
+ _out = out;
+ _targetRequest = targetRequest;
+ _useWWWProxy = useWWWProxy;
+ _disabled = false;
+ setName("InactivityThread");
+ }
+
+ public void disable() {
+ _disabled = true;
+ synchronized (_disableLock) {
+ _disableLock.notifyAll();
+ }
+ }
+
+ public void run() {
+ while (!_disabled) {
+ if (_runner.isFinished()) {
+ if (_log.shouldLog(Log.INFO)) _log.info("HTTP client request completed prior to timeout");
+ return;
+ }
+ if (_runner.getLastActivityOn() < Clock.getInstance().now() - INACTIVITY_TIMEOUT) {
+ if (_runner.getStartedOn() < Clock.getInstance().now() - INACTIVITY_TIMEOUT) {
+ if (_log.shouldLog(Log.WARN))
+ _log.warn("HTTP client request timed out (lastActivity: "
+ + new Date(_runner.getLastActivityOn()) + ", startedOn: "
+ + new Date(_runner.getLastActivityOn()) + ")");
+ timeout();
+ return;
+ } else {
+ // runner hasn't been going to long enough
+ }
+ } else {
+ // there has been activity in the period
+ }
+ synchronized (_disableLock) {
+ try {
+ _disableLock.wait(INACTIVITY_TIMEOUT);
+ } catch (InterruptedException ie) {
+ }
+ }
+ }
+ }
+
+ private void timeout() {
+ _log.info("Inactivity timeout reached");
+ l.log("Inactivity timeout reached");
+ if (_out != null) {
+ try {
+ if (_runner.getLastActivityOn() > 0) {
+ // some data has been sent, so don't 404 it
+ } else {
+ writeErrorMessage(ERR_TIMEOUT, _out, _targetRequest, _useWWWProxy, wwwProxy);
+ }
+ } catch (IOException ioe) {
+ _log.warn("Error writing out the 'timeout' message", ioe);
+ }
+ } else {
+ _log.warn("Client disconnected before we could say we timed out");
+ }
+ closeSocket(s);
+ }
}
private final static String getHostName(String host) {
- try {
- Destination dest=I2PTunnel.destFromName(host);
- if (dest == null) return "i2p";
- return dest.toBase64();
- } catch (DataFormatException dfe) {
- return "i2p";
- }
+ try {
+ Destination dest = I2PTunnel.destFromName(host);
+ if (dest == null) return "i2p";
+ return dest.toBase64();
+ } catch (DataFormatException dfe) {
+ return "i2p";
+ }
}
-
- private static void writeErrorMessage(byte[] errMessage, OutputStream out,
- String targetRequest,
- boolean usingWWWProxy,
- String wwwProxy)
- throws IOException {
- if (out != null) {
- out.write(errMessage);
- if (targetRequest != null) {
- out.write(targetRequest.getBytes());
- if (usingWWWProxy)
- out.write(("<br>WWW proxy: " +
- wwwProxy).getBytes());
- }
- out.write("<p /><i>Generated on: ".getBytes());
- out.write(new Date().toString().getBytes());
- out.write("</i></body></html>\n".getBytes());
- out.flush();
- }
+
+ private static void writeErrorMessage(byte[] errMessage, OutputStream out, String targetRequest,
+ boolean usingWWWProxy, String wwwProxy) throws IOException {
+ if (out != null) {
+ out.write(errMessage);
+ if (targetRequest != null) {
+ out.write(targetRequest.getBytes());
+ if (usingWWWProxy) out.write(("<br>WWW proxy: " + wwwProxy).getBytes());
+ }
+ out.write("<p /><i>Generated on: ".getBytes());
+ out.write(new Date().toString().getBytes());
+ out.write("</i></body></html>\n".getBytes());
+ out.flush();
+ }
}
- private static void handleHTTPClientException (Exception ex, OutputStream out,
- String targetRequest,
- boolean usingWWWProxy,
- String wwwProxy) {
- if (out != null) {
- try {
- writeErrorMessage(ERR_DESTINATION_UNKNOWN, out, targetRequest,
- usingWWWProxy, wwwProxy);
- } catch (IOException ioe) {
- _log.warn("Error writing out the 'destination was unknown' "+
- "message", ioe);
- }
- } else {
- _log.warn("Client disconnected before we could say that destination "+
- "was unknown", ex);
- }
+ private static void handleHTTPClientException(Exception ex, OutputStream out, String targetRequest,
+ boolean usingWWWProxy, String wwwProxy) {
+ if (out != null) {
+ try {
+ writeErrorMessage(ERR_DESTINATION_UNKNOWN, out, targetRequest, usingWWWProxy, wwwProxy);
+ } catch (IOException ioe) {
+ _log.warn("Error writing out the 'destination was unknown' " + "message", ioe);
+ }
+ } else {
+ _log.warn("Client disconnected before we could say that destination " + "was unknown", ex);
+ }
}
- private final static String SUPPORTED_HOSTS[] = { "i2p", "www.i2p.com",
- "i2p." };
-
+ private final static String SUPPORTED_HOSTS[] = { "i2p", "www.i2p.com", "i2p."};
+
private boolean isSupportedAddress(String host, String protocol) {
- if ( (host == null) || (protocol == null) ) return false;
- boolean found = false;
- String lcHost = host.toLowerCase();
- for (int i = 0; i < SUPPORTED_HOSTS.length; i++) {
- if (SUPPORTED_HOSTS[i].equals(lcHost)) {
- found = true;
- break;
- }
- }
-
- if (!found) {
- try {
- Destination d = I2PTunnel.destFromName(host);
- if (d == null) return false;
- } catch (DataFormatException dfe) {}
- }
-
- return protocol.equalsIgnoreCase("http://");
+ if ((host == null) || (protocol == null)) return false;
+ boolean found = false;
+ String lcHost = host.toLowerCase();
+ for (int i = 0; i < SUPPORTED_HOSTS.length; i++) {
+ if (SUPPORTED_HOSTS[i].equals(lcHost)) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ try {
+ Destination d = I2PTunnel.destFromName(host);
+ if (d == null) return false;
+ } catch (DataFormatException dfe) {
+ }
+ }
+
+ return protocol.equalsIgnoreCase("http://");
}
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java
index 1f152194eb..ad2246ed4e 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java
@@ -19,21 +19,21 @@ import net.i2p.util.Log;
public class I2PTunnelRunner extends I2PThread {
private final static Log _log = new Log(I2PTunnelRunner.class);
-
+
/**
* max bytes streamed in a packet - smaller ones might be filled
* up to this size. Larger ones are not split (at least not on
* Sun's impl of BufferedOutputStream), but that is the streaming
* api's job...
*/
- static int MAX_PACKET_SIZE = 1024*32;
+ static int MAX_PACKET_SIZE = 1024 * 32;
static final int NETWORK_BUFFER_SIZE = MAX_PACKET_SIZE;
private Socket s;
private I2PSocket i2ps;
Object slock, finishLock = new Object();
- boolean finished=false;
+ boolean finished = false;
HashMap ostreams, sockets;
I2PSession session;
byte[] initialData;
@@ -42,17 +42,16 @@ public class I2PTunnelRunner extends I2PThread {
/** when the runner started up */
private long startedOn;
- public I2PTunnelRunner(Socket s, I2PSocket i2ps, Object slock,
- byte[] initialData) {
- this.s=s;
- this.i2ps=i2ps;
- this.slock=slock;
- this.initialData = initialData;
- lastActivityOn = -1;
- startedOn = -1;
- _log.info("I2PTunnelRunner started");
- setName("I2PTunnelRunner");
- start();
+ public I2PTunnelRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialData) {
+ this.s = s;
+ this.i2ps = i2ps;
+ this.slock = slock;
+ this.initialData = initialData;
+ lastActivityOn = -1;
+ startedOn = -1;
+ _log.info("I2PTunnelRunner started");
+ setName("I2PTunnelRunner");
+ start();
}
/**
@@ -60,127 +59,133 @@ public class I2PTunnelRunner extends I2PThread {
* [aka we're done running the streams]?
*
*/
- public boolean isFinished() { return finished; }
-
+ public boolean isFinished() {
+ return finished;
+ }
+
/**
* When was the last data for this runner sent or received?
*
* @return date (ms since the epoch), or -1 if no data has been transferred yet
*
*/
- public long getLastActivityOn() { return lastActivityOn; }
- private void updateActivity() { lastActivityOn = Clock.getInstance().now(); }
-
+ public long getLastActivityOn() {
+ return lastActivityOn;
+ }
+
+ private void updateActivity() {
+ lastActivityOn = Clock.getInstance().now();
+ }
+
/**
* When this runner started up transferring data
*
*/
- public long getStartedOn() { return startedOn; }
-
+ public long getStartedOn() {
+ return startedOn;
+ }
+
public void run() {
- startedOn = Clock.getInstance().now();
- try {
- InputStream in = s.getInputStream();
- OutputStream out = new BufferedOutputStream(s.getOutputStream(),
- NETWORK_BUFFER_SIZE);
- InputStream i2pin = i2ps.getInputStream();
- OutputStream i2pout = new BufferedOutputStream
- (i2ps.getOutputStream(), MAX_PACKET_SIZE);
- if (initialData != null) {
- synchronized(slock) {
- i2pout.write(initialData);
- i2pout.flush();
- }
- }
- Thread t1 = new StreamForwarder(in, i2pout);
- Thread t2 = new StreamForwarder(i2pin, out);
- synchronized(finishLock) {
- while (!finished) {
- finishLock.wait();
- }
- }
- // now one connection is dead - kill the other as well.
- s.close();
- s = null;
- i2ps.close();
- i2ps = null;
- t1.join();
- t2.join();
- } catch (InterruptedException ex) {
- _log.error("Interrupted", ex);
- } catch (IOException ex) {
- ex.printStackTrace();
- _log.error("Error forwarding", ex);
- } finally {
- try {
- if (s != null) s.close();
- if (i2ps != null) i2ps.close();
- } catch (IOException ex) {
- ex.printStackTrace();
- _log.error("Could not close socket", ex);
- }
- }
+ startedOn = Clock.getInstance().now();
+ try {
+ InputStream in = s.getInputStream();
+ OutputStream out = new BufferedOutputStream(s.getOutputStream(), NETWORK_BUFFER_SIZE);
+ InputStream i2pin = i2ps.getInputStream();
+ OutputStream i2pout = new BufferedOutputStream(i2ps.getOutputStream(), MAX_PACKET_SIZE);
+ if (initialData != null) {
+ synchronized (slock) {
+ i2pout.write(initialData);
+ i2pout.flush();
+ }
+ }
+ Thread t1 = new StreamForwarder(in, i2pout);
+ Thread t2 = new StreamForwarder(i2pin, out);
+ synchronized (finishLock) {
+ while (!finished) {
+ finishLock.wait();
+ }
+ }
+ // now one connection is dead - kill the other as well.
+ s.close();
+ s = null;
+ i2ps.close();
+ i2ps = null;
+ t1.join();
+ t2.join();
+ } catch (InterruptedException ex) {
+ _log.error("Interrupted", ex);
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ _log.error("Error forwarding", ex);
+ } finally {
+ try {
+ if (s != null) s.close();
+ if (i2ps != null) i2ps.close();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ _log.error("Could not close socket", ex);
+ }
+ }
}
private class StreamForwarder extends I2PThread {
- InputStream in;
- OutputStream out;
-
- private StreamForwarder(InputStream in, OutputStream out) {
- this.in=in;
- this.out=out;
- setName("StreamForwarder");
- start();
- }
-
- public void run() {
- byte[] buffer = new byte[NETWORK_BUFFER_SIZE];
- try {
- int len;
- while ((len=in.read(buffer)) != -1) {
- out.write(buffer, 0, len);
-
- if (len > 0)
- updateActivity();
-
- if (in.available()==0) {
- try {
- Thread.sleep(I2PTunnel.PACKET_DELAY);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- if (in.available()==0) {
- out.flush(); // make sure the data get though
- }
- }
- } catch (SocketException ex) {
- // this *will* occur when the other threads closes the socket
- synchronized(finishLock) {
- if (!finished)
- _log.error("Error reading and writing", ex);
- else
- _log.warn("You may ignore this", ex);
- }
- } catch (IOException ex) {
- if (!finished)
- _log.error("Error forwarding", ex);
- else
- _log.warn("You may ignore this", ex);
- } finally {
- try {
- out.close();
- in.close();
- } catch (IOException ex) {
- _log.error("Error closing streams", ex);
- }
- synchronized(finishLock) {
- finished=true;
- finishLock.notifyAll();
- // the main thread will close sockets etc. now
- }
- }
- }
- }
-}
+ InputStream in;
+ OutputStream out;
+
+ private StreamForwarder(InputStream in, OutputStream out) {
+ this.in = in;
+ this.out = out;
+ setName("StreamForwarder");
+ start();
+ }
+
+ public void run() {
+ byte[] buffer = new byte[NETWORK_BUFFER_SIZE];
+ try {
+ int len;
+ while ((len = in.read(buffer)) != -1) {
+ out.write(buffer, 0, len);
+
+ if (len > 0) updateActivity();
+
+ if (in.available() == 0) {
+ try {
+ Thread.sleep(I2PTunnel.PACKET_DELAY);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ if (in.available() == 0) {
+ out.flush(); // make sure the data get though
+ }
+ }
+ } catch (SocketException ex) {
+ // this *will* occur when the other threads closes the socket
+ synchronized (finishLock) {
+ if (!finished)
+ _log.error("Error reading and writing", ex);
+ else
+ _log.warn("You may ignore this", ex);
+ }
+ } catch (IOException ex) {
+ if (!finished)
+ _log.error("Error forwarding", ex);
+ else
+ _log.warn("You may ignore this", ex);
+ } finally {
+ try {
+ out.close();
+ in.close();
+ } catch (IOException ex) {
+ _log.error("Error closing streams", ex);
+ }
+ synchronized (finishLock) {
+ finished = true;
+ finishLock.notifyAll();
+ // the main thread will close sockets etc. now
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
index 401c23e81c..e3401ebd10 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
@@ -26,9 +26,8 @@ import net.i2p.util.EventDispatcher;
import net.i2p.util.I2PThread;
import net.i2p.util.Log;
-public class I2PTunnelServer extends I2PTunnelTask
- implements Runnable {
-
+public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
+
private final static Log _log = new Log(I2PTunnelServer.class);
private I2PSocketManager sockMgr;
@@ -40,101 +39,93 @@ public class I2PTunnelServer extends I2PTunnelTask
private int remotePort;
private Logging l;
-
- public I2PTunnelServer(InetAddress host, int port,
- String privData, Logging l,
- EventDispatcher notifyThis) {
- super(host+":"+port+" <- "+privData, notifyThis);
- ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decode(privData));
- init(host, port, bais, privData, l);
- }
-
- public I2PTunnelServer(InetAddress host, int port,
- File privkey, String privkeyname,
- Logging l, EventDispatcher notifyThis) {
- super(host+":"+port+" <- "+privkeyname, notifyThis);
- try {
- init(host, port, new FileInputStream(privkey), privkeyname, l);
- } catch (IOException ioe) {
- _log.error("Error starting server", ioe);
- notifyEvent("openServerResult", "error");
- }
+
+ public I2PTunnelServer(InetAddress host, int port, String privData, Logging l, EventDispatcher notifyThis) {
+ super(host + ":" + port + " <- " + privData, notifyThis);
+ ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decode(privData));
+ init(host, port, bais, privData, l);
}
- public I2PTunnelServer(InetAddress host, int port,
- InputStream privData, String privkeyname,
- Logging l, EventDispatcher notifyThis) {
- super(host+":"+port+" <- "+privkeyname, notifyThis);
- init(host, port, privData, privkeyname, l);
+
+ public I2PTunnelServer(InetAddress host, int port, File privkey, String privkeyname, Logging l,
+ EventDispatcher notifyThis) {
+ super(host + ":" + port + " <- " + privkeyname, notifyThis);
+ try {
+ init(host, port, new FileInputStream(privkey), privkeyname, l);
+ } catch (IOException ioe) {
+ _log.error("Error starting server", ioe);
+ notifyEvent("openServerResult", "error");
+ }
}
-
- private void init(InetAddress host, int port, InputStream privData,
- String privkeyname, Logging l) {
- this.l=l;
- this.remoteHost=host;
- this.remotePort=port;
- I2PClient client = I2PClientFactory.createClient();
- Properties props = new Properties();
- props.putAll(System.getProperties());
- synchronized(slock) {
- sockMgr = I2PSocketManagerFactory.createManager
- (privData, I2PTunnel.host,
- Integer.parseInt(I2PTunnel.port), props);
-
- }
- l.log("Ready!");
- notifyEvent("openServerResult", "ok");
- open=true;
- Thread t = new I2PThread(this);
- t.setName("Server");
- t.start();
+
+ public I2PTunnelServer(InetAddress host, int port, InputStream privData, String privkeyname, Logging l,
+ EventDispatcher notifyThis) {
+ super(host + ":" + port + " <- " + privkeyname, notifyThis);
+ init(host, port, privData, privkeyname, l);
}
+ private void init(InetAddress host, int port, InputStream privData, String privkeyname, Logging l) {
+ this.l = l;
+ this.remoteHost = host;
+ this.remotePort = port;
+ I2PClient client = I2PClientFactory.createClient();
+ Properties props = new Properties();
+ props.putAll(System.getProperties());
+ synchronized (slock) {
+ sockMgr = I2PSocketManagerFactory.createManager(privData, I2PTunnel.host, Integer.parseInt(I2PTunnel.port),
+ props);
- public boolean close(boolean forced) {
- if (!open) return true;
- synchronized(lock) {
- if (!forced && sockMgr.listSockets().size() != 0) {
- l.log("There are still active connections!");
- for (Iterator it = sockMgr.listSockets().iterator();
- it.hasNext();) {
- l.log("->"+it.next());
- }
- return false;
- }
- l.log("Shutting down server "+toString());
- try {
- if (i2pss != null) i2pss.close();
- sockMgr.getSession().destroySession();
- } catch (I2PException ex) {
- _log.error("Error destroying the session", ex);
- System.exit(1);
- }
- l.log("Server shut down.");
- open=false;
- return true;
- }
+ }
+ l.log("Ready!");
+ notifyEvent("openServerResult", "ok");
+ open = true;
+ Thread t = new I2PThread(this);
+ t.setName("Server");
+ t.start();
}
+ public boolean close(boolean forced) {
+ if (!open) return true;
+ synchronized (lock) {
+ if (!forced && sockMgr.listSockets().size() != 0) {
+ l.log("There are still active connections!");
+ for (Iterator it = sockMgr.listSockets().iterator(); it.hasNext();) {
+ l.log("->" + it.next());
+ }
+ return false;
+ }
+ l.log("Shutting down server " + toString());
+ try {
+ if (i2pss != null) i2pss.close();
+ sockMgr.getSession().destroySession();
+ } catch (I2PException ex) {
+ _log.error("Error destroying the session", ex);
+ System.exit(1);
+ }
+ l.log("Server shut down.");
+ open = false;
+ return true;
+ }
+ }
public void run() {
- try {
- I2PServerSocket i2pss = sockMgr.getServerSocket();
- while (true) {
- I2PSocket i2ps = i2pss.accept();
- //local is fast, so synchronously. Does not need that many
- //threads.
- try {
- Socket s = new Socket(remoteHost, remotePort);
- new I2PTunnelRunner(s, i2ps, slock, null);
- } catch (SocketException ex) {
- i2ps.close();
- }
- }
- } catch (I2PException ex) {
- _log.error("Error while waiting for I2PConnections", ex);
- } catch (IOException ex) {
- _log.error("Error while waiting for I2PConnections", ex);
- }
- }
+ try {
+ I2PServerSocket i2pss = sockMgr.getServerSocket();
+ while (true) {
+ I2PSocket i2ps = i2pss.accept();
+ //local is fast, so synchronously. Does not need that many
+ //threads.
+ try {
+ Socket s = new Socket(remoteHost, remotePort);
+ new I2PTunnelRunner(s, i2ps, slock, null);
+ } catch (SocketException ex) {
+ i2ps.close();
+ }
+ }
+ } catch (I2PException ex) {
+ _log.error("Error while waiting for I2PConnections", ex);
+ } catch (IOException ex) {
+ _log.error("Error while waiting for I2PConnections", ex);
+ }
+ }
}
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelTask.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelTask.java
index a1082eca1d..24657a7a19 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelTask.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelTask.java
@@ -27,49 +27,86 @@ public abstract class I2PTunnelTask implements EventDispatcher {
//}
protected I2PTunnelTask(String name, EventDispatcher notifyThis) {
- attachEventDispatcher(notifyThis);
- this.name=name;
- this.id = -1;
+ attachEventDispatcher(notifyThis);
+ this.name = name;
+ this.id = -1;
}
-
+
/** for apps that use multiple I2PTunnel instances */
- public void setTunnel(I2PTunnel pTunnel) { tunnel = pTunnel; }
-
+ public void setTunnel(I2PTunnel pTunnel) {
+ tunnel = pTunnel;
+ }
+
public int getId() {
return this.id;
}
- public boolean isOpen() {return open;}
+ public boolean isOpen() {
+ return open;
+ }
public void setId(int id) {
this.id = id;
}
protected void setName(String name) {
- this.name=name;
+ this.name = name;
+ }
+
+ protected void routerDisconnected() {
+ tunnel.routerDisconnected();
}
- protected void routerDisconnected() { tunnel.routerDisconnected(); }
-
public abstract boolean close(boolean forced);
- public void disconnected(I2PSession session) { routerDisconnected(); }
- public void errorOccurred(I2PSession session, String message,
- Throwable error) {}
- public void reportAbuse(I2PSession session, int severity) {}
-
+ public void disconnected(I2PSession session) {
+ routerDisconnected();
+ }
+
+ public void errorOccurred(I2PSession session, String message, Throwable error) {
+ }
+
+ public void reportAbuse(I2PSession session, int severity) {
+ }
+
public String toString() {
- return name;
+ return name;
}
/* Required by the EventDispatcher interface */
- public EventDispatcher getEventDispatcher() { return _event; }
- public void attachEventDispatcher(EventDispatcher e) { _event.attachEventDispatcher(e.getEventDispatcher()); }
- public void detachEventDispatcher(EventDispatcher e) { _event.detachEventDispatcher(e.getEventDispatcher()); }
- public void notifyEvent(String e, Object a) { _event.notifyEvent(e,a); }
- public Object getEventValue(String n) { return _event.getEventValue(n); }
- public Set getEvents() { return _event.getEvents(); }
- public void ignoreEvents() { _event.ignoreEvents(); }
- public void unIgnoreEvents() { _event.unIgnoreEvents(); }
- public Object waitEventValue(String n) { return _event.waitEventValue(n); }
-}
+ public EventDispatcher getEventDispatcher() {
+ return _event;
+ }
+
+ public void attachEventDispatcher(EventDispatcher e) {
+ _event.attachEventDispatcher(e.getEventDispatcher());
+ }
+
+ public void detachEventDispatcher(EventDispatcher e) {
+ _event.detachEventDispatcher(e.getEventDispatcher());
+ }
+
+ public void notifyEvent(String e, Object a) {
+ _event.notifyEvent(e, a);
+ }
+
+ public Object getEventValue(String n) {
+ return _event.getEventValue(n);
+ }
+
+ public Set getEvents() {
+ return _event.getEvents();
+ }
+
+ public void ignoreEvents() {
+ _event.ignoreEvents();
+ }
+
+ public void unIgnoreEvents() {
+ _event.unIgnoreEvents();
+ }
+
+ public Object waitEventValue(String n) {
+ return _event.waitEventValue(n);
+ }
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
index 39e069e738..5061800ec9 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
@@ -22,17 +22,17 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
private static final int PING_COUNT = 3;
private static final int CPING_COUNT = 5;
- private static final int PING_TIMEOUT= 5000;
+ private static final int PING_TIMEOUT = 5000;
- private static final long PING_DISTANCE=1000;
+ private static final long PING_DISTANCE = 1000;
- private int MAX_SIMUL_PINGS=10; // not really final...
+ private int MAX_SIMUL_PINGS = 10; // not really final...
- private boolean countPing=false;
+ private boolean countPing = false;
private I2PSocketManager sockMgr;
private Logging l;
- private boolean finished=false;
+ private boolean finished = false;
private String command;
private long timeout = PING_TIMEOUT;
@@ -40,190 +40,183 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
private int simulPings = 0;
private long lastPingTime = 0;
- private Object lock = new Object(), slock = new Object();
+ private Object lock = new Object(), slock = new Object();
//public I2Ping(String cmd, Logging l,
// boolean ownDest) {
// I2Ping(cmd, l, (EventDispatcher)null);
//}
- public I2Ping(String cmd, Logging l,
- boolean ownDest, EventDispatcher notifyThis) {
- super("I2Ping ["+cmd+"]", notifyThis);
- this.l=l;
- command=cmd;
- synchronized(slock) {
- if (ownDest) {
- sockMgr = I2PTunnelClient.buildSocketManager();
- } else {
- sockMgr = I2PTunnelClient.getSocketManager();
- }
- }
- Thread t = new I2PThread(this);
- t.setName("Client");
- t.start();
- open=true;
+ public I2Ping(String cmd, Logging l, boolean ownDest, EventDispatcher notifyThis) {
+ super("I2Ping [" + cmd + "]", notifyThis);
+ this.l = l;
+ command = cmd;
+ synchronized (slock) {
+ if (ownDest) {
+ sockMgr = I2PTunnelClient.buildSocketManager();
+ } else {
+ sockMgr = I2PTunnelClient.getSocketManager();
+ }
+ }
+ Thread t = new I2PThread(this);
+ t.setName("Client");
+ t.start();
+ open = true;
}
public void run() {
- l.log("*** I2Ping results:");
- try {
- runCommand(command);
- } catch (InterruptedException ex) {
- l.log("*** Interrupted");
- _log.error("Pinger interrupted",ex);
- } catch (IOException ex) {
- _log.error("Pinger exception",ex);
- }
- l.log("*** Finished.");
- synchronized(lock) {
- finished=true;
- }
- close(false);
+ l.log("*** I2Ping results:");
+ try {
+ runCommand(command);
+ } catch (InterruptedException ex) {
+ l.log("*** Interrupted");
+ _log.error("Pinger interrupted", ex);
+ } catch (IOException ex) {
+ _log.error("Pinger exception", ex);
+ }
+ l.log("*** Finished.");
+ synchronized (lock) {
+ finished = true;
+ }
+ close(false);
}
- public void runCommand(String cmd) throws InterruptedException,
- IOException {
- if (cmd.startsWith("-t ")) { // timeout
- cmd = cmd.substring(3);
- int pos = cmd.indexOf(" ");
- if (pos == -1) {
- l.log("Syntax error");
- return;
- } else {
- timeout = Long.parseLong(cmd.substring(0, pos));
- cmd=cmd.substring(pos+1);
- }
- }
- if (cmd.startsWith("-m ")) { // max simultaneous pings
- cmd = cmd.substring(3);
- int pos = cmd.indexOf(" ");
- if (pos == -1) {
- l.log("Syntax error");
- return;
- } else {
- MAX_SIMUL_PINGS = Integer.parseInt(cmd.substring(0, pos));
- cmd=cmd.substring(pos+1);
- }
- }
- if (cmd.startsWith("-c ")) { // "count" ping
- countPing=true;
- cmd=cmd.substring(3);
- }
- if (cmd.equals("-h")) { // ping all hosts
- cmd="-l hosts.txt";
- }
- if (cmd.startsWith("-l ")) { // ping a list of hosts
- BufferedReader br = new BufferedReader
- (new FileReader(cmd.substring(3)));
- String line;
- List pingHandlers = new ArrayList();
- while ((line = br.readLine()) != null) {
- if (line.startsWith("#")) continue; // comments
- if (line.startsWith(";")) continue;
- if (line.startsWith("!")) continue;
- if (line.indexOf("=") != -1) { // maybe file is hosts.txt?
- line=line.substring(0,line.indexOf("="));
- }
- pingHandlers.add(new PingHandler(line));
- }
- br.close();
- for (Iterator it= pingHandlers.iterator(); it.hasNext(); ) {
- Thread t = (Thread) it.next();
- t.join();
- }
-
- } else {
- Thread t = new PingHandler(cmd);
- t.join();
- }
+ public void runCommand(String cmd) throws InterruptedException, IOException {
+ if (cmd.startsWith("-t ")) { // timeout
+ cmd = cmd.substring(3);
+ int pos = cmd.indexOf(" ");
+ if (pos == -1) {
+ l.log("Syntax error");
+ return;
+ } else {
+ timeout = Long.parseLong(cmd.substring(0, pos));
+ cmd = cmd.substring(pos + 1);
+ }
+ }
+ if (cmd.startsWith("-m ")) { // max simultaneous pings
+ cmd = cmd.substring(3);
+ int pos = cmd.indexOf(" ");
+ if (pos == -1) {
+ l.log("Syntax error");
+ return;
+ } else {
+ MAX_SIMUL_PINGS = Integer.parseInt(cmd.substring(0, pos));
+ cmd = cmd.substring(pos + 1);
+ }
+ }
+ if (cmd.startsWith("-c ")) { // "count" ping
+ countPing = true;
+ cmd = cmd.substring(3);
+ }
+ if (cmd.equals("-h")) { // ping all hosts
+ cmd = "-l hosts.txt";
+ }
+ if (cmd.startsWith("-l ")) { // ping a list of hosts
+ BufferedReader br = new BufferedReader(new FileReader(cmd.substring(3)));
+ String line;
+ List pingHandlers = new ArrayList();
+ while ((line = br.readLine()) != null) {
+ if (line.startsWith("#")) continue; // comments
+ if (line.startsWith(";")) continue;
+ if (line.startsWith("!")) continue;
+ if (line.indexOf("=") != -1) { // maybe file is hosts.txt?
+ line = line.substring(0, line.indexOf("="));
+ }
+ pingHandlers.add(new PingHandler(line));
+ }
+ br.close();
+ for (Iterator it = pingHandlers.iterator(); it.hasNext();) {
+ Thread t = (Thread) it.next();
+ t.join();
+ }
+
+ } else {
+ Thread t = new PingHandler(cmd);
+ t.join();
+ }
}
public boolean close(boolean forced) {
- if (!open) return true;
- synchronized(lock) {
- if (!forced && !finished) {
- l.log("There are still pings running!");
- return false;
- }
- l.log("Closing pinger "+toString());
- l.log("Pinger closed.");
- open=false;
- return true;
- }
+ if (!open) return true;
+ synchronized (lock) {
+ if (!forced && !finished) {
+ l.log("There are still pings running!");
+ return false;
+ }
+ l.log("Closing pinger " + toString());
+ l.log("Pinger closed.");
+ open = false;
+ return true;
+ }
}
public boolean ping(Destination dest) throws I2PException {
- try {
- synchronized(simulLock) {
- while (simulPings >= MAX_SIMUL_PINGS) {
- simulLock.wait();
- }
- simulPings++;
- while (lastPingTime + PING_DISTANCE >
- System.currentTimeMillis()) {
- // no wait here, to delay all pingers
- Thread.sleep(PING_DISTANCE/2);
- }
- lastPingTime=System.currentTimeMillis();
- }
- boolean sent = sockMgr.ping(dest, PING_TIMEOUT);
- synchronized(simulLock) {
- simulPings--;
- simulLock.notifyAll();
- }
- return sent;
- } catch (InterruptedException ex) {
- _log.error("Interrupted", ex);
- return false;
- }
+ try {
+ synchronized (simulLock) {
+ while (simulPings >= MAX_SIMUL_PINGS) {
+ simulLock.wait();
+ }
+ simulPings++;
+ while (lastPingTime + PING_DISTANCE > System.currentTimeMillis()) {
+ // no wait here, to delay all pingers
+ Thread.sleep(PING_DISTANCE / 2);
+ }
+ lastPingTime = System.currentTimeMillis();
+ }
+ boolean sent = sockMgr.ping(dest, PING_TIMEOUT);
+ synchronized (simulLock) {
+ simulPings--;
+ simulLock.notifyAll();
+ }
+ return sent;
+ } catch (InterruptedException ex) {
+ _log.error("Interrupted", ex);
+ return false;
+ }
}
-
-
public class PingHandler extends I2PThread {
- private String destination;
-
- public PingHandler(String dest) {
- this.destination=dest;
- setName("PingHandler for " + dest);
- start();
- }
-
- public void run() {
- try {
- Destination dest=I2PTunnel.destFromName(destination);
- if (dest == null) {
- synchronized(lock) { // Logger is not thread safe
- l.log("Unresolvable: "+destination+"");
- }
- return;
- }
- int cnt = countPing ? CPING_COUNT : PING_COUNT;
- StringBuffer pingResults = new StringBuffer
- (2*cnt+ destination.length()+3);
- for (int i=0;i<cnt; i++) {
- boolean sent;
- sent = ping(dest);
- if (countPing) {
- if (!sent) {
- pingResults.append(i).append(" ");
- break;
- } else if (i == cnt - 1) {
- pingResults.append("+ ");
- }
- } else {
- pingResults.append(sent?"+ ":"- ");
- }
-// System.out.println(sent+" -> "+destination);
- }
- pingResults.append(" ").append(destination);
- synchronized(lock) { // Logger is not thread safe
- l.log(pingResults.toString());
- }
- } catch (I2PException ex) {
- _log.error("Error pinging " + destination, ex);
- }
- }
+ private String destination;
+
+ public PingHandler(String dest) {
+ this.destination = dest;
+ setName("PingHandler for " + dest);
+ start();
+ }
+
+ public void run() {
+ try {
+ Destination dest = I2PTunnel.destFromName(destination);
+ if (dest == null) {
+ synchronized (lock) { // Logger is not thread safe
+ l.log("Unresolvable: " + destination + "");
+ }
+ return;
+ }
+ int cnt = countPing ? CPING_COUNT : PING_COUNT;
+ StringBuffer pingResults = new StringBuffer(2 * cnt + destination.length() + 3);
+ for (int i = 0; i < cnt; i++) {
+ boolean sent;
+ sent = ping(dest);
+ if (countPing) {
+ if (!sent) {
+ pingResults.append(i).append(" ");
+ break;
+ } else if (i == cnt - 1) {
+ pingResults.append("+ ");
+ }
+ } else {
+ pingResults.append(sent ? "+ " : "- ");
+ }
+ // System.out.println(sent+" -> "+destination);
+ }
+ pingResults.append(" ").append(destination);
+ synchronized (lock) { // Logger is not thread safe
+ l.log(pingResults.toString());
+ }
+ } catch (I2PException ex) {
+ _log.error("Error pinging " + destination, ex);
+ }
+ }
}
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/Logging.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/Logging.java
index 308793973c..8e65dd4aff 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/Logging.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/Logging.java
@@ -3,7 +3,6 @@
*/
package net.i2p.i2ptunnel;
-
public interface Logging {
public void log(String s);
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelManager.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelManager.java
index f314fb3112..4fe8053833 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelManager.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelManager.java
@@ -151,283 +151,285 @@ public class TunnelManager implements Runnable {
private I2PTunnel _tunnel;
private ServerSocket _socket;
private boolean _keepAccepting;
-
+
public TunnelManager(int listenPort) {
- this(null, listenPort);
+ this(null, listenPort);
}
+
public TunnelManager(String listenHost, int listenPort) {
- _tunnel = new I2PTunnel();
- _keepAccepting = true;
- try {
- if (listenHost != null) {
- _socket = new ServerSocket(listenPort, 0, InetAddress.getByName(listenHost));
- _log.info("Listening for tunnel management clients on " + listenHost + ":" + listenPort);
- } else {
- _socket = new ServerSocket(listenPort);
- _log.info("Listening for tunnel management clients on localhost:" + listenPort);
- }
- } catch (Exception e) {
- _log.error("Error starting up tunnel management listener on " + listenPort, e);
- }
+ _tunnel = new I2PTunnel();
+ _keepAccepting = true;
+ try {
+ if (listenHost != null) {
+ _socket = new ServerSocket(listenPort, 0, InetAddress.getByName(listenHost));
+ _log.info("Listening for tunnel management clients on " + listenHost + ":" + listenPort);
+ } else {
+ _socket = new ServerSocket(listenPort);
+ _log.info("Listening for tunnel management clients on localhost:" + listenPort);
+ }
+ } catch (Exception e) {
+ _log.error("Error starting up tunnel management listener on " + listenPort, e);
+ }
}
public static void main(String args[]) {
- int port = 7676;
- String host = null;
- if (args.length == 1) {
- try {
- port = Integer.parseInt(args[0]);
- } catch (NumberFormatException nfe) {
- _log.error("Usage: TunnelManager [host] [port]");
- return;
- }
- } else if (args.length == 2) {
- host = args[0];
- try {
- port = Integer.parseInt(args[1]);
- } catch (NumberFormatException nfe) {
- _log.error("Usage: TunnelManager [host] [port]");
- return;
- }
- }
+ int port = 7676;
+ String host = null;
+ if (args.length == 1) {
+ try {
+ port = Integer.parseInt(args[0]);
+ } catch (NumberFormatException nfe) {
+ _log.error("Usage: TunnelManager [host] [port]");
+ return;
+ }
+ } else if (args.length == 2) {
+ host = args[0];
+ try {
+ port = Integer.parseInt(args[1]);
+ } catch (NumberFormatException nfe) {
+ _log.error("Usage: TunnelManager [host] [port]");
+ return;
+ }
+ }
- TunnelManager mgr = new TunnelManager(host, port);
- Thread t = new I2PThread(mgr, "Listener");
- t.start();
+ TunnelManager mgr = new TunnelManager(host, port);
+ Thread t = new I2PThread(mgr, "Listener");
+ t.start();
}
-
+
public void run() {
- if (_socket == null) {
- _log.error("Unable to start listening, since the socket was not bound. Already running?");
- return;
- }
- _log.debug("Running");
- try {
- while (_keepAccepting) {
- Socket socket = _socket.accept();
- _log.debug("Client accepted");
- if (socket != null) {
- Thread t = new I2PThread(new TunnelManagerClientRunner(this, socket));
- t.setName("TunnelManager Client");
- t.setPriority(I2PThread.MIN_PRIORITY);
- t.start();
- }
- }
- } catch (IOException ioe) {
- _log.error("Error accepting connections", ioe);
- } catch (Exception e) {
- _log.error("Other error?!", e);
- } finally {
- if (_socket != null) try { _socket.close(); } catch (IOException ioe) {}
- }
- try { Thread.sleep(5000); } catch (InterruptedException ie) {}
+ if (_socket == null) {
+ _log.error("Unable to start listening, since the socket was not bound. Already running?");
+ return;
+ }
+ _log.debug("Running");
+ try {
+ while (_keepAccepting) {
+ Socket socket = _socket.accept();
+ _log.debug("Client accepted");
+ if (socket != null) {
+ Thread t = new I2PThread(new TunnelManagerClientRunner(this, socket));
+ t.setName("TunnelManager Client");
+ t.setPriority(I2PThread.MIN_PRIORITY);
+ t.start();
+ }
+ }
+ } catch (IOException ioe) {
+ _log.error("Error accepting connections", ioe);
+ } catch (Exception e) {
+ _log.error("Other error?!", e);
+ } finally {
+ if (_socket != null) try {
+ _socket.close();
+ } catch (IOException ioe) {
+ }
+ }
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException ie) {
+ }
}
public void error(String msg, OutputStream out) throws IOException {
- out.write(msg.getBytes());
- out.write('\n');
+ out.write(msg.getBytes());
+ out.write('\n');
}
-
+
public void processQuit(OutputStream out) throws IOException {
- out.write("Nice try".getBytes());
- out.write('\n');
+ out.write("Nice try".getBytes());
+ out.write('\n');
}
-
+
public void processList(OutputStream out) throws IOException {
- BufferLogger buf = new BufferLogger();
- long startCommand = Clock.getInstance().now();
- _tunnel.runCommand("list", buf);
- Object obj = _tunnel.waitEventValue("listDone");
- long endCommand = Clock.getInstance().now();
- String str = buf.getBuffer();
- _log.debug("ListDone complete after " + (endCommand-startCommand) + "ms: [" + str + "]");
- out.write(str.getBytes());
- out.write('\n');
- buf.ignoreFurtherActions();
+ BufferLogger buf = new BufferLogger();
+ long startCommand = Clock.getInstance().now();
+ _tunnel.runCommand("list", buf);
+ Object obj = _tunnel.waitEventValue("listDone");
+ long endCommand = Clock.getInstance().now();
+ String str = buf.getBuffer();
+ _log.debug("ListDone complete after " + (endCommand - startCommand) + "ms: [" + str + "]");
+ out.write(str.getBytes());
+ out.write('\n');
+ buf.ignoreFurtherActions();
}
public void processListenOn(String ip, OutputStream out) throws IOException {
- BufferLogger buf = new BufferLogger();
- _tunnel.runCommand("listen_on " + ip, buf);
- String status = (String)_tunnel.waitEventValue("listen_onResult");
- out.write((status + "\n").getBytes());
- buf.ignoreFurtherActions();
+ BufferLogger buf = new BufferLogger();
+ _tunnel.runCommand("listen_on " + ip, buf);
+ String status = (String) _tunnel.waitEventValue("listen_onResult");
+ out.write((status + "\n").getBytes());
+ buf.ignoreFurtherActions();
}
-
+
/**
* "lookup <name>" returns with the result in base64, else "Unknown host" [or something like that],
* then a newline.
*
*/
public void processLookup(String name, OutputStream out) throws IOException {
- BufferLogger buf = new BufferLogger();
- _tunnel.runCommand("lookup " + name, buf);
- String rv = (String)_tunnel.waitEventValue("lookupResult");
- out.write(rv.getBytes());
- out.write('\n');
- buf.ignoreFurtherActions();
+ BufferLogger buf = new BufferLogger();
+ _tunnel.runCommand("lookup " + name, buf);
+ String rv = (String) _tunnel.waitEventValue("lookupResult");
+ out.write(rv.getBytes());
+ out.write('\n');
+ buf.ignoreFurtherActions();
}
public void processTestDestination(String destKey, OutputStream out) throws IOException {
- try {
- Destination d = new Destination();
- d.fromBase64(destKey);
- out.write("valid\n".getBytes());
- } catch (DataFormatException dfe) {
- out.write("invalid\n".getBytes());
- }
- out.flush();
+ try {
+ Destination d = new Destination();
+ d.fromBase64(destKey);
+ out.write("valid\n".getBytes());
+ } catch (DataFormatException dfe) {
+ out.write("invalid\n".getBytes());
+ }
+ out.flush();
}
-
+
public void processConvertPrivate(String priv, OutputStream out) throws IOException {
- try {
- Destination dest = new Destination();
- dest.fromBase64(priv);
- String str = dest.toBase64();
- out.write(str.getBytes());
- out.write('\n');
- } catch (DataFormatException dfe) {
- _log.error("Error converting private data", dfe);
- out.write("Error converting private key\n".getBytes());
- }
+ try {
+ Destination dest = new Destination();
+ dest.fromBase64(priv);
+ String str = dest.toBase64();
+ out.write(str.getBytes());
+ out.write('\n');
+ } catch (DataFormatException dfe) {
+ _log.error("Error converting private data", dfe);
+ out.write("Error converting private key\n".getBytes());
+ }
}
-
+
public void processClose(String which, boolean forced, OutputStream out) throws IOException {
- BufferLogger buf = new BufferLogger();
- _tunnel.runCommand((forced?"close forced ":"close ") + which, buf);
- String str = (String)_tunnel.waitEventValue("closeResult");
- out.write((str + "\n").getBytes());
- buf.ignoreFurtherActions();
+ BufferLogger buf = new BufferLogger();
+ _tunnel.runCommand((forced ? "close forced " : "close ") + which, buf);
+ String str = (String) _tunnel.waitEventValue("closeResult");
+ out.write((str + "\n").getBytes());
+ buf.ignoreFurtherActions();
}
-
+
/**
* "genkey" returns with the base64 of the destination, followed by a tab, then the base64 of that
* destination's private keys, then a newline.
*
*/
public void processGenKey(OutputStream out) throws IOException {
- BufferLogger buf = new BufferLogger();
- _tunnel.runCommand("gentextkeys", buf);
- String priv = (String)_tunnel.waitEventValue("privateKey");
- String pub = (String)_tunnel.waitEventValue("publicDestination");
- out.write((pub + "\t" + priv).getBytes());
- out.write('\n');
- buf.ignoreFurtherActions();
+ BufferLogger buf = new BufferLogger();
+ _tunnel.runCommand("gentextkeys", buf);
+ String priv = (String) _tunnel.waitEventValue("privateKey");
+ String pub = (String) _tunnel.waitEventValue("publicDestination");
+ out.write((pub + "\t" + priv).getBytes());
+ out.write('\n');
+ buf.ignoreFurtherActions();
}
-
+
public void processOpenClient(int listenPort, String peer, OutputStream out) throws IOException {
- BufferLogger buf = new BufferLogger();
- _tunnel.runCommand("client " + listenPort + " " + peer, buf);
- Integer taskId = (Integer)_tunnel.waitEventValue("clientTaskId");
- if (taskId.intValue() < 0) {
- out.write("error\n".getBytes());
- buf.ignoreFurtherActions();
- return;
- }
- String rv = (String)_tunnel.waitEventValue("openClientResult");
- if (rv.equals("error")) {
- out.write((rv + "\n").getBytes());
- buf.ignoreFurtherActions();
- return;
- }
+ BufferLogger buf = new BufferLogger();
+ _tunnel.runCommand("client " + listenPort + " " + peer, buf);
+ Integer taskId = (Integer) _tunnel.waitEventValue("clientTaskId");
+ if (taskId.intValue() < 0) {
+ out.write("error\n".getBytes());
+ buf.ignoreFurtherActions();
+ return;
+ }
+ String rv = (String) _tunnel.waitEventValue("openClientResult");
+ if (rv.equals("error")) {
+ out.write((rv + "\n").getBytes());
+ buf.ignoreFurtherActions();
+ return;
+ }
- if (listenPort != 0) {
- out.write((rv + " [" + taskId.intValue() + "]\n").getBytes());
- buf.ignoreFurtherActions();
- return;
- }
- Integer port = (Integer)_tunnel.waitEventValue("clientLocalPort");
- out.write((rv + " " + port.intValue() + " [" + taskId.intValue()
- + "]\n").getBytes());
- buf.ignoreFurtherActions();
+ if (listenPort != 0) {
+ out.write((rv + " [" + taskId.intValue() + "]\n").getBytes());
+ buf.ignoreFurtherActions();
+ return;
+ }
+ Integer port = (Integer) _tunnel.waitEventValue("clientLocalPort");
+ out.write((rv + " " + port.intValue() + " [" + taskId.intValue() + "]\n").getBytes());
+ buf.ignoreFurtherActions();
}
- public void processOpenHTTPClient(int listenPort,
- String proxy,
- OutputStream out) throws IOException {
- BufferLogger buf = new BufferLogger();
- _tunnel.runCommand("httpclient " + listenPort + " " + proxy, buf);
- Integer taskId = (Integer)_tunnel.waitEventValue("httpclientTaskId");
- if (taskId.intValue() < 0) {
- out.write("error\n".getBytes());
- buf.ignoreFurtherActions();
- return;
- }
- String rv = (String)_tunnel.waitEventValue("openHTTPClientResult");
- if (rv.equals("error")) {
- out.write((rv + "\n").getBytes());
- buf.ignoreFurtherActions();
- return;
- }
+ public void processOpenHTTPClient(int listenPort, String proxy, OutputStream out) throws IOException {
+ BufferLogger buf = new BufferLogger();
+ _tunnel.runCommand("httpclient " + listenPort + " " + proxy, buf);
+ Integer taskId = (Integer) _tunnel.waitEventValue("httpclientTaskId");
+ if (taskId.intValue() < 0) {
+ out.write("error\n".getBytes());
+ buf.ignoreFurtherActions();
+ return;
+ }
+ String rv = (String) _tunnel.waitEventValue("openHTTPClientResult");
+ if (rv.equals("error")) {
+ out.write((rv + "\n").getBytes());
+ buf.ignoreFurtherActions();
+ return;
+ }
- if (listenPort != 0) {
- out.write((rv + " [" + taskId.intValue() + "]\n").getBytes());
- buf.ignoreFurtherActions();
- return;
- }
- Integer port = (Integer)_tunnel.waitEventValue("clientLocalPort");
- out.write((rv + " " + port.intValue() + " [" + taskId.intValue()
- + "]\n").getBytes());
- buf.ignoreFurtherActions();
+ if (listenPort != 0) {
+ out.write((rv + " [" + taskId.intValue() + "]\n").getBytes());
+ buf.ignoreFurtherActions();
+ return;
+ }
+ Integer port = (Integer) _tunnel.waitEventValue("clientLocalPort");
+ out.write((rv + " " + port.intValue() + " [" + taskId.intValue() + "]\n").getBytes());
+ buf.ignoreFurtherActions();
}
-
- public void processOpenSOCKSTunnel(int listenPort,
- OutputStream out) throws IOException {
- BufferLogger buf = new BufferLogger();
- _tunnel.runCommand("sockstunnel " + listenPort, buf);
- Integer taskId = (Integer)_tunnel.waitEventValue("sockstunnelTaskId");
- if (taskId.intValue() < 0) {
- out.write("error\n".getBytes());
- buf.ignoreFurtherActions();
- return;
- }
- String rv = (String)_tunnel.waitEventValue("openSOCKSTunnelResult");
- if (rv.equals("error")) {
- out.write((rv + "\n").getBytes());
- buf.ignoreFurtherActions();
- return;
- }
- if (listenPort != 0) {
- out.write((rv + " [" + taskId.intValue() + "]\n").getBytes());
- buf.ignoreFurtherActions();
- return;
- }
- Integer port = (Integer)_tunnel.waitEventValue("clientLocalPort");
- out.write((rv + " " + port.intValue() + " [" + taskId.intValue()
- + "]\n").getBytes());
- buf.ignoreFurtherActions();
+ public void processOpenSOCKSTunnel(int listenPort, OutputStream out) throws IOException {
+ BufferLogger buf = new BufferLogger();
+ _tunnel.runCommand("sockstunnel " + listenPort, buf);
+ Integer taskId = (Integer) _tunnel.waitEventValue("sockstunnelTaskId");
+ if (taskId.intValue() < 0) {
+ out.write("error\n".getBytes());
+ buf.ignoreFurtherActions();
+ return;
+ }
+ String rv = (String) _tunnel.waitEventValue("openSOCKSTunnelResult");
+ if (rv.equals("error")) {
+ out.write((rv + "\n").getBytes());
+ buf.ignoreFurtherActions();
+ return;
+ }
+
+ if (listenPort != 0) {
+ out.write((rv + " [" + taskId.intValue() + "]\n").getBytes());
+ buf.ignoreFurtherActions();
+ return;
+ }
+ Integer port = (Integer) _tunnel.waitEventValue("clientLocalPort");
+ out.write((rv + " " + port.intValue() + " [" + taskId.intValue() + "]\n").getBytes());
+ buf.ignoreFurtherActions();
}
- public void processOpenServer(String serverHost, int serverPort, String privateKeys, OutputStream out) throws IOException {
- BufferLogger buf = new BufferLogger();
- _tunnel.runCommand("textserver " + serverHost + " " + serverPort + " " + privateKeys, buf);
- Integer taskId = (Integer)_tunnel.waitEventValue("serverTaskId");
- if (taskId.intValue() < 0) {
- out.write("error\n".getBytes());
- buf.ignoreFurtherActions();
- return;
- }
-
- String rv = (String)_tunnel.waitEventValue("openServerResult");
+ public void processOpenServer(String serverHost, int serverPort, String privateKeys, OutputStream out)
+ throws IOException {
+ BufferLogger buf = new BufferLogger();
+ _tunnel.runCommand("textserver " + serverHost + " " + serverPort + " " + privateKeys, buf);
+ Integer taskId = (Integer) _tunnel.waitEventValue("serverTaskId");
+ if (taskId.intValue() < 0) {
+ out.write("error\n".getBytes());
+ buf.ignoreFurtherActions();
+ return;
+ }
+
+ String rv = (String) _tunnel.waitEventValue("openServerResult");
- if (rv.equals("error")) {
- out.write((rv + "\n").getBytes());
- buf.ignoreFurtherActions();
- return;
- }
+ if (rv.equals("error")) {
+ out.write((rv + "\n").getBytes());
+ buf.ignoreFurtherActions();
+ return;
+ }
- out.write((rv + " [" + taskId.intValue() + "]\n").getBytes());
- buf.ignoreFurtherActions();
+ out.write((rv + " [" + taskId.intValue() + "]\n").getBytes());
+ buf.ignoreFurtherActions();
}
-
+
/**
* Frisbee.
*
*/
public void unknownCommand(String command, OutputStream out) throws IOException {
- out.write("Unknown command: ".getBytes());
- out.write(command.getBytes());
- out.write("\n".getBytes());
+ out.write("Unknown command: ".getBytes());
+ out.write(command.getBytes());
+ out.write("\n".getBytes());
}
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelManagerClientRunner.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelManagerClientRunner.java
index ff281ae7db..c62928eb62 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelManagerClientRunner.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelManagerClientRunner.java
@@ -21,172 +21,174 @@ class TunnelManagerClientRunner implements Runnable {
private final static Log _log = new Log(TunnelManagerClientRunner.class);
private TunnelManager _mgr;
private Socket _clientSocket;
-
+
public TunnelManagerClientRunner(TunnelManager mgr, Socket socket) {
- _clientSocket = socket;
- _mgr = mgr;
+ _clientSocket = socket;
+ _mgr = mgr;
}
-
+
public void run() {
- _log.debug("Client running");
- try {
- BufferedReader reader = new BufferedReader(new InputStreamReader(_clientSocket.getInputStream()));
- OutputStream out = _clientSocket.getOutputStream();
+ _log.debug("Client running");
+ try {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(_clientSocket.getInputStream()));
+ OutputStream out = _clientSocket.getOutputStream();
- String cmd = reader.readLine();
- if (cmd != null)
- processCommand(cmd, out);
- } catch (IOException ioe) {
- _log.error("Error processing client commands", ioe);
- } finally {
- if (_clientSocket != null) try { _clientSocket.close(); } catch (IOException ioe) {}
- }
- _log.debug("Client closed");
+ String cmd = reader.readLine();
+ if (cmd != null) processCommand(cmd, out);
+ } catch (IOException ioe) {
+ _log.error("Error processing client commands", ioe);
+ } finally {
+ if (_clientSocket != null) try {
+ _clientSocket.close();
+ } catch (IOException ioe) {
+ }
+ }
+ _log.debug("Client closed");
}
-
+
/**
* Parse the command string and fire off the appropriate tunnelManager method,
* sending the results to the output stream
*/
private void processCommand(String command, OutputStream out) throws IOException {
- _log.debug("Processing [" + command + "]");
- StringTokenizer tok = new StringTokenizer(command);
- if (!tok.hasMoreTokens()) {
- _mgr.unknownCommand(command, out);
- } else {
- String cmd = tok.nextToken();
- if ("quit".equalsIgnoreCase(cmd)) {
- _mgr.processQuit(out);
- } else if ("lookup".equalsIgnoreCase(cmd)) {
- if (tok.hasMoreTokens())
- _mgr.processLookup(tok.nextToken(), out);
- else
- _mgr.error("Usage: lookup <hostname>", out);
- } else if ("testdestination".equalsIgnoreCase(cmd)) {
- if (tok.hasMoreTokens())
- _mgr.processTestDestination(tok.nextToken(), out);
- else
- _mgr.error("Usage: testdestination <publicDestination>", out);
- } else if ("convertprivate".equalsIgnoreCase(cmd)) {
- if (tok.hasMoreTokens())
- _mgr.processConvertPrivate(tok.nextToken(), out);
- else
- _mgr.error("Usage: convertprivate <privateData>", out);
- } else if ("close".equalsIgnoreCase(cmd)) {
- if (tok.hasMoreTokens()) {
- String closeArg;
- if ((closeArg = tok.nextToken()).equals("forced")) {
- if (tok.hasMoreTokens()) {
- _mgr.processClose(tok.nextToken(), true, out);
- } else {
- _mgr.error("Usage: close [forced] <jobnumber>|all", out);
- }
- } else {
- _mgr.processClose(closeArg, false, out);
- }
- } else {
- _mgr.error("Usage: close [forced] <jobnumber>|all", out);
- }
- } else if ("genkey".equalsIgnoreCase(cmd)) {
- _mgr.processGenKey(out);
- } else if ("list".equalsIgnoreCase(cmd)) {
- _mgr.processList(out);
- } else if ("listen_on".equalsIgnoreCase(cmd)) {
- if (tok.hasMoreTokens()) {
- _mgr.processListenOn(tok.nextToken(), out);
- } else {
- _mgr.error("Usage: listen_on <ip>", out);
- }
- } else if ("openclient".equalsIgnoreCase(cmd)) {
- int listenPort = 0;
- String peer = null;
- if (!tok.hasMoreTokens()) {
- _mgr.error("Usage: openclient <listenPort> <peer>", out);
- return;
- }
- try {
- String portStr = tok.nextToken();
- listenPort = Integer.parseInt(portStr);
- } catch (NumberFormatException nfe) {
- _mgr.error("Bad listen port", out);
- return;
- }
- if (!tok.hasMoreTokens()) {
- _mgr.error("Usage: openclient <listenport> <peer>", out);
- return;
- }
- peer = tok.nextToken();
- _mgr.processOpenClient(listenPort, peer, out);
- } else if ("openhttpclient".equalsIgnoreCase(cmd)) {
- int listenPort = 0;
- String proxy = "squid.i2p";
- if (!tok.hasMoreTokens()) {
- _mgr.error("Usage: openhttpclient <listenPort> [<proxy>]",out);
- return;
- }
- try {
- String portStr = tok.nextToken();
- listenPort = Integer.parseInt(portStr);
- } catch (NumberFormatException nfe) {
- _mgr.error("Bad listen port", out);
- return;
- }
- if (tok.hasMoreTokens()) {
- proxy = tok.nextToken();
- }
- if (tok.hasMoreTokens()) {
- _mgr.error("Usage: openclient <listenport> [<proxy>]",out);
- return;
- }
- _mgr.processOpenHTTPClient(listenPort, proxy, out);
- } else if ("opensockstunnel".equalsIgnoreCase(cmd)) {
- int listenPort = 0;
- if (!tok.hasMoreTokens()) {
- _mgr.error("Usage: opensockstunnel <listenPort>",out);
- return;
- }
- try {
- String portStr = tok.nextToken();
- listenPort = Integer.parseInt(portStr);
- } catch (NumberFormatException nfe) {
- _mgr.error("Bad listen port", out);
- return;
- }
- if (tok.hasMoreTokens()) {
- _mgr.error("Usage: opensockstunnel <listenport>",out);
- return;
- }
- _mgr.processOpenSOCKSTunnel(listenPort, out);
- } else if ("openserver".equalsIgnoreCase(cmd)) {
- int listenPort = 0;
- String serverHost = null;
- String serverKeys = null;
- if (!tok.hasMoreTokens()) {
- _mgr.error("Usage: openserver <serverHost> <serverPort> <serverKeys>", out);
- return;
- }
- serverHost = tok.nextToken();
+ _log.debug("Processing [" + command + "]");
+ StringTokenizer tok = new StringTokenizer(command);
+ if (!tok.hasMoreTokens()) {
+ _mgr.unknownCommand(command, out);
+ } else {
+ String cmd = tok.nextToken();
+ if ("quit".equalsIgnoreCase(cmd)) {
+ _mgr.processQuit(out);
+ } else if ("lookup".equalsIgnoreCase(cmd)) {
+ if (tok.hasMoreTokens())
+ _mgr.processLookup(tok.nextToken(), out);
+ else
+ _mgr.error("Usage: lookup <hostname>", out);
+ } else if ("testdestination".equalsIgnoreCase(cmd)) {
+ if (tok.hasMoreTokens())
+ _mgr.processTestDestination(tok.nextToken(), out);
+ else
+ _mgr.error("Usage: testdestination <publicDestination>", out);
+ } else if ("convertprivate".equalsIgnoreCase(cmd)) {
+ if (tok.hasMoreTokens())
+ _mgr.processConvertPrivate(tok.nextToken(), out);
+ else
+ _mgr.error("Usage: convertprivate <privateData>", out);
+ } else if ("close".equalsIgnoreCase(cmd)) {
+ if (tok.hasMoreTokens()) {
+ String closeArg;
+ if ((closeArg = tok.nextToken()).equals("forced")) {
+ if (tok.hasMoreTokens()) {
+ _mgr.processClose(tok.nextToken(), true, out);
+ } else {
+ _mgr.error("Usage: close [forced] <jobnumber>|all", out);
+ }
+ } else {
+ _mgr.processClose(closeArg, false, out);
+ }
+ } else {
+ _mgr.error("Usage: close [forced] <jobnumber>|all", out);
+ }
+ } else if ("genkey".equalsIgnoreCase(cmd)) {
+ _mgr.processGenKey(out);
+ } else if ("list".equalsIgnoreCase(cmd)) {
+ _mgr.processList(out);
+ } else if ("listen_on".equalsIgnoreCase(cmd)) {
+ if (tok.hasMoreTokens()) {
+ _mgr.processListenOn(tok.nextToken(), out);
+ } else {
+ _mgr.error("Usage: listen_on <ip>", out);
+ }
+ } else if ("openclient".equalsIgnoreCase(cmd)) {
+ int listenPort = 0;
+ String peer = null;
+ if (!tok.hasMoreTokens()) {
+ _mgr.error("Usage: openclient <listenPort> <peer>", out);
+ return;
+ }
+ try {
+ String portStr = tok.nextToken();
+ listenPort = Integer.parseInt(portStr);
+ } catch (NumberFormatException nfe) {
+ _mgr.error("Bad listen port", out);
+ return;
+ }
+ if (!tok.hasMoreTokens()) {
+ _mgr.error("Usage: openclient <listenport> <peer>", out);
+ return;
+ }
+ peer = tok.nextToken();
+ _mgr.processOpenClient(listenPort, peer, out);
+ } else if ("openhttpclient".equalsIgnoreCase(cmd)) {
+ int listenPort = 0;
+ String proxy = "squid.i2p";
+ if (!tok.hasMoreTokens()) {
+ _mgr.error("Usage: openhttpclient <listenPort> [<proxy>]", out);
+ return;
+ }
+ try {
+ String portStr = tok.nextToken();
+ listenPort = Integer.parseInt(portStr);
+ } catch (NumberFormatException nfe) {
+ _mgr.error("Bad listen port", out);
+ return;
+ }
+ if (tok.hasMoreTokens()) {
+ proxy = tok.nextToken();
+ }
+ if (tok.hasMoreTokens()) {
+ _mgr.error("Usage: openclient <listenport> [<proxy>]", out);
+ return;
+ }
+ _mgr.processOpenHTTPClient(listenPort, proxy, out);
+ } else if ("opensockstunnel".equalsIgnoreCase(cmd)) {
+ int listenPort = 0;
+ if (!tok.hasMoreTokens()) {
+ _mgr.error("Usage: opensockstunnel <listenPort>", out);
+ return;
+ }
+ try {
+ String portStr = tok.nextToken();
+ listenPort = Integer.parseInt(portStr);
+ } catch (NumberFormatException nfe) {
+ _mgr.error("Bad listen port", out);
+ return;
+ }
+ if (tok.hasMoreTokens()) {
+ _mgr.error("Usage: opensockstunnel <listenport>", out);
+ return;
+ }
+ _mgr.processOpenSOCKSTunnel(listenPort, out);
+ } else if ("openserver".equalsIgnoreCase(cmd)) {
+ int listenPort = 0;
+ String serverHost = null;
+ String serverKeys = null;
+ if (!tok.hasMoreTokens()) {
+ _mgr.error("Usage: openserver <serverHost> <serverPort> <serverKeys>", out);
+ return;
+ }
+ serverHost = tok.nextToken();
- if (!tok.hasMoreTokens()) {
- _mgr.error("Usage: openserver <serverHost> <serverPort> <serverKeys>", out);
- return;
- }
- try {
- String portStr = tok.nextToken();
- listenPort = Integer.parseInt(portStr);
- } catch (NumberFormatException nfe) {
- _mgr.error("Bad listen port", out);
- return;
- }
- if (!tok.hasMoreTokens()) {
- _mgr.error("Usage: openserver <serverHost> <serverPort> <serverKeys>", out);
- return;
- }
- serverKeys = tok.nextToken();
- _mgr.processOpenServer(serverHost, listenPort, serverKeys, out);
- } else {
- _mgr.unknownCommand(command, out);
- }
- }
+ if (!tok.hasMoreTokens()) {
+ _mgr.error("Usage: openserver <serverHost> <serverPort> <serverKeys>", out);
+ return;
+ }
+ try {
+ String portStr = tok.nextToken();
+ listenPort = Integer.parseInt(portStr);
+ } catch (NumberFormatException nfe) {
+ _mgr.error("Bad listen port", out);
+ return;
+ }
+ if (!tok.hasMoreTokens()) {
+ _mgr.error("Usage: openserver <serverHost> <serverPort> <serverKeys>", out);
+ return;
+ }
+ serverKeys = tok.nextToken();
+ _mgr.processOpenServer(serverHost, listenPort, serverKeys, out);
+ } else {
+ _mgr.unknownCommand(command, out);
+ }
+ }
}
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java
index d7c8083703..264eda1ef8 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java
@@ -26,31 +26,30 @@ public class I2PSOCKSTunnel extends I2PTunnelClientBase {
// I2PSOCKSTunnel(localPort, l, ownDest, (EventDispatcher)null);
//}
- public I2PSOCKSTunnel(int localPort, Logging l, boolean ownDest,
- EventDispatcher notifyThis) {
- super(localPort, ownDest, l, notifyThis, "SOCKSHandler");
+ public I2PSOCKSTunnel(int localPort, Logging l, boolean ownDest, EventDispatcher notifyThis) {
+ super(localPort, ownDest, l, notifyThis, "SOCKSHandler");
- if (waitEventValue("openBaseClientResult").equals("error")) {
- notifyEvent("openSOCKSTunnelResult", "error");
- return;
- }
-
- setName(getLocalPort() + " -> SOCKSTunnel");
+ if (waitEventValue("openBaseClientResult").equals("error")) {
+ notifyEvent("openSOCKSTunnelResult", "error");
+ return;
+ }
- startRunning();
+ setName(getLocalPort() + " -> SOCKSTunnel");
- notifyEvent("openSOCKSTunnelResult", "ok");
+ startRunning();
+
+ notifyEvent("openSOCKSTunnelResult", "ok");
}
protected void clientConnectionRun(Socket s) {
- try {
- SOCKSServer serv = SOCKSServerFactory.createSOCKSServer(s);
- Socket clientSock = serv.getClientSocket();
- I2PSocket destSock = serv.getDestinationI2PSocket();
- new I2PTunnelRunner (clientSock, destSock, sockLock, null);
- } catch (SOCKSException e) {
- _log.error("Error from SOCKS connection: " + e.getMessage());
- closeSocket(s);
- }
+ try {
+ SOCKSServer serv = SOCKSServerFactory.createSOCKSServer(s);
+ Socket clientSock = serv.getClientSocket();
+ I2PSocket destSock = serv.getDestinationI2PSocket();
+ new I2PTunnelRunner(clientSock, destSock, sockLock, null);
+ } catch (SOCKSException e) {
+ _log.error("Error from SOCKS connection: " + e.getMessage());
+ closeSocket(s);
+ }
}
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
index 713057e0e5..5efc51d9fb 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
@@ -42,189 +42,168 @@ public class SOCKS5Server extends SOCKSServer {
* @param clientSock client socket
*/
public SOCKS5Server(Socket clientSock) {
- this.clientSock = clientSock;
+ this.clientSock = clientSock;
}
public Socket getClientSocket() throws SOCKSException {
- setupServer();
+ setupServer();
- return clientSock;
+ return clientSock;
}
protected void setupServer() throws SOCKSException {
- if (setupCompleted) {
- return;
- }
-
- DataInputStream in;
- DataOutputStream out;
- try {
- in = new DataInputStream(clientSock.getInputStream());
- out = new DataOutputStream(clientSock.getOutputStream());
-
- init(in, out);
- manageRequest(in, out);
- } catch (IOException e) {
- throw new SOCKSException("Connection error ("
- + e.getMessage() + ")");
- }
-
- setupCompleted = true;
+ if (setupCompleted) { return; }
+
+ DataInputStream in;
+ DataOutputStream out;
+ try {
+ in = new DataInputStream(clientSock.getInputStream());
+ out = new DataOutputStream(clientSock.getOutputStream());
+
+ init(in, out);
+ manageRequest(in, out);
+ } catch (IOException e) {
+ throw new SOCKSException("Connection error (" + e.getMessage() + ")");
+ }
+
+ setupCompleted = true;
}
/**
* SOCKS5 connection initialization. This method assumes that
* SOCKS "VER" field has been stripped from the input stream.
*/
- private void init (DataInputStream in,
- DataOutputStream out) throws IOException, SOCKSException {
- int nMethods = in.readByte() & 0xff;
- boolean methodOk = false;
- int method = Method.NO_ACCEPTABLE_METHODS;
-
- for (int i = 0; i < nMethods; ++i) {
- method = in.readByte() & 0xff;
- if (method == Method.NO_AUTH_REQUIRED) {
- // That's fine, we do support this method
- break;
- }
- }
-
- boolean canContinue = false;
- switch (method) {
- case Method.NO_AUTH_REQUIRED:
- _log.debug("no authentication required");
- sendInitReply(Method.NO_AUTH_REQUIRED, out);
- return;
- default:
- _log.debug("no suitable authentication methods found ("
- + Integer.toHexString(method)+ ")");
- sendInitReply(Method.NO_ACCEPTABLE_METHODS, out);
- throw new SOCKSException("Unsupported authentication method");
- }
+ private void init(DataInputStream in, DataOutputStream out) throws IOException, SOCKSException {
+ int nMethods = in.readByte() & 0xff;
+ boolean methodOk = false;
+ int method = Method.NO_ACCEPTABLE_METHODS;
+
+ for (int i = 0; i < nMethods; ++i) {
+ method = in.readByte() & 0xff;
+ if (method == Method.NO_AUTH_REQUIRED) {
+ // That's fine, we do support this method
+ break;
+ }
+ }
+
+ boolean canContinue = false;
+ switch (method) {
+ case Method.NO_AUTH_REQUIRED:
+ _log.debug("no authentication required");
+ sendInitReply(Method.NO_AUTH_REQUIRED, out);
+ return;
+ default:
+ _log.debug("no suitable authentication methods found (" + Integer.toHexString(method) + ")");
+ sendInitReply(Method.NO_ACCEPTABLE_METHODS, out);
+ throw new SOCKSException("Unsupported authentication method");
+ }
}
-
+
/**
* SOCKS5 request management. This method assumes that all the
* stuff preceding or enveloping the actual request (e.g. protocol
* initialization, integrity/confidentiality encapsulations, etc)
* has been stripped out of the input/output streams.
*/
- private void manageRequest(DataInputStream in,
- DataOutputStream out) throws IOException, SOCKSException {
- int socksVer = in.readByte() & 0xff;
- if (socksVer != SOCKS_VERSION_5) {
- _log.debug("error in SOCKS5 request (protocol != 5? wtf?)");
- throw new SOCKSException("Invalid protocol version in request");
- }
-
- int command = in.readByte() & 0xff;
- switch (command) {
- case Command.CONNECT:
- break;
- case Command.BIND:
- _log.debug("BIND command is not supported!");
- sendRequestReply(Reply.COMMAND_NOT_SUPPORTED,
- AddressType.DOMAINNAME, null,
- "0.0.0.0", 0, out);
- throw new SOCKSException("BIND command not supported");
- case Command.UDP_ASSOCIATE:
- _log.debug("UDP ASSOCIATE command is not supported!");
- sendRequestReply(Reply.COMMAND_NOT_SUPPORTED,
- AddressType.DOMAINNAME, null,
- "0.0.0.0", 0, out);
- throw new SOCKSException("UDP ASSOCIATE command not supported");
- default:
- _log.debug("unknown command in request ("
- + Integer.toHexString(command) + ")");
- throw new SOCKSException("Invalid command in request");
- }
-
- {
- // Reserved byte, should be 0x00
- byte rsv = in.readByte();
- }
-
- int addressType = in.readByte() & 0xff;
- switch (addressType) {
- case AddressType.IPV4:
- connHostName = new String("");
- for (int i = 0; i < 4; ++i) {
- int octet = in.readByte() & 0xff;
- connHostName += Integer.toString(octet);
- if (i != 3) {
- connHostName += ".";
- }
- }
- _log.warn("IPV4 address type in request: " + connHostName
- + ". Is your client secure?");
- break;
- case AddressType.DOMAINNAME:
- {
- int addrLen = in.readByte() & 0xff;
- if (addrLen == 0) {
- _log.debug("0-sized address length? wtf?");
- throw new SOCKSException("Illegal DOMAINNAME length");
- }
- byte addr[] = new byte[addrLen];
- in.readFully(addr);
- connHostName = new String(addr);
- }
- _log.debug("DOMAINNAME address type in request: " + connHostName);
- break;
- case AddressType.IPV6:
- _log.warn("IP V6 address type in request! Is your client secure?"
- + " (IPv6 is not supported, anyway :-)");
- sendRequestReply(Reply.ADDRESS_TYPE_NOT_SUPPORTED,
- AddressType.DOMAINNAME, null,
- "0.0.0.0", 0, out);
- throw new SOCKSException("IPV6 addresses not supported");
- default:
- _log.debug("unknown address type in request ("
- + Integer.toHexString(command) + ")");
- throw new SOCKSException("Invalid addresses type in request");
- }
-
- connPort = in.readUnsignedShort();
- if (connPort == 0) {
- _log.debug("trying to connect to TCP port 0? Dropping!");
- throw new SOCKSException("Invalid port number in request");
- }
+ private void manageRequest(DataInputStream in, DataOutputStream out) throws IOException, SOCKSException {
+ int socksVer = in.readByte() & 0xff;
+ if (socksVer != SOCKS_VERSION_5) {
+ _log.debug("error in SOCKS5 request (protocol != 5? wtf?)");
+ throw new SOCKSException("Invalid protocol version in request");
+ }
+
+ int command = in.readByte() & 0xff;
+ switch (command) {
+ case Command.CONNECT:
+ break;
+ case Command.BIND:
+ _log.debug("BIND command is not supported!");
+ sendRequestReply(Reply.COMMAND_NOT_SUPPORTED, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
+ throw new SOCKSException("BIND command not supported");
+ case Command.UDP_ASSOCIATE:
+ _log.debug("UDP ASSOCIATE command is not supported!");
+ sendRequestReply(Reply.COMMAND_NOT_SUPPORTED, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
+ throw new SOCKSException("UDP ASSOCIATE command not supported");
+ default:
+ _log.debug("unknown command in request (" + Integer.toHexString(command) + ")");
+ throw new SOCKSException("Invalid command in request");
+ }
+
+ {
+ // Reserved byte, should be 0x00
+ byte rsv = in.readByte();
+ }
+
+ int addressType = in.readByte() & 0xff;
+ switch (addressType) {
+ case AddressType.IPV4:
+ connHostName = new String("");
+ for (int i = 0; i < 4; ++i) {
+ int octet = in.readByte() & 0xff;
+ connHostName += Integer.toString(octet);
+ if (i != 3) {
+ connHostName += ".";
+ }
+ }
+ _log.warn("IPV4 address type in request: " + connHostName + ". Is your client secure?");
+ break;
+ case AddressType.DOMAINNAME:
+ {
+ int addrLen = in.readByte() & 0xff;
+ if (addrLen == 0) {
+ _log.debug("0-sized address length? wtf?");
+ throw new SOCKSException("Illegal DOMAINNAME length");
+ }
+ byte addr[] = new byte[addrLen];
+ in.readFully(addr);
+ connHostName = new String(addr);
+ }
+ _log.debug("DOMAINNAME address type in request: " + connHostName);
+ break;
+ case AddressType.IPV6:
+ _log.warn("IP V6 address type in request! Is your client secure?" + " (IPv6 is not supported, anyway :-)");
+ sendRequestReply(Reply.ADDRESS_TYPE_NOT_SUPPORTED, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
+ throw new SOCKSException("IPV6 addresses not supported");
+ default:
+ _log.debug("unknown address type in request (" + Integer.toHexString(command) + ")");
+ throw new SOCKSException("Invalid addresses type in request");
+ }
+
+ connPort = in.readUnsignedShort();
+ if (connPort == 0) {
+ _log.debug("trying to connect to TCP port 0? Dropping!");
+ throw new SOCKSException("Invalid port number in request");
+ }
}
protected void confirmConnection() throws SOCKSException {
- DataInputStream in;
- DataOutputStream out;
- try {
- out = new DataOutputStream(clientSock.getOutputStream());
-
- sendRequestReply(Reply.SUCCEEDED,
- AddressType.IPV4,
- InetAddress.getByName("127.0.0.1"),
- null, 1, out);
- } catch (IOException e) {
- throw new SOCKSException("Connection error ("
- + e.getMessage() + ")");
- }
+ DataInputStream in;
+ DataOutputStream out;
+ try {
+ out = new DataOutputStream(clientSock.getOutputStream());
+
+ sendRequestReply(Reply.SUCCEEDED, AddressType.IPV4, InetAddress.getByName("127.0.0.1"), null, 1, out);
+ } catch (IOException e) {
+ throw new SOCKSException("Connection error (" + e.getMessage() + ")");
+ }
}
/**
* Send the specified reply during SOCKS5 initialization
*/
- private void sendInitReply(int replyCode,
- DataOutputStream out) throws IOException {
- ByteArrayOutputStream reps = new ByteArrayOutputStream();
+ private void sendInitReply(int replyCode, DataOutputStream out) throws IOException {
+ ByteArrayOutputStream reps = new ByteArrayOutputStream();
- reps.write(SOCKS_VERSION_5);
- reps.write(replyCode);
+ reps.write(SOCKS_VERSION_5);
+ reps.write(replyCode);
- byte[] reply = reps.toByteArray();
+ byte[] reply = reps.toByteArray();
- if (_log.shouldLog(Log.DEBUG)) {
- _log.debug("Sending init reply:\n" + HexDump.dump(reply));
- }
+ if (_log.shouldLog(Log.DEBUG)) {
+ _log.debug("Sending init reply:\n" + HexDump.dump(reply));
+ }
- out.write(reply);
+ out.write(reply);
}
/**
@@ -232,78 +211,72 @@ public class SOCKS5Server extends SOCKSServer {
* one of inetAddr or domainName can be null, depending on
* addressType.
*/
- private void sendRequestReply(int replyCode,
- int addressType,
- InetAddress inetAddr,
- String domainName,
- int bindPort,
- DataOutputStream out) throws IOException {
- ByteArrayOutputStream reps = new ByteArrayOutputStream();
- DataOutputStream dreps = new DataOutputStream(reps);
-
- dreps.write(SOCKS_VERSION_5);
- dreps.write(replyCode);
-
- // Reserved byte, should be 0x00
- dreps.write(0x00);
-
- dreps.write(addressType);
-
- switch (addressType) {
- case AddressType.IPV4:
- dreps.write(inetAddr.getAddress());
- break;
- case AddressType.DOMAINNAME:
- dreps.writeByte(domainName.length());
- dreps.writeBytes(domainName);
- break;
- default:
- _log.error("unknown address type passed to sendReply() ("
- + Integer.toHexString(addressType) + ")! wtf?");
- return;
- }
-
- dreps.writeShort(bindPort);
-
- byte[] reply = reps.toByteArray();
-
- if (_log.shouldLog(Log.DEBUG)) {
- _log.debug("Sending request reply:\n" + HexDump.dump(reply));
- }
-
- out.write(reply);
+ private void sendRequestReply(int replyCode, int addressType, InetAddress inetAddr, String domainName,
+ int bindPort, DataOutputStream out) throws IOException {
+ ByteArrayOutputStream reps = new ByteArrayOutputStream();
+ DataOutputStream dreps = new DataOutputStream(reps);
+
+ dreps.write(SOCKS_VERSION_5);
+ dreps.write(replyCode);
+
+ // Reserved byte, should be 0x00
+ dreps.write(0x00);
+
+ dreps.write(addressType);
+
+ switch (addressType) {
+ case AddressType.IPV4:
+ dreps.write(inetAddr.getAddress());
+ break;
+ case AddressType.DOMAINNAME:
+ dreps.writeByte(domainName.length());
+ dreps.writeBytes(domainName);
+ break;
+ default:
+ _log.error("unknown address type passed to sendReply() (" + Integer.toHexString(addressType) + ")! wtf?");
+ return;
+ }
+
+ dreps.writeShort(bindPort);
+
+ byte[] reply = reps.toByteArray();
+
+ if (_log.shouldLog(Log.DEBUG)) {
+ _log.debug("Sending request reply:\n" + HexDump.dump(reply));
+ }
+
+ out.write(reply);
}
-
-
+
/*
* Some namespaces to enclose SOCKS protocol codes
*/
private class Method {
- private static final int NO_AUTH_REQUIRED = 0x00;
- private static final int NO_ACCEPTABLE_METHODS = 0xff;
+ private static final int NO_AUTH_REQUIRED = 0x00;
+ private static final int NO_ACCEPTABLE_METHODS = 0xff;
}
private class AddressType {
- private static final int IPV4 = 0x01;
- private static final int DOMAINNAME = 0x03;
- private static final int IPV6 = 0x04;
+ private static final int IPV4 = 0x01;
+ private static final int DOMAINNAME = 0x03;
+ private static final int IPV6 = 0x04;
}
private class Command {
- private static final int CONNECT = 0x01;
- private static final int BIND = 0x02;
- private static final int UDP_ASSOCIATE = 0x03;
+ private static final int CONNECT = 0x01;
+ private static final int BIND = 0x02;
+ private static final int UDP_ASSOCIATE = 0x03;
}
private class Reply {
- private static final int SUCCEEDED = 0x00;
- private static final int GENERAL_SOCKS_SERVER_FAILURE = 0x01;
- private static final int CONNECTION_NOT_ALLOWED_BY_RULESET = 0x02;
- private static final int NETWORK_UNREACHABLE = 0x03;
- private static final int HOST_UNREACHABLE = 0x04;
- private static final int CONNECTION_REFUSED = 0x05;
- private static final int TTL_EXPIRED = 0x06;
- private static final int COMMAND_NOT_SUPPORTED = 0x07;
- private static final int ADDRESS_TYPE_NOT_SUPPORTED = 0x08;
+ private static final int SUCCEEDED = 0x00;
+ private static final int GENERAL_SOCKS_SERVER_FAILURE = 0x01;
+ private static final int CONNECTION_NOT_ALLOWED_BY_RULESET = 0x02;
+ private static final int NETWORK_UNREACHABLE = 0x03;
+ private static final int HOST_UNREACHABLE = 0x04;
+ private static final int CONNECTION_REFUSED = 0x05;
+ private static final int TTL_EXPIRED = 0x06;
+ private static final int COMMAND_NOT_SUPPORTED = 0x07;
+ private static final int ADDRESS_TYPE_NOT_SUPPORTED = 0x08;
}
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSException.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSException.java
index 489e057b4a..cddd019ab0 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSException.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSException.java
@@ -14,10 +14,10 @@ package net.i2p.i2ptunnel.socks;
public class SOCKSException extends Exception {
public SOCKSException() {
- super();
+ super();
}
-
+
public SOCKSException(String s) {
- super(s);
+ super(s);
}
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServer.java
index 77a2c8949b..bf8b0889fd 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServer.java
@@ -47,7 +47,6 @@ public abstract class SOCKSServer {
*/
public abstract Socket getClientSocket() throws SOCKSException;
-
/**
* Confirm to the client that the connection has succeeded
*/
@@ -60,40 +59,39 @@ public abstract class SOCKSServer {
* @return an I2PSocket connected with the destination
*/
public I2PSocket getDestinationI2PSocket() throws SOCKSException {
- setupServer();
+ setupServer();
+
+ if (connHostName == null) {
+ _log.error("BUG: destination host name has not been initialized!");
+ throw new SOCKSException("BUG! See the logs!");
+ }
+ if (connPort == 0) {
+ _log.error("BUG: destination port has not been initialized!");
+ throw new SOCKSException("BUG! See the logs!");
+ }
- if (connHostName == null) {
- _log.error("BUG: destination host name has not been initialized!");
- throw new SOCKSException("BUG! See the logs!");
- }
- if (connPort == 0) {
- _log.error("BUG: destination port has not been initialized!");
- throw new SOCKSException("BUG! See the logs!");
- }
+ // FIXME: here we should read our config file, select an
+ // outproxy, and instantiate the proper socket class that
+ // handles the outproxy itself (SOCKS4a, SOCKS5, HTTP CONNECT...).
+ I2PSocket destSock;
- // FIXME: here we should read our config file, select an
- // outproxy, and instantiate the proper socket class that
- // handles the outproxy itself (SOCKS4a, SOCKS5, HTTP CONNECT...).
- I2PSocket destSock;
+ try {
+ if (connHostName.toLowerCase().endsWith(".i2p")) {
+ _log.debug("connecting to " + connHostName + "...");
+ I2PSocketManager sm = I2PSocketManagerFactory.createManager();
+ destSock = sm.connect(I2PTunnel.destFromName(connHostName), new I2PSocketOptions());
+ confirmConnection();
+ _log.debug("connection confirmed - exchanging data...");
+ } else {
+ _log.error("We don't support outproxies (yet)");
+ throw new SOCKSException("Ouproxies not supported (yet)");
+ }
+ } catch (DataFormatException e) {
+ throw new SOCKSException("Error in destination format");
+ } catch (I2PException e) {
+ throw new SOCKSException("I2P error (" + e.getMessage() + ")");
+ }
- try {
- if (connHostName.toLowerCase().endsWith(".i2p")) {
- _log.debug("connecting to " + connHostName + "...");
- I2PSocketManager sm = I2PSocketManagerFactory.createManager();
- destSock = sm.connect(I2PTunnel.destFromName(connHostName),
- new I2PSocketOptions());
- confirmConnection();
- _log.debug("connection confirmed - exchanging data...");
- } else {
- _log.error("We don't support outproxies (yet)");
- throw new SOCKSException("Ouproxies not supported (yet)");
- }
- } catch (DataFormatException e) {
- throw new SOCKSException("Error in destination format");
- } catch (I2PException e) {
- throw new SOCKSException("I2P error (" + e.getMessage() + ")");
- }
-
- return destSock;
+ return destSock;
}
-}
+}
\ No newline at end of file
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServerFactory.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServerFactory.java
index 9f823e54b1..357149652e 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServerFactory.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServerFactory.java
@@ -27,27 +27,26 @@ public class SOCKSServerFactory {
* @param s a Socket used to choose the SOCKS server type
*/
public static SOCKSServer createSOCKSServer(Socket s) throws SOCKSException {
- SOCKSServer serv;
+ SOCKSServer serv;
- try {
- DataInputStream in = new DataInputStream(s.getInputStream());
- int socksVer = in.readByte();
-
- switch (socksVer) {
- case 0x05: // SOCKS version 5
- serv = new SOCKS5Server(s);
- break;
- default:
- _log.debug("SOCKS protocol version not supported ("
- + Integer.toHexString(socksVer) + ")");
- return null;
- }
- } catch (IOException e) {
- _log.debug("error reading SOCKS protocol version");
- throw new SOCKSException("Connection error ("
- + e.getMessage() + ")");
- }
+ try {
+ DataInputStream in = new DataInputStream(s.getInputStream());
+ int socksVer = in.readByte();
- return serv;
+ switch (socksVer) {
+ case 0x05:
+ // SOCKS version 5
+ serv = new SOCKS5Server(s);
+ break;
+ default:
+ _log.debug("SOCKS protocol version not supported (" + Integer.toHexString(socksVer) + ")");
+ return null;
+ }
+ } catch (IOException e) {
+ _log.debug("error reading SOCKS protocol version");
+ throw new SOCKSException("Connection error (" + e.getMessage() + ")");
+ }
+
+ return serv;
}
-}
+}
\ No newline at end of file
--
GitLab