[Pkg-telepathy-commits] [libnice] 186/265: agent: Refactor nice_agent_set_relay_info()

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit b66a1aed3fa0d258a514a142e15ab1aaaa0488e3
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Thu Mar 27 21:06:55 2014 -0400

    agent: Refactor nice_agent_set_relay_info()
    
    No behavior change is introduced
---
 agent/agent.c | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/agent/agent.c b/agent/agent.c
index 03ae14a..0f48fbc 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -1921,6 +1921,8 @@ nice_agent_set_relay_info(NiceAgent *agent,
 {
 
   Component *component = NULL;
+  gboolean ret = TRUE;
+  TurnServer *turn;
 
   g_return_val_if_fail (server_ip, FALSE);
   g_return_val_if_fail (server_port, FALSE);
@@ -1930,31 +1932,37 @@ nice_agent_set_relay_info(NiceAgent *agent,
 
   agent_lock();
 
-  if (agent_find_component (agent, stream_id, component_id, NULL, &component)) {
-    TurnServer *turn = g_slice_new0 (TurnServer);
-    nice_address_init (&turn->server);
+  if (!agent_find_component (agent, stream_id, component_id, NULL,
+          &component)) {
+    ret = FALSE;
+    goto done;
+  }
 
-    if (nice_address_set_from_string (&turn->server, server_ip)) {
-      nice_address_set_port (&turn->server, server_port);
-    } else {
-      g_slice_free (TurnServer, turn);
-      agent_unlock_and_emit (agent);
-      return FALSE;
-    }
+  turn = g_slice_new0 (TurnServer);
 
+  nice_address_init (&turn->server);
 
-    turn->username = g_strdup (username);
-    turn->password = g_strdup (password);
-    turn->type = type;
+  if (nice_address_set_from_string (&turn->server, server_ip)) {
+    nice_address_set_port (&turn->server, server_port);
+  } else {
+    g_slice_free (TurnServer, turn);
+    ret = FALSE;
+    goto done;
+  }
 
-    nice_debug ("Agent %p: added relay server [%s]:%d of type %d", agent,
-        server_ip, server_port, type);
+  turn->username = g_strdup (username);
+  turn->password = g_strdup (password);
+  turn->type = type;
 
-    component->turn_servers = g_list_append (component->turn_servers, turn);
-  }
+  nice_debug ("Agent %p: added relay server [%s]:%d of type %d", agent,
+      server_ip, server_port, type);
+
+  component->turn_servers = g_list_append (component->turn_servers, turn);
+
+ done:
 
   agent_unlock_and_emit (agent);
-  return TRUE;
+  return ret;
 }
 
 #ifdef HAVE_GUPNP

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git