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

SAM: Don't log an error on datagram send success!

Browse Source 
set i2cp.fastReceive=true
log tweaks
This commit is contained in:
zzz
2016-02-17 14:11:18 +00:00
parent 27d0a81bcb
commit 455f32faa7
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -453,8 +453,8 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
String dest = props.getProperty("DESTINATION");
if (dest == null) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Destination not specified in SEND message");
if (_log.shouldWarn())
_log.warn("Destination not specified in SEND message");
return false;
}
@ -522,27 +522,27 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
in.readFully(data);
SAMMessageSess sess = isRaw ? rawSession : datagramSession;
if (sess.sendBytes(dest, data, proto, fromPort, toPort)) {
_log.error("SEND failed");
if (!sess.sendBytes(dest, data, proto, fromPort, toPort)) {
if (_log.shouldWarn())
_log.warn((isRaw ? "SEND RAW to " : "SEND DATAGRAM to ") + dest + " size " + size +
" failed");
// a message send failure is no reason to drop the SAM session
// for raw and repliable datagrams, just carry on our merry way
return true;
}
return true;
} catch (EOFException e) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Too few bytes with SEND message (expected: "
+ size);
if (_log.shouldWarn())
_log.warn("Too few bytes with SEND message (expected: "
+ size, e);
return false;
} catch (IOException e) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Caught IOException while parsing SEND message",
if (_log.shouldWarn())
_log.warn("Caught IOException while parsing SEND message",
e);
return false;
} catch (DataFormatException e) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Invalid key specified with SEND message",
if (_log.shouldWarn())
_log.warn("Invalid key specified with SEND message",
e);
return false;
} catch (I2PSessionException e) {
@ -550,8 +550,8 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
return false;
}
} else {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Unrecognized message opcode: \""
if (_log.shouldWarn())
_log.warn("Unrecognized message opcode: \""
+ opcode + "\"");
return false;
}
@ -571,8 +571,8 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
} else if (opcode.equals("CLOSE")) {
return execStreamClose(props);
} else {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Unrecognized STREAM message opcode: \""
if (_log.shouldWarn())
_log.warn("Unrecognized STREAM message opcode: \""
+ opcode + "\"");
return false;
}

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

@ -458,6 +458,7 @@ class SAMv3Handler extends SAMv1Handler
// (iMule sets BestEffort) as None is more efficient
// and the client has no way to access delivery notifications
i2cpProps.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE);
i2cpProps.setProperty("i2cp.fastReceive", "true");
// Record the session in the database sSessionsHash
Properties allProps = new Properties();