Changeset 4525 for pjproject/trunk

Timestamp:

May 28, 2013 12:03:36 PM (12 years ago)

Author:

riza

Message:

Re #1643: Restore configuration reset with added modification on app destroy. It was deleted from code to enable cli retain config values when restarted

Location:

pjproject/trunk/pjsip-apps/src/pjsua

Files:

• pjsua_app.c (modified) (2 diffs)
• pjsua_app_config.c (modified) (3 diffs)

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

@@ -1913 +1913 @@
     pj_status_t status = PJ_SUCCESS;
     unsigned i;
+    pj_bool_t use_cli = PJ_FALSE;
+    int cli_fe = 0;
+    pj_uint16_t cli_telnet_port = 0;
 
 #ifdef STEREO_DEMO
@@ -1970 +1973 @@
 
     status = pjsua_destroy();
+
+    if (app_config.use_cli) {
+        use_cli = app_config.use_cli;
+        cli_fe = app_config.cli_cfg.cli_fe;
+        cli_telnet_port = app_config.cli_cfg.telnet_cfg.port;   
+    }
+
+    /* Reset config */
+    pj_bzero(&app_config, sizeof(app_config));
+
+    if (use_cli) {    
+        app_config.use_cli = use_cli;
+        app_config.cli_cfg.cli_fe = cli_fe;
+        app_config.cli_cfg.telnet_cfg.port = cli_telnet_port;
+    }
 
     return status;

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

@@ -1455 +1455 @@
     for (i=0; i<PJ_ARRAY_SIZE(cfg->buddy_cfg); ++i)
         pjsua_buddy_config_default(&cfg->buddy_cfg[i]);
-
-    cfg->buddy_cnt = 0;
+    
     cfg->vid.vcapture_dev = PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
     cfg->vid.vrender_dev = PJMEDIA_VID_DEFAULT_RENDER_DEV;
@@ -1473 +1472 @@
 
     /* Initialize default config */
-    default_config(app_config);
+    default_config();
 
     /* Parse the arguments */
@@ -1481 +1480 @@
 
 pj_status_t load_config(int argc,
-                                char **argv,
-                                pj_str_t *uri_arg)
+                        char **argv,
+                        pj_str_t *uri_arg)
 {
     pj_status_t status;