Changeset 5636 for pjproject/trunk/pjsip/src/pjsua2/account.cpp

Timestamp:

Aug 2, 2017 2:51:59 AM (7 years ago)

Author:

ming

Message:

Fixed #2032: NAT64 support for IPv4 interoperability

File:

• pjproject/trunk/pjsip/src/pjsua2/account.cpp (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsua2/account.cpp

@@ -185 +185 @@
     NODE_READ_NUM_T   ( this_node, pjsua_stun_use, sipStunUse);
     NODE_READ_NUM_T   ( this_node, pjsua_stun_use, mediaStunUse);
+    NODE_READ_NUM_T   ( this_node, pjsua_nat64_opt, nat64Opt);
     NODE_READ_BOOL    ( this_node, iceEnabled);
     NODE_READ_INT     ( this_node, iceMaxHostCands);
@@ -216 +217 @@
     NODE_WRITE_NUM_T   ( this_node, pjsua_stun_use, sipStunUse);
     NODE_WRITE_NUM_T   ( this_node, pjsua_stun_use, mediaStunUse);
+    NODE_WRITE_NUM_T   ( this_node, pjsua_nat64_opt, nat64Opt);
     NODE_WRITE_BOOL    ( this_node, iceEnabled);
     NODE_WRITE_INT     ( this_node, iceMaxHostCands);
@@ -392 +394 @@
     ret.sip_stun_use            = natConfig.sipStunUse;
     ret.media_stun_use          = natConfig.mediaStunUse;
+    ret.nat64_opt               = natConfig.nat64Opt;
     ret.ice_cfg_use             = PJSUA_ICE_CONFIG_USE_CUSTOM;
     ret.ice_cfg.enable_ice      = natConfig.iceEnabled;
@@ -535 +538 @@
     natConfig.sipStunUse        = prm.sip_stun_use;
     natConfig.mediaStunUse      = prm.media_stun_use;
+    natConfig.nat64Opt          = prm.nat64_opt;
     if (prm.ice_cfg_use == PJSUA_ICE_CONFIG_USE_CUSTOM) {
         natConfig.iceEnabled = PJ2BOOL(prm.ice_cfg.enable_ice);