agent: don't change agent role when restarting ice

Ice restart must not change the role of the agents since RFC8445,
section 9, "ICE Restarts".

diff --git a/agent/agent.c b/agent/agent.c
index f779d8d..a1dc930 100644 (file)
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -5534,14 +5534,6 @@ nice_agent_restart (
 
   agent_lock (agent);
 
-  /* step: regenerate tie-breaker value */
-  priv_generate_tie_breaker (agent);
-
-  /* step: reset controlling mode from the property value */
-  agent->controlling_mode = agent->saved_controlling_mode;
-  nice_debug ("Agent %p : ICE restart, reset role to \"%s\".",
-      agent, agent->controlling_mode ? "controlling" : "controlled");
-
   for (i = agent->streams; i; i = i->next) {
     NiceStream *stream = i->data;
 

diff --git a/tests/test-restart.c b/tests/test-restart.c
index 064cd69..2f1e1b6 100644 (file)
--- a/tests/test-restart.c
+++ b/tests/test-restart.c
@@ -202,7 +202,6 @@ static int run_restart_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *
   NiceCandidate cdes;
   GSList *cands;
   guint ls_id, rs_id;
-  guint64 tie_breaker;
 
   /* XXX: dear compiler, these are for you: */
   (void)baseaddr;
@@ -338,14 +337,7 @@ static int run_restart_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *
   g_assert (lagent->controlling_mode == TRUE);
   g_assert (ragent->controlling_mode == FALSE);
   /* step: restart agents, exchange updated credentials */
-  tie_breaker = ragent->tie_breaker;
   nice_agent_restart (ragent);
-  g_assert (tie_breaker != ragent->tie_breaker);
-  /* This role switch of ragent should be done now, and both agents
-   * have now the same role, which should generate a role conflict
-   * resolution situation */
-  g_assert (lagent->controlling_mode == TRUE);
-  g_assert (ragent->controlling_mode == TRUE);
   nice_agent_restart (lagent);
   {
       gchar *ufrag = NULL, *password = NULL;