Changeset 5339 for pjproject/trunk/pjnath/src/pjnath/ice_session.c

Timestamp:

Jun 8, 2016 3:17:45 AM (8 years ago)

Author:

nanang

Message:

Re #422: Added IPv6 support to PJNATH, changes:

• Deprecated 'pj_ice_strans_cfg.af', if set, the value will be ignored, address family setting is now specified via transport setting, i.e: 'pj_ice_strans_cfg.stun_tp/turn_tp'.
• Deprecated 'pj_ice_strans_cfg.stun/turn', for backward compatibility, this field value will be checked if 'pj_ice_strans_cfg.stun_tp_cnt/turn_tp_cnt' is set to zero.
• Added 'pj_ice_strans_stun_cfg' & 'pj_ice_strans_stun_cfg' and the corresponding 'pj_ice_strans_stun/turn_cfg_default()'
• Added 'pj_ice_strans_cfg.stun_tp/turn_tp' as replacement of 'pj_ice_strans_cfg.stun/turn', it is now an array so app can have multiple STUN/TURN transports.
• Added macro PJ_ICE_MAX_STUN/TURN to specify maximum number of STUN/TURN transports in each ICE component in compile-time.
• Miscellaneous: fixed socket number limit in concurrency test in pjnath-test, updated pjsua_media.c to use new 'pj_ice_strans_cfg' setting.

File:

• pjproject/trunk/pjnath/src/pjnath/ice_session.c (modified) (3 diffs)

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

@@ -397 +397 @@
     /* Initialize transport datas */
     for (i=0; i<PJ_ARRAY_SIZE(ice->tp_data); ++i) {
-        ice->tp_data[i].transport_id = i;
+        ice->tp_data[i].transport_id = 0;
         ice->tp_data[i].has_req_data = PJ_FALSE;
     }
@@ -724 +724 @@
     pj_status_t status = PJ_SUCCESS;
     char address[PJ_INET6_ADDRSTRLEN];
+    unsigned i;
 
     PJ_ASSERT_RETURN(ice && comp_id && 
@@ -748 +749 @@
         rel_addr = base_addr;
     pj_memcpy(&lcand->rel_addr, rel_addr, addr_len);
+
+    /* Update transport data */
+    for (i = 0; i < PJ_ARRAY_SIZE(ice->tp_data); ++i) {
+        /* Check if this transport has been registered */
+        if (ice->tp_data[i].transport_id == transport_id)
+            break;
+
+        if (ice->tp_data[i].transport_id == 0) {
+            /* Found an empty slot, register this transport here */
+            ice->tp_data[i].transport_id = transport_id;
+            break;
+        }
+    }
+    pj_assert(i < PJ_ARRAY_SIZE(ice->tp_data) &&
+              ice->tp_data[i].transport_id == transport_id);
 
     pj_ansi_strcpy(ice->tmp.txt, pj_sockaddr_print(&lcand->addr, address,