diff --git a/src/org/ice4j/ice/Agent.java b/src/org/ice4j/ice/Agent.java index 7f406b0..3c7c037 100644 --- a/src/org/ice4j/ice/Agent.java +++ b/src/org/ice4j/ice/Agent.java @@ -1079,7 +1079,21 @@ public class Agent // enqueueing the pair in the triggered check queue. The state of // the pair is then changed to Waiting. // Emil: This actually applies for all cases. - parentStream.getCheckList().scheduleTriggeredCheck(triggerPair); + /* + * Lyubomir: The connectivity checks for a CheckList are started + * elsewhere as soon as and only if the CheckList changes from fronzen + * to unfrozen. Since CheckList#scheduleTriggeredCheck will change + * triggerPair to Waiting and will thus unfreeze its CheckList, make + * sure that the connectivity checks for the CheckList are started. + * Otherwise, the connectivity checks for the CheckList may never be + * started (which may make the Agent remain running forever). + */ + CheckList checkList = parentStream.getCheckList(); + boolean wasFrozen = checkList.isFrozen(); + + checkList.scheduleTriggeredCheck(triggerPair); + if (wasFrozen && !checkList.isFrozen()) + connCheckClient.startChecks(checkList); } /** diff --git a/src/org/ice4j/ice/CheckList.java b/src/org/ice4j/ice/CheckList.java index dad9746..0ffc555 100644 --- a/src/org/ice4j/ice/CheckList.java +++ b/src/org/ice4j/ice/CheckList.java @@ -207,9 +207,13 @@ public class CheckList { for (CandidatePair pair : this) { - if (pair.getState() != CandidatePairState.SUCCEEDED - && pair.getState() != CandidatePairState.FAILED) + CandidatePairState pairState = pair.getState(); + + if ((pairState != CandidatePairState.SUCCEEDED) + && (pairState != CandidatePairState.FAILED)) + { return false; + } } return true; } @@ -229,7 +233,6 @@ public class CheckList if (pair.getState() != CandidatePairState.FROZEN) return false; } - return true; } diff --git a/src/org/ice4j/ice/ConnectivityCheckClient.java b/src/org/ice4j/ice/ConnectivityCheckClient.java index 2b25807..f089a85 100644 --- a/src/org/ice4j/ice/ConnectivityCheckClient.java +++ b/src/org/ice4j/ice/ConnectivityCheckClient.java @@ -69,8 +69,8 @@ class ConnectivityCheckClient */ public void startChecks() { - CheckList firstCheckList = parentAgent.getStreams().get(0) - .getCheckList(); + CheckList firstCheckList + = parentAgent.getStreams().get(0).getCheckList(); startChecks(firstCheckList); } @@ -82,7 +82,7 @@ class ConnectivityCheckClient * @param checkList the {@link CheckList} to start client side connectivity * checks for. */ - private void startChecks(CheckList checkList) + public void startChecks(CheckList checkList) { PaceMaker paceMaker = new PaceMaker(checkList); @@ -261,6 +261,7 @@ class ConnectivityCheckClient && (pairState != CandidatePairState.SUCCEEDED)) { allPairsDone = false; + break; } } } diff --git a/src/org/ice4j/ice/ConnectivityCheckServer.java b/src/org/ice4j/ice/ConnectivityCheckServer.java index 7024f7c..d812a23 100644 --- a/src/org/ice4j/ice/ConnectivityCheckServer.java +++ b/src/org/ice4j/ice/ConnectivityCheckServer.java @@ -102,7 +102,7 @@ class ConnectivityCheckServer && request.containsAttribute(Attribute.ICE_CONTROLLED))) { if (!repairRoleConflict(evt)) - return; + return; } long priority = extractPriority(request); diff --git a/src/org/ice4j/ice/IceMediaStream.java b/src/org/ice4j/ice/IceMediaStream.java index 6747f68..89fc290 100644 --- a/src/org/ice4j/ice/IceMediaStream.java +++ b/src/org/ice4j/ice/IceMediaStream.java @@ -603,7 +603,6 @@ public class IceMediaStream if (pair.getFoundation().equals(foundation)) return true; } - return false; }