Changeset 5490de1 for router

Timestamp:

Apr 8, 2019 4:12:14 PM (15 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

cde5353

Parents:

488e89a

Message:

Router: Replace GarlicConfig? setters with constructor args

Location:

router/java

Files:

• src/net/i2p/router/message/GarlicConfig.java (modified) (6 diffs)
• src/net/i2p/router/message/OutboundClientMessageJobHelper.java (modified) (6 diffs)
• src/net/i2p/router/message/OutboundClientMessageOneShotJob.java (modified) (3 diffs)
• src/net/i2p/router/message/PayloadGarlicConfig.java (modified) (3 diffs)
• src/net/i2p/router/networkdb/kademlia/MessageWrapper.java (modified) (3 diffs)
• src/net/i2p/router/tunnel/pool/TestJob.java (modified) (1 diff)
• test/junit/net/i2p/router/message/BuildTestMessageJob.java (modified) (4 diffs)

router/java/src/net/i2p/router/message/GarlicConfig.java

@@ -28 +28 @@
     private RouterInfo _recipient;
     private PublicKey _recipientPublicKey;
-    private Certificate _cert;
-    private long _id;
-    private long _expiration;
+    private final Certificate _cert;
+    private final long _id;
+    private final long _expiration;
     private final List<GarlicConfig> _cloveConfigs;
-    private DeliveryInstructions _instructions;
+    private final DeliveryInstructions _instructions;
     // unused
     //private boolean _requestAck;
@@ -42 +42 @@
     //private long _replyBlockExpiration;
     
-    public GarlicConfig() {
-        this(new ArrayList<GarlicConfig>(4));
+    public GarlicConfig(Certificate cert, long id, long expiration, DeliveryInstructions di) {
+        this(new ArrayList<GarlicConfig>(4), cert, id, expiration, di);
     }
 
-    protected GarlicConfig(List<GarlicConfig> cloveConfigs) {
-        _id = -1;
-        _expiration = -1;
+    protected GarlicConfig(List<GarlicConfig> cloveConfigs, Certificate cert, long id,
+                           long expiration, DeliveryInstructions di) {
+        _cert = cert;
+        _id = id;
+        _expiration = expiration;
         _cloveConfigs = cloveConfigs;
+        _instructions = di;
         //_replyBlockMessageId = -1;
         //_replyBlockExpiration = -1;
@@ -80 +83 @@
      *
      */
-    public void setCertificate(Certificate cert) { _cert = cert; }
     public Certificate getCertificate() { return _cert; }
     
@@ -87 +89 @@
      *
      */
-    public void setId(long id) { _id = id; }
     public long getId() { return _id; }
     
@@ -94 +95 @@
      *
      */
-    public void setExpiration(long expiration) { _expiration = expiration; }
     public long getExpiration() { return _expiration; }
  
@@ -101 +101 @@
      *
      */
-    public void setDeliveryInstructions(DeliveryInstructions instructions) { _instructions = instructions; }
     public DeliveryInstructions getDeliveryInstructions() { return _instructions; }
     

router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java

@@ -147 +147 @@
         if (replyToken >= 0 && log.shouldLog(Log.DEBUG))
             log.debug("Reply token: " + replyToken);
-        GarlicConfig config = new GarlicConfig();
+        GarlicConfig config = new GarlicConfig(Certificate.NULL_CERT,
+                                               ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE),
+                                               expiration, DeliveryInstructions.LOCAL);
         
         if (requireAck) {
@@ -168 +170 @@
         config.addClove(dataClove);
 
-        config.setCertificate(Certificate.NULL_CERT);
-        config.setDeliveryInstructions(DeliveryInstructions.LOCAL);
-        config.setId(ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE));
-        config.setExpiration(expiration); // +2*Router.CLOCK_FUDGE_FACTOR);
         config.setRecipientPublicKey(recipientPK);
         
@@ -214 +212 @@
         //ackInstructions.setEncrypted(false);
         
-        PayloadGarlicConfig ackClove = new PayloadGarlicConfig();
-        ackClove.setCertificate(Certificate.NULL_CERT);
-        ackClove.setDeliveryInstructions(ackInstructions);
-        ackClove.setExpiration(expiration);
-        ackClove.setId(ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE));
         DeliveryStatusMessage dsm = buildDSM(ctx, replyToken);
         GarlicMessage msg = wrapDSM(ctx, skm, dsm);
@@ -226 +219 @@
             return null;
         }
-        ackClove.setPayload(msg);
+        PayloadGarlicConfig ackClove = new PayloadGarlicConfig(Certificate.NULL_CERT,
+                                                               ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE),
+                                                               expiration, ackInstructions, msg);
         // this does nothing, the clove is not separately encrypted
         //ackClove.setRecipient(ctx.router().getRouterInfo());
@@ -284 +279 @@
         //instructions.setEncrypted(false);
         
