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

SAM: Handle UTF-8 in ReadLine (ticket #1488)

Browse Source 
Allow forever timeout in ReadLine
Use ReadLine in v1 and v3 handlers
Fix send client closing too fast in v1 stream mode
UTF-8 test and fixes in clients
This commit is contained in:
zzz
2015-11-28 21:25:44 +00:00
parent dffd441304
commit 513e1b9ff8
7 changed files with 221 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
View File

@@ -98,6 +98,7 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
String opcode = null;
boolean canContinue = false;
Properties props;
final StringBuilder buf = new StringBuilder(128);
this.thread.setName("SAMv1Handler " + _id);
if (_log.shouldLog(Log.DEBUG))
@@ -120,19 +121,13 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
_log.info("Connection closed by client");
break;
}
java.io.InputStream is = clientSocketChannel.socket().getInputStream();
if (is == null) {
_log.info("Connection closed by client");
break;
}
msg = DataHelper.readLine(is);
if (msg == null) {
_log.info("Connection closed by client (line read : null)");
break;
}
buf.setLength(0);
// TODO set timeout first time
ReadLine.readLine(clientSocketChannel.socket(), buf, 0);
msg = buf.toString();
if (_log.shouldLog(Log.DEBUG)) {
_log.debug("New message received: [" + msg + "]");
_log.debug("New message received: [" + msg + ']');
}
props = SAMUtils.parseParams(msg);
domain = props.getProperty(SAMUtils.COMMAND);