Changeset 4603

Timestamp:

Sep 26, 2013 9:57:34 AM (11 years ago)

Author:

nanang

Message:

Misc (re #1630): pjsua app param '--ip-addr' doesn't affect RTP address of local accounts.

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (6 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -1592 +1592 @@
         /* Add local account */
         pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
-        if (PJMEDIA_HAS_VIDEO) {
+
+        /* Adjust local account config based on pjsua app config */
+        {
             pjsua_acc_config acc_cfg;
             pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
+
             app_config_init_video(&acc_cfg);
+            acc_cfg.rtp_cfg = app_config.rtp_cfg;
             pjsua_acc_modify(aid, &acc_cfg);
         }
+
         //pjsua_acc_set_transport(aid, transport_id);
         pjsua_acc_set_online_status(current_acc, PJ_TRUE);
@@ -1631 +1636 @@
         /* Add local account */
         pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
-        if (PJMEDIA_HAS_VIDEO) {
+
+        /* Adjust local account config based on pjsua app config */
+        {
             pjsua_acc_config acc_cfg;
             pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
+
             app_config_init_video(&acc_cfg);
-            if (app_config.ipv6)
-                acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
+            acc_cfg.rtp_cfg = app_config.rtp_cfg;
+            acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
             pjsua_acc_modify(aid, &acc_cfg);
         }
+
         //pjsua_acc_set_transport(aid, transport_id);
         pjsua_acc_set_online_status(current_acc, PJ_TRUE);
@@ -1665 +1674 @@
         /* Add local account */
         pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
-        if (PJMEDIA_HAS_VIDEO) {
+
+        /* Adjust local account config based on pjsua app config */
+        {
             pjsua_acc_config acc_cfg;
             pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
+
             app_config_init_video(&acc_cfg);
+            acc_cfg.rtp_cfg = app_config.rtp_cfg;
             pjsua_acc_modify(aid, &acc_cfg);
         }
+
         pjsua_acc_set_online_status(current_acc, PJ_TRUE);
 
@@ -1690 +1704 @@
         /* Add local account */
         pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
-        if (PJMEDIA_HAS_VIDEO) {
+
+        /* Adjust local account config based on pjsua app config */
+        {
             pjsua_acc_config acc_cfg;
             pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
+
             app_config_init_video(&acc_cfg);
-            if (app_config.ipv6)
-                acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
+            acc_cfg.rtp_cfg = app_config.rtp_cfg;
+            acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
             pjsua_acc_modify(aid, &acc_cfg);
         }
+
         //pjsua_acc_set_transport(aid, transport_id);
         pjsua_acc_set_online_status(current_acc, PJ_TRUE);
@@ -1725 +1743 @@
         /* Add local account */
         pjsua_acc_add_local(transport_id, PJ_FALSE, &acc_id);
-        if (PJMEDIA_HAS_VIDEO) {
+
+        /* Adjust local account config based on pjsua app config */
+        {
             pjsua_acc_config acc_cfg;
             pjsua_acc_get_config(acc_id, tmp_pool, &acc_cfg);
+
             app_config_init_video(&acc_cfg);
+            acc_cfg.rtp_cfg = app_config.rtp_cfg;
             pjsua_acc_modify(acc_id, &acc_cfg);
         }
+
         pjsua_acc_set_online_status(acc_id, PJ_TRUE);
     }
@@ -1749 +1772 @@
         /* Add local account */
         pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
-        if (PJMEDIA_HAS_VIDEO) {
+
+        /* Adjust local account config based on pjsua app config */
+        {
             pjsua_acc_config acc_cfg;
             pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
+
             app_config_init_video(&acc_cfg);
-            if (app_config.ipv6)
-                acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
+            acc_cfg.rtp_cfg = app_config.rtp_cfg;
+            acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
             pjsua_acc_modify(aid, &acc_cfg);
         }
+
         //pjsua_acc_set_transport(aid, transport_id);
         pjsua_acc_set_online_status(current_acc, PJ_TRUE);