Changeset 5184 for pjproject

Timestamp:

Oct 1, 2015 4:43:28 AM (9 years ago)

Author:

nanang

Message:

Fix #1891: Also match base address in find local candidate after receiving ICE check response.

File:

• pjproject/trunk/pjnath/src/pjnath/ice_session.c (modified) (1 diff)

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -2324 +2324 @@
     pj_assert(lcand == NULL);
     for (i=0; i<ice->lcand_cnt; ++i) {
-        if (pj_sockaddr_cmp(&xaddr->sockaddr, &ice->lcand[i].addr) == 0) {
+        /* Ticket #1891: apply additional check as there may be a shared
+         * mapped address for different base/local addresses.
+         */
+        if (pj_sockaddr_cmp(&xaddr->sockaddr, &ice->lcand[i].addr) == 0 &&
+            pj_sockaddr_cmp(&check->lcand->base_addr,
+                            &ice->lcand[i].base_addr) == 0)
+        {
             /* Match */
             lcand = &ice->lcand[i];