Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fail a connectivity check request received after checks are stopped. #287

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/main/java/org/ice4j/ice/Agent.java
Original file line number Diff line number Diff line change
Expand Up @@ -1578,8 +1578,9 @@ public CandidatePair findCandidatePair(String localUFrag,
* @param useCandidate indicates whether the incoming check
* {@link org.ice4j.message.Request} contained the USE-CANDIDATE ICE
* attribute.
* @return Whether the response to the check should get a success response
*/
protected void incomingCheckReceived(TransportAddress remoteAddress,
protected boolean incomingCheckReceived(TransportAddress remoteAddress,
TransportAddress localAddress,
long priority,
String remoteUFrag,
Expand All @@ -1593,7 +1594,7 @@ protected void incomingCheckReceived(TransportAddress remoteAddress,
{
logger.info("No localAddress for this incoming checks: " +
localAddress);
return;
return false;
}

Component parentComponent = localCandidate.getParentComponent();
Expand Down Expand Up @@ -1639,9 +1640,10 @@ else if (state == IceProcessingState.FAILED)

// We have been started, and have not failed (yet). If this is
// a new pair, handle it (even if we have already completed).
triggerCheck(triggeredPair);
return triggerCheck(triggeredPair);
}
}
return true;
}

/**
Expand All @@ -1651,8 +1653,9 @@ else if (state == IceProcessingState.FAILED)
*
* @param triggerPair the pair containing the local and remote candidate
* that we'd need to trigger a check for.
* @return Whether a triggered check was started
*/
private void triggerCheck(CandidatePair triggerPair)
private boolean triggerCheck(CandidatePair triggerPair)
{
//first check whether we already know about the remote address in case
//we've just discovered a peer-reflexive candidate.
Expand Down Expand Up @@ -1702,7 +1705,7 @@ private void triggerCheck(CandidatePair triggerPair)
checkListStatesUpdated();
}

return;
return true;
}

// RFC 5245: If the state of that pair is In-Progress, the agent
Expand All @@ -1723,6 +1726,12 @@ private void triggerCheck(CandidatePair triggerPair)
// Its state is set to Waiting [and it] is enqueued into the
// triggered check queue.
//
// Local addition: if we're already stopped, we're never going to send the
// check for the triggered pair, so don't enqueue it.
if (connCheckClient.isStopped())
{
return false;
}
if (triggerPair.getParentComponent().getSelectedPair() == null)
logger.info("Add peer CandidatePair with new reflexive " +
"address to checkList: " + triggerPair.toRedactedString());
Expand All @@ -1749,6 +1758,8 @@ private void triggerCheck(CandidatePair triggerPair)
checkList.scheduleTriggeredCheck(triggerPair);
if (wasFrozen && !checkList.isFrozen())
connCheckClient.startChecks(checkList);

return true;
}

/**
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/ice4j/ice/ConnectivityCheckClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -1004,4 +1004,10 @@ public void stop()
}
}
}

public boolean isStopped() {
synchronized (paceMakers) {
return stopped;
}
}
}
17 changes: 14 additions & 3 deletions src/main/java/org/ice4j/ice/ConnectivityCheckServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,23 @@ public void processRequest(StunMessageEvent evt)
remoteUfrag = username.substring(0, colon);

//tell our address handler we saw a new remote address;
parentAgent.incomingCheckReceived(evt.getRemoteAddress(),
boolean respond = parentAgent.incomingCheckReceived(evt.getRemoteAddress(),
evt.getLocalAddress(), priority, remoteUfrag, localUFrag,
useCandidate);

Response response = MessageFactory.createBindingResponse(
request, evt.getRemoteAddress());
Response response;

if (respond)
{
response = MessageFactory.createBindingResponse(
request, evt.getRemoteAddress());
}
else
{
response = MessageFactory.createBindingErrorResponse(
ErrorCodeAttribute.FORBIDDEN,
"Cannot add new remote candidates in current ICE state");
}

/* add USERNAME and MESSAGE-INTEGRITY attribute in the response */

Expand Down
Loading