Attachment 116353 Details for Bug 90894 – conncheck: generate candidate pair for valid srflx candidate

[patch] conncheck: generate candidate pair for valid srflx candidate

0001-conncheck-generate-candidate-pair-for-valid-srflx-ca.patch (text/plain), 4.02 KB, created by Jakub Adam on 2015-06-08 06:45:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Adam

Created: 2015-06-08 06:45:56 UTC

Size: 4.02 KB

patch

obsolete

>From 3f623f1e8da0a43d9e41dc86e7ce50acc6bdcfff Mon Sep 17 00:00:00 2001
>From: Jakub Adam <jakub.adam@ktknet.cz>
>Date: Fri, 29 May 2015 17:06:50 +0200
>Subject: [PATCH 1/2] conncheck: generate candidate pair for valid srflx
> candidate
>
>In priv_process_response_check_for_peer_reflexive(), mere presence of
>a candidate in local_candidates doesn't mean there's also some candidate
>pair in conncheck_list using it - for instance that candidate may be
>server reflexive, for which no check pairs are initially created (see
>conn_check_add_for_candidate_pair()).
>
>If we fail to find corresponding pair upon receiving such candidate's IP
>in a conncheck response's XOR-MAPPED-ADDRESS attribute, we shall add a
>new one in a similar way we would add a new pair for a just discovered
>peer reflexive candidate.
>
>Previous priv_process_response_check_for_peer_reflexive() implementation
>would return NULL, causing a CandidateCheckPair with local candidate of
>type HOST to be wrongly selected even though the local host IP might not
>be directly accessible by the remote counterpart (e.g. it's an address
>on a private network segment). In practice this was coming through as
>a duplex connection that libnice was reporting as properly established,
>but only one direction of the communication was actually working.
>---
> agent/conncheck.c | 30 ++++++++++++++++--------------
> 1 file changed, 16 insertions(+), 14 deletions(-)
>
>diff --git a/agent/conncheck.c b/agent/conncheck.c
>index 057fc81..5a669c1 100644
>--- a/agent/conncheck.c
>+++ b/agent/conncheck.c
>@@ -2276,14 +2276,14 @@ static CandidateCheckPair *priv_process_response_check_for_peer_reflexive(NiceAg
>   CandidateCheckPair *new_pair = NULL;
>   NiceAddress mapped;
>   GSList *i, *j;
>-  gboolean local_cand_matches = FALSE;
>+  NiceCandidate *local_cand = NULL;
> 
>   nice_address_set_from_sockaddr (&mapped, mapped_sockaddr);
> 
>   for (j = component->local_candidates; j; j = j->next) {
>     NiceCandidate *cand = j->data;
>     if (nice_address_equal (&mapped, &cand->addr)) {
>-      local_cand_matches = TRUE;
>+      local_cand = cand;
> 
>       /* We always need to select the peer-reflexive Candidate Pair in the case
>        * of a TCP-ACTIVE local candidate, so we find it even if an incoming
>@@ -2300,7 +2300,7 @@ static CandidateCheckPair *priv_process_response_check_for_peer_reflexive(NiceAg
>     }
>   }
> 
>-  if (local_cand_matches == TRUE) {
>+  if (new_pair) {
>     /* note: this is same as "adding to VALID LIST" in the spec
>        text */
>     p->state = NICE_CHECK_SUCCEEDED;
>@@ -2308,20 +2308,22 @@ static CandidateCheckPair *priv_process_response_check_for_peer_reflexive(NiceAg
>     priv_conn_check_unfreeze_related (agent, stream, p);
>   }
>   else {
>-    NiceCandidate *cand =
>-      discovery_add_peer_reflexive_candidate (agent,
>-					      stream->id,
>-					      component->id,
>-					      &mapped,
>-					      sockptr,
>-					      local_candidate,
>-					      remote_candidate);
>-    p->state = NICE_CHECK_FAILED;
>-    nice_debug ("Agent %p : pair %p state FAILED", agent, p);
>+    if (!local_cand) {
>+      local_cand = discovery_add_peer_reflexive_candidate (agent,
>+                                                           stream->id,
>+                                                           component->id,
>+                                                           &mapped,
>+                                                           sockptr,
>+                                                           local_candidate,
>+                                                           remote_candidate);
>+      p->state = NICE_CHECK_FAILED;
>+      nice_debug ("Agent %p : pair %p state FAILED", agent, p);
>+    }
> 
>     /* step: add a new discovered pair (see RFC 5245 7.1.3.2.2
> 	       "Constructing a Valid Pair") */
>-    new_pair = priv_add_peer_reflexive_pair (agent, stream->id, component->id, cand, p);
>+    new_pair = priv_add_peer_reflexive_pair (agent, stream->id, component->id,
>+                                             local_cand, p);
>     nice_debug ("Agent %p : conncheck %p FAILED, %p DISCOVERED.", agent, p, new_pair);
>   }
> 
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 90894: 116353 | 116354

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.