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

* NetDB: Fix handling of DSM down client tunnels

Browse Source
This commit is contained in:
zzz
2014-01-12 19:21:52 +00:00
parent 8c6922ac5f
commit 8bbab31872
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
history.txt
View File

@ -1,5 +1,5 @@
2014-01-12 zzz
* NetDB: Fix handling of DSRM down client tunnels
* NetDB: Fix handling of DSRM and DSM down client tunnels
2014-01-11 zzz
* NetDB:

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

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

5
router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
View File

@ -90,8 +90,9 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver {
(type != DeliveryStatusMessage.MESSAGE_TYPE) &&
(type != GarlicMessage.MESSAGE_TYPE) &&
// allow DSM of our own key (used by FloodfillVerifyStoreJob)
// as long as there's no reply token (FVSJ will never set a reply token but an attacker might)
((type != DatabaseStoreMessage.MESSAGE_TYPE) || (!_client.equals(((DatabaseStoreMessage)msg).getKey())) ||
// or other keys (used by IterativeSearchJob)
// as long as there's no reply token (we will never set a reply token but an attacker might)
((type != DatabaseStoreMessage.MESSAGE_TYPE) ||
(((DatabaseStoreMessage)msg).getReplyToken() != 0)) &&
(type != TunnelBuildReplyMessage.MESSAGE_TYPE) &&
(type != VariableTunnelBuildReplyMessage.MESSAGE_TYPE)) {