Changeset 6045 for pjproject/trunk/pjnath/src/pjnath/stun_sock.c

Timestamp:

Jul 26, 2019 9:32:14 AM (5 years ago)

Author:

nanang

Message:

Close #2217: Omit deprecated IPv6 addresses from ICE candidates.

File:

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

pjproject/trunk/pjnath/src/pjnath/stun_sock.c

@@ -683 +683 @@
     } else {
         pj_sockaddr def_addr;
-        pj_uint16_t port = pj_sockaddr_get_port(&info->bound_addr); 
+        pj_uint16_t port = pj_sockaddr_get_port(&info->bound_addr);
+        pj_enum_ip_option enum_opt;
         unsigned i;
 
@@ -698 +699 @@
         
         /* Enum all IP interfaces in the host */
+        pj_enum_ip_option_default(&enum_opt);
+        enum_opt.af = stun_sock->af;
+        enum_opt.omit_deprecated_ipv6 = PJ_TRUE;
         info->alias_cnt = PJ_ARRAY_SIZE(info->aliases);
-        status = pj_enum_ip_interface(stun_sock->af, &info->alias_cnt, 
-                                      info->aliases);
+        status = pj_enum_ip_interface2(&enum_opt, &info->alias_cnt, 
+                                       info->aliases);
+        if (status == PJ_ENOTSUP) {
+            /* Try again without omitting deprecated IPv6 addresses */
+            enum_opt.omit_deprecated_ipv6 = PJ_FALSE;
+            status = pj_enum_ip_interface2(&enum_opt, &info->alias_cnt, 
+                                           info->aliases);
+        }
+
         if (status != PJ_SUCCESS) {
             /* If enumeration fails, just return the default address */