-        PayloadGarlicConfig clove = new PayloadGarlicConfig();
-        clove.setCertificate(Certificate.NULL_CERT);
-        clove.setDeliveryInstructions(instructions);
-        clove.setExpiration(expiration);
-        clove.setId(ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE));
         DataMessage msg = new DataMessage(ctx);
         msg.setData(data.getEncryptedData());
-        clove.setPayload(msg);
+        PayloadGarlicConfig clove = new PayloadGarlicConfig(Certificate.NULL_CERT,
+                                                            ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE),
+                                                            expiration, instructions, msg);
         // defaults
         //clove.setRecipientPublicKey(null);
@@ -304 +296 @@
      */
     private static PayloadGarlicConfig buildLeaseSetClove(RouterContext ctx, long expiration, LeaseSet replyLeaseSet) {
-        PayloadGarlicConfig clove = new PayloadGarlicConfig();
-        clove.setCertificate(Certificate.NULL_CERT);
-        clove.setDeliveryInstructions(DeliveryInstructions.LOCAL);
-        clove.setExpiration(expiration);
-        clove.setId(ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE));
         DatabaseStoreMessage msg = new DatabaseStoreMessage(ctx);
         msg.setEntry(replyLeaseSet);
         msg.setMessageExpiration(expiration);
-        clove.setPayload(msg);
+        PayloadGarlicConfig clove = new PayloadGarlicConfig(Certificate.NULL_CERT,
+                                                            ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE),
+                                                            expiration, DeliveryInstructions.LOCAL, msg);
         // defaults
         //clove.setRecipientPublicKey(null);

router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java

@@ -904 +904 @@
      */
     private PayloadGarlicConfig buildClove() {
-        PayloadGarlicConfig clove = new PayloadGarlicConfig();
-        
         DeliveryInstructions instructions = new DeliveryInstructions();
         instructions.setDeliveryMode(DeliveryInstructions.DELIVERY_MODE_DESTINATION);
@@ -914 +912 @@
         //instructions.setDelaySeconds(0);
         //instructions.setEncrypted(false);
-        
-        clove.setCertificate(Certificate.NULL_CERT);
-        clove.setDeliveryInstructions(instructions);
-        clove.setExpiration(OVERALL_TIMEOUT_MS_DEFAULT+getContext().clock().now());
-        clove.setId(getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE));
         
         DataMessage msg = new DataMessage(getContext());
@@ -928 +921 @@
             return null;
         msg.setData(d);
-        msg.setMessageExpiration(clove.getExpiration());
-        
-        clove.setPayload(msg);
+        long expires = OVERALL_TIMEOUT_MS_DEFAULT + getContext().clock().now();
+        msg.setMessageExpiration(expires);
+        PayloadGarlicConfig clove = new PayloadGarlicConfig(Certificate.NULL_CERT,
+                                                            getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE), 
+                                                            expires,
+                                                            instructions, msg);
+        
         // defaults
         //clove.setRecipientPublicKey(null);

router/java/src/net/i2p/router/message/PayloadGarlicConfig.java

@@ -9 +9 @@
  */
 
+import net.i2p.data.Certificate;
+import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.I2NPMessage;
 
@@ -18 +20 @@
  */
 public class PayloadGarlicConfig extends GarlicConfig {
-    private I2NPMessage _payload;
+    private final I2NPMessage _payload;
 
-    public PayloadGarlicConfig() {
-        super(null);
+    public PayloadGarlicConfig(Certificate cert, long id, long expiration,
+                               DeliveryInstructions di, I2NPMessage message) {
+        super(null, cert, id, expiration, di);
+        _payload = message; 
     }
     
@@ -28 +32 @@
      * in this block
      */
-    public void setPayload(I2NPMessage message) { 
-        _payload = message; 
-    }
-
     public I2NPMessage getPayload() { return _payload; }
  

router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java

@@ -44 +44 @@
      */
     static WrappedMessage wrap(RouterContext ctx, I2NPMessage m, Hash from, RouterInfo to) {
-        PayloadGarlicConfig payload = new PayloadGarlicConfig();
-        payload.setCertificate(Certificate.NULL_CERT);
-        payload.setId(ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE));
-        payload.setPayload(m);
+        PayloadGarlicConfig payload = new PayloadGarlicConfig(Certificate.NULL_CERT,
+                                                              ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE),
+                                                              m.getMessageExpiration(),
+                                                              DeliveryInstructions.LOCAL, m);
         payload.setRecipient(to);
-        payload.setDeliveryInstructions(DeliveryInstructions.LOCAL);
-        payload.setExpiration(m.getMessageExpiration());
 
         SessionKeyManager skm;
@@ -125 +123 @@
      */
     static GarlicMessage wrap(RouterContext ctx, I2NPMessage m, RouterInfo to) {
-        PayloadGarlicConfig payload = new PayloadGarlicConfig();
-        payload.setCertificate(Certificate.NULL_CERT);
-        payload.setId(ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE));
-        payload.setPayload(m);
+        PayloadGarlicConfig payload = new PayloadGarlicConfig(Certificate.NULL_CERT,
+                                                              ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE),
+                                                              m.getMessageExpiration(),
+                                                              DeliveryInstructions.LOCAL, m);
         payload.setRecipient(to);
