Changeset 4580 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Aug 6, 2013 8:02:24 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1693: Pay attention to reg_hdr_list and sub_hdr_list in pjsua_acc_modify(), and also fixed pjsua_acc_get_config()

File:

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

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

@@ -1280 +1280 @@
     pjsua_transport_config tcp_cfg;
     unsigned i;
+    pj_pool_t *tmp_pool;
     pj_status_t status;
 
@@ -1289 +1290 @@
     /* Create pool for application */
     app_config.pool = pjsua_pool_create("pjsua-app", 1000, 1000);
+    tmp_pool = pjsua_pool_create("tmp-pjsua", 1000, 1000);;
 
     /* Init CLI & its FE settings */
@@ -1300 +1302 @@
     /** Parse args **/
     status = load_config(app_cfg.argc, app_cfg.argv, &uri_arg);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        pj_pool_release(tmp_pool);
         return status;
+    }
 
     /* Initialize application callbacks */
@@ -1340 +1344 @@
     status = pjsua_init(&app_config.cfg, &app_config.log_cfg,
                         &app_config.media_cfg);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        pj_pool_release(tmp_pool);
         return status;
+    }
 
     /* Initialize our module to handle otherwise unhandled request */
@@ -1588 +1594 @@
         if (PJMEDIA_HAS_VIDEO) {
             pjsua_acc_config acc_cfg;
-            pjsua_acc_get_config(aid, &acc_cfg);
+            pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
             app_config_init_video(&acc_cfg);
             pjsua_acc_modify(aid, &acc_cfg);
@@ -1627 +1633 @@
         if (PJMEDIA_HAS_VIDEO) {
             pjsua_acc_config acc_cfg;
-            pjsua_acc_get_config(aid, &acc_cfg);
+            pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
             app_config_init_video(&acc_cfg);
             if (app_config.ipv6)
@@ -1661 +1667 @@
         if (PJMEDIA_HAS_VIDEO) {
             pjsua_acc_config acc_cfg;
-            pjsua_acc_get_config(aid, &acc_cfg);
+            pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
             app_config_init_video(&acc_cfg);
             pjsua_acc_modify(aid, &acc_cfg);
@@ -1686 +1692 @@
         if (PJMEDIA_HAS_VIDEO) {
             pjsua_acc_config acc_cfg;
-            pjsua_acc_get_config(aid, &acc_cfg);
+            pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
             app_config_init_video(&acc_cfg);
             if (app_config.ipv6)
@@ -1721 +1727 @@
         if (PJMEDIA_HAS_VIDEO) {
             pjsua_acc_config acc_cfg;
-            pjsua_acc_get_config(acc_id, &acc_cfg);
+            pjsua_acc_get_config(acc_id, tmp_pool, &acc_cfg);
             app_config_init_video(&acc_cfg);
             pjsua_acc_modify(acc_id, &acc_cfg);
@@ -1745 +1751 @@
         if (PJMEDIA_HAS_VIDEO) {
             pjsua_acc_config acc_cfg;
-            pjsua_acc_get_config(aid, &acc_cfg);
+            pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
             app_config_init_video(&acc_cfg);
             if (app_config.ipv6)
@@ -1830 +1836 @@
     call_opt.vid_cnt = app_config.vid.vid_cnt;
 
+    pj_pool_release(tmp_pool);
     return PJ_SUCCESS;
 
 on_error:
+    pj_pool_release(tmp_pool);
     app_destroy();
     return status;