Changeset 2808 for pjproject

Timestamp:

Jun 25, 2009 12:42:03 PM (15 years ago)

Author:

bennylp

Message:

Ticket #813: Wrong selection of default candidate among host candidates

• backported changes in #757

File:

• pjproject/branches/1.0/pjnath/src/pjnath/stun_sock.c (modified) (2 diffs)

pjproject/branches/1.0/pjnath/src/pjnath/stun_sock.c

@@ -535 +535 @@
         pj_sockaddr_cp(&info->aliases[0], &info->bound_addr);
     } else {
+        pj_sockaddr def_addr;
+        pj_uint16_t port = pj_sockaddr_get_port(&info->bound_addr); 
         unsigned i;
 
+        /* Get the default address */
+        status = pj_gethostip(stun_sock->af, &def_addr);
+        if (status != PJ_SUCCESS)
+            return status;
+        
+        pj_sockaddr_set_port(&def_addr, port);
+        
         /* Enum all IP interfaces in the host */
         info->alias_cnt = PJ_ARRAY_SIZE(info->aliases);
@@ -546 +555 @@
         /* Set the port number for each address.
          */
-        if (stun_sock->af == pj_AF_INET()) {
-            for (i=0; i<info->alias_cnt; ++i) {
-                pj_sockaddr_set_port(&info->aliases[i],
-                                     pj_sockaddr_get_port(&info->bound_addr));
+        for (i=0; i<info->alias_cnt; ++i) {
+            pj_sockaddr_set_port(&info->aliases[i], port);
+        }
+
+        /* Put the default IP in the first slot */
+        for (i=0; i<info->alias_cnt; ++i) {
+            if (pj_sockaddr_cmp(&info->aliases[i], &def_addr)==0) {
+                if (i!=0) {
+                    pj_sockaddr_cp(&info->aliases[i], &info->aliases[0]);
+                    pj_sockaddr_cp(&info->aliases[0], &def_addr);
+                }
+                break;
             }
         }