Changeset 4229 for pjproject/trunk

Timestamp:

Aug 13, 2012 9:15:39 AM (12 years ago)

Author:

bennylp

Message:

More #1412: also handle the case for presence subscription, publish, and mwi when the account does not have registration

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_acc.c (modified) (2 diffs)
• pjsua_pres.c (modified) (4 diffs)

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

@@ -486 +486 @@
         if (pjsua_var.acc[id].cfg.mwi_enabled)
             pjsua_start_mwi(id, PJ_TRUE);
+
+        /* Start publish too */
+        if (acc->cfg.publish_enabled)
+            pjsua_pres_init_publish_acc(id);
     }
 
@@ -2704 +2708 @@
         tdata->via_addr = pjsua_var.acc[acc_id].via_addr;
         tdata->via_tp = pjsua_var.acc[acc_id].via_tp;
+    } else if (!pjsua_sip_acc_is_using_stun(acc_id)) {
+        /* Choose local interface to use in Via if acc is not using
+         * STUN
+         */
+        pjsua_acc_get_uac_addr(acc_id, tdata->pool,
+                               target,
+                               &tdata->via_addr,
+                               NULL, NULL,
+                               &tdata->via_tp);
     }
 

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

@@ -865 +865 @@
     }
 
-    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0)
+    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0) {
         pjsip_dlg_set_via_sent_by(dlg, &acc->via_addr, acc->via_tp);
+    } else if (!pjsua_sip_acc_is_using_stun(acc_id)) {
+        /* Choose local interface to use in Via if acc is not using
+         * STUN. See https://trac.pjsip.org/repos/ticket/1412
+         */
+        char target_buf[PJSIP_MAX_URL_SIZE];
+        pj_str_t target;
+        pjsip_host_port via_addr;
+        const void *via_tp;
+
+        target.ptr = target_buf;
+        target.slen = pjsip_uri_print(PJSIP_URI_IN_REQ_URI,
+                                      dlg->target,
+                                      target_buf, sizeof(target_buf));
+        if (target.slen < 0) target.slen = 0;
+
+        if (pjsua_acc_get_uac_addr(acc_id, dlg->pool, &target,
+                                   &via_addr, NULL, NULL,
+                                   &via_tp) == PJ_SUCCESS)
+        {
+            pjsip_dlg_set_via_sent_by(dlg, &via_addr, (void*)via_tp);
+        }
+    }
 
     /* Set credentials and preference. */
@@ -1237 +1259 @@
         pjsip_publishc_set_via_sent_by(acc->publish_sess, &acc->via_addr,
                                        acc->via_tp);
+    } else if (!pjsua_sip_acc_is_using_stun(acc_id)) {
+        /* Choose local interface to use in Via if acc is not using
+         * STUN. See https://trac.pjsip.org/repos/ticket/1412
+         */
+        pjsip_host_port via_addr;
+        const void *via_tp;
+
+        if (pjsua_acc_get_uac_addr(acc_id, acc->pool, &acc_cfg->id,
+                                   &via_addr, NULL, NULL,
+                                   &via_tp) == PJ_SUCCESS)
+        {
+            pjsip_publishc_set_via_sent_by(acc->publish_sess, &via_addr,
+                                           (void*)via_tp);
+        }
     }
 
@@ -1790 +1826 @@
     pjsip_dlg_inc_lock(buddy->dlg);
 
-    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0)
+    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0) {
         pjsip_dlg_set_via_sent_by(buddy->dlg, &acc->via_addr, acc->via_tp);
+    } else if (!pjsua_sip_acc_is_using_stun(acc_id)) {
+        /* Choose local interface to use in Via if acc is not using
+         * STUN. See https://trac.pjsip.org/repos/ticket/1412
+         */
+        pjsip_host_port via_addr;
+        const void *via_tp;
+
+        if (pjsua_acc_get_uac_addr(acc_id, buddy->dlg->pool, &buddy->uri,
+                                   &via_addr, NULL, NULL,
+                                   &via_tp) == PJ_SUCCESS)
+        {
+            pjsip_dlg_set_via_sent_by(buddy->dlg, &via_addr, (void*)via_tp);
+        }
+    }
+
 
     status = pjsip_pres_create_uac( buddy->dlg, &pres_callback, 
@@ -2115 +2166 @@
     pjsip_dlg_inc_lock(acc->mwi_dlg);
 
-    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0)
+    if (acc->cfg.allow_via_rewrite && acc->via_addr.host.slen > 0) {
         pjsip_dlg_set_via_sent_by(acc->mwi_dlg, &acc->via_addr, acc->via_tp);
+    } else if (!pjsua_sip_acc_is_using_stun(acc_id)) {
+        /* Choose local interface to use in Via if acc is not using
+         * STUN. See https://trac.pjsip.org/repos/ticket/1412
+         */
+        pjsip_host_port via_addr;
+        const void *via_tp;
+
+        if (pjsua_acc_get_uac_addr(acc_id, acc->mwi_dlg->pool, &acc->cfg.id,
+                                   &via_addr, NULL, NULL,
+                                   &via_tp) == PJ_SUCCESS)
+        {
+            pjsip_dlg_set_via_sent_by(acc->mwi_dlg, &via_addr,
+                                      (void*)via_tp);
+        }
+    }
 
     /* Create UAC subscription */