From bc285371e07f1f5b9137a2aaaed521edb5fd8866 Mon Sep 17 00:00:00 2001 From: emcho Date: Sat, 8 May 2010 21:35:41 +0000 Subject: [PATCH] Implements client side role conflict detection and resolution (RFC 5245: Section 7.1.3.1) --- src/org/ice4j/ice/CheckList.java | 2 +- .../ice/checks/ConnectivityCheckClient.java | 18 +++++++++++++++--- .../ice/checks/ConnectivityCheckServer.java | 5 +++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/org/ice4j/ice/CheckList.java b/src/org/ice4j/ice/CheckList.java index 7f85331..53f1ea6 100644 --- a/src/org/ice4j/ice/CheckList.java +++ b/src/org/ice4j/ice/CheckList.java @@ -67,7 +67,7 @@ public class CheckList * * @param pair the pair to schedule a triggered check for. */ - protected void scheduleTriggeredCheck(CandidatePair pair) + public void scheduleTriggeredCheck(CandidatePair pair) { synchronized(triggeredCheckQueue) { diff --git a/src/org/ice4j/ice/checks/ConnectivityCheckClient.java b/src/org/ice4j/ice/checks/ConnectivityCheckClient.java index 21fcaea..c62ac9e 100644 --- a/src/org/ice4j/ice/checks/ConnectivityCheckClient.java +++ b/src/org/ice4j/ice/checks/ConnectivityCheckClient.java @@ -167,7 +167,10 @@ public class ConnectivityCheckClient == Response.BINDING_ERROR_RESPONSE) { if(! response.getResponse().contains(Attribute.ERROR_CODE)) + { + logger.fine("Received a malformed error response."); return; //malformed error response + } processErrorResponse(response); } @@ -178,16 +181,25 @@ public class ConnectivityCheckClient Response response = evt.getResponse(); Request originalRequest = evt.getRequest(); - Attribute errorCode = response.getAttribute(Attribute.ERROR_CODE); + ErrorCodeAttribute errorCode = (ErrorCodeAttribute)response + .getAttribute(Attribute.ERROR_CODE); + + logger.finest("Received error code " + errorCode.getErrorCode()); //RESOLVE ROLE_CONFLICTS - if(response.contains(ErrorCodeAttribute.ROLE_CONFLICT)) + if(errorCode.getErrorCode() == ErrorCodeAttribute.ROLE_CONFLICT) { boolean wasControlling = originalRequest .contains(Attribute.ICE_CONTROLLING); - logger.finest("Swithing to isControlling=" + !wasControlling); +System.out.println("Swithing to isControlling=" + !wasControlling); parentAgent.setControlling(!wasControlling); + + CandidatePair pair = ((CandidatePair)evt.getTransactionID() + .getApplicationData()); + + pair.getParentComponent().getParentStream().getCheckList() + .scheduleTriggeredCheck(pair); } } diff --git a/src/org/ice4j/ice/checks/ConnectivityCheckServer.java b/src/org/ice4j/ice/checks/ConnectivityCheckServer.java index 8e80979..ff86125 100644 --- a/src/org/ice4j/ice/checks/ConnectivityCheckServer.java +++ b/src/org/ice4j/ice/checks/ConnectivityCheckServer.java @@ -125,8 +125,9 @@ public class ConnectivityCheckServer } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + //try to trigger a 500 response although if this one failed, + //then chances are the 500 will fail too. + throw new RuntimeException("Failed to send a response", e); } }