summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2014-04-16 00:14:16 (GMT)
committerOlivier CrĂȘte <olivier.crete@collabora.com>2014-04-25 00:55:56 (GMT)
commit28ab0b5078c89d7abc4aa4115f3530f95fe406f6 (patch)
treeca48bd7aef368ae29ce49fb2dbdc2ca77cfe2e7e
parent0e1c1099c0d86f78fae0aff1a963372426e63eca (diff)
downloadlibnice-28ab0b5078c89d7abc4aa4115f3530f95fe406f6.tar.gz
libnice-28ab0b5078c89d7abc4aa4115f3530f95fe406f6.tar.xz
stream: Clear connchecks on restart inside stream
-rw-r--r--agent/agent.c5
-rw-r--r--agent/stream.c5
-rw-r--r--agent/stream.h2
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