summaryrefslogtreecommitdiff
path: root/agent/discovery.c
diff options
context:
space:
mode:
authorYouness Alaoui <youness.alaoui@collabora.co.uk>2014-04-08 20:21:55 -0400
committerOlivier CrĂȘte <olivier.crete@ocrete.ca>2014-05-15 09:43:59 -0400
commitf93f37f4f296a43be5600c46114ee3b29c984530 (patch)
treea59f64e53da910a6746b54a2b8df5157bfd269d6 /agent/discovery.c
parentc4bfe3479593172e6b85d361faac68410efb7fee (diff)
downloadlibnice-f93f37f4f296a43be5600c46114ee3b29c984530.tar.gz
Add support for ice-tcp priorities, udp-tunneled and nat-assisted priorities
Diffstat (limited to 'agent/discovery.c')
-rw-r--r--agent/discovery.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/agent/discovery.c b/agent/discovery.c
index 3aeeccc..f63d3dc 100644
--- a/agent/discovery.c
+++ b/agent/discovery.c
@@ -486,7 +486,8 @@ NiceCandidate *discovery_add_local_host_candidate (
agent->compatibility == NICE_COMPATIBILITY_OC2007) {
candidate->priority = nice_candidate_msn_priority (candidate);
} else {
- candidate->priority = nice_candidate_ice_priority (candidate);
+ candidate->priority = nice_candidate_ice_priority (candidate,
+ agent->reliable, FALSE);
}
priv_generate_candidate_credentials (agent, candidate);
@@ -534,7 +535,8 @@ discovery_add_server_reflexive_candidate (
guint component_id,
NiceAddress *address,
NiceCandidateTransport transport,
- NiceSocket *base_socket)
+ NiceSocket *base_socket,
+ gboolean nat_assisted)
{
NiceCandidate *candidate;
Component *component;
@@ -556,7 +558,8 @@ discovery_add_server_reflexive_candidate (
agent->compatibility == NICE_COMPATIBILITY_OC2007) {
candidate->priority = nice_candidate_msn_priority (candidate);
} else {
- candidate->priority = nice_candidate_ice_priority (candidate);
+ candidate->priority = nice_candidate_ice_priority (candidate,
+ agent->reliable, nat_assisted);
}
/* step: link to the base candidate+socket */
@@ -616,7 +619,8 @@ discovery_add_relay_candidate (
agent->compatibility == NICE_COMPATIBILITY_OC2007) {
candidate->priority = nice_candidate_msn_priority (candidate);
} else {
- candidate->priority = nice_candidate_ice_priority (candidate);
+ candidate->priority = nice_candidate_ice_priority (candidate,
+ agent->reliable, FALSE);
}
/* step: link to the base candidate+socket */
@@ -692,7 +696,8 @@ discovery_add_peer_reflexive_candidate (
agent->compatibility == NICE_COMPATIBILITY_OC2007) {
candidate->priority = nice_candidate_msn_priority (candidate);
} else {
- candidate->priority = nice_candidate_ice_priority (candidate);
+ candidate->priority = nice_candidate_ice_priority (candidate,
+ agent->reliable, FALSE);
}
priv_assign_foundation (agent, candidate);
@@ -785,7 +790,8 @@ NiceCandidate *discovery_learn_remote_peer_reflexive_candidate (
agent->compatibility == NICE_COMPATIBILITY_OC2007) {
candidate->priority = nice_candidate_msn_priority (candidate);
} else {
- candidate->priority = nice_candidate_ice_priority (candidate);
+ candidate->priority = nice_candidate_ice_priority (candidate,
+ agent->reliable, FALSE);
}
priv_assign_remote_foundation (agent, candidate);