2004-11-01 jrandom

* Increase the tunnel test timeout rapidly if our tunnels are failing.
    * Honor message expirations for some tunnel jobs that were prematurely
      expired.
    * Streamline memory usage with temporary object caches and more efficient
      serialization for SHA256 calculation, logging, and both I2CP and I2NP
      message handling.
    * Fix some situations where we forward messages too eagerly.  For a
      request at the tunnel endpoint, if the tunnel is inbound and the target
      is remote, honor the message by tunnel routing the data rather than
      sending it directly to the requested location.

router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java

@@ -18,7 +18,7 @@ import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
 
 /**
- * Handle messages from router to router
+ * Handle messages from router to router.  This class is NOT threadsafe
  *
  */
 public class I2NPMessageHandler {
@@ -28,6 +28,8 @@ public class I2NPMessageHandler {
     private long _lastReadEnd;
     private int _lastSize;
     private byte _messageBuffer[];
+    private I2NPMessage _lastRead;
+    
     public I2NPMessageHandler(I2PAppContext context) {
         _context = context;
         _log = context.logManager().getLog(I2NPMessageHandler.class);
@@ -68,6 +70,51 @@ public class I2NPMessageHandler {
             throw new I2NPMessageException("Error reading the message", dfe);
         }
     }
+    
+    /** clear the last message read from a byte array with an offset */
+    public I2NPMessage lastRead() { 
+        I2NPMessage rv = _lastRead;
+        _lastRead = null;
+        return rv;
+    }
+    
+    /**
+     * Read an I2NPMessage from the stream and return the fully populated object.
+     *
+     * @throws IOException if there is an IO problem reading from the stream
+     * @throws I2NPMessageException if there is a problem handling the particular
+     *          message - if it is an unknown type or has improper formatting, etc.
+     */
+    public I2NPMessage readMessage(byte data[]) throws IOException, I2NPMessageException {
+        int offset = readMessage(data, 0);
+        return lastRead();
+    }
+    public int readMessage(byte data[], int offset) throws IOException, I2NPMessageException {
+        int cur = offset;
+        int type = (int)DataHelper.fromLong(data, cur, 1);
+        cur++;
+        _lastReadBegin = System.currentTimeMillis();
+        I2NPMessage msg = createMessage(type);
+        if (msg == null)
+            throw new I2NPMessageException("The type "+ type + " is an unknown I2NP message");
+        try {
+            _lastSize = msg.readBytes(data, type, cur);
+            cur += _lastSize;
+        } catch (IOException ioe) {
+            throw ioe;
+        } catch (I2NPMessageException ime) {
+            throw ime;
+        } catch (Exception e) {
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Error reading the stream", e);
+            throw new IOException("Unknown error reading the " + msg.getClass().getName() 
+                                  + ": " + e.getMessage());
+        }
+        _lastReadEnd = System.currentTimeMillis();
+        _lastRead = msg;
+        return cur - offset;
+    }
+    
     public long getLastReadTime() { return _lastReadEnd - _lastReadBegin; }
     public int getLastSize() { return _lastSize; }