Changeset 5562 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Mar 3, 2017 2:11:02 AM (8 years ago)

Author:

ming

Message:

Fixed #1966:

• Add option to specify default address family in ICE default candidate
• As answerer, match the address family in the SDP offer if possible.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -852 +852 @@
     
     ice_cfg.opt = acc_cfg->ice_cfg.ice_opt;
+
+    if (call_med->call->async_call.rem_sdp) {
+        /* Match the default address family according to the offer */
+        const pj_str_t ID_IP6 = { "IP6", 3};
+        const pjmedia_sdp_media *m;
+        const pjmedia_sdp_conn *c;
+
+        m = call_med->call->async_call.rem_sdp->media[call_med->idx];
+        c = m->conn? m->conn : call_med->call->async_call.rem_sdp->conn;
+
+        if (pj_stricmp(&c->addr_type, &ID_IP6) == 0)
+            ice_cfg.af = pj_AF_INET6();
+    } else if (use_ipv6) {
+        ice_cfg.af = pj_AF_INET6();
+    }
 
     /* If STUN transport is configured, initialize STUN transport settings */