X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fmain%2Fbridge.java;h=f2f3df2c6fad170190309e2f2df074be3f10189c;hb=dce410fec00030c0affde7b19bcde6de847fae13;hp=8aaa93f71de9286b6342e7bbb70854d3b9411cd6;hpb=7d048df41aea44c07ea6e1ab774c627053f39dfa;p=fanfix.git
diff --git a/src/be/nikiroo/utils/main/bridge.java b/src/be/nikiroo/utils/main/bridge.java
index 8aaa93f..f2f3df2 100644
--- a/src/be/nikiroo/utils/main/bridge.java
+++ b/src/be/nikiroo/utils/main/bridge.java
@@ -18,10 +18,11 @@ public class bridge {
*
* - The bridge name
* - The bridge port
- * - TRUE for an SSL bridge, FALSE for plain text
+ * - a key for an encrypted bridge, PLAIN_TEXT for plain text
* - The forward server host
* - The forward server port
- * - TRUE for an SSL forward server, FALSE for plain text
+ * - a key for an encrypted forward server, PLAIN_TEXT for
+ * plain text
* - (optional) a trace level
* - (optional) a truncate size for data
*
@@ -34,10 +35,10 @@ public class bridge {
+ "Syntax: [name] [port] [ssl] [fhost] [fport] [fssl] ([trace level]) ([max])\n"
+ "\tname: the bridge name\n"
+ "\tport: the bridge port\n"
- + "\tssl: TRUE for an SSL bridge, FALSE for plain text\n"
+ + "\tkey: a key for an encrypted bridge, PLAIN_TEXT for plain text\n"
+ "\tfhost: the forward server host\n"
+ "\tfport: the forward server port\n"
- + "\tfssl: TRUE for an SSL forward server, FALSE for plain text\n"
+ + "\tfkey: a key for an encrypted forward server, PLAIN_TEXT for plain text\n"
+ "\ttrace level: the optional trace level (default is 1)\n"
+ "\tmax: the maximum size after which to truncate data\n");
return;
@@ -46,10 +47,18 @@ public class bridge {
int i = 0;
String name = args[i++];
int port = Integer.parseInt(args[i++]);
- boolean ssl = Boolean.parseBoolean(args[i++]);
+ String key = args[i++];
+ // TODO: bad
+ if ("PLAIN_TEXT".equals(key)) {
+ key = null;
+ }
String fhost = args[i++];
int fport = Integer.parseInt(args[i++]);
- boolean fssl = Boolean.parseBoolean(args[i++]);
+ String fkey = args[i++];
+ // TODO: bad
+ if ("PLAIN_TEXT".equals(fkey)) {
+ fkey = null;
+ }
int traceLevel = 1;
if (args.length > 6) {
@@ -60,8 +69,8 @@ public class bridge {
maxPrintSize = Integer.parseInt(args[i++]);
}
- ServerBridge bridge = new ServerBridge(name, port, ssl, fhost,
- fport, fssl);
+ ServerBridge bridge = new ServerBridge(name, port, key, fhost,
+ fport, fkey);
bridge.setTraceHandler(new TraceHandler(true, true, traceLevel,
maxPrintSize));
bridge.run();