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

SAMv3: alternate form of calling SAMBridge.main. Usage message updated.

Browse Source
This commit is contained in:
mkvore-commit
2009-04-06 06:39:30 +00:00
parent 4d27f18710
commit fcbfd7554f
1 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
apps/sam/java/src/net/i2p/sam/SAMBridge.java
View File

@ -51,11 +51,17 @@ public class SAMBridge implements Runnable {
private boolean acceptConnections = true; private boolean acceptConnections = true;
private static final int SAM_LISTENPORT = 7656; private static final int SAM_LISTENPORT = 7656;
public static final String DEFAULT_SAM_KEYFILE = "sam.keys"; public static final String DEFAULT_SAM_KEYFILE = "sam.keys";
public static final String PROP_DATAGRAM_HOST = "sam.datagram.host"; public static final String PROP_TCP_HOST = "sam.tcp.host";
public static final String PROP_DATAGRAM_PORT = "sam.datagram.port"; public static final String PROP_TCP_PORT = "sam.tcp.port";
public static final String DEFAULT_DATAGRAM_HOST = "0.0.0.0"; protected static final String DEFAULT_TCP_HOST = "0.0.0.0";
public static final String DEFAULT_DATAGRAM_PORT = "7655"; protected static final String DEFAULT_TCP_PORT = "7656";
public static final String PROP_DATAGRAM_HOST = "sam.udp.host";
public static final String PROP_DATAGRAM_PORT = "sam.udp.port";
protected static final String DEFAULT_DATAGRAM_HOST = "0.0.0.0";
protected static final String DEFAULT_DATAGRAM_PORT = "7655";
private SAMBridge() {} private SAMBridge() {}
@ -199,9 +205,13 @@ public class SAMBridge implements Runnable {
} }
} }
static class HelpRequested extends Exception {static final long serialVersionUID=0x1;}
/** /**
* Usage: * Usage:
* <pre>SAMBridge [ keyfile [listenHost ] listenPort [ name=val ]* ]</pre> * <pre>SAMBridge [ keyfile [listenHost ] listenPort [ name=val ]* ]</pre>
* or:
* <pre>SAMBridge [ name=val ]* </pre>
* *
* name=val options are passed to the I2CP code to build a session, * name=val options are passed to the I2CP code to build a session,
* allowing the bridge to specify an alternate I2CP host and port, tunnel * allowing the bridge to specify an alternate I2CP host and port, tunnel
@ -211,24 +221,34 @@ public class SAMBridge implements Runnable {
public static void main(String args[]) { public static void main(String args[]) {
String keyfile = DEFAULT_SAM_KEYFILE; String keyfile = DEFAULT_SAM_KEYFILE;
int port = SAM_LISTENPORT; int port = SAM_LISTENPORT;
String host = "0.0.0.0"; String host = DEFAULT_TCP_HOST;
Properties opts = null; Properties opts = null;
if (args.length > 0) { if (args.length > 0) {
keyfile = args[0]; try {
int portIndex = 1; opts = parseOptions(args, 0);
try { keyfile = args[0];
port = Integer.parseInt(args[portIndex]); int portIndex = 1;
} catch (NumberFormatException nfe) { try {
host = args[1]; if (args.length>portIndex) port = Integer.parseInt(args[portIndex]);
portIndex++; } catch (NumberFormatException nfe) {
try { host = args[portIndex];
port = Integer.parseInt(args[portIndex]); portIndex++;
} catch (NumberFormatException nfe1) { try {
usage(); if (args.length>portIndex) port = Integer.parseInt(args[portIndex]);
return; } catch (NumberFormatException nfe1) {
} try {
} port = Integer.parseInt(opts.getProperty(SAMBridge.PROP_TCP_PORT, SAMBridge.DEFAULT_TCP_PORT));
opts = parseOptions(args, portIndex+1); host = opts.getProperty(SAMBridge.PROP_TCP_HOST, SAMBridge.DEFAULT_TCP_HOST);
} catch (NumberFormatException e) {
usage();
return;
}
}
}
} catch (HelpRequested e) {
usage();
return;
}
} }
SAMBridge bridge = new SAMBridge(host, port, opts, keyfile); SAMBridge bridge = new SAMBridge(host, port, opts, keyfile);
I2PAppThread t = new I2PAppThread(bridge, "SAMListener"); I2PAppThread t = new I2PAppThread(bridge, "SAMListener");
@ -244,10 +264,11 @@ public class SAMBridge implements Runnable {
t.start(); t.start();
} }
private static Properties parseOptions(String args[], int startArgs) { private static Properties parseOptions(String args[], int startArgs) throws HelpRequested {
Properties props = new Properties(); Properties props = new Properties();
// skip over first few options // skip over first few options
for (int i = startArgs; i < args.length; i++) { for (int i = startArgs; i < args.length; i++) {
if (args[i].equals("-h")) throw new HelpRequested();
int eq = args[i].indexOf('='); int eq = args[i].indexOf('=');
if (eq <= 0) continue; if (eq <= 0) continue;
if (eq >= args[i].length()-1) continue; if (eq >= args[i].length()-1) continue;
@ -263,11 +284,26 @@ public class SAMBridge implements Runnable {
private static void usage() { private static void usage() {
System.err.println("Usage: SAMBridge [keyfile [listenHost] listenPortNum[ name=val]*]"); System.err.println("Usage: SAMBridge [keyfile [listenHost] listenPortNum[ name=val]*]");
System.err.println("or:");
System.err.println(" SAMBridge [ name=val ]*");
System.err.println(" keyfile: location to persist private keys (default sam.keys)"); System.err.println(" keyfile: location to persist private keys (default sam.keys)");
System.err.println(" listenHost: interface to listen on (0.0.0.0 for all interfaces)"); System.err.println(" listenHost: interface to listen on (0.0.0.0 for all interfaces)");
System.err.println(" listenPort: port to listen for SAM connections on (default 7656)"); System.err.println(" listenPort: port to listen for SAM connections on (default 7656)");
System.err.println(" name=val: options to pass when connecting via I2CP, such as "); System.err.println(" name=val: options to pass when connecting via I2CP, such as ");
System.err.println(" i2cp.host=localhost and i2cp.port=7654"); System.err.println(" i2cp.host=localhost and i2cp.port=7654");
System.err.println("");
System.err.println("Host and ports of the SAM bridge can be specified with the alternate");
System.err.println("form by specifying options "+SAMBridge.PROP_TCP_HOST+" and/or "+
SAMBridge.PROP_TCP_PORT);
System.err.println("");
System.err.println("Options "+SAMBridge.PROP_DATAGRAM_HOST+" and "+SAMBridge.PROP_DATAGRAM_PORT+
" specify the listening ip");
System.err.println("range and the port of SAM datagram server. This server is");
System.err.println("only launched after a client creates the first SAM datagram");
System.err.println("or raw session, after a handshake with SAM version >= 3.0.");
System.err.println("");
System.err.println("The option loglevel=[DEBUG|WARN|ERROR|CRIT] can be used");
System.err.println("for tuning the log verbosity.\n");
} }
public void run() { public void run() {