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

* SAM: Add support for RAW on the bridge socket in v3 (ticket #1334)

Browse Source 
log fixes
This commit is contained in:
zzz
2014-07-19 15:43:51 +00:00
parent 5d21738410
commit 4b0019c732
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -391,7 +391,11 @@ class SAMv3Handler extends SAMv1Handler
} else if (domain.equals("NAMING")) { } else if (domain.equals("NAMING")) {
canContinue = execNamingMessage(opcode, props); canContinue = execNamingMessage(opcode, props);
} else if (domain.equals("DATAGRAM")) { } else if (domain.equals("DATAGRAM")) {
// TODO not yet overridden, ID is ignored, most recent DATAGRAM session is used
canContinue = execDatagramMessage(opcode, props); canContinue = execDatagramMessage(opcode, props);
} else if (domain.equals("RAW")) {
// TODO not yet overridden, ID is ignored, most recent RAW session is used
canContinue = execRawMessage(opcode, props);
} else { } else {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Unrecognized message domain: \"" _log.debug("Unrecognized message domain: \""
@@ -694,10 +698,10 @@ class SAMv3Handler extends SAMv1Handler
else else
{ {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug ( "Unrecognized RAW message opcode: \"" _log.debug ( "Unrecognized STREAM message opcode: \""
+ opcode + "\"" ); + opcode + "\"" );
try { try {
notifyStreamResult(true, "I2P_ERROR", "Unrecognized RAW message opcode: "+opcode ); notifyStreamResult(true, "I2P_ERROR", "Unrecognized STREAM message opcode: "+opcode );
} catch (IOException e) {} } catch (IOException e) {}
return false; return false;
} }
@@ -716,9 +720,9 @@ class SAMv3Handler extends SAMv1Handler
String dest = props.getProperty("DESTINATION"); String dest = props.getProperty("DESTINATION");
if (dest == null) { if (dest == null) {
notifyStreamResult(verbose, "I2P_ERROR", "Destination not specified in RAW SEND message"); notifyStreamResult(verbose, "I2P_ERROR", "Destination not specified in STREAM CONNECT message");
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Destination not specified in RAW SEND message"); _log.debug("Destination not specified in STREAM CONNECT message");
return false; return false;
} }
props.remove("DESTINATION"); props.remove("DESTINATION");

1
history.txt
View File

@@ -1,6 +1,7 @@
2014-07-19 zzz 2014-07-19 zzz
* i2psnark: Don't prefer leeches during end game, to * i2psnark: Don't prefer leeches during end game, to
prevent slowdowns or stalls prevent slowdowns or stalls
* SAM: Add support for RAW on the bridge socket in v3 (ticket #1334)
* Streaming; Disable fail-fast for now. * Streaming; Disable fail-fast for now.
2014-07-15 str4d 2014-07-15 str4d

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 16; public final static long BUILD = 17;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";