Changeset 5339 for pjproject/trunk/pjmedia/src/pjmedia/transport_ice.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/pjmedia/src/pjmedia/transport_ice.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -51 +51 @@
     pjmedia_transport    base;
     pj_pool_t           *pool;
-    int                  af;
     unsigned             options;       /**< Transport options.             */
 
@@ -236 +235 @@
     tp_ice = PJ_POOL_ZALLOC_T(pool, struct transport_ice);
     tp_ice->pool = pool;
-    tp_ice->af = cfg->af;
     tp_ice->options = options;
     tp_ice->comp_cnt = comp_cnt;
@@ -823 +821 @@
     pj_sockaddr rem_conn_addr, rtcp_addr;
     unsigned i;
+    int rem_af = 0;
     pj_status_t status;
 
@@ -849 +848 @@
 
     /* Verify address family matches */
+    /*
     if ((tp_ice->af==pj_AF_INET() && 
          pj_strcmp(&rem_conn->addr_type, &STR_IP4)!=0) ||
@@ -856 +856 @@
         return PJMEDIA_SDP_ETPORTNOTEQUAL;
     }
+    */
+
+    /* Get remote address family */
+    if (pj_strcmp(&rem_conn->addr_type, &STR_IP4)==0)
+        rem_af = pj_AF_INET();
+    else if (pj_strcmp(&rem_conn->addr_type, &STR_IP6)==0)
+        rem_af = pj_AF_INET6();
+    else
+        pj_assert(!"Unsupported address family");
 
     /* Assign remote connection address */
-    status = pj_sockaddr_init(tp_ice->af, &rem_conn_addr, &rem_conn->addr,
+    status = pj_sockaddr_init(rem_af, &rem_conn_addr, &rem_conn->addr,
                               (pj_uint16_t)rem_m->desc.port);
     if (status != PJ_SUCCESS)
@@ -884 +893 @@
             if (rtcp_attr.addr.slen) {
                 /* Verify address family matches */
+                /*
                 if ((tp_ice->af==pj_AF_INET() && 
                      pj_strcmp(&rtcp_attr.addr_type, &STR_IP4)!=0) ||
@@ -891 +901 @@
                     return PJMEDIA_SDP_ETPORTNOTEQUAL;
                 }
+                */
 
                 /* Assign RTCP address */
-                status = pj_sockaddr_init(tp_ice->af, &rtcp_addr,
+                status = pj_sockaddr_init(rem_af, &rtcp_addr,
                                           &rtcp_attr.addr,
                                           (pj_uint16_t)rtcp_attr.port);
@@ -901 +912 @@
             } else {
                 /* Assign RTCP address */
-                status = pj_sockaddr_init(tp_ice->af, &rtcp_addr, 
+                status = pj_sockaddr_init(rem_af, &rtcp_addr, 
                                           NULL, 
                                           (pj_uint16_t)rtcp_attr.port);