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

SAM: Set keepalive on sockets (ticket #1573)

Browse Source 
Also on both sides of I2CP.
BOB already does it.
This commit is contained in:
zzz
2015-05-12 20:13:17 +00:00
parent 40130a8a61
commit b5455cee6e
5 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java
View File

@ -46,6 +46,7 @@ class SAMHandlerFactory {
try { try {
Socket sock = s.socket(); Socket sock = s.socket();
sock.setSoTimeout(HELLO_TIMEOUT); sock.setSoTimeout(HELLO_TIMEOUT);
sock.setKeepAlive(true);
String line = DataHelper.readLine(sock.getInputStream()); String line = DataHelper.readLine(sock.getInputStream());
sock.setSoTimeout(0); sock.setSoTimeout(0);
if (line == null) { if (line == null) {

1
apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
View File

@ -263,6 +263,7 @@ class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Sessi
// build pipes between both sockets // build pipes between both sockets
try { try {
clientServerSock.socket().setKeepAlive(true);
if (this.verbose) if (this.verbose)
SAMv3Handler.notifyStreamIncomingConnection( SAMv3Handler.notifyStreamIncomingConnection(
clientServerSock, i2ps.getPeerDestination()); clientServerSock, i2ps.getPeerDestination());

2
core/java/src/net/i2p/client/I2PSessionImpl.java
View File

@ -488,6 +488,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
try { try {
I2PSSLSocketFactory fact = new I2PSSLSocketFactory(_context, false, "certificates/i2cp"); I2PSSLSocketFactory fact = new I2PSSLSocketFactory(_context, false, "certificates/i2cp");
_socket = fact.createSocket(_hostname, _portNum); _socket = fact.createSocket(_hostname, _portNum);
_socket.setKeepAlive(true);
} catch (GeneralSecurityException gse) { } catch (GeneralSecurityException gse) {
IOException ioe = new IOException("SSL Fail"); IOException ioe = new IOException("SSL Fail");
ioe.initCause(gse); ioe.initCause(gse);
@ -495,6 +496,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
} }
} else { } else {
_socket = new Socket(_hostname, _portNum); _socket = new Socket(_hostname, _portNum);
_socket.setKeepAlive(true);
} }
// _socket.setSoTimeout(1000000); // Uhmmm we could really-really use a real timeout, and handle it. // _socket.setSoTimeout(1000000); // Uhmmm we could really-really use a real timeout, and handle it.
OutputStream out = _socket.getOutputStream(); OutputStream out = _socket.getOutputStream();

1
core/java/src/net/i2p/client/I2PSimpleSession.java
View File

@ -89,6 +89,7 @@ class I2PSimpleSession extends I2PSessionImpl2 {
} else { } else {
_socket = new Socket(_hostname, _portNum); _socket = new Socket(_hostname, _portNum);
} }
_socket.setKeepAlive(true);
OutputStream out = _socket.getOutputStream(); OutputStream out = _socket.getOutputStream();
out.write(I2PClient.PROTOCOL_BYTE); out.write(I2PClient.PROTOCOL_BYTE);
out.flush(); out.flush();

1
router/java/src/net/i2p/router/client/ClientListenerRunner.java
View File

@ -93,6 +93,7 @@ class ClientListenerRunner implements Runnable {
if (validate(socket)) { if (validate(socket)) {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Connection received"); _log.debug("Connection received");
socket.setKeepAlive(true);
runConnection(socket); runConnection(socket);
} else { } else {
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))