From 28ab0b5078c89d7abc4aa4115f3530f95fe406f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Cr=C3=AAte?= Date: Tue, 15 Apr 2014 20:14:16 -0400 Subject: [PATCH] stream: Clear connchecks on restart inside stream --- agent/agent.c | 5 +---- agent/stream.c | 5 ++++- agent/stream.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/agent/agent.c b/agent/agent.c index d000877..09e9d9d 100644 --- a/agent/agent.c +++ b/agent/agent.c @@ -3698,9 +3698,6 @@ nice_agent_restart ( agent_lock(); - /* step: clean up all connectivity checks */ - conn_check_free (agent); - /* step: regenerate tie-breaker value */ priv_generate_tie_breaker (agent); @@ -3709,7 +3706,7 @@ nice_agent_restart ( /* step: reset local credentials for the stream and * clean up the list of remote candidates */ - stream_restart (stream, agent->rng); + stream_restart (agent, stream, agent->rng); } agent_unlock_and_emit (agent); diff --git a/agent/stream.c b/agent/stream.c index 245bba7..041306d 100644 --- a/agent/stream.c +++ b/agent/stream.c @@ -133,10 +133,13 @@ void stream_initialize_credentials (Stream *stream, NiceRNG *rng) * session. */ void -stream_restart (Stream *stream, NiceRNG *rng) +stream_restart (NiceAgent *agent, Stream *stream, NiceRNG *rng) { GSList *i; + /* step: clean up all connectivity checks */ + conn_check_prune_stream (agent, stream); + stream->initial_binding_request_received = FALSE; stream_initialize_credentials (stream, rng); diff --git a/agent/stream.h b/agent/stream.h index 3d2d2db..7b96bd0 100644 --- a/agent/stream.h +++ b/agent/stream.h @@ -93,7 +93,7 @@ void stream_initialize_credentials (Stream *stream, NiceRNG *rng); void -stream_restart (Stream *stream, NiceRNG *rng); +stream_restart (NiceAgent *agent, Stream *stream, NiceRNG *rng); G_END_DECLS -- 2.7.4