From b564f067328dccc8c4111d1c740e1e3f901d4291 Mon Sep 17 00:00:00 2001 From: gp Date: Thu, 19 Mar 2015 10:11:05 +0000 Subject: [PATCH] Adds a "reachable" flag to the ConnectivityCheck*.java for debugging purposes. --- src/org/ice4j/ice/Agent.java | 11 +++++++++++ src/org/ice4j/ice/ConnectivityCheckClient.java | 18 ++++++++++++++++++ src/org/ice4j/ice/ConnectivityCheckServer.java | 18 ++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/src/org/ice4j/ice/Agent.java b/src/org/ice4j/ice/Agent.java index 1000005..587770c 100644 --- a/src/org/ice4j/ice/Agent.java +++ b/src/org/ice4j/ice/Agent.java @@ -1725,6 +1725,17 @@ public class Agent if(!atLeastOneListSucceeded) { //all lists ended but none succeeded. No love today ;( + if (logger.isLoggable(Level.INFO)) { + if (connCheckClient.isReachable() + || connCheckServer.isReachable()) + { + logger.info("Suspicious ICE connectivity failure. Checks" + + " failed but the remote end was able to reach us."); + } + + logger.info("ICE state is FAILED"); + } + terminate(IceProcessingState.FAILED); return; } diff --git a/src/org/ice4j/ice/ConnectivityCheckClient.java b/src/org/ice4j/ice/ConnectivityCheckClient.java index 957900b..5b4e413 100644 --- a/src/org/ice4j/ice/ConnectivityCheckClient.java +++ b/src/org/ice4j/ice/ConnectivityCheckClient.java @@ -54,6 +54,22 @@ class ConnectivityCheckClient */ private Map timers = new HashMap(); + /** + * A flag that determines whether we have received a STUN response or not. + */ + private boolean reachable = false; + + /** + * Returns a boolean value indicating whether we have received a STUN + * response or not. + * + * @return a boolean value indicating whether we have received a STUN + * response or not. + */ + public boolean isReachable() { + return reachable; + } + /** * Creates a new ConnectivityCheckHandler setting * parentAgent as the agent that will be used for retrieving @@ -321,6 +337,8 @@ class ConnectivityCheckClient */ public void processResponse(StunResponseEvent ev) { + reachable = true; + CandidatePair checkedPair = (CandidatePair) ev.getTransactionID().getApplicationData(); diff --git a/src/org/ice4j/ice/ConnectivityCheckServer.java b/src/org/ice4j/ice/ConnectivityCheckServer.java index 07f4233..460ac67 100644 --- a/src/org/ice4j/ice/ConnectivityCheckServer.java +++ b/src/org/ice4j/ice/ConnectivityCheckServer.java @@ -48,6 +48,22 @@ class ConnectivityCheckServer */ private final StunStack stunStack; + /** + * A flag that determines whether we have received a STUN request or not. + */ + private boolean reachable = false; + + /** + * Returns a boolean value indicating whether we have received a STUN + * request or not. + * + * @return a boolean value indicating whether we have received a STUN + * request or not. + */ + public boolean isReachable() { + return reachable; + } + /** * Creates a new ConnectivityCheckServer setting * parentAgent as the agent that will be used for retrieving @@ -82,6 +98,8 @@ class ConnectivityCheckServer if(logger.isLoggable(Level.FINER)) logger.finer("Received request " + evt); + reachable = true; + Request request = (Request)evt.getMessage(); //ignore incoming requests that are not meant for the local user.