Changeset c92c664

Timestamp:

Dec 13, 2011 8:38:02 PM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

60297f56

Parents:

24c1473

Message:

used cached cert; generics

Location:

router/java/src/net/i2p/router/message

Files:

• CloveSet.java (modified) (3 diffs)
• GarlicConfig.java (modified) (2 diffs)
• GarlicMessageParser.java (modified) (2 diffs)

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

@@ -20 +20 @@
  */
 class CloveSet {
-    private final List _cloves;
+    private final List<GarlicClove> _cloves;
     private Certificate _cert;
     private long _msgId;
@@ -33 +33 @@
     public int getCloveCount() { return _cloves.size(); }
     public void addClove(GarlicClove clove) { _cloves.add(clove); }
-    public GarlicClove getClove(int index) { return (GarlicClove)_cloves.get(index); }
+    public GarlicClove getClove(int index) { return _cloves.get(index); }
     
     public Certificate getCertificate() { return _cert; }
@@ -47 +47 @@
         buf.append("{");
         for (int i = 0; i < _cloves.size(); i++) {
-            GarlicClove clove = (GarlicClove)_cloves.get(i);
+            GarlicClove clove = _cloves.get(i);
             if (clove.getData() != null)
                 buf.append(clove.getData().getClass().getName()).append(", ");

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

@@ -28 +28 @@
     private long _id;
     private long _expiration;
-    private final List _cloveConfigs;
+    private final List<GarlicConfig> _cloveConfigs;
     private DeliveryInstructions _instructions;
     private boolean _requestAck;
@@ -143 +143 @@
     }
     public int getCloveCount() { return _cloveConfigs.size(); }
-    public GarlicConfig getClove(int index) { return (GarlicConfig)_cloveConfigs.get(index); }
+    public GarlicConfig getClove(int index) { return _cloveConfigs.get(index); }
     public void clearCloves() { _cloveConfigs.clear(); }
     

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

@@ -47 +47 @@
         }
         if (decrData == null) {
-            if (_log.shouldLog(Log.WARN))
-                _log.warn("Decryption of garlic message failed", new Exception("Decrypt fail"));
+            // This is the usual error path and it's logged at WARN level in GarlicMessageReceiver
+            if (_log.shouldLog(Log.INFO))
+                _log.info("Decryption of garlic message failed", new Exception("Decrypt fail"));
             return null;
         } else {
@@ -79 +80 @@
                 _log.debug("After reading clove " + i);
         }
-        Certificate cert = new Certificate();
-        offset += cert.readBytes(data, offset);
+        //Certificate cert = new Certificate();
+        //offset += cert.readBytes(data, offset);
+        Certificate cert = Certificate.create(data, offset);
+        offset += cert.size();
         long msgId = DataHelper.fromLong(data, offset, 4);
         offset += 4;
         Date expiration = DataHelper.fromDate(data, offset);
-        offset += DataHelper.DATE_LENGTH;
 
         set.setCertificate(cert);