conncheck: change state before updating nominated pairs
authorFabrice Bellet <fabrice@bellet.info>
Sun, 2 Jul 2017 14:02:09 +0000 (16:02 +0200)
committerOlivier CrĂȘte <olivier.crete@collabora.com>
Tue, 5 Sep 2017 19:03:44 +0000 (15:03 -0400)
When a pair is nominated while in state failed, we first move
back to state connecting, then we update the selected pair, and
finally we move to state connected.

agent/conncheck.c

index 0e3ce88..e584c0e 100644 (file)
@@ -2114,11 +2114,11 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
       }
 
       if (pair->valid) {
-        priv_update_selected_pair (agent, component, pair);
         /* Do not step down to CONNECTED if we're already at state READY*/
         if (component->state == NICE_COMPONENT_STATE_FAILED)
           agent_signal_component_state_change (agent,
               stream->id, component->id, NICE_COMPONENT_STATE_CONNECTING);
+        priv_update_selected_pair (agent, component, pair);
         if (component->state == NICE_COMPONENT_STATE_CONNECTING)
           /* step: notify the client of a new component state (must be done
            *       before the possible check list state update step */