summaryrefslogtreecommitdiff
path: root/agent/discovery.c
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2014-01-02 15:01:40 +0000
committerOlivier CrĂȘte <olivier.crete@collabora.com>2014-01-31 01:48:58 -0500
commitc56727025dd1ffa2e0513bf6bfc5218b58e2b483 (patch)
tree3851f0d5a90db35ff67866c9961f1a585ea7b3b7 /agent/discovery.c
parent12ee430ef3dbe61e52fe1ace5196f1931cf1e2c4 (diff)
downloadlibnice-c56727025dd1ffa2e0513bf6bfc5218b58e2b483.tar.gz
agent: Move GSource handling into Component
Rather than handle GSource creation, attachment and removal in NiceAgent, handle it inside Component. This brings it closer to the networking code, and improves encapsulation of the state of each Component.
Diffstat (limited to 'agent/discovery.c')
-rw-r--r--agent/discovery.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/agent/discovery.c b/agent/discovery.c
index 418d687..012a290 100644
--- a/agent/discovery.c
+++ b/agent/discovery.c
@@ -489,8 +489,7 @@ NiceCandidate *discovery_add_local_host_candidate (
goto errors;
_priv_set_socket_tos (agent, udp_socket, stream->tos);
- agent_attach_stream_component_socket (agent, stream,
- component, udp_socket);
+ component_attach_socket (component, udp_socket);
return candidate;
@@ -621,7 +620,7 @@ discovery_add_relay_candidate (
if (!priv_add_local_candidate_pruned (agent, stream_id, component, candidate))
goto errors;
- component_add_detached_socket (component, relay_socket);
+ component_attach_socket (component, relay_socket);
agent_signal_new_candidate (agent, candidate);
return candidate;