From 0952c20a5cecff1749334d2eb1bc3c53b901967b Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@fsfe.org>
Date: Sun, 25 Jun 2017 23:19:35 +0200
Subject: [PATCH] Coming closer...

---
 .../jingle_s5b/JingleS5BTransportSession.java | 70 ++++++++++---------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java
index 360fb777d..72803c8a9 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java
@@ -145,39 +145,42 @@ public class JingleS5BTransportSession extends JingleTransportSession<JingleS5BT
                 Socks5Client socks5Client = new Socks5Client(streamHost, receivedTransport.getDestinationAddress());
                 socket = socks5Client.getSocket(10 * 1000);
                 workedForUs = candidate;
+                LOGGER.log(Level.INFO, "Connected to remote address " + address + " with dstAddr "
+                        + receivedTransport.getDestinationAddress());
+                break;
 
             } catch (IOException | XMPPException | InterruptedException | TimeoutException | SmackException e) {
                 LOGGER.log(Level.WARNING, "Could not connect to remotes address " + address + " with dstAddr "
                         + receivedTransport.getDestinationAddress());
             }
-
-            JingleContent content = jSession.getContents().get(0);
-
-            Jingle response;
-
-            if (socket != null) {
-                connectedSocket = socket;
-                localUsedCandidate = workedForUs;
-
-                response = transportManager.createCandidateUsed(jSession.getRemote(), jSession.getInitiator(),
-                        jSession.getSessionId(), content.getSenders(), content.getCreator(),
-                        content.getName(), receivedTransport.getStreamId(), localUsedCandidate.getCandidateId());
-
-            } else {
-                localError = true;
-                response = transportManager.createCandidateError(jSession.getRemote(), jSession.getInitiator(),
-                        jSession.getSessionId(), content.getSenders(), content.getCreator(),
-                        content.getName(), receivedTransport.getStreamId());
-            }
-
-            try {
-                jSession.getConnection().sendStanza(response);
-            } catch (SmackException.NotConnectedException | InterruptedException e) {
-                LOGGER.log(Level.WARNING, "Could not send candidate-used.", e);
-            }
-
-            closeIfBothSidesFailed();
         }
+
+        JingleContent content = jSession.getContents().get(0);
+
+        Jingle response;
+
+        if (socket != null) {
+            connectedSocket = socket;
+            localUsedCandidate = workedForUs;
+
+            response = transportManager.createCandidateUsed(jSession.getRemote(), jSession.getInitiator(),
+                    jSession.getSessionId(), content.getSenders(), content.getCreator(),
+                    content.getName(), receivedTransport.getStreamId(), localUsedCandidate.getCandidateId());
+
+        } else {
+            localError = true;
+            response = transportManager.createCandidateError(jSession.getRemote(), jSession.getInitiator(),
+                    jSession.getSessionId(), content.getSenders(), content.getCreator(),
+                    content.getName(), receivedTransport.getStreamId());
+        }
+
+        try {
+            jSession.getConnection().sendStanza(response);
+        } catch (SmackException.NotConnectedException | InterruptedException e) {
+            LOGGER.log(Level.WARNING, "Could not send candidate-used.", e);
+        }
+
+        closeIfBothSidesFailed();
     }
 
     private boolean closeIfBothSidesFailed() {
@@ -234,7 +237,7 @@ public class JingleS5BTransportSession extends JingleTransportSession<JingleS5BT
             return jutil.createErrorMalformedRequest(candidateUsed);
         }
 
-        if (localUsedCandidate != null) {
+        if (localUsedCandidate != null || localError) {
             try {
                 connect(determineUsedCandidate());
             } catch (SmackException.NotConnectedException | InterruptedException e) {
@@ -341,12 +344,11 @@ public class JingleS5BTransportSession extends JingleTransportSession<JingleS5BT
             return IQ.createResultIQ(candidateError);
         }
 
-        if (localUsedCandidate != null) {
-
-            if (localUsedCandidate.getType() != JingleS5BTransportCandidate.Type.proxy) {
-                //TODO: Connect
-            } else {
-
+        if (localUsedCandidate != null || localError) {
+            try {
+                connect(determineUsedCandidate());
+            } catch (SmackException.NotConnectedException | InterruptedException e) {
+                callback.onException(e);
             }
         }