Changeset 036b777

Timestamp:

Jun 17, 2015 2:16:06 AM (6 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

8096e4f6

Parents:

bc85543

Message:

Catch uncaught exceptions in ClientConnectionRunner? and stop connection
Catch null SessionId? in messages and stop connection instead of NPE
Wait for LS in SubSession? in connect() so we don't send data w/o
a session ID and leaseset
Log tweaks

Files:

• core/java/src/net/i2p/client/I2PSessionImpl.java (modified) (2 diffs)
• core/java/src/net/i2p/client/SubSession.java (modified) (1 diff)
• core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java (modified) (1 diff)
• core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java (modified) (1 diff)
• router/java/src/net/i2p/router/client/ClientConnectionRunner.java (modified) (7 diffs)
• router/java/src/net/i2p/router/client/ClientMessageEventListener.java (modified) (7 diffs)

core/java/src/net/i2p/client/I2PSessionImpl.java

@@ -82 +82 @@
     private SessionId _sessionId;
     /** currently granted lease set, or null */
-    private volatile LeaseSet _leaseSet;
+    protected volatile LeaseSet _leaseSet;
 
     // subsession stuff
@@ -131 +131 @@
 
     /** monitor for waiting until a lease set has been granted */
-    private final Object _leaseSetWait = new Object();
+    protected final Object _leaseSetWait = new Object();
 
     /**

core/java/src/net/i2p/client/SubSession.java

@@ -102 +102 @@
             }
         }
-        _primary.connect();
-        synchronized(_stateLock) {
-            if (_state != State.OPEN) {
-                Thread notifier = new I2PAppThread(_availabilityNotifier, "ClientNotifier " + getPrefix(), true);
-                notifier.start();
-                _state = State.OPEN;
+        boolean success = false;
+        try {
+            _primary.connect();
+            // wait until we have created a lease set
+            int waitcount = 0;
+            while (_leaseSet == null) {
+                if (waitcount++ > 5*60) {
+                    throw new IOException("No tunnels built after waiting 5 minutes. Your network connection may be down, or there is severe network congestion.");
+                }
+                synchronized (_leaseSetWait) {
+                    // InterruptedException caught below
+                    _leaseSetWait.wait(1000);
+                }
+            }
+            synchronized(_stateLock) {
+                if (_state != State.OPEN) {
+                    Thread notifier = new I2PAppThread(_availabilityNotifier, "ClientNotifier " + getPrefix(), true);
+                    notifier.start();
+                    _state = State.OPEN;
+                }
+            }
+            success = true;
+        } catch (InterruptedException ie) {
+            throw new I2PSessionException("Interrupted", ie);
+        } catch (IOException ioe) {
+            throw new I2PSessionException(getPrefix() + "Cannot connect to the router on " + _hostname + ':' + _portNum, ioe);
+        } finally {
+            if (!success) {
+                _availabilityNotifier.stopNotifying();
+                changeState(State.CLOSED);
             }
         }

core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java

@@ -159 +159 @@
 
         public void run() {
+            try {
+                run2();
+            } catch (Exception e) {
+                _log.log(Log.CRIT, "Uncaught I2CP error", e);
+                _listener.readError(I2CPMessageReader.this, e);
+                cancelRunner();
+            }
+        }
+
+        /**
+         * Called by run()
+         * @since 0.9.21
+         */
+        protected void run2() {
             while (_stayAlive) {
                 while (_doRun) {

core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java

@@ -43 +43 @@
          */
         @Override
-        public void run() {
+        protected void run2() {
             while (_stayAlive) {
                 while (_doRun) {

router/java/src/net/i2p/router/client/ClientConnectionRunner.java

@@ -229 +229 @@
      *  will be null if session not found
      *  IS subsession aware.
+     *  Returns null if id is null.
      *  @since 0.9.21 added id param
      */
     public SessionConfig getConfig(SessionId id) {
+        if (id == null)
+            return null;
         for (SessionParams sp : _sessions.values()) {
             if (id.equals(sp.sessionId))
@@ -318 +321 @@
      */
     public Hash getDestHash(SessionId id) {
+        if (id == null)
+            return null;
         for (Map.Entry<Hash, SessionParams> e : _sessions.entrySet()) {
             if (id.equals(e.getValue().sessionId))
@@ -331 +336 @@
      */
     public Destination getDestination(SessionId id) {
+        if (id == null)
+            return null;
         for (SessionParams sp : _sessions.values()) {
             if (id.equals(sp.sessionId))
@@ -392 +399 @@
         if (hash == null)
             throw new IllegalStateException();
+        if (id == null)
+            throw new NullPointerException();
         SessionParams sp = _sessions.get(hash);
         if (sp == null || sp.sessionId != null)
@@ -404 +413 @@
      */
     void removeSession(SessionId id) {
+        if (id == null)
+            return;
         boolean isPrimary = false;
         for (Iterator<SessionParams> iter = _sessions.values().iterator(); iter.hasNext(); ) {
@@ -814 +825 @@
             state = sp.leaseRequest;
             if (state != null) {
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("Already requesting " + state);
                 LeaseSet requested = state.getRequested();
                 LeaseSet granted = state.getGranted();
@@ -822 +831 @@
                      ( (granted != null) && (granted.getEarliestLeaseDate() > ours) ) ) {
                     // theirs is newer
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug("Already requesting, theirs newer, do nothing: " + state);
                 } else {
                     // ours is newer, so wait a few secs and retry
                     set.setDestination(dest);
                     _context.simpleTimer2().addEvent(new Rerequest(set, expirationTime, onCreateJob, onFailedJob), 3*1000);
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug("Already requesting, ours newer, wait 3 sec: " + state);
                 }
                 // fire onCreated?

router/java/src/net/i2p/router/client/ClientMessageEventListener.java

@@ -81 +81 @@
      */
     public void messageReceived(I2CPMessageReader reader, I2CPMessage message) {
-        if (_runner.isDead()) return;
+        if (_runner.isDead()) {
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Received but runner dead: \n" + message);
+            return;
+        }
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("Message received: \n" + message);
@@ -363 +367 @@
         if (cfg == null) {
             if (_log.shouldLog(Log.ERROR))
-                _log.error("SendMessage w/o session");
-            _runner.disconnectClient("SendMessage w/o session");
+                _log.error("SendMessage w/o session: " + sid);
+            _runner.disconnectClient("SendMessage w/o session: " + sid);
             return;
         }
@@ -373 +377 @@
         long timeToDistribute = _context.clock().now() - beforeDistribute;
         // TODO validate session id
-        _runner.ackSendMessage(message.getSessionId(), id, message.getNonce());
+        _runner.ackSendMessage(sid, id, message.getNonce());
         _context.statManager().addRateData("client.distributeTime", timeToDistribute);
-        if ( (timeToDistribute > 50) && (_log.shouldLog(Log.INFO)) )
-            _log.info("Took too long to distribute the message (which holds up the ack): " + timeToDistribute);
+        if ( (timeToDistribute > 50) && (_log.shouldLog(Log.DEBUG)) )
+            _log.debug("Took too long to distribute the message (which holds up the ack): " + timeToDistribute);
     }
 
@@ -387 +391 @@
         if (_runner.isDead()) return;
         if (_log.shouldLog(Log.DEBUG))
-            _log.debug("Handling recieve begin: id = " + message.getMessageId());
+            _log.debug("Handling receive begin: id = " + message.getMessageId());
         MessagePayloadMessage msg = new MessagePayloadMessage();
         msg.setMessageId(message.getMessageId());
@@ -410 +414 @@
     
     /**
-     * The client told us that the message has been recieved completely.  This currently
+     * The client told us that the message has been received completely.  This currently
      * does not do any security checking prior to removing the message from the 
      * pending queue, though it should.
@@ -444 +448 @@
         if (cfg == null) {
             if (_log.shouldLog(Log.ERROR))
-                _log.error("CreateLeaseSet w/o session");
-            _runner.disconnectClient("CreateLeaseSet w/o session");
+                _log.error("CreateLeaseSet w/o session: " + id);
+            _runner.disconnectClient("CreateLeaseSet w/o session: " + id);
             return;
         }
@@ -534 +538 @@
         if (cfg == null) {
             if (_log.shouldLog(Log.ERROR))
-                _log.error("ReconfigureSession w/o session");
+                _log.error("ReconfigureSession w/o session: " + id);
             //sendStatusMessage(id, SessionStatusMessage.STATUS_INVALID);
-            _runner.disconnectClient("ReconfigureSession w/o session");
+            _runner.disconnectClient("ReconfigureSession w/o session: " + id);
             return;
         }