Repairs an issue with conflict resolution

This commit is contained in:
emcho 2010-05-18 17:07:25 +00:00
parent f948c50706
commit 579782bb0a
2 changed files with 23 additions and 4 deletions

View File

@ -1012,6 +1012,11 @@ public class Agent
// received. The agent now sets the nominated flag in the // received. The agent now sets the nominated flag in the
// valid pair to true. // valid pair to true.
nominationConfirmed( triggerPair ); nominationConfirmed( triggerPair );
//the above maye have caused us to exit, and so we need to
//make the call below in order to make sure that we update
//ICE processing state.
checkListStatesUpdated();
} }
return; return;
@ -1168,7 +1173,6 @@ public class Agent
atLeastOneListSucceeded = true; atLeastOneListSucceeded = true;
} }
} }
//Once the state of each check list is Completed: //Once the state of each check list is Completed:
//The agent sets the state of ICE processing overall to Completed. //The agent sets the state of ICE processing overall to Completed.
if(allListsEnded) if(allListsEnded)

View File

@ -98,7 +98,7 @@ class ConnectivityCheckServer
|| ( ! parentAgent.isControlling() || ( ! parentAgent.isControlling()
&& request.contains(Attribute.ICE_CONTROLLED))) && request.contains(Attribute.ICE_CONTROLLED)))
{ {
repairRoleConflict(evt); if (!repairRoleConflict(evt))
return; return;
} }
@ -165,17 +165,25 @@ class ConnectivityCheckServer
/** /**
* Resolves a role conflicts by either sendinf a <tt>487 Role Conflict</tt> * Resolves a role conflicts by either sendinf a <tt>487 Role Conflict</tt>
* response or by changing this server's parent agent role. * response or by changing this server's parent agent role. The method
* returns <tt>true</tt> if the role conflict is silently resolved and
* processing can continue. It returns <tt>false</tt> if we had to reply
* with a 487 and processing needs to stop until a repaired request is
* received.
* *
* @param evt the {@link StunMessageEvent} containing the * @param evt the {@link StunMessageEvent} containing the
* <tt>ICE-CONTROLLING</tt> or <tt>ICE-CONTROLLED</tt> attribute that * <tt>ICE-CONTROLLING</tt> or <tt>ICE-CONTROLLED</tt> attribute that
* allowed us to detect the role conflict. * allowed us to detect the role conflict.
*
* @return <tt>true</tt> if the role conflict is silently resolved and
* processing can continue and <tt>false</tt> otherwise.
*/ */
private void repairRoleConflict(StunMessageEvent evt) private boolean repairRoleConflict(StunMessageEvent evt)
{ {
Message req = evt.getMessage(); Message req = evt.getMessage();
long ourTieBreaker = parentAgent.getTieBreaker(); long ourTieBreaker = parentAgent.getTieBreaker();
// If the agent is in the controlling role, and the // If the agent is in the controlling role, and the
// ICE-CONTROLLING attribute is present in the request: // ICE-CONTROLLING attribute is present in the request:
if(parentAgent.isControlling() if(parentAgent.isControlling()
@ -201,6 +209,8 @@ class ConnectivityCheckServer
evt.getTransactionID().getBytes(), evt.getTransactionID().getBytes(),
response, evt.getLocalAddress(), response, evt.getLocalAddress(),
evt.getRemoteAddress()); evt.getRemoteAddress());
return false;
} }
catch(Exception exc) catch(Exception exc)
{ {
@ -218,6 +228,7 @@ class ConnectivityCheckServer
+ theirTieBreaker + " and ourTieBreaker=" + theirTieBreaker + " and ourTieBreaker="
+ ourTieBreaker); + ourTieBreaker);
parentAgent.setControlling(false); parentAgent.setControlling(false);
return true;
} }
} }
// If the agent is in the controlled role, and the ICE-CONTROLLED // If the agent is in the controlled role, and the ICE-CONTROLLED
@ -240,6 +251,7 @@ class ConnectivityCheckServer
+ theirTieBreaker + " and ourTieBreaker=" + theirTieBreaker + " and ourTieBreaker="
+ ourTieBreaker); + ourTieBreaker);
parentAgent.setControlling(true); parentAgent.setControlling(true);
return true;
} }
// If the agent's tie-breaker is less than the contents of the // If the agent's tie-breaker is less than the contents of the
// ICE-CONTROLLED attribute, the agent generates a Binding error // ICE-CONTROLLED attribute, the agent generates a Binding error
@ -256,6 +268,8 @@ class ConnectivityCheckServer
evt.getTransactionID().getBytes(), evt.getTransactionID().getBytes(),
response, evt.getLocalAddress(), response, evt.getLocalAddress(),
evt.getRemoteAddress()); evt.getRemoteAddress());
return false;
} }
catch(Exception exc) catch(Exception exc)
{ {
@ -264,6 +278,7 @@ class ConnectivityCheckServer
} }
} }
} }
return true; // we don't have a role conflict
} }
/** /**