From 5c4ad56614304b7eac77ea90b4b234c73fa28d64 Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Wed, 30 Sep 2015 16:55:30 -0500 Subject: [PATCH] Revert "Does not retransmit StunClientTransaction-s over TCP." because 1. The particular implementation causes us to timeout client transactions after 200ms. 2. We can't be certain that all legs of the connection use a reliable transport (i.e. we may be connected via TCP to a TURN server, which talks to the other side over UDP), so we should retransmit anyway. This reverts commit 8a7f8c1eeaa22c475ec43d9468891afbead11413. --- .../org/ice4j/ice/ConnectivityCheckClient.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/main/java/org/ice4j/ice/ConnectivityCheckClient.java b/src/main/java/org/ice4j/ice/ConnectivityCheckClient.java index 0060ad3..32e9ffd 100644 --- a/src/main/java/org/ice4j/ice/ConnectivityCheckClient.java +++ b/src/main/java/org/ice4j/ice/ConnectivityCheckClient.java @@ -283,8 +283,6 @@ class ConnectivityCheckClient tran.setApplicationData(candidatePair); - if (isReliableTransport(candidatePair)) - maxRetransmissions = 0; logger.fine( "start check for " + candidatePair.toShortString() + " tid " + tran); @@ -740,20 +738,6 @@ class ConnectivityCheckClient evt.getRemoteAddress()); } - /** - * Checks whether the transport protocol used by pair is to be - * considered reliable for the purposes of ConnectivityCheckClient, - * that is, if client transactions need to be retransmitted or not. - * @param pair the pair to check. - * @return true iff the transport protocol of pair is - * to be considered reliable and retransmissions should be disabled for - * a client transaction for pair. - */ - private boolean isReliableTransport(CandidatePair pair) - { - return pair.getLocalCandidate().getTransport() == Transport.TCP; - } - /** * In case of a role conflict, changes the state of the agent and * reschedules the check, in all other cases sets the corresponding peer