From 333f80680e9c3c6038554b9a379fbc9e8a88b571 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 2 Oct 2010 15:11:41 +0000
Subject: [PATCH]     * UDP:       - Avoid rare AIOOBE       - Comments       -
 Logging cleanup       - Comment out a main()

---
 .../transport/udp/InboundEstablishState.java       |  7 +++++++
 .../net/i2p/router/transport/udp/UDPPacket.java    |  2 ++
 .../i2p/router/transport/udp/UDPPacketReader.java  |  2 ++
 .../net/i2p/router/transport/udp/UDPTransport.java | 14 ++++++++------
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java
index 829f62ee00..6bdfa23a54 100644
--- a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java
+++ b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java
@@ -218,6 +218,13 @@ public class InboundEstablishState {
         if (_receivedIdentity == null)
             _receivedIdentity = new byte[conf.readTotalFragmentNum()][];
         int cur = conf.readCurrentFragmentNum();
+        if (cur >= _receivedIdentity.length) {
+            // avoid AIOOBE
+            // should do more than this, but what? disconnect?
+            fail();
+            packetReceived();
+            return;
+        }
         if (_receivedIdentity[cur] == null) {
             byte fragment[] = new byte[conf.readCurrentFragmentSize()];
             conf.readFragmentData(fragment, 0);
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
index 5dc001e18f..588b0ff490 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
@@ -67,9 +67,11 @@ public class UDPPacket {
     // various flag fields for use in the data packets
     public static final byte DATA_FLAG_EXPLICIT_ACK = (byte)(1 << 7);
     public static final byte DATA_FLAG_ACK_BITFIELDS = (1 << 6);
+    // unused
     public static final byte DATA_FLAG_ECN = (1 << 4);
     public static final byte DATA_FLAG_WANT_ACKS = (1 << 3);
     public static final byte DATA_FLAG_WANT_REPLY = (1 << 2);
+    // unused
     public static final byte DATA_FLAG_EXTENDED = (1 << 1);
     
     public static final byte BITFIELD_CONTINUATION = (byte)(1 << 7);
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
index aaf0f721a6..9d2c329394 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
@@ -756,6 +756,7 @@ public class UDPPacketReader {
     }
     
     
+/******
     public static void main(String args[]) {
         I2PAppContext ctx = I2PAppContext.getGlobalContext();
         try {
@@ -781,4 +782,5 @@ public class UDPPacketReader {
         }
         
     }
+*******/
 }
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index 5570b83893..0617790a37 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -945,7 +945,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 // try to shift 'em around every 10 minutes or so
                 if (_introducersSelectedOn < _context.clock().now() - 10*60*1000) {
                     if (_log.shouldLog(Log.WARN))
-                        _log.warn("Our introducers are valid, but thy havent changed in a while, so lets rechoose");
+                        _log.warn("Our introducers are valid, but havent changed in a while, so lets rechoose");
                     return true;
                 } else {
                     if (_log.shouldLog(Log.INFO))
@@ -954,7 +954,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 }
             } else {
                 if (_log.shouldLog(Log.INFO))
-                    _log.info("Our introducers are not valid (" +valid + ")");
+                    _log.info("Need more introducers (have " +valid + " need " + PUBLIC_RELAY_COUNT + ')');
                 return true;
             }
         } else {
@@ -1233,7 +1233,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 _introducersSelectedOn = _context.clock().now();
                 introducersIncluded = true;
             } else {
+                // FIXME
                 // maybe we should fail to publish an address at all in this case?
+                // YES that would be better
                 if (_log.shouldLog(Log.WARN))
                     _log.warn("Need introducers but we don't know any");
             }
@@ -1331,13 +1333,13 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         switch (status) {
             case CommSystemFacade.STATUS_REJECT_UNSOLICITED:
             case CommSystemFacade.STATUS_DIFFERENT:
-                if (_log.shouldLog(Log.INFO))
-                    _log.info("Require introducers, because our status is " + status);
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("Require introducers, because our status is " + status);
                 return true;
             default:
                 if (!allowDirectUDP()) {
-                    if (_log.shouldLog(Log.INFO))
-                        _log.info("Require introducers, because we do not allow direct UDP connections");
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug("Require introducers, because we do not allow direct UDP connections");
                     return true;
                 }
                 return false;