Skip to content

Handle Failure Cases #12

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 19, 2018
Merged

Handle Failure Cases #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions src/icelib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3482,7 +3482,7 @@ ICELIB_incomingBindingResponse(ICELIB_INSTANCE* pInstance,
/* */
/* ----- Handle a 487 Role Conflict error response */
/* */
/* ICE-19: 7.1.2.1 Failure Cases */
/* ICE-19: 7.1.3.1 Failure Cases */
/* */
/* Invert CONTROLLING state. */
/* Bug in ICE-19: should also recompute priorities */
Expand All @@ -3494,6 +3494,7 @@ ICELIB_incomingBindingResponse(ICELIB_INSTANCE* pInstance,

ICELIB_log(&pInstance->callbacks.callbackLog, ICELIB_logWarning,
"Error response 487: Role Conflict!");

if(!pInstance->roleHasSwapped){
pInstance->roleHasSwapped = !pInstance->roleHasSwapped;
pInstance->iceControlling = !pInstance->iceControlling;
Expand All @@ -3506,17 +3507,18 @@ ICELIB_incomingBindingResponse(ICELIB_INSTANCE* pInstance,
ICELIB_log1(&pInstance->callbacks.callbackLog, ICELIB_logWarning,
"Changing role, iceControlling now: %d!",
pInstance->iceControlling);
}

ICELIB_changePairState(pPair,
ICELIB_PAIR_WAITING,
&pInstance->callbacks.callbackLog);
ICELIB_changePairState(pPair,
ICELIB_PAIR_WAITING,
&pInstance->callbacks.callbackLog);

if ( ICELIB_triggeredFifoPut(pTriggeredChecksFifo, pPair) )
{
ICELIB_log(&pInstance->callbacks.callbackLog, ICELIB_logError,
"Triggered check queue full!");
}
if ( ICELIB_triggeredFifoPut(pTriggeredChecksFifo, pPair) )
{
ICELIB_log(&pInstance->callbacks.callbackLog, ICELIB_logError,
"Triggered check queue full!");
}

return;
}

Expand Down