Improve UDP socket logic, fixing various issues with concurrency when…

… sending messages.
acomminos · Aug 23, 2017 · 4a0fe1d · 4a0fe1d
1 parent 4a44ab6
commit 4a0fe1d
Show file tree

Hide file tree

Showing 4 changed files with 166 additions and 100 deletions.
diff --git a/src/main/java/com/morlunk/jumble/net/JumbleConnection.java b/src/main/java/com/morlunk/jumble/net/JumbleConnection.java
@@ -625,17 +625,12 @@ public void onTCPConnectionEstablished() {
         mConnected = true;
 
         // Attempt to start UDP thread once connected.
-        if(!shouldForceTCP()) {
-            try {
-                mUDP = new JumbleUDP(mCryptState);
-                mUDP.setUDPConnectionListener(this);
-                mUDP.connect(mHost, mPort);
-            } catch (ConnectException e) {
-                onUDPConnectionError(e);
-            }
+        if (!shouldForceTCP()) {
+            mUDP = new JumbleUDP(mCryptState, this, mMainHandler);
+            mUDP.connect(mHost, mPort);
         }
 
-        if(mListener != null) mListener.onConnectionEstablished();
+        if (mListener != null) mListener.onConnectionEstablished();
     }
 
     @Override

diff --git a/src/main/java/com/morlunk/jumble/net/JumbleNetworkThread.java b/src/main/java/com/morlunk/jumble/net/JumbleNetworkThread.java
@@ -27,6 +27,7 @@
  * Base class for TCP/UDP protocol implementations.
  * Provides a common threading model (single threaded queue for write)
  * Created by andrew on 25/03/14.
+ * @deprecated This shouldn't be needed. Redundant inheritance with limited shared code.
  */
 public abstract class JumbleNetworkThread implements Runnable {
 

diff --git a/src/main/java/com/morlunk/jumble/net/JumbleTCP.java b/src/main/java/com/morlunk/jumble/net/JumbleTCP.java
@@ -126,15 +126,6 @@ public void run() {
                     });
                 }
             }
-
-            if(mListener != null) {
-                executeOnMainThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        mListener.onTCPConnectionDisconnect();
-                    }
-                });
-            }
         } catch (SocketException e) {
             error("Could not open a connection to the host", e);
         } catch (SSLHandshakeException e) {
@@ -162,6 +153,13 @@ public void run() {
                 e.printStackTrace();
             }
             mRunning = false;
+
+            executeOnMainThread(new Runnable() {
+                @Override
+                public void run() {
+                    mListener.onTCPConnectionDisconnect();
+                }
+            });
             stopThreads();
         }
     }
@@ -215,6 +213,8 @@ public void run() {
      * Attempts to disconnect gracefully on the Tx thread.
      * Disconnects interrupt the socket listening on the Tx thread, suppressing any exceptions
      * caused by this request. Any remaining protobuf messages will be dispatched first.
+     *
+     * Suppresses all future errors on this connection.
      */
     public void disconnect() {
         if (!mRunning) return;
@@ -256,6 +256,18 @@ public void run() {
             });
     }
 
+    /**
+     * Runnable that
+     */
+    private static class OutboxConsumer implements Runnable {
+
+
+        @Override
+        public void run() {
+
+        }
+    }
+
     public interface TCPConnectionListener {
         public void onTCPConnectionEstablished();
         public void onTLSHandshakeFailed(X509Certificate[] chain);