Commit 7048b757 authored by Youness Alaoui's avatar Youness Alaoui Committed by Olivier Crête

test-fullmode: protect against ready->connected->ready state change and accept...

test-fullmode: protect against ready->connected->ready state change and accept data reception on connected state
parent 425f534a
...@@ -210,15 +210,25 @@ static void cb_candidate_gathering_done(NiceAgent *agent, guint stream_id, gpoin ...@@ -210,15 +210,25 @@ static void cb_candidate_gathering_done(NiceAgent *agent, guint stream_id, gpoin
static void cb_component_state_changed (NiceAgent *agent, guint stream_id, guint component_id, guint state, gpointer data) static void cb_component_state_changed (NiceAgent *agent, guint stream_id, guint component_id, guint state, gpointer data)
{ {
gboolean ready_to_connected = FALSE;
g_debug ("test-fullmode:%s: %p", G_STRFUNC, data); g_debug ("test-fullmode:%s: %p", G_STRFUNC, data);
if (GPOINTER_TO_UINT (data) == 1) if (GPOINTER_TO_UINT (data) == 1) {
if (global_lagent_state[component_id - 1] == NICE_COMPONENT_STATE_READY &&
state == NICE_COMPONENT_STATE_CONNECTED)
ready_to_connected = TRUE;
global_lagent_state[component_id - 1] = state; global_lagent_state[component_id - 1] = state;
else if (GPOINTER_TO_UINT (data) == 2) } else if (GPOINTER_TO_UINT (data) == 2) {
if (global_ragent_state[component_id - 1] == NICE_COMPONENT_STATE_READY &&
state == NICE_COMPONENT_STATE_CONNECTED)
ready_to_connected = TRUE;
global_ragent_state[component_id - 1] = state; global_ragent_state[component_id - 1] = state;
}
if (state == NICE_COMPONENT_STATE_READY) if (state == NICE_COMPONENT_STATE_READY)
global_components_ready++; global_components_ready++;
else if (state == NICE_COMPONENT_STATE_CONNECTED && ready_to_connected)
global_components_ready--;
if (state == NICE_COMPONENT_STATE_FAILED) if (state == NICE_COMPONENT_STATE_FAILED)
global_components_failed++; global_components_failed++;
...@@ -1031,10 +1041,14 @@ int main (void) ...@@ -1031,10 +1041,14 @@ int main (void)
priv_print_global_status (); priv_print_global_status ();
/* should SUCCEED as agent L can send the checks: */ /* should SUCCEED as agent L can send the checks: */
g_assert (result == 0); g_assert (result == 0);
g_assert (global_lagent_state[0] == NICE_COMPONENT_STATE_READY); g_assert (global_lagent_state[0] == NICE_COMPONENT_STATE_CONNECTED ||
g_assert (global_lagent_state[1] == NICE_COMPONENT_STATE_READY); global_lagent_state[0] == NICE_COMPONENT_STATE_READY);
g_assert (global_ragent_state[0] == NICE_COMPONENT_STATE_READY); g_assert (global_lagent_state[1] == NICE_COMPONENT_STATE_CONNECTED ||
g_assert (global_ragent_state[1] == NICE_COMPONENT_STATE_READY); global_lagent_state[1] == NICE_COMPONENT_STATE_READY);
g_assert (global_ragent_state[0] == NICE_COMPONENT_STATE_CONNECTED ||
global_ragent_state[0] == NICE_COMPONENT_STATE_READY);
g_assert (global_ragent_state[1] == NICE_COMPONENT_STATE_CONNECTED ||
global_ragent_state[1] == NICE_COMPONENT_STATE_READY);
g_object_set (G_OBJECT (lagent), "max-connectivity-checks", 100, NULL); g_object_set (G_OBJECT (lagent), "max-connectivity-checks", 100, NULL);
/* run test with a conflict in controlling mode: controlling-controlling */ /* run test with a conflict in controlling mode: controlling-controlling */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment