fixup server stop to not wait by default

fixup potential selector issue
trustmanager doesnt need to be used, sslcontext does it automatically

Author: koush

AndroidAsync-Kotlin/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.61'
     repositories {
         mavenCentral()
     }

AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java

@@ -385,40 +385,28 @@ private void handleHandshakeStatus(HandshakeStatus status) {
         try {
             if (!finishedHandshake && (engine.getHandshakeStatus() == HandshakeStatus.NOT_HANDSHAKING || engine.getHandshakeStatus() == HandshakeStatus.FINISHED)) {
                 if (clientMode) {
-                    TrustManager[] trustManagers = this.trustManagers;
-                    if (trustManagers == null) {
-                        TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                        tmf.init((KeyStore) null);
-                        trustManagers = tmf.getTrustManagers();
-                    }
-                    boolean trusted = false;
                     Exception peerUnverifiedCause = null;
-                    for (TrustManager tm : trustManagers) {
-                        try {
-                            X509TrustManager xtm = (X509TrustManager) tm;
-                            peerCertificates = (X509Certificate[]) engine.getSession().getPeerCertificates();
-                            xtm.checkServerTrusted(peerCertificates, "SSL");
-                            if (mHost != null) {
-                                if (hostnameVerifier == null) {
-                                    StrictHostnameVerifier verifier = new StrictHostnameVerifier();
-                                    verifier.verify(mHost, StrictHostnameVerifier.getCNs(peerCertificates[0]), StrictHostnameVerifier.getDNSSubjectAlts(peerCertificates[0]));
-                                }
-                                else {
-                                    if (!hostnameVerifier.verify(mHost, engine.getSession())) {
-                                        throw new SSLException("hostname <" + mHost + "> has been denied");
-                                    }
+                    boolean trusted = false;
+                    try {
+                        peerCertificates = (X509Certificate[]) engine.getSession().getPeerCertificates();
+                        if (mHost != null) {
+                            if (hostnameVerifier == null) {
+                                StrictHostnameVerifier verifier = new StrictHostnameVerifier();
+                                verifier.verify(mHost, StrictHostnameVerifier.getCNs(peerCertificates[0]), StrictHostnameVerifier.getDNSSubjectAlts(peerCertificates[0]));
+                            }
+                            else {
+                                if (!hostnameVerifier.verify(mHost, engine.getSession())) {
+                                    throw new SSLException("hostname <" + mHost + "> has been denied");
                                 }
                             }
-                            trusted = true;
-                            break;
-                        }
-                        catch (GeneralSecurityException ex) {
-                            peerUnverifiedCause = ex;
-                        }
-                        catch (SSLException ex) {
-                            peerUnverifiedCause = ex;
                         }
+
+                        trusted = true;
+                    }
+                    catch (SSLException ex) {
+                        peerUnverifiedCause = ex;
                     }
+
                     finishedHandshake = true;
                     if (!trusted) {
                         AsyncSSLException e = new AsyncSSLException(peerUnverifiedCause);
@@ -446,13 +434,7 @@ public void run() {
                 onDataAvailable();
             }
         }
-        catch (NoSuchAlgorithmException ex) {
-            throw new RuntimeException(ex);
-        }
-        catch (GeneralSecurityException ex) {
-            report(ex);
-        }
-        catch (AsyncSSLException ex) {
+        catch (Exception ex) {
             report(ex);
         }
     }

AndroidAsync/src/com/koushikdutta/async/AsyncServer.java

@@ -122,15 +122,11 @@ public AsyncServer(String name) {
 
     private static ExecutorService synchronousWorkers = newSynchronousWorkers("AsyncServer-worker-");
     private static void wakeup(final SelectorWrapper selector) {
-        synchronousWorkers.execute(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    selector.wakeupOnce();
-                }
-                catch (Exception e) {
-                    Log.i(LOGTAG, "Selector Exception? L Preview?");
-                }
+        synchronousWorkers.execute(() -> {
+            try {
+                selector.wakeupOnce();
+            }
+            catch (Exception e) {
             }
         });
     }
@@ -275,7 +271,7 @@ public int compare(Scheduled s1, Scheduled s2) {
 
 
     public void stop() {
-        stop(true);
+        stop(false);
     }
 
     public void stop(boolean wait) {
@@ -298,7 +294,13 @@ public void run() {
                     semaphore.release();
                 }
             }, 0));
-            currentSelector.wakeupOnce();
+            synchronousWorkers.execute(() -> {
+                try {
+                    currentSelector.wakeupOnce();
+                }
+                catch (Exception e) {
+                }
+            });
 
             // force any existing connections to die
             shutdownKeys(currentSelector);
@@ -589,58 +591,66 @@ public AsyncDatagramSocket openDatagram(final InetAddress host, final int port,
         // ugh.. this should really be post to make it nonblocking...
         // but i want datagrams to be immediately writable.
         // they're not really used anyways.
-        run(new Runnable() {
-            @Override
-            public void run() {
-                final DatagramChannel socket;
-                try {
-                    socket = DatagramChannel.open();
-                }
-                catch (Exception e) {
-                    return;
-                }
-                try {
-                    handler.attach(socket);
+        Runnable runnable = () -> {
+            final DatagramChannel socket;
+            try {
+                socket = DatagramChannel.open();
+            }
+            catch (Exception e) {
+                return;
+            }
+            try {
+                handler.attach(socket);
 
-                    InetSocketAddress address;
-                    if (host == null)
-                        address = new InetSocketAddress(port);
-                    else
-                        address = new InetSocketAddress(host, port);
+                InetSocketAddress address;
+                if (host == null)
+                    address = new InetSocketAddress(port);
+                else
+                    address = new InetSocketAddress(host, port);
 
-                    if (reuseAddress)
-                        socket.socket().setReuseAddress(reuseAddress);
-                    socket.socket().bind(address);
-                    handleSocket(handler);
-                }
-                catch (IOException e) {
-                    Log.e(LOGTAG, "Datagram error", e);
-                    StreamUtility.closeQuietly(socket);
-                }
+                if (reuseAddress)
+                    socket.socket().setReuseAddress(reuseAddress);
+                socket.socket().bind(address);
+                handleSocket(handler);
             }
-        });
+            catch (IOException e) {
+                Log.e(LOGTAG, "Datagram error", e);
+                StreamUtility.closeQuietly(socket);
+            }
+        };
+
+        if (getAffinity() != Thread.currentThread()) {
+            run(runnable);
+            return handler;
+        }
+
+        runnable.run();
         return handler;
     }
 
     public AsyncDatagramSocket connectDatagram(final SocketAddress remote) throws IOException {
-        final DatagramChannel socket = DatagramChannel.open();
         final AsyncDatagramSocket handler = new AsyncDatagramSocket();
+        final DatagramChannel socket = DatagramChannel.open();
         handler.attach(socket);
         // ugh.. this should really be post to make it nonblocking...
         // but i want datagrams to be immediately writable.
         // they're not really used anyways.
-        run(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    handleSocket(handler);
-                    socket.connect(remote);
-                }
-                catch (IOException e) {
-                    StreamUtility.closeQuietly(socket);
-                }
+        Runnable runnable = () -> {
+            try {
+                handleSocket(handler);
+                socket.connect(remote);
             }
-        });
+            catch (IOException e) {
+                StreamUtility.closeQuietly(socket);
+            }
+        };
+
+        if (getAffinity() != Thread.currentThread()) {
+            run(runnable);
+            return handler;
+        }
+
+        runnable.run();
         return handler;
     }
 

AndroidAsync/src/com/koushikdutta/async/SelectorWrapper.java

@@ -7,13 +7,14 @@
 import java.util.Set;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Created by koush on 2/13/14.
  */
 class SelectorWrapper implements Closeable {
     private Selector selector;
-    boolean isWaking;
+    public AtomicBoolean isWaking = new AtomicBoolean(false);
     Semaphore semaphore = new Semaphore(0);
     public Selector getSelector() {
         return selector;
@@ -67,34 +68,34 @@ public void wakeupOnce() {
             return;
 
         // now, we NEED to wait for the select to start to forcibly wake it.
-        synchronized (this) {
-            // check if another thread is already waiting
-            if (isWaking) {
-//                System.out.println("race wakeup already progressing");
-                return;
-            }
-            isWaking = true;
+        if (isWaking.getAndSet(true)) {
+            selector.wakeup();
+            return;
         }
 
         try {
-//            System.out.println("performing race wakup");
-            // try to wake up 10 times
-            for (int i = 0; i < 100; i++) {
-                try {
-                    if (semaphore.tryAcquire(10, TimeUnit.MILLISECONDS)) {
-//                        System.out.println("race wakeup success");
-                        return;
-                    }
-                }
-                catch (InterruptedException e) {
-                }
-                selector.wakeup();
-            }
+            waitForSelect();
+            selector.wakeup();
+        } finally {
+            isWaking.set(false);
         }
-        finally {
-            synchronized (this) {
-                isWaking = false;
+    }
+
+    public boolean waitForSelect() {
+        // try to wake up 10 times
+        for (int i = 0; i < 100; i++) {
+            try {
+                if (semaphore.tryAcquire(10, TimeUnit.MILLISECONDS)) {
+                    // successfully acquiring means the selector is NOT selecting, since select
+                    // will drain all permits.
+                    continue;
+                }
+            } catch (InterruptedException e) {
+                // an InterruptedException means the acquire failed a select is in progress,
+                // since it holds all permits
+                return true;
             }
         }
+        return false;
     }
 }