X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerBridge.java;h=db50876b32aafb144bc89047e73073c391c569f8;hb=875fbf21497ef5c8d74d5b7d88e2bbabede5aa3c;hp=9ccae1c498cd04611ccb4d6016da4255efdae68f;hpb=f4053377fa15da2f11e82955bfab86e673fa371c;p=fanfix.git
diff --git a/src/be/nikiroo/utils/serial/server/ServerBridge.java b/src/be/nikiroo/utils/serial/server/ServerBridge.java
index 9ccae1c..db50876 100644
--- a/src/be/nikiroo/utils/serial/server/ServerBridge.java
+++ b/src/be/nikiroo/utils/serial/server/ServerBridge.java
@@ -220,7 +220,7 @@ public class ServerBridge extends Server {
* the data to trace
*/
private void trace(String prefix, String data) {
- int size = data.length();
+ int size = data == null ? 0 : data.length();
String ssize = size + " byte";
if (size > 1) {
ssize = size + " bytes";
@@ -238,8 +238,12 @@ public class ServerBridge extends Server {
if (getTraceHandler().getTraceLevel() >= 2) {
try {
- if (data.startsWith("ZIP:")) {
- data = StringUtils.unzip64(data.substring(4));
+ while (data.startsWith("ZIP:") || data.startsWith("B64:")) {
+ if (data.startsWith("ZIP:")) {
+ data = StringUtils.unbase64s(data.substring(4), true);
+ } else if (data.startsWith("B64:")) {
+ data = StringUtils.unbase64s(data.substring(4), false);
+ }
}
Object obj = new Importer().read(data).getValue();
@@ -283,64 +287,4 @@ public class ServerBridge extends Server {
getTraceHandler().trace("", 2);
}
}
-
- /**
- * Start a bridge between 2 servers.
- *
- * @param args
- * an array containing:
- *
- * - The bridge name
- * - The bridge port
- * - TRUE for an SSL bridge, FALSE for plain text
- * - The forward server host
- * - The forward server port
- * - TRUE for an SSL forward server, FALSE for plain text
- * - (optional) a trace level
- * - (optional) a truncate size for data
- *
- */
- public static void main(String[] args) {
- final TraceHandler tracer = new TraceHandler(true, false, 0);
- try {
- if (args.length < 6) {
- tracer.error("Invalid syntax.\n"
- + "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"
- + "\tfhost: the forward server host\n"
- + "\tfport: the forward server port\n"
- + "\tfssl: TRUE for an SSL forward server, FALSE 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;
- }
-
- int i = 0;
- String name = args[i++];
- int port = Integer.parseInt(args[i++]);
- boolean ssl = Boolean.parseBoolean(args[i++]);
- String fhost = args[i++];
- int fport = Integer.parseInt(args[i++]);
- boolean fssl = Boolean.parseBoolean(args[i++]);
-
- int traceLevel = 1;
- if (args.length > 6) {
- traceLevel = Integer.parseInt(args[i++]);
- }
- int maxPrintSize = 0;
- if (args.length > 7) {
- maxPrintSize = Integer.parseInt(args[i++]);
- }
-
- ServerBridge bridge = new ServerBridge(name, port, ssl, fhost,
- fport, fssl);
- bridge.setTraceHandler(new TraceHandler(true, true, traceLevel,
- maxPrintSize));
- bridge.run();
- } catch (Exception e) {
- tracer.error(e);
- }
- }
}