Changeset 4889

Timestamp:

Aug 18, 2014 9:09:18 AM (10 years ago)

Author:

bennylp

Message:

More re #1677:

• renamed the option to contact_use_src_port
• added the missing pjsua2 API implementation

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• include/pjsua2/account.hpp (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (1 diff)
• src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• src/pjsua2/account.cpp (modified) (4 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -3066 +3066 @@
      * Default: PJ_TRUE (yes).
      */
-    pj_bool_t        contact_rewrite_use_src_port;
+    pj_bool_t        contact_use_src_port;
 
     /**

pjproject/trunk/pjsip/include/pjsua2/account.hpp

@@ -562 +562 @@
 
     /**
+     * Specify if source TCP port should be used as the initial Contact
+     * address if TCP/TLS transport is used. Note that this feature will
+     * be automatically turned off when nameserver is configured because
+     * it may yield different destination address due to DNS SRV resolution.
+     * Also some platforms are unable to report the local address of the
+     * TCP socket when it is still connecting. In these cases, this
+     * feature will also be turned off.
+     *
+     * Default: 1 (yes).
+     */
+    int                 contactUseSrcPort;
+
+    /**
      * This option is used to overwrite the "sent-by" field of the Via header
      * for outgoing messages with the same interface address as the one in

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

@@ -3044 +3044 @@
 
     /* For TCP/TLS, acc may request to specify source port */
-    if (acc->cfg.contact_rewrite_use_src_port) {
+    if (acc->cfg.contact_use_src_port) {
         pjsip_host_info dinfo;
         pjsip_transport *tp = NULL;

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

@@ -290 +290 @@
     cfg->reg_retry_interval = PJSUA_REG_RETRY_INTERVAL;
     cfg->contact_rewrite_method = PJSUA_CONTACT_REWRITE_METHOD;
-    cfg->contact_rewrite_use_src_port = PJ_TRUE;
+    cfg->contact_use_src_port = PJ_TRUE;
     cfg->use_rfc5626 = PJ_TRUE;
     cfg->reg_use_proxy = PJSUA_REG_USE_OUTBOUND_PROXY |

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

@@ -203 +203 @@
     NODE_READ_UNSIGNED( this_node, udpKaIntervalSec);
     NODE_READ_STRING  ( this_node, udpKaData);
+    NODE_READ_INT     ( this_node, contactUseSrcPort);
 }
 
@@ -233 +234 @@
     NODE_WRITE_UNSIGNED( this_node, udpKaIntervalSec);
     NODE_WRITE_STRING  ( this_node, udpKaData);
+    NODE_WRITE_INT     ( this_node, contactUseSrcPort);
 }
 
@@ -398 +400 @@
     ret.allow_contact_rewrite   = natConfig.contactRewriteUse;
     ret.contact_rewrite_method  = natConfig.contactRewriteMethod;
+    ret.contact_use_src_port    = natConfig.contactUseSrcPort;
     ret.allow_via_rewrite       = natConfig.viaRewriteUse;
     ret.allow_sdp_nat_rewrite   = natConfig.sdpNatRewriteUse;
@@ -559 +562 @@
     natConfig.contactRewriteUse = prm.allow_contact_rewrite;
     natConfig.contactRewriteMethod = prm.contact_rewrite_method;
+    natConfig.contactUseSrcPort = prm.contact_use_src_port;
     natConfig.viaRewriteUse     = prm.allow_via_rewrite;
     natConfig.sdpNatRewriteUse  = prm.allow_sdp_nat_rewrite;