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

* I2PTunnel: Make CLI-only methods private, and static where possible

Browse Source
This commit is contained in:
zzz
2012-03-17 21:49:11 +00:00
parent 3a2fe5e860
commit e2a39a3eb5
1 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
View File

@@ -302,7 +302,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
* *
* @param l logger to receive events and output * @param l logger to receive events and output
*/ */
public void runHelp(Logging l) { private static void runHelp(Logging l) {
l.log("Command list:"); l.log("Command list:");
l.log("config <i2phost> <i2pport>"); l.log("config <i2phost> <i2pport>");
l.log("listen_on <ip>"); l.log("listen_on <ip>");
@@ -1107,13 +1107,14 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
/** /**
* Specify the i2cp host and port * Specify the i2cp host and port
* Deprecated - only used by CLI
* *
* Sets the event "configResult" = "ok" or "error" after the configuration has been specified * Sets the event "configResult" = "ok" or "error" after the configuration has been specified
* *
* @param args {hostname, portNumber} * @param args {hostname, portNumber}
* @param l logger to receive events and output * @param l logger to receive events and output
*/ */
public void runConfig(String args[], Logging l) { private void runConfig(String args[], Logging l) {
if (args.length == 2) { if (args.length == 2) {
host = args[0]; host = args[0];
listenHost = host; listenHost = host;
@@ -1128,13 +1129,14 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
/** /**
* Specify whether to use its own destination for each outgoing tunnel * Specify whether to use its own destination for each outgoing tunnel
* Deprecated - only used by CLI
* *
* Sets the event "owndestResult" = "ok" or "error" after the configuration has been specified * Sets the event "owndestResult" = "ok" or "error" after the configuration has been specified
* *
* @param args {yes or no} * @param args {yes or no}
* @param l logger to receive events and output * @param l logger to receive events and output
*/ */
public void runOwnDest(String args[], Logging l) { private void runOwnDest(String args[], Logging l) {
if (args.length == 1 && (args[0].equalsIgnoreCase("yes") || args[0].equalsIgnoreCase("no"))) { if (args.length == 1 && (args[0].equalsIgnoreCase("yes") || args[0].equalsIgnoreCase("no"))) {
ownDest = args[0].equalsIgnoreCase("yes"); ownDest = args[0].equalsIgnoreCase("yes");
notifyEvent("owndestResult", "ok"); notifyEvent("owndestResult", "ok");
@@ -1190,21 +1192,22 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
/** /**
* Generate a new keypair * Generate a new keypair
* Deprecated - only used by CLI
* *
* Sets the event "genkeysResult" = "ok" or "error" after the generation is complete * Sets the event "genkeysResult" = "ok" or "error" after the generation is complete
* *
* @param args {privateKeyFilename, publicKeyFilename} or {privateKeyFilename} * @param args {privateKeyFilename, publicKeyFilename} or {privateKeyFilename}
* @param l logger to receive events and output * @param l logger to receive events and output
*/ */
public void runGenKeys(String args[], Logging l) { private static void runGenKeys(String args[], Logging l) {
OutputStream pubdest = null; OutputStream pubdest = null;
if (args.length == 2) { if (args.length == 2) {
try { try {
pubdest = new FileOutputStream(args[1]); pubdest = new FileOutputStream(args[1]);
} catch (IOException ioe) { } catch (IOException ioe) {
l.log("Error opening output stream"); l.log("Error opening output stream");
_log.error(getPrefix() + "Error generating keys to out", ioe); //_log.error(getPrefix() + "Error generating keys to out", ioe);
notifyEvent("genkeysResult", "error"); //notifyEvent("genkeysResult", "error");
return; return;
} }
} else if (args.length != 1) { } else if (args.length != 1) {
@@ -1212,7 +1215,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
l.log(" creates a new keypair and prints the public key.\n" l.log(" creates a new keypair and prints the public key.\n"
+ " if pubkeyfile is given, saves the public key there." + "\n" + " if pubkeyfile is given, saves the public key there." + "\n"
+ " if the privkeyfile already exists, just print/save" + "the pubkey."); + " if the privkeyfile already exists, just print/save" + "the pubkey.");
notifyEvent("genkeysResult", "error"); //notifyEvent("genkeysResult", "error");
} }
try { try {
File privKeyFile = new File(args[0]); File privKeyFile = new File(args[0]);
@@ -1222,58 +1225,61 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
} else { } else {
makeKey(new FileOutputStream(privKeyFile), pubdest, l); makeKey(new FileOutputStream(privKeyFile), pubdest, l);
} }
notifyEvent("genkeysResult", "ok"); //notifyEvent("genkeysResult", "ok");
} catch (IOException ioe) { } catch (IOException ioe) {
l.log("Error generating keys - " + ioe.getMessage()); l.log("Error generating keys - " + ioe.getMessage());
notifyEvent("genkeysResult", "error"); //notifyEvent("genkeysResult", "error");
_log.error(getPrefix() + "Error generating keys", ioe); //_log.error(getPrefix() + "Error generating keys", ioe);
} }
} }
/** /**
* Generate a new keypair * Generate a new keypair
* Deprecated - only used by CLI
* *
* Sets the event "privateKey" = base64 of the privateKey stream and * Sets the event "privateKey" = base64 of the privateKey stream and
* sets the event "publicDestination" = base64 of the destination * sets the event "publicDestination" = base64 of the destination
* *
* @param l logger to receive events and output * @param l logger to receive events and output
*/ */
public void runGenTextKeys(Logging l) { private static void runGenTextKeys(Logging l) {
ByteArrayOutputStream privkey = new ByteArrayOutputStream(512); ByteArrayOutputStream privkey = new ByteArrayOutputStream(512);
ByteArrayOutputStream pubkey = new ByteArrayOutputStream(512); ByteArrayOutputStream pubkey = new ByteArrayOutputStream(512);
makeKey(privkey, pubkey, l); makeKey(privkey, pubkey, l);
l.log("Private key: " + Base64.encode(privkey.toByteArray())); l.log("Private key: " + Base64.encode(privkey.toByteArray()));
notifyEvent("privateKey", Base64.encode(privkey.toByteArray())); //notifyEvent("privateKey", Base64.encode(privkey.toByteArray()));
notifyEvent("publicDestination", Base64.encode(pubkey.toByteArray())); //notifyEvent("publicDestination", Base64.encode(pubkey.toByteArray()));
} }
/** /**
* Exit the JVM if there are no more tasks left running. If there are tunnels * Exit the JVM if there are no more tasks left running. If there are tunnels
* running, it returns. * running, it returns.
* Deprecated - only used by CLI
* *
* Sets the event "quitResult" = "error" if there are tasks running (but if there * Sets the event "quitResult" = "error" if there are tasks running (but if there
* aren't, well, there's no point in setting the quitResult to "ok", now is there?) * aren't, well, there's no point in setting the quitResult to "ok", now is there?)
* *
* @param l logger to receive events and output * @param l logger to receive events and output
*/ */
public void runQuit(Logging l) { private void runQuit(Logging l) {
purgetasks(l); purgetasks(l);
if (tasks.isEmpty()) { if (tasks.isEmpty()) {
System.exit(0); System.exit(0);
} }
l.log("There are running tasks. Try 'list'."); l.log("There are running tasks. Try 'list'.");
notifyEvent("quitResult", "error"); //notifyEvent("quitResult", "error");
} }
/** /**
* Retrieve a list of currently running tasks * Retrieve a list of currently running tasks
* Deprecated - only used by CLI
* *
* Sets the event "listDone" = "done" after dumping the tasks to * Sets the event "listDone" = "done" after dumping the tasks to
* the logger * the logger
* *
* @param l logger to receive events and output * @param l logger to receive events and output
*/ */
public void runList(Logging l) { private void runList(Logging l) {
purgetasks(l); purgetasks(l);
for (I2PTunnelTask t : tasks) { for (I2PTunnelTask t : tasks) {
l.log("[" + t.getId() + "] " + t.toString()); l.log("[" + t.getId() + "] " + t.toString());
@@ -1331,13 +1337,14 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
/** /**
* Run all of the commands in the given file (one command per line) * Run all of the commands in the given file (one command per line)
* Deprecated - only used by CLI
* *
* Sets the event "runResult" = "ok" or "error" after the closing is complete * Sets the event "runResult" = "ok" or "error" after the closing is complete
* *
* @param args {filename} * @param args {filename}
* @param l logger to receive events and output * @param l logger to receive events and output
*/ */
public void runRun(String args[], Logging l) { private void runRun(String args[], Logging l) {
if (args.length == 1) { if (args.length == 1) {
try { try {
BufferedReader br = new BufferedReader(new FileReader(args[0])); BufferedReader br = new BufferedReader(new FileReader(args[0]));
@@ -1362,13 +1369,14 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
/** /**
* Perform a lookup of the name specified * Perform a lookup of the name specified
* Deprecated - only used by CLI
* *
* Sets the event "lookupResult" = base64 of the destination, or an error message * Sets the event "lookupResult" = base64 of the destination, or an error message
* *
* @param args {name} * @param args {name}
* @param l logger to receive events and output * @param l logger to receive events and output
*/ */
public void runLookup(String args[], Logging l) { private void runLookup(String args[], Logging l) {
if (args.length != 1) { if (args.length != 1) {
l.log("lookup <name>"); l.log("lookup <name>");
l.log(" try to resolve the name into a destination key"); l.log(" try to resolve the name into a destination key");
@@ -1392,13 +1400,14 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
/** /**
* Start up a ping task with the specified args (currently supporting -ns, -h, -l) * Start up a ping task with the specified args (currently supporting -ns, -h, -l)
* Deprecated - only used by CLI
* *
* Sets the event "pingTaskId" = Integer of the taskId, or -1 * Sets the event "pingTaskId" = Integer of the taskId, or -1
* *
* @param allargs arguments to pass to the I2Ping task * @param allargs arguments to pass to the I2Ping task
* @param l logger to receive events and output * @param l logger to receive events and output
*/ */
public void runPing(String allargs, Logging l) { private void runPing(String allargs, Logging l) {
if (allargs.length() != 0) { if (allargs.length() != 0) {
I2PTunnelTask task; I2PTunnelTask task;
// pings always use the main destination // pings always use the main destination
@@ -1493,7 +1502,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
* @param pubDest location to store the destination * @param pubDest location to store the destination
* @param l logger to send messages to * @param l logger to send messages to
*/ */
public static void makeKey(OutputStream writeTo, OutputStream pubDest, Logging l) { private static void makeKey(OutputStream writeTo, OutputStream pubDest, Logging l) {
try { try {
l.log("Generating new keys..."); l.log("Generating new keys...");
I2PClient client = I2PClientFactory.createClient(); I2PClient client = I2PClientFactory.createClient();
@@ -1518,7 +1527,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
* @param pubDest stream to write the destination to * @param pubDest stream to write the destination to
* @param l logger to send messages to * @param l logger to send messages to
*/ */
public static void showKey(InputStream readFrom, OutputStream pubDest, Logging l) { private static void showKey(InputStream readFrom, OutputStream pubDest, Logging l) {
try { try {
Destination d = new Destination(); Destination d = new Destination();
d.readBytes(readFrom); d.readBytes(readFrom);