-        payload.setDeliveryInstructions(DeliveryInstructions.LOCAL);
-        payload.setExpiration(m.getMessageExpiration());
 
         SessionKey sentKey = ctx.keyGenerator().generateSessionKey();
@@ -225 +221 @@
      */
     public static GarlicMessage wrap(RouterContext ctx, I2NPMessage m, SessionKey encryptKey, SessionTag encryptTag) {
-        PayloadGarlicConfig payload = new PayloadGarlicConfig();
-        payload.setCertificate(Certificate.NULL_CERT);
-        payload.setId(ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE));
-        payload.setPayload(m);
-        payload.setDeliveryInstructions(DeliveryInstructions.LOCAL);
-        payload.setExpiration(m.getMessageExpiration());
+        PayloadGarlicConfig payload = new PayloadGarlicConfig(Certificate.NULL_CERT,
+                                                              ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE),
+                                                              m.getMessageExpiration(),
+                                                              DeliveryInstructions.LOCAL, m);
 
         GarlicMessage msg = GarlicMessageBuilder.buildMessage(ctx, payload, null, null, 

router/java/src/net/i2p/router/tunnel/pool/TestJob.java

@@ -116 +116 @@
         // remembering that key+tag so that we can decrypt it later.  this means we can do the
         // garlic encryption without any ElGamal (yay)
-        PayloadGarlicConfig payload = new PayloadGarlicConfig();
-        payload.setCertificate(Certificate.NULL_CERT);
-        payload.setId(getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE));
-        payload.setPayload(m);
+        PayloadGarlicConfig payload = new PayloadGarlicConfig(Certificate.NULL_CERT,
+                                                              getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE),
+                                                              m.getMessageExpiration(),
+                                                              DeliveryInstructions.LOCAL, m);
         payload.setRecipient(getContext().router().getRouterInfo());
-        payload.setDeliveryInstructions(DeliveryInstructions.LOCAL);
-        payload.setExpiration(m.getMessageExpiration());
 
         SessionKey encryptKey = getContext().keyGenerator().generateSessionKey();

router/java/test/junit/net/i2p/router/message/BuildTestMessageJob.java

@@ -104 +104 @@
         if (_log.shouldLog(Log.INFO))
             _log.info("Test message key: " + _testMessageKey);
-        GarlicConfig config = new GarlicConfig();
-        
-        PayloadGarlicConfig ackClove = buildAckClove();
-        config.addClove(ackClove);
-        
+
         DeliveryInstructions instructions = new DeliveryInstructions();
         instructions.setDeliveryMode(DeliveryInstructions.DELIVERY_MODE_ROUTER);
@@ -114 +110 @@
         instructions.setTunnelId(null);
         
-        config.setCertificate(new Certificate(Certificate.CERTIFICATE_TYPE_NULL, null));
-        config.setDeliveryInstructions(instructions);
-        config.setId(getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE));
-        config.setExpiration(_timeoutMs+getContext().clock().now()+2*Router.CLOCK_FUDGE_FACTOR);
+        GarlicConfig config = new GarlicConfig(new Certificate(Certificate.CERTIFICATE_TYPE_NULL, null),
+                                               getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE),
+                                               _timeoutMs+getContext().clock().now()+2*Router.CLOCK_FUDGE_FACTOR,
+                                               instructions);
+        
+        PayloadGarlicConfig ackClove = buildAckClove();
+        config.addClove(ackClove);
+        
         config.setRecipient(_target);
         
@@ -127 +127 @@
      */
     private PayloadGarlicConfig buildAckClove() {
-        PayloadGarlicConfig ackClove = new PayloadGarlicConfig();
         
         DeliveryInstructions ackInstructions = new DeliveryInstructions();
@@ -139 +138 @@
             _log.debug("Delivery status message key: " + _testMessageKey + " arrival: " + msg.getArrival());
         
-        ackClove.setCertificate(new Certificate(Certificate.CERTIFICATE_TYPE_NULL, null));
-        ackClove.setDeliveryInstructions(ackInstructions);
-        ackClove.setExpiration(_timeoutMs+getContext().clock().now());
-        ackClove.setId(getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE));
-        ackClove.setPayload(msg);
+        PayloadGarlicConfig ackClove = new PayloadGarlicConfig(new Certificate(Certificate.CERTIFICATE_TYPE_NULL, null),
+                                                               getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE),
+                                                               _timeoutMs+getContext().clock().now(),
+                                                               ackInstructions,
+                                                               msg);
         ackClove.setRecipient(_target);