From 4283d71b92a73b92e3532dcc4d755b52ebc5049e Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 13 Jan 2019 13:14:58 +0000 Subject: [PATCH] I2CP: Set LS2 unpublished bit, show in debug output --- .../client/impl/RequestLeaseSetMessageHandler.java | 2 ++ .../impl/RequestVariableLeaseSetMessageHandler.java | 2 ++ core/java/src/net/i2p/data/EncryptedLeaseSet.java | 1 + core/java/src/net/i2p/data/LeaseSet2.java | 1 + core/java/src/net/i2p/data/MetaLeaseSet.java | 1 + history.txt | 13 +++++++++++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 7 files changed, 21 insertions(+), 1 deletion(-) diff --git a/core/java/src/net/i2p/client/impl/RequestLeaseSetMessageHandler.java b/core/java/src/net/i2p/client/impl/RequestLeaseSetMessageHandler.java index 138b40e8c..8b3bf1b3f 100644 --- a/core/java/src/net/i2p/client/impl/RequestLeaseSetMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/RequestLeaseSetMessageHandler.java @@ -128,6 +128,8 @@ class RequestLeaseSetMessageHandler extends HandlerImpl { session.destroySession(); return; } + if (Boolean.parseBoolean(session.getOptions().getProperty("i2cp.dontPublishLeaseSet"))) + ((LeaseSet2)leaseSet).setUnpublished(); } else { leaseSet = new LeaseSet(); } diff --git a/core/java/src/net/i2p/client/impl/RequestVariableLeaseSetMessageHandler.java b/core/java/src/net/i2p/client/impl/RequestVariableLeaseSetMessageHandler.java index 282ac7d50..05eabce9f 100644 --- a/core/java/src/net/i2p/client/impl/RequestVariableLeaseSetMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/RequestVariableLeaseSetMessageHandler.java @@ -53,6 +53,8 @@ class RequestVariableLeaseSetMessageHandler extends RequestLeaseSetMessageHandle session.destroySession(); return; } + if (Boolean.parseBoolean(session.getOptions().getProperty("i2cp.dontPublishLeaseSet"))) + ((LeaseSet2)leaseSet).setUnpublished(); } else { leaseSet = new LeaseSet(); } diff --git a/core/java/src/net/i2p/data/EncryptedLeaseSet.java b/core/java/src/net/i2p/data/EncryptedLeaseSet.java index 23bc75e14..3f531179d 100644 --- a/core/java/src/net/i2p/data/EncryptedLeaseSet.java +++ b/core/java/src/net/i2p/data/EncryptedLeaseSet.java @@ -298,6 +298,7 @@ public class EncryptedLeaseSet extends LeaseSet2 { buf.append("\n\tTransient Expires: ").append(new java.util.Date(_transientExpires)); buf.append("\n\tOffline Signature: ").append(_offlineSignature); } + buf.append("\n\tUnpublished? ").append(isUnpublished()); buf.append("\n\tSignature: ").append(_signature); buf.append("\n\tPublished: ").append(new java.util.Date(_published)); buf.append("\n\tExpires: ").append(new java.util.Date(_expires)); diff --git a/core/java/src/net/i2p/data/LeaseSet2.java b/core/java/src/net/i2p/data/LeaseSet2.java index 7d77299ec..d5e1831ab 100644 --- a/core/java/src/net/i2p/data/LeaseSet2.java +++ b/core/java/src/net/i2p/data/LeaseSet2.java @@ -540,6 +540,7 @@ public class LeaseSet2 extends LeaseSet { buf.append("\n\t\t[").append(key).append("] = [").append(val).append("]"); } } + buf.append("\n\tUnpublished? ").append(isUnpublished()); buf.append("\n\tSignature: ").append(_signature); buf.append("\n\tPublished: ").append(new java.util.Date(_published)); buf.append("\n\tExpires: ").append(new java.util.Date(_expires)); diff --git a/core/java/src/net/i2p/data/MetaLeaseSet.java b/core/java/src/net/i2p/data/MetaLeaseSet.java index e20736913..70835db82 100644 --- a/core/java/src/net/i2p/data/MetaLeaseSet.java +++ b/core/java/src/net/i2p/data/MetaLeaseSet.java @@ -171,6 +171,7 @@ public class MetaLeaseSet extends LeaseSet2 { buf.append("\n\t\t[").append(key).append("] = [").append(val).append("]"); } } + buf.append("\n\tUnpublished? ").append(isUnpublished()); buf.append("\n\tSignature: ").append(_signature); buf.append("\n\tPublished: ").append(new java.util.Date(_published)); buf.append("\n\tExpires: ").append(new java.util.Date(_expires)); diff --git a/history.txt b/history.txt index eab8dee24..966857b1a 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,16 @@ +2019-01-13 zzz + * I2CP: Set LS2 unpublished bit, show in debug output + +2019-01-12 zzz + * NetDB: Use isSlow() in floodfill criteria + * SSU: More consolidation of clock().now() calls + +2019-01-10 zzz + * I2CP: + - Router-side handling of meta LS2 + - Remove client-side-only options from those sent to router + - Router-side stub for encrypted LS2 + 2019-01-09 zzz * Console: Fix broken image link on /configui * I2CP: Stub out client-side creation of meta and enc. LS2 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 25340f779..421ff4f63 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -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 = 15; + public final static long BUILD = 16; /** for example "-test" */ public final static String EXTRA = "-rc";