X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectAction.java;h=0f2f1b4319fa799950119815c31dd9bf81043ee8;hb=29fd216d455363af8bd4adb1e3325645b0ba7fb5;hp=901632627b218d35469fcc7cb6b71f2af2b8144d;hpb=08f80ac5fa60738d3ad74c4b5390a0b79ae313d4;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/server/ConnectAction.java b/src/be/nikiroo/utils/serial/server/ConnectAction.java
index 9016326..0f2f1b4 100644
--- a/src/be/nikiroo/utils/serial/server/ConnectAction.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectAction.java
@@ -9,6 +9,7 @@ import javax.net.ssl.SSLException;
 
 import be.nikiroo.utils.CryptUtils;
 import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.StringUtils;
 import be.nikiroo.utils.serial.Exporter;
 import be.nikiroo.utils.serial.Importer;
 import be.nikiroo.utils.streams.BufferedOutputStream;
@@ -27,6 +28,12 @@ import be.nikiroo.utils.streams.ReplaceOutputStream;
  * @author niki
  */
 abstract class ConnectAction {
+	// We separate each "packet" we send with this character and make sure it
+	// does not occurs in the message itself.
+	static private char STREAM_SEP = '\b';
+	static private String[] STREAM_RAW = new String[] { "\\", "\b" };
+	static private String[] STREAM_CODED = new String[] { "\\\\", "\\b" };
+
 	private Socket s;
 	private boolean server;
 
@@ -98,13 +105,10 @@ abstract class ConnectAction {
 	 */
 	public void connect() {
 		try {
-			// TODO: assure that \b is never used, make sure \n usage is OK
 			in = new NextableInputStream(s.getInputStream(),
-					new NextableInputStreamStep('\b'));
-
+					new NextableInputStreamStep(STREAM_SEP));
 			try {
 				out = new BufferedOutputStream(s.getOutputStream());
-
 				try {
 					action();
 				} finally {
@@ -288,20 +292,15 @@ abstract class ConnectAction {
 		synchronized (lock) {
 			OutputStream sub;
 			if (crypt != null) {
-				sub = crypt.encrypt64(out.open(), false);
+				sub = crypt.encrypt64(out.open());
 			} else {
 				sub = out.open();
 			}
 
-			// TODO: could be possible to check for non-crypt and only
-			// do it for crypt
-			sub = new ReplaceOutputStream(sub, //
-					new String[] { "\\", "\b" }, //
-					new String[] { "\\\\", "\\b" });
-
+			sub = new ReplaceOutputStream(sub, STREAM_RAW, STREAM_CODED);
 			try {
 				if (asString) {
-					sub.write(data.toString().getBytes("UTF-8"));
+					sub.write(StringUtils.getBytes(data.toString()));
 				} else {
 					new Exporter(sub).append(data);
 				}
@@ -309,7 +308,7 @@ abstract class ConnectAction {
 				sub.close();
 			}
 
-			out.write('\b');
+			out.write(STREAM_SEP);
 
 			if (server) {
 				out.flush();
@@ -363,6 +362,7 @@ abstract class ConnectAction {
 	 * @throws java.lang.NullPointerException
 	 *             for Objects only: if the counter part has no data to send
 	 */
+	@SuppressWarnings("resource")
 	private Object rec(boolean asString) throws IOException,
 			NoSuchFieldException, NoSuchMethodException,
 			ClassNotFoundException, java.lang.NullPointerException {
@@ -374,16 +374,12 @@ abstract class ConnectAction {
 					contentToSend = false;
 				}
 
-				if (in.next()) {
-					// TODO: could be possible to check for non-crypt and only
-					// do it for crypt
-					InputStream read = new ReplaceInputStream(in.open(), //
-							new String[] { "\\\\", "\\b" }, //
-							new String[] { "\\", "\b" });
-
+				if (in.next() && !in.eof()) {
+					InputStream read = new ReplaceInputStream(in.open(),
+							STREAM_CODED, STREAM_RAW);
 					try {
 						if (crypt != null) {
-							read = crypt.decrypt64(read, false);
+							read = crypt.decrypt64(read);
 						}
 
 						if (asString) {