Commit 729bd3bb authored by Olivier Crête's avatar Olivier Crête

conncheck: Deduplicate conncheck stopping code

parent f122e417
...@@ -434,6 +434,17 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen ...@@ -434,6 +434,17 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
} }
static void
conn_check_stop (NiceAgent *agent)
{
if (agent->conncheck_timer_source == NULL)
return;
g_source_destroy (agent->conncheck_timer_source);
g_source_unref (agent->conncheck_timer_source);
agent->conncheck_timer_source = NULL;
}
/* /*
* Timer callback that handles initiating and managing connectivity * Timer callback that handles initiating and managing connectivity
...@@ -524,11 +535,7 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent) ...@@ -524,11 +535,7 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent)
/* Stopping the timer so destroy the source.. this will allow /* Stopping the timer so destroy the source.. this will allow
the timer to be reset if we get a set_remote_candidates after this the timer to be reset if we get a set_remote_candidates after this
point */ point */
if (agent->conncheck_timer_source != NULL) { conn_check_stop (agent);
g_source_destroy (agent->conncheck_timer_source);
g_source_unref (agent->conncheck_timer_source);
agent->conncheck_timer_source = NULL;
}
/* XXX: what to signal, is all processing now really done? */ /* XXX: what to signal, is all processing now really done? */
nice_debug ("Agent %p : changing conncheck state to COMPLETED.", agent); nice_debug ("Agent %p : changing conncheck state to COMPLETED.", agent);
...@@ -1632,17 +1639,6 @@ static void conn_check_free_item (gpointer data) ...@@ -1632,17 +1639,6 @@ static void conn_check_free_item (gpointer data)
g_slice_free (CandidateCheckPair, pair); g_slice_free (CandidateCheckPair, pair);
} }
static void
conn_check_stop (NiceAgent *agent)
{
if (agent->conncheck_timer_source == NULL)
return;
g_source_destroy (agent->conncheck_timer_source);
g_source_unref (agent->conncheck_timer_source);
agent->conncheck_timer_source = NULL;
}
/* /*
* Frees all resources of all connectivity checks. * Frees all resources of all connectivity checks.
*/ */
......
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