diff --git a/apps/sam/java/src/net/i2p/sam/SAMBridge.java b/apps/sam/java/src/net/i2p/sam/SAMBridge.java
index d6be6d5920df25e76c6602c7d62cc8ffc854081f..1894c97198882e7c8efedc0a800183d92339b8d9 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMBridge.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMBridge.java
@@ -519,13 +519,8 @@ public class SAMBridge implements Runnable, ClientApp {
} catch (SAMException e) {
if (_log.shouldLog(Log.ERROR))
_log.error("SAM error: " + e.getMessage(), e);
- try {
- String reply = "HELLO REPLY RESULT=I2P_ERROR MESSAGE=\"" + e.getMessage() + "\"\n";
- s.write(ByteBuffer.wrap(reply.getBytes("ISO-8859-1")));
- } catch (IOException ioe) {
- if (_log.shouldLog(Log.ERROR))
- _log.error("SAM Error sending error reply", ioe);
- }
+ String reply = "HELLO REPLY RESULT=I2P_ERROR MESSAGE=\"" + e.getMessage() + "\"\n";
+ SAMHandler.writeString(reply, s);
try { s.close(); } catch (IOException ioe) {}
} catch (Exception ee) {
try { s.close(); } catch (IOException ioe) {}
diff --git a/apps/sam/java/src/net/i2p/sam/SAMHandler.java b/apps/sam/java/src/net/i2p/sam/SAMHandler.java
index a775dd063c085740a87aa4f506eeb5f5a78dae97..be4d99dab35aee129eeaf3e634fb64072fe6ca8b 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMHandler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMHandler.java
@@ -13,6 +13,7 @@ import java.nio.channels.SocketChannel;
import java.nio.ByteBuffer;
import java.util.Properties;
+import net.i2p.data.DataHelper;
import net.i2p.util.I2PAppThread;
import net.i2p.util.Log;
@@ -132,10 +133,11 @@ abstract class SAMHandler implements Runnable {
}
}
+ /** @return success */
public static boolean writeString(String str, SocketChannel out)
{
try {
- writeBytes(ByteBuffer.wrap(str.getBytes("ISO-8859-1")), out);
+ writeBytes(ByteBuffer.wrap(DataHelper.getASCII(str)), out);
} catch (IOException e) {
//_log.debug("Caught IOException", e);
return false;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java b/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java
index 35d4411095756e803859d60a01959dc6cd956e66..56757acdec92009e395bef5e46a875707d90a8d3 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java
@@ -84,23 +84,13 @@ class SAMHandlerFactory {
String ver = chooseBestVersion(minVer, maxVer);
- try {
- if (ver == null) {
- s.write(ByteBuffer.wrap(("HELLO REPLY RESULT=NOVERSION\n").getBytes("ISO-8859-1")));
- return null ;
- }
- // Let's answer positively
- s.write(ByteBuffer.wrap(("HELLO REPLY RESULT=OK VERSION="
- + ver + "\n").getBytes("ISO-8859-1")));
- } catch (UnsupportedEncodingException e) {
- log.error("Caught UnsupportedEncodingException ("
- + e.getMessage() + ")");
- throw new SAMException("Character encoding error: "
- + e.getMessage());
- } catch (IOException e) {
- throw new SAMException("Error writing to socket: "
- + e.getMessage());
+ if (ver == null) {
+ SAMHandler.writeString("HELLO REPLY RESULT=NOVERSION\n", s);
+ return null;
}
+ // Let's answer positively
+ if (!SAMHandler.writeString("HELLO REPLY RESULT=OK VERSION=" + ver + "\n", s))
+ throw new SAMException("Error writing to socket");
// ...and instantiate the right SAM handler
int verMajor = getMajor(ver);
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
index 2549cedec9b4c73a1c61b07baa529e156ee60dc5..eab3740f7ffb4dfecdf4a496a593596aa6401a4c 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
@@ -782,9 +782,8 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
ByteArrayOutputStream msg = new ByteArrayOutputStream();
String msgText = "RAW RECEIVED SIZE=" + data.length + "\n";
- msg.write(msgText.getBytes("ISO-8859-1"));
+ msg.write(DataHelper.getASCII(msgText));
msg.write(data);
- msg.flush();
if (_log.shouldLog(Log.DEBUG))
_log.debug("sending to client: " + msgText);
@@ -820,7 +819,7 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
String msgText = "DATAGRAM RECEIVED DESTINATION=" + sender.toBase64()
+ " SIZE=" + data.length + "\n";
- msg.write(msgText.getBytes("ISO-8859-1"));
+ msg.write(DataHelper.getASCII(msgText));
if (_log.shouldLog(Log.DEBUG))
_log.debug("sending to client: " + msgText);
@@ -926,7 +925,7 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
if (_log.shouldLog(Log.DEBUG))
_log.debug("sending to client: " + msgText);
- ByteBuffer prefix = ByteBuffer.wrap(msgText.getBytes("ISO-8859-1"));
+ ByteBuffer prefix = ByteBuffer.wrap(DataHelper.getASCII(msgText));
Object writeLock = getWriteLock();
synchronized (writeLock) {
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java b/apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java
index b3386e97218b153aab0cad0cf4dc75d195f4ac3b..a16c92327fe23cc2f055d850a3ab48cd08a546a9 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java
@@ -10,6 +10,7 @@ import java.util.Properties;
import net.i2p.client.I2PSessionException;
import net.i2p.data.DataFormatException;
+import net.i2p.data.DataHelper;
import net.i2p.data.Destination;
import net.i2p.util.Log;
@@ -76,7 +77,7 @@ class SAMv3DatagramSession extends SAMDatagramSession implements SAMv3Handler.Se
} else {
String msg = sender.toBase64()+"\n";
ByteBuffer msgBuf = ByteBuffer.allocate(msg.length()+data.length);
- msgBuf.put(msg.getBytes("ISO-8859-1"));
+ msgBuf.put(DataHelper.getASCII(msg));
msgBuf.put(data);
msgBuf.flip();
this.server.send(this.clientAddress, msgBuf);