Index: pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c
===================================================================
--- pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c	(revision 4439)
+++ pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c	(revision 4440)
@@ -18,10 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjsua-lib/pjsua.h>
+#include "pjsua_cmd.h"
 #include "gui.h"
 
-
 #define THIS_FILE	"pjsua_app.c"
-#define NO_LIMIT	(int)0x7FFFFFFF
 
 //#define STEREO_DEMO
@@ -44,133 +42,13 @@
 #define RING_INTERVAL	    3000
 
-#define MAX_AVI             4
-
-/* Call specific data */
-struct call_data
-{
-    pj_timer_entry	    timer;
-    pj_bool_t		    ringback_on;
-    pj_bool_t		    ring_on;
-};
-
-/* Video settings */
-struct app_vid
-{
-    unsigned		    vid_cnt;
-    int			    vcapture_dev;
-    int			    vrender_dev;
-    pj_bool_t		    in_auto_show;
-    pj_bool_t		    out_auto_transmit;
-};
-
-/* Pjsua application data */
-static struct app_config
-{
-    pjsua_config	    cfg;
-    pjsua_logging_config    log_cfg;
-    pjsua_media_config	    media_cfg;
-    pj_bool_t		    no_refersub;
-    pj_bool_t		    ipv6;
-    pj_bool_t		    enable_qos;
-    pj_bool_t		    no_tcp;
-    pj_bool_t		    no_udp;
-    pj_bool_t		    use_tls;
-    pjsua_transport_config  udp_cfg;
-    pjsua_transport_config  rtp_cfg;
-    pjsip_redirect_op	    redir_op;
-
-    unsigned		    acc_cnt;
-    pjsua_acc_config	    acc_cfg[PJSUA_MAX_ACC];
-
-    unsigned		    buddy_cnt;
-    pjsua_buddy_config	    buddy_cfg[PJSUA_MAX_BUDDIES];
-
-    struct call_data	    call_data[PJSUA_MAX_CALLS];
-
-    pj_pool_t		   *pool;
-    /* Compatibility with older pjsua */
-
-    unsigned		    codec_cnt;
-    pj_str_t		    codec_arg[32];
-    unsigned		    codec_dis_cnt;
-    pj_str_t                codec_dis[32];
-    pj_bool_t		    null_audio;
-    unsigned		    wav_count;
-    pj_str_t		    wav_files[32];
-    unsigned		    tone_count;
-    pjmedia_tone_desc	    tones[32];
-    pjsua_conf_port_id	    tone_slots[32];
-    pjsua_player_id	    wav_id;
-    pjsua_conf_port_id	    wav_port;
-    pj_bool_t		    auto_play;
-    pj_bool_t		    auto_play_hangup;
-    pj_timer_entry	    auto_hangup_timer;
-    pj_bool_t		    auto_loop;
-    pj_bool_t		    auto_conf;
-    pj_str_t		    rec_file;
-    pj_bool_t		    auto_rec;
-    pjsua_recorder_id	    rec_id;
-    pjsua_conf_port_id	    rec_port;
-    unsigned		    auto_answer;
-    unsigned		    duration;
-
-#ifdef STEREO_DEMO
-    pjmedia_snd_port	   *snd;
-    pjmedia_port	   *sc, *sc_ch1;
-    pjsua_conf_port_id	    sc_ch1_slot;
-#endif
-
-    float		    mic_level,
-			    speaker_level;
-
-    int			    capture_dev, playback_dev;
-    unsigned		    capture_lat, playback_lat;
-
-    pj_bool_t		    no_tones;
-    int			    ringback_slot;
-    int			    ringback_cnt;
-    pjmedia_port	   *ringback_port;
-    int			    ring_slot;
-    int			    ring_cnt;
-    pjmedia_port	   *ring_port;
-
-    struct app_vid	    vid;
-    unsigned		    aud_cnt;
-
-    /* AVI to play */
-    unsigned                avi_cnt;
-    struct {
-	pj_str_t		path;
-	pjmedia_vid_dev_index	dev_id;
-	pjsua_conf_port_id	slot;
-    } avi[MAX_AVI];
-    pj_bool_t               avi_auto_play;
-    int			    avi_def_idx;
-
-} app_config;
-
-
-//static pjsua_acc_id	current_acc;
 #define current_acc	pjsua_acc_get_default()
-static pjsua_call_id	current_call = PJSUA_INVALID_ID;
-static pj_bool_t	cmd_echo;
-static int		stdout_refresh = -1;
-static const char      *stdout_refresh_text = "STDOUT_REFRESH";
-static pj_bool_t	stdout_refresh_quit = PJ_FALSE;
+
 static pj_str_t		uri_arg;
-
-#if defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0)
-#   define SOME_BUF_SIZE	(1024 * 10)
-#else
-#   define SOME_BUF_SIZE	(1024 * 3)
-#endif
-
-static char some_buf[SOME_BUF_SIZE];
 
 #ifdef STEREO_DEMO
 static void stereo_demo();
 #endif
+
 pj_status_t app_destroy(void);
-
 static void ringback_start(pjsua_call_id call_id);
 static void ring_start(pjsua_call_id call_id);
@@ -179,4 +57,13 @@
 pj_bool_t 	app_restart;
 pj_log_func     *log_cb = NULL;
+static const char      *stdout_refresh_text = "STDOUT_REFRESH";
+
+/** Forward declaration **/
+void console_app_main(const pj_str_t *uri_to_call, pj_bool_t *app_restart);
+
+void cli_console_app_main(const pj_str_t *uri_to_call, pj_bool_t *app_restart);
+void app_config_init_video(pjsua_acc_config *acc_cfg);
+pj_status_t setup_cli();
+void destroy_cli();
 
 /*****************************************************************************
@@ -382,4 +269,10 @@
 
     puts  ("");
+    puts  ("CLI options:");
+    puts  ("  --use-cli           Use CLI as user interface");
+    puts  ("  --cli-telnet-port=N CLI telnet port");
+    puts  ("");
+
+    puts  ("");
     puts  ("When URL is specified, pjsua will immediately initiate call to that URL");
     puts  ("");
@@ -388,7 +281,25 @@
 }
 
+static int stdout_refresh_proc(void *arg)
+{
+    PJ_UNUSED_ARG(arg);
+
+    /* Set thread to lowest priority so that it doesn't clobber
+     * stdout output
+     */
+    pj_thread_set_prio(pj_thread_this(), 
+		       pj_thread_get_prio_min(pj_thread_this()));
+
+    while (!stdout_refresh_quit) {
+	pj_thread_sleep(stdout_refresh * 1000);
+	puts(stdout_refresh_text);
+	fflush(stdout);
+    }
+
+    return 0;
+}
 
 /* Set default config. */
-static void default_config(struct app_config *cfg)
+static void default_config(pjsua_app_config *cfg)
 {
     char tmp[80];
@@ -407,5 +318,5 @@
     cfg->rtp_cfg.port = 4000;
     cfg->redir_op = PJSIP_REDIRECT_ACCEPT_REPLACE;
-    cfg->duration = NO_LIMIT;
+    cfg->duration = NO_LIMIT_DURATION;
     cfg->wav_id = PJSUA_INVALID_ID;
     cfg->rec_id = PJSUA_INVALID_ID;
@@ -431,6 +342,8 @@
 
     cfg->avi_def_idx = PJSUA_INVALID_ID;
-}
-
+
+    cfg->use_cli = PJ_FALSE;
+    cfg->cli_telnet_port = 0;
+}
 
 /*
@@ -467,4 +380,5 @@
 	int   len, token_len;
 	
+	pj_bzero(line, sizeof(line));
 	if (fgets(line, sizeof(line), fhnd) == NULL) break;
 	
@@ -536,27 +450,9 @@
     *app_argv = argv;
     return 0;
-
-}
-
-static int my_atoi(const char *cs)
-{
-    pj_str_t s;
-
-    pj_cstr(&s, cs);
-    if (cs[0] == '-') {
-	s.ptr++, s.slen--;
-	return 0 - (int)pj_strtoul(&s);
-    } else if (cs[0] == '+') {
-	s.ptr++, s.slen--;
-	return pj_strtoul(&s);
-    } else {
-	return pj_strtoul(&s);
-    }
-}
-
+}
 
 /* Parse arguments. */
-static pj_status_t parse_args(int argc, char *argv[],
-			      struct app_config *cfg,
+static pj_status_t parse_args(int argc, char *argv[], 
+			      pjsua_app_config *cfg,
 			      pj_str_t *uri_to_call)
 {
@@ -598,5 +494,6 @@
 	   OPT_TIMER, OPT_TIMER_SE, OPT_TIMER_MIN_SE,
 	   OPT_VIDEO, OPT_EXTRA_AUDIO,
-	   OPT_VCAPTURE_DEV, OPT_VRENDER_DEV, OPT_PLAY_AVI, OPT_AUTO_PLAY_AVI
+	   OPT_VCAPTURE_DEV, OPT_VRENDER_DEV, OPT_PLAY_AVI, OPT_AUTO_PLAY_AVI,
+	   OPT_USE_CLI, OPT_CLI_TELNET_PORT
     };
     struct pj_getopt_option long_options[] = {
@@ -727,4 +624,6 @@
 	{ "play-avi",	1, 0, OPT_PLAY_AVI},
 	{ "auto-play-avi", 0, 0, OPT_AUTO_PLAY_AVI},
+	{ "use-cli",	0, 0, OPT_USE_CLI},
+	{ "cli-telnet-port", 1, 0, OPT_CLI_TELNET_PORT},
 	{ NULL, 0, 0, 0}
     };
@@ -749,5 +648,5 @@
 
     if (config_file) {
-	status = read_config_file(app_config.pool, config_file, &argc, &argv);
+	status = read_config_file(cfg->pool, config_file, &argc, &argv);
 	if (status != 0)
 	    return status;
@@ -1549,4 +1448,12 @@
 	case OPT_AUTO_PLAY_AVI:
 	    app_config.avi_auto_play = PJ_TRUE;
+	    break;
+
+	case OPT_USE_CLI:
+	    cfg->use_cli = PJ_TRUE;
+	    break;
+
+	case OPT_CLI_TELNET_PORT:
+	    cfg->cli_telnet_port = atoi(pj_optarg);
 	    break;
 
@@ -1631,730 +1538,5 @@
 	}
     }
-
-
     return PJ_SUCCESS;
-}
-
-
-/*
- * Save account settings
- */
-static void write_account_settings(int acc_index, pj_str_t *result)
-{
-    unsigned i;
-    char line[128];
-    pjsua_acc_config *acc_cfg = &app_config.acc_cfg[acc_index];
-
-    
-    pj_ansi_sprintf(line, "\n#\n# Account %d:\n#\n", acc_index);
-    pj_strcat2(result, line);
-
-
-    /* Identity */
-    if (acc_cfg->id.slen) {
-	pj_ansi_sprintf(line, "--id %.*s\n", 
-			(int)acc_cfg->id.slen, 
-			acc_cfg->id.ptr);
-	pj_strcat2(result, line);
-    }
-
-    /* Registrar server */
-    if (acc_cfg->reg_uri.slen) {
-	pj_ansi_sprintf(line, "--registrar %.*s\n",
-			      (int)acc_cfg->reg_uri.slen,
-			      acc_cfg->reg_uri.ptr);
-	pj_strcat2(result, line);
-
-	pj_ansi_sprintf(line, "--reg-timeout %u\n",
-			      acc_cfg->reg_timeout);
-	pj_strcat2(result, line);
-    }
-
-    /* Contact */
-    if (acc_cfg->force_contact.slen) {
-	pj_ansi_sprintf(line, "--contact %.*s\n", 
-			(int)acc_cfg->force_contact.slen, 
-			acc_cfg->force_contact.ptr);
-	pj_strcat2(result, line);
-    }
-
-    /* Contact header parameters */
-    if (acc_cfg->contact_params.slen) {
-	pj_ansi_sprintf(line, "--contact-params %.*s\n", 
-			(int)acc_cfg->contact_params.slen, 
-			acc_cfg->contact_params.ptr);
-	pj_strcat2(result, line);
-    }
-
-    /* Contact URI parameters */
-    if (acc_cfg->contact_uri_params.slen) {
-	pj_ansi_sprintf(line, "--contact-uri-params %.*s\n", 
-			(int)acc_cfg->contact_uri_params.slen, 
-			acc_cfg->contact_uri_params.ptr);
-	pj_strcat2(result, line);
-    }
-
-    /*  */
-    if (acc_cfg->allow_contact_rewrite!=1)
-    {
-	pj_ansi_sprintf(line, "--auto-update-nat %i\n",
-			(int)acc_cfg->allow_contact_rewrite);
-	pj_strcat2(result, line);
-    }
-
-#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
-    /* SRTP */
-    if (acc_cfg->use_srtp) {
-	int use_srtp = (int)acc_cfg->use_srtp;
-	if (use_srtp == PJMEDIA_SRTP_OPTIONAL && 
-	    acc_cfg->srtp_optional_dup_offer)
-	{
-	    use_srtp = 3;
-	}
-	pj_ansi_sprintf(line, "--use-srtp %i\n", use_srtp);
-	pj_strcat2(result, line);
-    }
-    if (acc_cfg->srtp_secure_signaling != 
-	PJSUA_DEFAULT_SRTP_SECURE_SIGNALING) 
-    {
-	pj_ansi_sprintf(line, "--srtp-secure %d\n",
-			acc_cfg->srtp_secure_signaling);
-	pj_strcat2(result, line);
-    }
-#endif
-
-    /* Proxy */
-    for (i=0; i<acc_cfg->proxy_cnt; ++i) {
-	pj_ansi_sprintf(line, "--proxy %.*s\n",
-			      (int)acc_cfg->proxy[i].slen,
-			      acc_cfg->proxy[i].ptr);
-	pj_strcat2(result, line);
-    }
-
-    /* Credentials */
-    for (i=0; i<acc_cfg->cred_count; ++i) {
-	if (acc_cfg->cred_info[i].realm.slen) {
-	    pj_ansi_sprintf(line, "--realm %.*s\n",
-				  (int)acc_cfg->cred_info[i].realm.slen,
-				  acc_cfg->cred_info[i].realm.ptr);
-	    pj_strcat2(result, line);
-	}
-
-	if (acc_cfg->cred_info[i].username.slen) {
-	    pj_ansi_sprintf(line, "--username %.*s\n",
-				  (int)acc_cfg->cred_info[i].username.slen,
-				  acc_cfg->cred_info[i].username.ptr);
-	    pj_strcat2(result, line);
-	}
-
-	if (acc_cfg->cred_info[i].data.slen) {
-	    pj_ansi_sprintf(line, "--password %.*s\n",
-				  (int)acc_cfg->cred_info[i].data.slen,
-				  acc_cfg->cred_info[i].data.ptr);
-	    pj_strcat2(result, line);
-	}
-
-	if (i != acc_cfg->cred_count - 1)
-	    pj_strcat2(result, "--next-cred\n");
-    }
-
-    /* reg-use-proxy */
-    if (acc_cfg->reg_use_proxy != 3) {
-	pj_ansi_sprintf(line, "--reg-use-proxy %d\n",
-			      acc_cfg->reg_use_proxy);
-	pj_strcat2(result, line);
-    }
-
-    /* rereg-delay */
-    if (acc_cfg->reg_retry_interval != PJSUA_REG_RETRY_INTERVAL) {
-	pj_ansi_sprintf(line, "--rereg-delay %d\n",
-		              acc_cfg->reg_retry_interval);
-	pj_strcat2(result, line);
-    }
-
-    /* 100rel extension */
-    if (acc_cfg->require_100rel) {
-	pj_strcat2(result, "--use-100rel\n");
-    }
-
-    /* Session Timer extension */
-    if (acc_cfg->use_timer) {
-	pj_ansi_sprintf(line, "--use-timer %d\n",
-			      acc_cfg->use_timer);
-	pj_strcat2(result, line);
-    }
-    if (acc_cfg->timer_setting.min_se != 90) {
-	pj_ansi_sprintf(line, "--timer-min-se %d\n",
-			      acc_cfg->timer_setting.min_se);
-	pj_strcat2(result, line);
-    }
-    if (acc_cfg->timer_setting.sess_expires != PJSIP_SESS_TIMER_DEF_SE) {
-	pj_ansi_sprintf(line, "--timer-se %d\n",
-			      acc_cfg->timer_setting.sess_expires);
-	pj_strcat2(result, line);
-    }
-
-    /* Publish */
-    if (acc_cfg->publish_enabled)
-	pj_strcat2(result, "--publish\n");
-
-    /* MWI */
-    if (acc_cfg->mwi_enabled)
-	pj_strcat2(result, "--mwi\n");
-
-    if (acc_cfg->sip_stun_use != PJSUA_STUN_USE_DEFAULT ||
-	acc_cfg->media_stun_use != PJSUA_STUN_USE_DEFAULT)
-    {
-	pj_strcat2(result, "--disable-stun\n");
-    }
-
-    /* Media Transport*/
-    if (acc_cfg->ice_cfg.enable_ice)
-	pj_strcat2(result, "--use-ice\n");
-
-    if (acc_cfg->ice_cfg.ice_opt.aggressive == PJ_FALSE)
-	pj_strcat2(result, "--ice-regular\n");
-
-    if (acc_cfg->turn_cfg.enable_turn)
-	pj_strcat2(result, "--use-turn\n");
-
-    if (acc_cfg->ice_cfg.ice_max_host_cands >= 0) {
-	pj_ansi_sprintf(line, "--ice_max_host_cands %d\n",
-	                acc_cfg->ice_cfg.ice_max_host_cands);
-	pj_strcat2(result, line);
-    }
-
-    if (acc_cfg->ice_cfg.ice_no_rtcp)
-	pj_strcat2(result, "--ice-no-rtcp\n");
-
-    if (acc_cfg->turn_cfg.turn_server.slen) {
-	pj_ansi_sprintf(line, "--turn-srv %.*s\n",
-			(int)acc_cfg->turn_cfg.turn_server.slen,
-			acc_cfg->turn_cfg.turn_server.ptr);
-	pj_strcat2(result, line);
-    }
-
-    if (acc_cfg->turn_cfg.turn_conn_type == PJ_TURN_TP_TCP)
-	pj_strcat2(result, "--turn-tcp\n");
-
-    if (acc_cfg->turn_cfg.turn_auth_cred.data.static_cred.username.slen) {
-	pj_ansi_sprintf(line, "--turn-user %.*s\n",
-			(int)acc_cfg->turn_cfg.turn_auth_cred.data.static_cred.username.slen,
-			acc_cfg->turn_cfg.turn_auth_cred.data.static_cred.username.ptr);
-	pj_strcat2(result, line);
-    }
-
-    if (acc_cfg->turn_cfg.turn_auth_cred.data.static_cred.data.slen) {
-	pj_ansi_sprintf(line, "--turn-passwd %.*s\n",
-			(int)acc_cfg->turn_cfg.turn_auth_cred.data.static_cred.data.slen,
-			acc_cfg->turn_cfg.turn_auth_cred.data.static_cred.data.ptr);
-	pj_strcat2(result, line);
-    }
-}
-
-
-/*
- * Write settings.
- */
-static int write_settings(const struct app_config *config,
-			  char *buf, pj_size_t max)
-{
-    unsigned acc_index;
-    unsigned i;
-    pj_str_t cfg;
-    char line[128];
-    extern pj_bool_t pjsip_use_compact_form;
-
-    PJ_UNUSED_ARG(max);
-
-    cfg.ptr = buf;
-    cfg.slen = 0;
-
-    /* Logging. */
-    pj_strcat2(&cfg, "#\n# Logging options:\n#\n");
-    pj_ansi_sprintf(line, "--log-level %d\n",
-		    config->log_cfg.level);
-    pj_strcat2(&cfg, line);
-
-    pj_ansi_sprintf(line, "--app-log-level %d\n",
-		    config->log_cfg.console_level);
-    pj_strcat2(&cfg, line);
-
-    if (config->log_cfg.log_filename.slen) {
-	pj_ansi_sprintf(line, "--log-file %.*s\n",
-			(int)config->log_cfg.log_filename.slen,
-			config->log_cfg.log_filename.ptr);
-	pj_strcat2(&cfg, line);
-    }
-
-    if (config->log_cfg.log_file_flags & PJ_O_APPEND) {
-	pj_strcat2(&cfg, "--log-append\n");
-    }
-
-    /* Save account settings. */
-    for (acc_index=0; acc_index < config->acc_cnt; ++acc_index) {
-	
-	write_account_settings(acc_index, &cfg);
-
-	if (acc_index < config->acc_cnt-1)
-	    pj_strcat2(&cfg, "--next-account\n");
-    }
-
-
-    pj_strcat2(&cfg, "\n#\n# Network settings:\n#\n");
-
-    /* Nameservers */
-    for (i=0; i<config->cfg.nameserver_count; ++i) {
-	pj_ansi_sprintf(line, "--nameserver %.*s\n",
-			      (int)config->cfg.nameserver[i].slen,
-			      config->cfg.nameserver[i].ptr);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* Outbound proxy */
-    for (i=0; i<config->cfg.outbound_proxy_cnt; ++i) {
-	pj_ansi_sprintf(line, "--outbound %.*s\n",
-			      (int)config->cfg.outbound_proxy[i].slen,
-			      config->cfg.outbound_proxy[i].ptr);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* Transport options */
-    if (config->ipv6) {
-	pj_strcat2(&cfg, "--ipv6\n");
-    }
-    if (config->enable_qos) {
-	pj_strcat2(&cfg, "--set-qos\n");
-    }
-
-    /* UDP Transport. */
-    pj_ansi_sprintf(line, "--local-port %d\n", config->udp_cfg.port);
-    pj_strcat2(&cfg, line);
-
-    /* IP address, if any. */
-    if (config->udp_cfg.public_addr.slen) {
-	pj_ansi_sprintf(line, "--ip-addr %.*s\n", 
-			(int)config->udp_cfg.public_addr.slen,
-			config->udp_cfg.public_addr.ptr);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* Bound IP address, if any. */
-    if (config->udp_cfg.bound_addr.slen) {
-	pj_ansi_sprintf(line, "--bound-addr %.*s\n", 
-			(int)config->udp_cfg.bound_addr.slen,
-			config->udp_cfg.bound_addr.ptr);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* No TCP ? */
-    if (config->no_tcp) {
-	pj_strcat2(&cfg, "--no-tcp\n");
-    }
-
-    /* No UDP ? */
-    if (config->no_udp) {
-	pj_strcat2(&cfg, "--no-udp\n");
-    }
-
-    /* STUN */
-    for (i=0; i<config->cfg.stun_srv_cnt; ++i) {
-	pj_ansi_sprintf(line, "--stun-srv %.*s\n",
-			(int)config->cfg.stun_srv[i].slen, 
-			config->cfg.stun_srv[i].ptr);
-	pj_strcat2(&cfg, line);
-    }
-
-#if defined(PJSIP_HAS_TLS_TRANSPORT) && (PJSIP_HAS_TLS_TRANSPORT != 0)
-    /* TLS */
-    if (config->use_tls)
-	pj_strcat2(&cfg, "--use-tls\n");
-    if (config->udp_cfg.tls_setting.ca_list_file.slen) {
-	pj_ansi_sprintf(line, "--tls-ca-file %.*s\n",
-			(int)config->udp_cfg.tls_setting.ca_list_file.slen, 
-			config->udp_cfg.tls_setting.ca_list_file.ptr);
-	pj_strcat2(&cfg, line);
-    }
-    if (config->udp_cfg.tls_setting.cert_file.slen) {
-	pj_ansi_sprintf(line, "--tls-cert-file %.*s\n",
-			(int)config->udp_cfg.tls_setting.cert_file.slen, 
-			config->udp_cfg.tls_setting.cert_file.ptr);
-	pj_strcat2(&cfg, line);
-    }
-    if (config->udp_cfg.tls_setting.privkey_file.slen) {
-	pj_ansi_sprintf(line, "--tls-privkey-file %.*s\n",
-			(int)config->udp_cfg.tls_setting.privkey_file.slen, 
-			config->udp_cfg.tls_setting.privkey_file.ptr);
-	pj_strcat2(&cfg, line);
-    }
-
-    if (config->udp_cfg.tls_setting.password.slen) {
-	pj_ansi_sprintf(line, "--tls-password %.*s\n",
-			(int)config->udp_cfg.tls_setting.password.slen, 
-			config->udp_cfg.tls_setting.password.ptr);
-	pj_strcat2(&cfg, line);
-    }
-
-    if (config->udp_cfg.tls_setting.verify_server)
-	pj_strcat2(&cfg, "--tls-verify-server\n");
-
-    if (config->udp_cfg.tls_setting.verify_client)
-	pj_strcat2(&cfg, "--tls-verify-client\n");
-
-    if (config->udp_cfg.tls_setting.timeout.sec) {
-	pj_ansi_sprintf(line, "--tls-neg-timeout %d\n",
-			(int)config->udp_cfg.tls_setting.timeout.sec);
-	pj_strcat2(&cfg, line);
-    }
-
-    for (i=0; i<config->udp_cfg.tls_setting.ciphers_num; ++i) {
-	pj_ansi_sprintf(line, "--tls-cipher 0x%06X # %s\n",
-			config->udp_cfg.tls_setting.ciphers[i],
-			pj_ssl_cipher_name(config->udp_cfg.tls_setting.ciphers[i]));
-	pj_strcat2(&cfg, line);
-    }
-#endif
-
-    pj_strcat2(&cfg, "\n#\n# Media settings:\n#\n");
-
-    /* Video & extra audio */
-    for (i=0; i<config->vid.vid_cnt; ++i) {
-	pj_strcat2(&cfg, "--video\n");
-    }
-    for (i=1; i<config->aud_cnt; ++i) {
-	pj_strcat2(&cfg, "--extra-audio\n");
-    }
-
-    /* SRTP */
-#if PJMEDIA_HAS_SRTP
-    if (app_config.cfg.use_srtp != PJSUA_DEFAULT_USE_SRTP) {
-	int use_srtp = (int)app_config.cfg.use_srtp;
-	if (use_srtp == PJMEDIA_SRTP_OPTIONAL && 
-	    app_config.cfg.srtp_optional_dup_offer)
-	{
-	    use_srtp = 3;
-	}
-	pj_ansi_sprintf(line, "--use-srtp %d\n", use_srtp);
-	pj_strcat2(&cfg, line);
-    }
-    if (app_config.cfg.srtp_secure_signaling != 
-	PJSUA_DEFAULT_SRTP_SECURE_SIGNALING) 
-    {
-	pj_ansi_sprintf(line, "--srtp-secure %d\n",
-			app_config.cfg.srtp_secure_signaling);
-	pj_strcat2(&cfg, line);
-    }
-#endif
-
-    /* Media */
-    if (config->null_audio)
-	pj_strcat2(&cfg, "--null-audio\n");
-    if (config->auto_play)
-	pj_strcat2(&cfg, "--auto-play\n");
-    if (config->auto_loop)
-	pj_strcat2(&cfg, "--auto-loop\n");
-    if (config->auto_conf)
-	pj_strcat2(&cfg, "--auto-conf\n");
-    for (i=0; i<config->wav_count; ++i) {
-	pj_ansi_sprintf(line, "--play-file %s\n",
-			config->wav_files[i].ptr);
-	pj_strcat2(&cfg, line);
-    }
-    for (i=0; i<config->tone_count; ++i) {
-	pj_ansi_sprintf(line, "--play-tone %d,%d,%d,%d\n",
-			config->tones[i].freq1, config->tones[i].freq2, 
-			config->tones[i].on_msec, config->tones[i].off_msec);
-	pj_strcat2(&cfg, line);
-    }
-    if (config->rec_file.slen) {
-	pj_ansi_sprintf(line, "--rec-file %s\n",
-			config->rec_file.ptr);
-	pj_strcat2(&cfg, line);
-    }
-    if (config->auto_rec)
-	pj_strcat2(&cfg, "--auto-rec\n");
-    if (config->capture_dev != PJSUA_INVALID_ID) {
-	pj_ansi_sprintf(line, "--capture-dev %d\n", config->capture_dev);
-	pj_strcat2(&cfg, line);
-    }
-    if (config->playback_dev != PJSUA_INVALID_ID) {
-	pj_ansi_sprintf(line, "--playback-dev %d\n", config->playback_dev);
-	pj_strcat2(&cfg, line);
-    }
-    if (config->media_cfg.snd_auto_close_time != -1) {
-	pj_ansi_sprintf(line, "--snd-auto-close %d\n", 
-			config->media_cfg.snd_auto_close_time);
-	pj_strcat2(&cfg, line);
-    }
-    if (config->no_tones) {
-	pj_strcat2(&cfg, "--no-tones\n");
-    }
-    if (config->media_cfg.jb_max != -1) {
-	pj_ansi_sprintf(line, "--jb-max-size %d\n", 
-			config->media_cfg.jb_max);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* Sound device latency */
-    if (config->capture_lat != PJMEDIA_SND_DEFAULT_REC_LATENCY) {
-	pj_ansi_sprintf(line, "--capture-lat %d\n", config->capture_lat);
-	pj_strcat2(&cfg, line);
-    }
-    if (config->playback_lat != PJMEDIA_SND_DEFAULT_PLAY_LATENCY) {
-	pj_ansi_sprintf(line, "--playback-lat %d\n", config->playback_lat);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* Media clock rate. */
-    if (config->media_cfg.clock_rate != PJSUA_DEFAULT_CLOCK_RATE) {
-	pj_ansi_sprintf(line, "--clock-rate %d\n",
-			config->media_cfg.clock_rate);
-	pj_strcat2(&cfg, line);
-    } else {
-	pj_ansi_sprintf(line, "#using default --clock-rate %d\n",
-			config->media_cfg.clock_rate);
-	pj_strcat2(&cfg, line);
-    }
-
-    if (config->media_cfg.snd_clock_rate && 
-	config->media_cfg.snd_clock_rate != config->media_cfg.clock_rate) 
-    {
-	pj_ansi_sprintf(line, "--snd-clock-rate %d\n",
-			config->media_cfg.snd_clock_rate);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* Stereo mode. */
-    if (config->media_cfg.channel_count == 2) {
-	pj_ansi_sprintf(line, "--stereo\n");
-	pj_strcat2(&cfg, line);
-    }
-
-    /* quality */
-    if (config->media_cfg.quality != PJSUA_DEFAULT_CODEC_QUALITY) {
-	pj_ansi_sprintf(line, "--quality %d\n",
-			config->media_cfg.quality);
-	pj_strcat2(&cfg, line);
-    } else {
-	pj_ansi_sprintf(line, "#using default --quality %d\n",
-			config->media_cfg.quality);
-	pj_strcat2(&cfg, line);
-    }
-
-    if (config->vid.vcapture_dev != PJMEDIA_VID_DEFAULT_CAPTURE_DEV) {
-	pj_ansi_sprintf(line, "--vcapture-dev %d\n", config->vid.vcapture_dev);
-	pj_strcat2(&cfg, line);
-    }
-    if (config->vid.vrender_dev != PJMEDIA_VID_DEFAULT_RENDER_DEV) {
-	pj_ansi_sprintf(line, "--vrender-dev %d\n", config->vid.vrender_dev);
-	pj_strcat2(&cfg, line);
-    }
-    for (i=0; i<config->avi_cnt; ++i) {
-	pj_ansi_sprintf(line, "--play-avi %s\n", config->avi[i].path.ptr);
-	pj_strcat2(&cfg, line);
-    }
-    if (config->avi_auto_play) {
-	pj_ansi_sprintf(line, "--auto-play-avi\n");
-	pj_strcat2(&cfg, line);
-    }
-
-    /* ptime */
-    if (config->media_cfg.ptime) {
-	pj_ansi_sprintf(line, "--ptime %d\n",
-			config->media_cfg.ptime);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* no-vad */
-    if (config->media_cfg.no_vad) {
-	pj_strcat2(&cfg, "--no-vad\n");
-    }
-
-    /* ec-tail */
-    if (config->media_cfg.ec_tail_len != PJSUA_DEFAULT_EC_TAIL_LEN) {
-	pj_ansi_sprintf(line, "--ec-tail %d\n",
-			config->media_cfg.ec_tail_len);
-	pj_strcat2(&cfg, line);
-    } else {
-	pj_ansi_sprintf(line, "#using default --ec-tail %d\n",
-			config->media_cfg.ec_tail_len);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* ec-opt */
-    if (config->media_cfg.ec_options != 0) {
-	pj_ansi_sprintf(line, "--ec-opt %d\n",
-			config->media_cfg.ec_options);
-	pj_strcat2(&cfg, line);
-    } 
-
-    /* ilbc-mode */
-    if (config->media_cfg.ilbc_mode != PJSUA_DEFAULT_ILBC_MODE) {
-	pj_ansi_sprintf(line, "--ilbc-mode %d\n",
-			config->media_cfg.ilbc_mode);
-	pj_strcat2(&cfg, line);
-    } else {
-	pj_ansi_sprintf(line, "#using default --ilbc-mode %d\n",
-			config->media_cfg.ilbc_mode);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* RTP drop */
-    if (config->media_cfg.tx_drop_pct) {
-	pj_ansi_sprintf(line, "--tx-drop-pct %d\n",
-			config->media_cfg.tx_drop_pct);
-	pj_strcat2(&cfg, line);
-
-    }
-    if (config->media_cfg.rx_drop_pct) {
-	pj_ansi_sprintf(line, "--rx-drop-pct %d\n",
-			config->media_cfg.rx_drop_pct);
-	pj_strcat2(&cfg, line);
-
-    }
-
-
-    /* Start RTP port. */
-    pj_ansi_sprintf(line, "--rtp-port %d\n",
-		    config->rtp_cfg.port);
-    pj_strcat2(&cfg, line);
-
-    /* Disable codec */
-    for (i=0; i<config->codec_dis_cnt; ++i) {
-	pj_ansi_sprintf(line, "--dis-codec %s\n",
-		    config->codec_dis[i].ptr);
-	pj_strcat2(&cfg, line);
-    }
-    /* Add codec. */
-    for (i=0; i<config->codec_cnt; ++i) {
-	pj_ansi_sprintf(line, "--add-codec %s\n",
-		    config->codec_arg[i].ptr);
-	pj_strcat2(&cfg, line);
-    }
-
-    pj_strcat2(&cfg, "\n#\n# User agent:\n#\n");
-
-    /* Auto-answer. */
-    if (config->auto_answer != 0) {
-	pj_ansi_sprintf(line, "--auto-answer %d\n",
-			config->auto_answer);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* accept-redirect */
-    if (config->redir_op != PJSIP_REDIRECT_ACCEPT_REPLACE) {
-	pj_ansi_sprintf(line, "--accept-redirect %d\n",
-			config->redir_op);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* Max calls. */
-    pj_ansi_sprintf(line, "--max-calls %d\n",
-		    config->cfg.max_calls);
-    pj_strcat2(&cfg, line);
-
-    /* Uas-duration. */
-    if (config->duration != NO_LIMIT) {
-	pj_ansi_sprintf(line, "--duration %d\n",
-			config->duration);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* norefersub ? */
-    if (config->no_refersub) {
-	pj_strcat2(&cfg, "--norefersub\n");
-    }
-
-    if (pjsip_use_compact_form)
-    {
-	pj_strcat2(&cfg, "--use-compact-form\n");
-    }
-
-    if (!config->cfg.force_lr) {
-	pj_strcat2(&cfg, "--no-force-lr\n");
-    }
-
-    pj_strcat2(&cfg, "\n#\n# Buddies:\n#\n");
-
-    /* Add buddies. */
-    for (i=0; i<config->buddy_cnt; ++i) {
-	pj_ansi_sprintf(line, "--add-buddy %.*s\n",
-			      (int)config->buddy_cfg[i].uri.slen,
-			      config->buddy_cfg[i].uri.ptr);
-	pj_strcat2(&cfg, line);
-    }
-
-    /* SIP extensions. */
-    pj_strcat2(&cfg, "\n#\n# SIP extensions:\n#\n");
-    /* 100rel extension */
-    if (config->cfg.require_100rel) {
-	pj_strcat2(&cfg, "--use-100rel\n");
-    }
-    /* Session Timer extension */
-    if (config->cfg.use_timer) {
-	pj_ansi_sprintf(line, "--use-timer %d\n",
-			      config->cfg.use_timer);
-	pj_strcat2(&cfg, line);
-    }
-    if (config->cfg.timer_setting.min_se != 90) {
-	pj_ansi_sprintf(line, "--timer-min-se %d\n",
-			      config->cfg.timer_setting.min_se);
-	pj_strcat2(&cfg, line);
-    }
-    if (config->cfg.timer_setting.sess_expires != PJSIP_SESS_TIMER_DEF_SE) {
-	pj_ansi_sprintf(line, "--timer-se %d\n",
-			      config->cfg.timer_setting.sess_expires);
-	pj_strcat2(&cfg, line);
-    }
-
-    *(cfg.ptr + cfg.slen) = '\0';
-    return cfg.slen;
-}
-
-
-/*
- * Dump application states.
- */
-static void app_dump(pj_bool_t detail)
-{
-    pjsua_dump(detail);
-}
-
-/*
- * Print log of call states. Since call states may be too long for logger,
- * printing it is a bit tricky, it should be printed part by part as long 
- * as the logger can accept.
- */
-static void log_call_dump(int call_id) 
-{
-    unsigned call_dump_len;
-    unsigned part_len;
-    unsigned part_idx;
-    unsigned log_decor;
-
-    pjsua_call_dump(call_id, PJ_TRUE, some_buf, 
-		    sizeof(some_buf), "  ");
-    call_dump_len = strlen(some_buf);
-
-    log_decor = pj_log_get_decor();
-    pj_log_set_decor(log_decor & ~(PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_CR));
-    PJ_LOG(3,(THIS_FILE, "\n"));
-    pj_log_set_decor(0);
-
-    part_idx = 0;
-    part_len = PJ_LOG_MAX_SIZE-80;
-    while (part_idx < call_dump_len) {
-	char p_orig, *p;
-
-	p = &some_buf[part_idx];
-	if (part_idx + part_len > call_dump_len)
-	    part_len = call_dump_len - part_idx;
-	p_orig = p[part_len];
-	p[part_len] = '\0';
-	PJ_LOG(3,(THIS_FILE, "%s", p));
-	p[part_len] = p_orig;
-	part_idx += part_len;
-    }
-    pj_log_set_decor(log_decor);
 }
 
@@ -2362,5 +1544,4 @@
  * Console application
  */
-
 static void ringback_start(pjsua_call_id call_id)
 {
@@ -2427,89 +1608,4 @@
 }
 
-#ifdef HAVE_MULTIPART_TEST
-  /*
-   * Enable multipart in msg_data and add a dummy body into the
-   * multipart bodies.
-   */
-  static void add_multipart(pjsua_msg_data *msg_data)
-  {
-      static pjsip_multipart_part *alt_part;
-
-      if (!alt_part) {
-	  pj_str_t type, subtype, content;
-
-	  alt_part = pjsip_multipart_create_part(app_config.pool);
-
-	  type = pj_str("text");
-	  subtype = pj_str("plain");
-	  content = pj_str("Sample text body of a multipart bodies");
-	  alt_part->body = pjsip_msg_body_create(app_config.pool, &type,
-						 &subtype, &content);
-      }
-
-      msg_data->multipart_ctype.type = pj_str("multipart");
-      msg_data->multipart_ctype.subtype = pj_str("mixed");
-      pj_list_push_back(&msg_data->multipart_parts, alt_part);
-  }
-#  define TEST_MULTIPART(msg_data)	add_multipart(msg_data)
-#else
-#  define TEST_MULTIPART(msg_data)
-#endif
-
-/*
- * Find next call when current call is disconnected or when user
- * press ']'
- */
-static pj_bool_t find_next_call(void)
-{
-    int i, max;
-
-    max = pjsua_call_get_max_count();
-    for (i=current_call+1; i<max; ++i) {
-	if (pjsua_call_is_active(i)) {
-	    current_call = i;
-	    return PJ_TRUE;
-	}
-    }
-
-    for (i=0; i<current_call; ++i) {
-	if (pjsua_call_is_active(i)) {
-	    current_call = i;
-	    return PJ_TRUE;
-	}
-    }
-
-    current_call = PJSUA_INVALID_ID;
-    return PJ_FALSE;
-}
-
-
-/*
- * Find previous call when user press '['
- */
-static pj_bool_t find_prev_call(void)
-{
-    int i, max;
-
-    max = pjsua_call_get_max_count();
-    for (i=current_call-1; i>=0; --i) {
-	if (pjsua_call_is_active(i)) {
-	    current_call = i;
-	    return PJ_TRUE;
-	}
-    }
-
-    for (i=max-1; i>current_call; --i) {
-	if (pjsua_call_is_active(i)) {
-	    current_call = i;
-	    return PJ_TRUE;
-	}
-    }
-
-    current_call = PJSUA_INVALID_ID;
-    return PJ_FALSE;
-}
-
-
 /* Callback from timer when the maximum call duration has been
  * exceeded.
@@ -2596,5 +1692,5 @@
     } else {
 
-	if (app_config.duration!=NO_LIMIT && 
+	if (app_config.duration != NO_LIMIT_DURATION && 
 	    call_info.state == PJSIP_INV_STATE_CONFIRMED) 
 	{
@@ -2650,5 +1746,4 @@
 }
 
-
 /**
  * Handler when there is incoming call.
@@ -2704,5 +1799,5 @@
 		  "From: %s\n"
 		  "To: %s\n"
-		  "Press a to answer or h to reject call",
+		  "Press %s to answer or %s to reject call",
 		  acc_id,
 		  call_info.rem_aud_cnt,
@@ -2710,5 +1805,7 @@
 		  notif_st,
 		  call_info.remote_info.ptr,
-		  call_info.local_info.ptr));
+		  call_info.local_info.ptr,
+		  (app_config.use_cli?"c a":"a"),
+		  (app_config.use_cli?"c g":"h")));
     }
 }
@@ -2925,40 +2022,4 @@
 }
 
-/* arrange windows. arg:
- *   -1:    arrange all windows
- *   != -1: arrange only this window id
- */
-static void arrange_window(pjsua_vid_win_id wid)
-{
-#if PJSUA_HAS_VIDEO
-    pjmedia_coord pos;
-    int i, last;
-
-    pos.x = 0;
-    pos.y = 10;
-    last = (wid == PJSUA_INVALID_ID) ? PJSUA_MAX_VID_WINS : wid;
-
-    for (i=0; i<last; ++i) {
-	pjsua_vid_win_info wi;
-	pj_status_t status;
-
-	status = pjsua_vid_win_get_info(i, &wi);
-	if (status != PJ_SUCCESS)
-	    continue;
-
-	if (wid == PJSUA_INVALID_ID)
-	    pjsua_vid_win_set_pos(i, &pos);
-
-	if (wi.show)
-	    pos.y += wi.size.h;
-    }
-
-    if (wid != PJSUA_INVALID_ID)
-	pjsua_vid_win_set_pos(wid, &pos);
-#else
-    PJ_UNUSED_ARG(wid);
-#endif
-}
-
 /* Process video media state. "mi" is the media index. */
 static void on_call_video_state(pjsua_call_info *ci, unsigned mi,
@@ -3070,5 +2131,4 @@
     // Log already written.
 }
-
 
 /*
@@ -3444,70 +2504,4 @@
 #endif
 
-/*
- * Print buddy list.
- */
-static void print_buddy_list(void)
-{
-    pjsua_buddy_id ids[64];
-    int i;
-    unsigned count = PJ_ARRAY_SIZE(ids);
-
-    puts("Buddy list:");
-
-    pjsua_enum_buddies(ids, &count);
-
-    if (count == 0)
-	puts(" -none-");
-    else {
-	for (i=0; i<(int)count; ++i) {
-	    pjsua_buddy_info info;
-
-	    if (pjsua_buddy_get_info(ids[i], &info) != PJ_SUCCESS)
-		continue;
-
-	    printf(" [%2d] <%.*s>  %.*s\n", 
-		    ids[i]+1, 
-		    (int)info.status_text.slen,
-		    info.status_text.ptr, 
-		    (int)info.uri.slen,
-		    info.uri.ptr);
-	}
-    }
-    puts("");
-}
-
-
-/*
- * Print account status.
- */
-static void print_acc_status(int acc_id)
-{
-    char buf[80];
-    pjsua_acc_info info;
-
-    pjsua_acc_get_info(acc_id, &info);
-
-    if (!info.has_registration) {
-	pj_ansi_snprintf(buf, sizeof(buf), "%.*s", 
-			 (int)info.status_text.slen,
-			 info.status_text.ptr);
-
-    } else {
-	pj_ansi_snprintf(buf, sizeof(buf),
-			 "%d/%.*s (expires=%d)",
-			 info.status,
-			 (int)info.status_text.slen,
-			 info.status_text.ptr,
-			 info.expires);
-
-    }
-
-    printf(" %c[%2d] %.*s: %s\n", (acc_id==current_acc?'*':' '),
-	   acc_id,  (int)info.acc_uri.slen, info.acc_uri.ptr, buf);
-    printf("       Online status: %.*s\n", 
-	(int)info.online_status_text.slen,
-	info.online_status_text.ptr);
-}
-
 /* Playfile done notification, set timer to hangup calls */
 pj_status_t on_playfile_done(pjmedia_port *port, void *usr_data)
@@ -3550,1865 +2544,4 @@
 
 /*
- * Show a bit of help.
- */
-static void keystroke_help(void)
-{
-    pjsua_acc_id acc_ids[16];
-    unsigned count = PJ_ARRAY_SIZE(acc_ids);
-    int i;
-
-    printf(">>>>\n");
-
-    pjsua_enum_accs(acc_ids, &count);
-
-    printf("Account list:\n");
-    for (i=0; i<(int)count; ++i)
-	print_acc_status(acc_ids[i]);
-
-    print_buddy_list();
-    
-    //puts("Commands:");
-    puts("+=============================================================================+");
-    puts("|       Call Commands:         |   Buddy, IM & Presence:  |     Account:      |");
-    puts("|                              |                          |                   |");
-    puts("|  m  Make new call            | +b  Add new buddy       .| +a  Add new accnt |");
-    puts("|  M  Make multiple calls      | -b  Delete buddy         | -a  Delete accnt. |");
-    puts("|  a  Answer call              |  i  Send IM              | !a  Modify accnt. |");
-    puts("|  h  Hangup call  (ha=all)    |  s  Subscribe presence   | rr  (Re-)register |");
-    puts("|  H  Hold call                |  u  Unsubscribe presence | ru  Unregister    |");
-    puts("|  v  re-inVite (release hold) |  t  ToGgle Online status |  >  Cycle next ac.|");
-    puts("|  U  send UPDATE              |  T  Set online status    |  <  Cycle prev ac.|");
-    puts("| ],[ Select next/prev call    +--------------------------+-------------------+");
-    puts("|  x  Xfer call                |      Media Commands:     |  Status & Config: |");
-    puts("|  X  Xfer with Replaces       |                          |                   |");
-    puts("|  #  Send RFC 2833 DTMF       | cl  List ports           |  d  Dump status   |");
-    puts("|  *  Send DTMF with INFO      | cc  Connect port         | dd  Dump detailed |");
-    puts("| dq  Dump curr. call quality  | cd  Disconnect port      | dc  Dump config   |");
-    puts("|                              |  V  Adjust audio Volume  |  f  Save config   |");
-    puts("|  S  Send arbitrary REQUEST   | Cp  Codec priorities     |                   |");
-    puts("+-----------------------------------------------------------------------------+");
-#if PJSUA_HAS_VIDEO
-    puts("| Video: \"vid help\" for more info                                             |");
-    puts("+-----------------------------------------------------------------------------+");
-#endif
-    puts("|  q  QUIT   L  ReLoad   sleep MS   echo [0|1|txt]     n: detect NAT type     |");
-    puts("+=============================================================================+");
-
-    i = pjsua_call_get_count();
-    printf("You have %d active call%s\n", i, (i>1?"s":""));
-
-    if (current_call != PJSUA_INVALID_ID) {
-	pjsua_call_info ci;
-	if (pjsua_call_get_info(current_call, &ci)==PJ_SUCCESS)
-	    printf("Current call id=%d to %.*s [%.*s]\n", current_call,
-		   (int)ci.remote_info.slen, ci.remote_info.ptr,
-		   (int)ci.state_text.slen, ci.state_text.ptr);
-    }
-}
-
-/* Help screen for video */
-#if PJSUA_HAS_VIDEO
-static void vid_show_help(void)
-{
-    pj_bool_t vid_enabled = (app_config.vid.vid_cnt > 0);
-
-    puts("+=============================================================================+");
-    puts("|                            Video commands:                                  |");
-    puts("|                                                                             |");
-    puts("| vid help                  Show this help screen                             |");
-    puts("| vid enable|disable        Enable or disable video in next offer/answer      |");
-    puts("| vid acc show              Show current account video settings               |");
-    puts("| vid acc autorx on|off     Automatically show incoming video on/off          |");
-    puts("| vid acc autotx on|off     Automatically offer video on/off                  |");
-    puts("| vid acc cap ID            Set default capture device for current acc        |");
-    puts("| vid acc rend ID           Set default renderer device for current acc       |");
-    puts("| vid call rx on|off N      Enable/disable video RX for stream N in curr call |");
-    puts("| vid call tx on|off N      Enable/disable video TX for stream N in curr call |");
-    puts("| vid call add              Add video stream for current call                 |");
-    puts("| vid call enable|disable N Enable/disable stream #N in current call          |");
-    puts("| vid call cap N ID         Set capture dev ID for stream #N in current call  |");
-    puts("| vid dev list              List all video devices                            |");
-    puts("| vid dev refresh           Refresh video device list                         |");
-    puts("| vid dev prev on|off ID    Enable/disable preview for specified device ID    |");
-    puts("| vid codec list            List video codecs                                 |");
-    puts("| vid codec prio ID PRIO    Set codec ID priority to PRIO                     |");
-    puts("| vid codec fps ID NUM DEN  Set codec ID framerate to (NUM/DEN) fps           |");
-    puts("| vid codec bw ID AVG MAX   Set codec ID bitrate to AVG & MAX kbps            |");
-    puts("| vid codec size ID W H     Set codec ID size/resolution to W x H             |");
-    puts("| vid win list              List all active video windows                     |");
-    puts("| vid win arrange           Auto arrange windows                              |");
-    puts("| vid win show|hide ID      Show/hide the specified video window ID           |");
-    puts("| vid win move ID X Y       Move window ID to position X,Y                    |");
-    puts("| vid win resize ID w h     Resize window ID to the specified width, height   |");
-    puts("+=============================================================================+");
-    printf("| Video will be %s in the next offer/answer %s                            |\n",
-	   (vid_enabled? "enabled" : "disabled"), (vid_enabled? " " : ""));
-    puts("+=============================================================================+");
-}
-#endif
-
-/*
- * Input simple string
- */
-static pj_bool_t simple_input(const char *title, char *buf, pj_size_t len)
-{
-    char *p;
-
-    printf("%s (empty to cancel): ", title); fflush(stdout);
-    if (fgets(buf, len, stdin) == NULL)
-	return PJ_FALSE;
-
-    /* Remove trailing newlines. */
-    for (p=buf; ; ++p) {
-	if (*p=='\r' || *p=='\n') *p='\0';
-	else if (!*p) break;
-    }
-
-    if (!*buf)
-	return PJ_FALSE;
-    
-    return PJ_TRUE;
-}
-
-
-#define NO_NB	-2
-struct input_result
-{
-    int	  nb_result;
-    char *uri_result;
-};
-
-
-/*
- * Input URL.
- */
-static void ui_input_url(const char *title, char *buf, int len, 
-			 struct input_result *result)
-{
-    result->nb_result = NO_NB;
-    result->uri_result = NULL;
-
-    print_buddy_list();
-
-    printf("Choices:\n"
-	   "   0         For current dialog.\n"
-	   "  -1         All %d buddies in buddy list\n"
-	   "  [1 -%2d]    Select from buddy list\n"
-	   "  URL        An URL\n"
-	   "  <Enter>    Empty input (or 'q') to cancel\n"
-	   , pjsua_get_buddy_count(), pjsua_get_buddy_count());
-    printf("%s: ", title);
-
-    fflush(stdout);
-    if (fgets(buf, len, stdin) == NULL)
-	return;
-    len = strlen(buf);
-
-    /* Left trim */
-    while (pj_isspace(*buf)) {
-	++buf;
-	--len;
-    }
-
-    /* Remove trailing newlines */
-    while (len && (buf[len-1] == '\r' || buf[len-1] == '\n'))
-	buf[--len] = '\0';
-
-    if (len == 0 || buf[0]=='q')
-	return;
-
-    if (pj_isdigit(*buf) || *buf=='-') {
-	
-	int i;
-	
-	if (*buf=='-')
-	    i = 1;
-	else
-	    i = 0;
-
-	for (; i<len; ++i) {
-	    if (!pj_isdigit(buf[i])) {
-		puts("Invalid input");
-		return;
-	    }
-	}
-
-	result->nb_result = my_atoi(buf);
-
-	if (result->nb_result >= 0 && 
-	    result->nb_result <= (int)pjsua_get_buddy_count()) 
-	{
-	    return;
-	}
-	if (result->nb_result == -1)
-	    return;
-
-	puts("Invalid input");
-	result->nb_result = NO_NB;
-	return;
-
-    } else {
-	pj_status_t status;
-
-	if ((status=pjsua_verify_url(buf)) != PJ_SUCCESS) {
-	    pjsua_perror(THIS_FILE, "Invalid URL", status);
-	    return;
-	}
-
-	result->uri_result = buf;
-    }
-}
-
-/*
- * List the ports in conference bridge
- */
-static void conf_list(void)
-{
-    unsigned i, count;
-    pjsua_conf_port_id id[PJSUA_MAX_CALLS];
-
-    printf("Conference ports:\n");
-
-    count = PJ_ARRAY_SIZE(id);
-    pjsua_enum_conf_ports(id, &count);
-
-    for (i=0; i<count; ++i) {
-	char txlist[PJSUA_MAX_CALLS*4+10];
-	unsigned j;
-	pjsua_conf_port_info info;
-
-	pjsua_conf_get_port_info(id[i], &info);
-
-	txlist[0] = '\0';
-	for (j=0; j<info.listener_cnt; ++j) {
-	    char s[10];
-	    pj_ansi_sprintf(s, "#%d ", info.listeners[j]);
-	    pj_ansi_strcat(txlist, s);
-	}
-	printf("Port #%02d[%2dKHz/%dms/%d] %20.*s  transmitting to: %s\n", 
-	       info.slot_id, 
-	       info.clock_rate/1000,
-	       info.samples_per_frame*1000/info.channel_count/info.clock_rate,
-	       info.channel_count,
-	       (int)info.name.slen, 
-	       info.name.ptr,
-	       txlist);
-
-    }
-    puts("");
-}
-
-
-/*
- * Send arbitrary request to remote host
- */
-static void send_request(char *cstr_method, const pj_str_t *dst_uri)
-{
-    pj_str_t str_method;
-    pjsip_method method;
-    pjsip_tx_data *tdata;
-    pjsip_endpoint *endpt;
-    pj_status_t status;
-
-    endpt = pjsua_get_pjsip_endpt();
-
-    str_method = pj_str(cstr_method);
-    pjsip_method_init_np(&method, &str_method);
-
-    status = pjsua_acc_create_request(current_acc, &method, dst_uri, &tdata);
-
-    status = pjsip_endpt_send_request(endpt, tdata, -1, NULL, NULL);
-    if (status != PJ_SUCCESS) {
-	pjsua_perror(THIS_FILE, "Unable to send request", status);
-	return;
-    }
-}
-
-
-/*
- * Change extended online status.
- */
-static void change_online_status(void)
-{
-    char menuin[32];
-    pj_bool_t online_status;
-    pjrpid_element elem;
-    int i, choice;
-
-    enum {
-	AVAILABLE, BUSY, OTP, IDLE, AWAY, BRB, OFFLINE, OPT_MAX
-    };
-
-    struct opt {
-	int id;
-	char *name;
-    } opts[] = {
-	{ AVAILABLE, "Available" },
-	{ BUSY, "Busy"},
-	{ OTP, "On the phone"},
-	{ IDLE, "Idle"},
-	{ AWAY, "Away"},
-	{ BRB, "Be right back"},
-	{ OFFLINE, "Offline"}
-    };
-
-    printf("\n"
-	   "Choices:\n");
-    for (i=0; i<PJ_ARRAY_SIZE(opts); ++i) {
-	printf("  %d  %s\n", opts[i].id+1, opts[i].name);
-    }
-
-    if (!simple_input("Select status", menuin, sizeof(menuin)))
-	return;
-
-    choice = atoi(menuin) - 1;
-    if (choice < 0 || choice >= OPT_MAX) {
-	puts("Invalid selection");
-	return;
-    }
-
-    pj_bzero(&elem, sizeof(elem));
-    elem.type = PJRPID_ELEMENT_TYPE_PERSON;
-
-    online_status = PJ_TRUE;
-
-    switch (choice) {
-    case AVAILABLE:
-	break;
-    case BUSY:
-	elem.activity = PJRPID_ACTIVITY_BUSY;
-	elem.note = pj_str("Busy");
-	break;
-    case OTP:
-	elem.activity = PJRPID_ACTIVITY_BUSY;
-	elem.note = pj_str("On the phone");
-	break;
-    case IDLE:
-	elem.activity = PJRPID_ACTIVITY_UNKNOWN;
-	elem.note = pj_str("Idle");
-	break;
-    case AWAY:
-	elem.activity = PJRPID_ACTIVITY_AWAY;
-	elem.note = pj_str("Away");
-	break;
-    case BRB:
-	elem.activity = PJRPID_ACTIVITY_UNKNOWN;
-	elem.note = pj_str("Be right back");
-	break;
-    case OFFLINE:
-	online_status = PJ_FALSE;
-	break;
-    }
-
-    pjsua_acc_set_online_status2(current_acc, online_status, &elem);
-}
-
-
-/*
- * Change codec priorities.
- */
-static void manage_codec_prio(void)
-{
-    pjsua_codec_info c[32];
-    unsigned i, count = PJ_ARRAY_SIZE(c);
-    char input[32];
-    char *codec, *prio;
-    pj_str_t id;
-    int new_prio;
-    pj_status_t status;
-
-    printf("List of audio codecs:\n");
-    pjsua_enum_codecs(c, &count);
-    for (i=0; i<count; ++i) {
-	printf("  %d\t%.*s\n", c[i].priority, (int)c[i].codec_id.slen,
-			       c[i].codec_id.ptr);
-    }
-
-#if PJSUA_HAS_VIDEO
-    puts("");
-    printf("List of video codecs:\n");
-    pjsua_vid_enum_codecs(c, &count);
-    for (i=0; i<count; ++i) {
-	printf("  %d\t%.*s%s%.*s\n", c[i].priority,
-				     (int)c[i].codec_id.slen,
-				     c[i].codec_id.ptr,
-				     c[i].desc.slen? " - ":"",
-				     (int)c[i].desc.slen,
-				     c[i].desc.ptr);
-    }
-#endif
-
-    puts("");
-    puts("Enter codec id and its new priority (e.g. \"speex/16000 200\", ""\"H263 200\"),");
-    puts("or empty to cancel.");
-
-    printf("Codec name (\"*\" for all) and priority: ");
-    if (fgets(input, sizeof(input), stdin) == NULL)
-	return;
-    if (input[0]=='\r' || input[0]=='\n') {
-	puts("Done");
-	return;
-    }
-
-    codec = strtok(input, " \t\r\n");
-    prio = strtok(NULL, " \r\n");
-
-    if (!codec || !prio) {
-	puts("Invalid input");
-	return;
-    }
-
-    new_prio = atoi(prio);
-    if (new_prio < 0) 
-	new_prio = 0;
-    else if (new_prio > PJMEDIA_CODEC_PRIO_HIGHEST) 
-	new_prio = PJMEDIA_CODEC_PRIO_HIGHEST;
-
-    status = pjsua_codec_set_priority(pj_cstr(&id, codec), 
-				      (pj_uint8_t)new_prio);
-#if PJSUA_HAS_VIDEO
-    if (status != PJ_SUCCESS) {
-	status = pjsua_vid_codec_set_priority(pj_cstr(&id, codec), 
-					      (pj_uint8_t)new_prio);
-    }
-#endif
-    if (status != PJ_SUCCESS)
-	pjsua_perror(THIS_FILE, "Error setting codec priority", status);
-}
-
-
-#if PJSUA_HAS_VIDEO
-static void vid_print_dev(int id, const pjmedia_vid_dev_info *vdi,
-                          const char *title)
-{
-    char capnames[120];
-    char formats[120];
-    const char *dirname;
-    unsigned i;
-
-    if (vdi->dir == PJMEDIA_DIR_CAPTURE_RENDER) {
-	dirname = "capture, render";
-    } else if (vdi->dir == PJMEDIA_DIR_CAPTURE) {
-	dirname = "capture";
-    } else {
-	dirname = "render";
-    }
-
-
-    capnames[0] = '\0';
-    for (i=0; i<sizeof(int)*8 && (1 << i) < PJMEDIA_VID_DEV_CAP_MAX; ++i) {
-	if (vdi->caps & (1 << i)) {
-	    const char *capname = pjmedia_vid_dev_cap_name(1 << i, NULL);
-	    if (capname) {
-		if (*capnames)
-		    strcat(capnames, ", ");
-		strncat(capnames, capname,
-		        sizeof(capnames)-strlen(capnames)-1);
-	    }
-	}
-    }
-
-    formats[0] = '\0';
-    for (i=0; i<vdi->fmt_cnt; ++i) {
-	const pjmedia_video_format_info *vfi =
-		pjmedia_get_video_format_info(NULL, vdi->fmt[i].id);
-	if (vfi) {
-	    if (*formats)
-		strcat(formats, ", ");
-	    strncat(formats, vfi->name, sizeof(formats)-strlen(formats)-1);
-	}
-    }
-
-    PJ_LOG(3,(THIS_FILE, "%3d %s [%s][%s] %s", id, vdi->name, vdi->driver,
-	      dirname, title));
-    PJ_LOG(3,(THIS_FILE, "    Supported capabilities: %s", capnames));
-    PJ_LOG(3,(THIS_FILE, "    Supported formats: %s", formats));
-}
-
-static void vid_list_devs(void)
-{
-    unsigned i, count;
-    pjmedia_vid_dev_info vdi;
-    pj_status_t status;
-
-    PJ_LOG(3,(THIS_FILE, "Video device list:"));
-    count = pjsua_vid_dev_count();
-    if (count == 0) {
-	PJ_LOG(3,(THIS_FILE, " - no device detected -"));
-	return;
-    } else {
-	PJ_LOG(3,(THIS_FILE, "%d device(s) detected:", count));
-    }
-
-    status = pjsua_vid_dev_get_info(PJMEDIA_VID_DEFAULT_RENDER_DEV, &vdi);
-    if (status == PJ_SUCCESS)
-	vid_print_dev(PJMEDIA_VID_DEFAULT_RENDER_DEV, &vdi,
-	              "(default renderer device)");
-
-    status = pjsua_vid_dev_get_info(PJMEDIA_VID_DEFAULT_CAPTURE_DEV, &vdi);
-    if (status == PJ_SUCCESS)
-	vid_print_dev(PJMEDIA_VID_DEFAULT_CAPTURE_DEV, &vdi,
-	              "(default capture device)");
-
-    for (i=0; i<count; ++i) {
-	status = pjsua_vid_dev_get_info(i, &vdi);
-	if (status == PJ_SUCCESS)
-	    vid_print_dev(i, &vdi, "");
-    }
-}
-
-static void app_config_init_video(pjsua_acc_config *acc_cfg)
-{
-    acc_cfg->vid_in_auto_show = app_config.vid.in_auto_show;
-    acc_cfg->vid_out_auto_transmit = app_config.vid.out_auto_transmit;
-    /* Note that normally GUI application will prefer a borderless
-     * window.
-     */
-    acc_cfg->vid_wnd_flags = PJMEDIA_VID_DEV_WND_BORDER |
-                             PJMEDIA_VID_DEV_WND_RESIZABLE;
-    acc_cfg->vid_cap_dev = app_config.vid.vcapture_dev;
-    acc_cfg->vid_rend_dev = app_config.vid.vrender_dev;
-
-    if (app_config.avi_auto_play &&
-	app_config.avi_def_idx != PJSUA_INVALID_ID &&
-	app_config.avi[app_config.avi_def_idx].dev_id != PJMEDIA_VID_INVALID_DEV)
-    {
-	acc_cfg->vid_cap_dev = app_config.avi[app_config.avi_def_idx].dev_id;
-    }
-}
-
-static void app_config_show_video(int acc_id, const pjsua_acc_config *acc_cfg)
-{
-    PJ_LOG(3,(THIS_FILE,
-	      "Account %d:\n"
-	      "  RX auto show:     %d\n"
-	      "  TX auto transmit: %d\n"
-	      "  Capture dev:      %d\n"
-	      "  Render dev:       %d",
-	      acc_id,
-	      acc_cfg->vid_in_auto_show,
-	      acc_cfg->vid_out_auto_transmit,
-	      acc_cfg->vid_cap_dev,
-	      acc_cfg->vid_rend_dev));
-}
-
-static void vid_handle_menu(char *menuin)
-{
-    char *argv[8];
-    int argc = 0;
-
-    /* Tokenize */
-    argv[argc] = strtok(menuin, " \t\r\n");
-    while (argv[argc] && *argv[argc]) {
-	argc++;
-	argv[argc] = strtok(NULL, " \t\r\n");
-    }
-
-    if (argc == 1 || strcmp(argv[1], "help")==0) {
-	vid_show_help();
-    } else if (argc == 2 && (strcmp(argv[1], "enable")==0 ||
-			     strcmp(argv[1], "disable")==0))
-    {
-	pj_bool_t enabled = (strcmp(argv[1], "enable")==0);
-	app_config.vid.vid_cnt = (enabled ? 1 : 0);
-	PJ_LOG(3,(THIS_FILE, "Video will be %s in next offer/answer",
-		  (enabled?"enabled":"disabled")));
-    } else if (strcmp(argv[1], "acc")==0) {
-	pjsua_acc_config acc_cfg;
-	pj_bool_t changed = PJ_FALSE;
-
-	pjsua_acc_get_config(current_acc, &acc_cfg);
-
-	if (argc == 3 && strcmp(argv[2], "show")==0) {
-	    app_config_show_video(current_acc, &acc_cfg);
-	} else if (argc == 4 && strcmp(argv[2], "autorx")==0) {
-	    int on = (strcmp(argv[3], "on")==0);
-	    acc_cfg.vid_in_auto_show = on;
-	    changed = PJ_TRUE;
-	} else if (argc == 4 && strcmp(argv[2], "autotx")==0) {
-	    int on = (strcmp(argv[3], "on")==0);
-	    acc_cfg.vid_out_auto_transmit = on;
-	    changed = PJ_TRUE;
-	} else if (argc == 4 && strcmp(argv[2], "cap")==0) {
-	    int dev = atoi(argv[3]);
-	    acc_cfg.vid_cap_dev = dev;
-	    changed = PJ_TRUE;
-	} else if (argc == 4 && strcmp(argv[2], "rend")==0) {
-	    int dev = atoi(argv[3]);
-	    acc_cfg.vid_rend_dev = dev;
-	    changed = PJ_TRUE;
-	} else {
-	    goto on_error;
-	}
-
-	if (changed) {
-	    pj_status_t status = pjsua_acc_modify(current_acc, &acc_cfg);
-	    if (status != PJ_SUCCESS)
-		PJ_PERROR(1,(THIS_FILE, status, "Error modifying account %d",
-			     current_acc));
-	}
-
-    } else if (strcmp(argv[1], "call")==0) {
-	pjsua_call_vid_strm_op_param param;
-	pj_status_t status = PJ_SUCCESS;
-
-	pjsua_call_vid_strm_op_param_default(&param);
-
-	if (argc == 5 && strcmp(argv[2], "rx")==0) {
-	    pjsua_stream_info si;
-	    pj_bool_t on = (strcmp(argv[3], "on") == 0);
-
-	    param.med_idx = atoi(argv[4]);
-	    if (pjsua_call_get_stream_info(current_call, param.med_idx, &si) ||
-		si.type != PJMEDIA_TYPE_VIDEO)
-	    {
-		PJ_PERROR(1,(THIS_FILE, PJ_EINVAL, "Invalid stream"));
-		return;
-	    }
-
-	    if (on) param.dir = (si.info.vid.dir | PJMEDIA_DIR_DECODING);
-	    else param.dir = (si.info.vid.dir & PJMEDIA_DIR_ENCODING);
-
-	    status = pjsua_call_set_vid_strm(current_call,
-	                                     PJSUA_CALL_VID_STRM_CHANGE_DIR,
-	                                     &param);
-	}
-	else if (argc == 5 && strcmp(argv[2], "tx")==0) {
-	    pj_bool_t on = (strcmp(argv[3], "on") == 0);
-	    pjsua_call_vid_strm_op op = on? PJSUA_CALL_VID_STRM_START_TRANSMIT :
-					    PJSUA_CALL_VID_STRM_STOP_TRANSMIT;
-
-	    param.med_idx = atoi(argv[4]);
-
-	    status = pjsua_call_set_vid_strm(current_call, op, &param);
-	}
-	else if (argc == 3 && strcmp(argv[2], "add")==0) {
-	    status = pjsua_call_set_vid_strm(current_call,
-	                                     PJSUA_CALL_VID_STRM_ADD, NULL);
-	}
-	else if (argc >= 3 && 
-		 (strcmp(argv[2], "disable")==0 || strcmp(argv[2], "enable")==0))
-	{
-	    pj_bool_t enable = (strcmp(argv[2], "enable") == 0);
-	    pjsua_call_vid_strm_op op = enable? PJSUA_CALL_VID_STRM_CHANGE_DIR :
-						PJSUA_CALL_VID_STRM_REMOVE;
-
-	    param.med_idx = argc >= 4? atoi(argv[3]) : -1;
-	    param.dir = PJMEDIA_DIR_ENCODING_DECODING;
-	    status = pjsua_call_set_vid_strm(current_call, op, &param);
-	}
-	else if (argc >= 3 && strcmp(argv[2], "cap")==0) {
-	    param.med_idx = argc >= 4? atoi(argv[3]) : -1;
-	    param.cap_dev = argc >= 5? atoi(argv[4]) : PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
-	    status = pjsua_call_set_vid_strm(current_call,
-	                                     PJSUA_CALL_VID_STRM_CHANGE_CAP_DEV,
-	                                     &param);
-	} else
-	    goto on_error;
-
-	if (status != PJ_SUCCESS) {
-	    PJ_PERROR(1,(THIS_FILE, status, "Error modifying video stream"));
-	}
-
-    } else if (argc >= 3 && strcmp(argv[1], "dev")==0) {
-	if (strcmp(argv[2], "list")==0) {
-	    vid_list_devs();
-	} else if (strcmp(argv[2], "refresh")==0) {
-	    pjmedia_vid_dev_refresh();
-	} else if (strcmp(argv[2], "prev")==0) {
-	    if (argc != 5) {
-		goto on_error;
-	    } else {
-		pj_bool_t on = (strcmp(argv[3], "on") == 0);
-		int dev_id = atoi(argv[4]);
-		if (on) {
-                    pjsua_vid_preview_param param;
-
-                    pjsua_vid_preview_param_default(&param);
-                    param.wnd_flags = PJMEDIA_VID_DEV_WND_BORDER |
-                                      PJMEDIA_VID_DEV_WND_RESIZABLE;
-		    pjsua_vid_preview_start(dev_id, &param);
-		    arrange_window(pjsua_vid_preview_get_win(dev_id));
-		} else {
-		    pjsua_vid_win_id wid;
-		    wid = pjsua_vid_preview_get_win(dev_id);
-		    if (wid != PJSUA_INVALID_ID) {
-			/* Preview window hiding once it is stopped is
-			 * responsibility of app */
-			pjsua_vid_win_set_show(wid, PJ_FALSE);
-			pjsua_vid_preview_stop(dev_id);
-		    }
-		}
-	    }
-	} else
-	    goto on_error;
-    } else if (strcmp(argv[1], "win")==0) {
-	pj_status_t status = PJ_SUCCESS;
-
-	if (argc==3 && strcmp(argv[2], "list")==0) {
-	    pjsua_vid_win_id wids[PJSUA_MAX_VID_WINS];
-	    unsigned i, cnt = PJ_ARRAY_SIZE(wids);
-
-	    pjsua_vid_enum_wins(wids, &cnt);
-
-	    PJ_LOG(3,(THIS_FILE, "Found %d video windows:", cnt));
-	    PJ_LOG(3,(THIS_FILE, "WID show    pos       size"));
-	    PJ_LOG(3,(THIS_FILE, "------------------------------"));
-	    for (i = 0; i < cnt; ++i) {
-		pjsua_vid_win_info wi;
-		pjsua_vid_win_get_info(wids[i], &wi);
-		PJ_LOG(3,(THIS_FILE, "%3d   %c  (%d,%d)  %dx%d",
-			  wids[i], (wi.show?'Y':'N'), wi.pos.x, wi.pos.y,
-			  wi.size.w, wi.size.h));
-	    }
-	} else if (argc==4 && (strcmp(argv[2], "show")==0 ||
-			       strcmp(argv[2], "hide")==0))
-	{
-	    pj_bool_t show = (strcmp(argv[2], "show")==0);
-	    pjsua_vid_win_id wid = atoi(argv[3]);
-	    status = pjsua_vid_win_set_show(wid, show);
-	} else if (argc==6 && strcmp(argv[2], "move")==0) {
-	    pjsua_vid_win_id wid = atoi(argv[3]);
-	    pjmedia_coord pos;
-
-	    pos.x = atoi(argv[4]);
-	    pos.y = atoi(argv[5]);
-	    status = pjsua_vid_win_set_pos(wid, &pos);
-	} else if (argc==6 && strcmp(argv[2], "resize")==0) {
-	    pjsua_vid_win_id wid = atoi(argv[3]);
-	    pjmedia_rect_size size;
-
-	    size.w = atoi(argv[4]);
-	    size.h = atoi(argv[5]);
-	    status = pjsua_vid_win_set_size(wid, &size);
-	} else if (argc==3 && strcmp(argv[2], "arrange")==0) {
-	    arrange_window(PJSUA_INVALID_ID);
-	} else
-	    goto on_error;
-
-	if (status != PJ_SUCCESS) {
-	    PJ_PERROR(1,(THIS_FILE, status, "Window operation error"));
-	}
-
-    } else if (strcmp(argv[1], "codec")==0) {
-	pjsua_codec_info ci[PJMEDIA_CODEC_MGR_MAX_CODECS];
-	unsigned count = PJ_ARRAY_SIZE(ci);
-	pj_status_t status;
-
-	if (argc==3 && strcmp(argv[2], "list")==0) {
-	    status = pjsua_vid_enum_codecs(ci, &count);
-	    if (status != PJ_SUCCESS) {
-		PJ_PERROR(1,(THIS_FILE, status, "Error enumerating codecs"));
-	    } else {
-		unsigned i;
-		PJ_LOG(3,(THIS_FILE, "Found %d video codecs:", count));
-		PJ_LOG(3,(THIS_FILE, "codec id      prio  fps    bw(kbps)   size"));
-		PJ_LOG(3,(THIS_FILE, "------------------------------------------"));
-		for (i=0; i<count; ++i) {
-		    pjmedia_vid_codec_param cp;
-		    pjmedia_video_format_detail *vfd;
-
-		    status = pjsua_vid_codec_get_param(&ci[i].codec_id, &cp);
-		    if (status != PJ_SUCCESS)
-			continue;
-
-		    vfd = pjmedia_format_get_video_format_detail(&cp.enc_fmt,
-								 PJ_TRUE);
-		    PJ_LOG(3,(THIS_FILE, "%.*s%.*s %3d %7.2f  %4d/%4d  %dx%d", 
-			      (int)ci[i].codec_id.slen, ci[i].codec_id.ptr,
-			      13-(int)ci[i].codec_id.slen, "                ",
-			      ci[i].priority,
-			      (vfd->fps.num*1.0/vfd->fps.denum),
-			      vfd->avg_bps/1000, vfd->max_bps/1000,
-			      vfd->size.w, vfd->size.h));
-		}
-	    }
-	} else if (argc==5 && strcmp(argv[2], "prio")==0) {
-	    pj_str_t cid;
-	    int prio;
-	    cid = pj_str(argv[3]);
-	    prio = atoi(argv[4]);
-	    status = pjsua_vid_codec_set_priority(&cid, (pj_uint8_t)prio);
-	    if (status != PJ_SUCCESS)
-		PJ_PERROR(1,(THIS_FILE, status, "Set codec priority error"));
-	} else if (argc==6 && strcmp(argv[2], "fps")==0) {
-	    pjmedia_vid_codec_param cp;
-	    pj_str_t cid;
-	    int M, N;
-	    cid = pj_str(argv[3]);
-	    M = atoi(argv[4]);
-	    N = atoi(argv[5]);
-	    status = pjsua_vid_codec_get_param(&cid, &cp);
-	    if (status == PJ_SUCCESS) {
-		cp.enc_fmt.det.vid.fps.num = M;
-		cp.enc_fmt.det.vid.fps.denum = N;
-		status = pjsua_vid_codec_set_param(&cid, &cp);
-	    }
-	    if (status != PJ_SUCCESS)
-		PJ_PERROR(1,(THIS_FILE, status, "Set codec framerate error"));
-	} else if (argc==6 && strcmp(argv[2], "bw")==0) {
-	    pjmedia_vid_codec_param cp;
-	    pj_str_t cid;
-	    int M, N;
-	    cid = pj_str(argv[3]);
-	    M = atoi(argv[4]);
-	    N = atoi(argv[5]);
-	    status = pjsua_vid_codec_get_param(&cid, &cp);
-	    if (status == PJ_SUCCESS) {
-		cp.enc_fmt.det.vid.avg_bps = M * 1000;
-		cp.enc_fmt.det.vid.max_bps = N * 1000;
-		status = pjsua_vid_codec_set_param(&cid, &cp);
-	    }
-	    if (status != PJ_SUCCESS)
-		PJ_PERROR(1,(THIS_FILE, status, "Set codec bitrate error"));
-	} else if (argc==6 && strcmp(argv[2], "size")==0) {
-	    pjmedia_vid_codec_param cp;
-	    pj_str_t cid;
-	    int M, N;
-	    cid = pj_str(argv[3]);
-	    M = atoi(argv[4]);
-	    N = atoi(argv[5]);
-	    status = pjsua_vid_codec_get_param(&cid, &cp);
-	    if (status == PJ_SUCCESS) {
-		cp.enc_fmt.det.vid.size.w = M;
-		cp.enc_fmt.det.vid.size.h = N;
-		status = pjsua_vid_codec_set_param(&cid, &cp);
-	    }
-	    if (status != PJ_SUCCESS)
-		PJ_PERROR(1,(THIS_FILE, status, "Set codec size error"));
-	} else
-	    goto on_error;
-    } else
-	goto on_error;
-
-    return;
-
-on_error:
-    PJ_LOG(1,(THIS_FILE, "Invalid command, use 'vid help'"));
-}
-
-#else
-
-static void app_config_init_video(pjsua_acc_config *acc_cfg)
-{
-    PJ_UNUSED_ARG(acc_cfg);
-}
-
-#endif /* PJSUA_HAS_VIDEO */
-
-
-/*
- * Main "user interface" loop.
- */
-void console_app_main(const pj_str_t *uri_to_call)
-{
-    char menuin[80];
-    char buf[128];
-    char text[128];
-    int i, count;
-    char *uri;
-    pj_str_t tmp;
-    struct input_result result;
-    pjsua_msg_data msg_data;
-    pjsua_call_info call_info;
-    pjsua_acc_info acc_info;
-    pjsua_call_setting call_opt;
-
-    pjsua_call_setting_default(&call_opt);
-    call_opt.aud_cnt = app_config.aud_cnt;
-    call_opt.vid_cnt = app_config.vid.vid_cnt;
-
-    /* If user specifies URI to call, then call the URI */
-    if (uri_to_call->slen) {
-	pjsua_call_make_call( current_acc, uri_to_call, &call_opt, NULL, NULL, NULL);
-    }
-
-    keystroke_help();
-
-    for (;;) {
-
-	printf(">>> ");
-	fflush(stdout);
-
-	if (fgets(menuin, sizeof(menuin), stdin) == NULL) {
-	    /* 
-	     * Be friendly to users who redirect commands into
-	     * program, when file ends, resume with kbd.
-	     * If exit is desired end script with q for quit
-	     */
- 	    /* Reopen stdin/stdout/stderr to /dev/console */
-#if defined(PJ_WIN32) && PJ_WIN32!=0
-	    if (freopen ("CONIN$", "r", stdin) == NULL) {
-#else
-	    if (1) {
-#endif
-		puts("Cannot switch back to console from file redirection");
-		menuin[0] = 'q';
-		menuin[1] = '\0';
-	    } else {
-		puts("Switched back to console from file redirection");
-		continue;
-	    }
-	}
-
-	if (cmd_echo) {
-	    printf("%s", menuin);
-	}
-
-	/* Update call setting */
-	pjsua_call_setting_default(&call_opt);
-	call_opt.aud_cnt = app_config.aud_cnt;
-	call_opt.vid_cnt = app_config.vid.vid_cnt;
-
-	switch (menuin[0]) {
-
-	case 'm':
-	    /* Make call! : */
-	    printf("(You currently have %d calls)\n", 
-		     pjsua_call_get_count());
-	    
-	    uri = NULL;
-	    ui_input_url("Make call", buf, sizeof(buf), &result);
-	    if (result.nb_result != NO_NB) {
-
-		if (result.nb_result == -1 || result.nb_result == 0) {
-		    puts("You can't do that with make call!");
-		    continue;
-		} else {
-		    pjsua_buddy_info binfo;
-		    pjsua_buddy_get_info(result.nb_result-1, &binfo);
-		    tmp.ptr = buf;
-		    pj_strncpy(&tmp, &binfo.uri, sizeof(buf));
-		}
-
-	    } else if (result.uri_result) {
-		tmp = pj_str(result.uri_result);
-	    } else {
-		tmp.slen = 0;
-	    }
-	    
-	    pjsua_msg_data_init(&msg_data);
-	    TEST_MULTIPART(&msg_data);
-	    pjsua_call_make_call( current_acc, &tmp, &call_opt, NULL,
-	                          &msg_data, &current_call);
-	    break;
-
-	case 'M':
-	    /* Make multiple calls! : */
-	    printf("(You currently have %d calls)\n", 
-		   pjsua_call_get_count());
-	    
-	    if (!simple_input("Number of calls", menuin, sizeof(menuin)))
-		continue;
-
-	    count = my_atoi(menuin);
-	    if (count < 1)
-		continue;
-
-	    ui_input_url("Make call", buf, sizeof(buf), &result);
-	    if (result.nb_result != NO_NB) {
-		pjsua_buddy_info binfo;
-		if (result.nb_result == -1 || result.nb_result == 0) {
-		    puts("You can't do that with make call!");
-		    continue;
-		}
-		pjsua_buddy_get_info(result.nb_result-1, &binfo);
-		tmp.ptr = buf;
-		pj_strncpy(&tmp, &binfo.uri, sizeof(buf));
-	    } else {
-		tmp = pj_str(result.uri_result);
-	    }
-
-	    for (i=0; i<my_atoi(menuin); ++i) {
-		pj_status_t status;
-	    
-		status = pjsua_call_make_call(current_acc, &tmp, &call_opt, NULL,
-					      NULL, NULL);
-		if (status != PJ_SUCCESS)
-		    break;
-	    }
-	    break;
-
-	case 'n':
-	    i = pjsua_detect_nat_type();
-	    if (i != PJ_SUCCESS)
-		pjsua_perror(THIS_FILE, "Error", i);
-	    break;
-
-	case 'i':
-	    /* Send instant messaeg */
-
-	    /* i is for call index to send message, if any */
-	    i = -1;
-    
-	    /* Make compiler happy. */
-	    uri = NULL;
-
-	    /* Input destination. */
-	    ui_input_url("Send IM to", buf, sizeof(buf), &result);
-	    if (result.nb_result != NO_NB) {
-
-		if (result.nb_result == -1) {
-		    puts("You can't send broadcast IM like that!");
-		    continue;
-
-		} else if (result.nb_result == 0) {
-    
-		    i = current_call;
-
-		} else {
-		    pjsua_buddy_info binfo;
-		    pjsua_buddy_get_info(result.nb_result-1, &binfo);
-		    tmp.ptr = buf;
-		    pj_strncpy_with_null(&tmp, &binfo.uri, sizeof(buf));
-		    uri = buf;
-		}
-
-	    } else if (result.uri_result) {
-		uri = result.uri_result;
-	    }
-	    
-
-	    /* Send typing indication. */
-	    if (i != -1)
-		pjsua_call_send_typing_ind(i, PJ_TRUE, NULL);
-	    else {
-		pj_str_t tmp_uri = pj_str(uri);
-		pjsua_im_typing(current_acc, &tmp_uri, PJ_TRUE, NULL);
-	    }
-
-	    /* Input the IM . */
-	    if (!simple_input("Message", text, sizeof(text))) {
-		/*
-		 * Cancelled.
-		 * Send typing notification too, saying we're not typing.
-		 */
-		if (i != -1)
-		    pjsua_call_send_typing_ind(i, PJ_FALSE, NULL);
-		else {
-		    pj_str_t tmp_uri = pj_str(uri);
-		    pjsua_im_typing(current_acc, &tmp_uri, PJ_FALSE, NULL);
-		}
-		continue;
-	    }
-
-	    tmp = pj_str(text);
-
-	    /* Send the IM */
-	    if (i != -1)
-		pjsua_call_send_im(i, NULL, &tmp, NULL, NULL);
-	    else {
-		pj_str_t tmp_uri = pj_str(uri);
-		pjsua_im_send(current_acc, &tmp_uri, NULL, &tmp, NULL, NULL);
-	    }
-
-	    break;
-
-	case 'a':
-
-	    if (current_call != -1) {
-		pjsua_call_get_info(current_call, &call_info);
-	    } else {
-		/* Make compiler happy */
-		call_info.role = PJSIP_ROLE_UAC;
-		call_info.state = PJSIP_INV_STATE_DISCONNECTED;
-	    }
-
-	    if (current_call == -1 || 
-		call_info.role != PJSIP_ROLE_UAS ||
-		call_info.state >= PJSIP_INV_STATE_CONNECTING)
-	    {
-		puts("No pending incoming call");
-		fflush(stdout);
-		continue;
-
-	    } else {
-		int st_code;
-		char contact[120];
-		pj_str_t hname = { "Contact", 7 };
-		pj_str_t hvalue;
-		pjsip_generic_string_hdr hcontact;
-
-		if (!simple_input("Answer with code (100-699)", buf, sizeof(buf)))
-		    continue;
-		
-		st_code = my_atoi(buf);
-		if (st_code < 100)
-		    continue;
-
-		pjsua_msg_data_init(&msg_data);
-
-		if (st_code/100 == 3) {
-		    if (!simple_input("Enter URL to be put in Contact", 
-				      contact, sizeof(contact)))
-			continue;
-		    hvalue = pj_str(contact);
-		    pjsip_generic_string_hdr_init2(&hcontact, &hname, &hvalue);
-
-		    pj_list_push_back(&msg_data.hdr_list, &hcontact);
-		}
-
-		/*
-		 * Must check again!
-		 * Call may have been disconnected while we're waiting for 
-		 * keyboard input.
-		 */
-		if (current_call == -1) {
-		    puts("Call has been disconnected");
-		    fflush(stdout);
-		    continue;
-		}
-
-		pjsua_call_answer2(current_call, &call_opt, st_code, NULL, &msg_data);
-	    }
-
-	    break;
-
-
-	case 'h':
-
-	    if (current_call == -1) {
-		puts("No current call");
-		fflush(stdout);
-		continue;
-
-	    } else if (menuin[1] == 'a') {
-		
-		/* Hangup all calls */
-		pjsua_call_hangup_all();
-
-	    } else {
-
-		/* Hangup current calls */
-		pjsua_call_hangup(current_call, 0, NULL, NULL);
-	    }
-	    break;
-
-	case ']':
-	case '[':
-	    /*
-	     * Cycle next/prev dialog.
-	     */
-	    if (menuin[0] == ']') {
-		find_next_call();
-
-	    } else {
-		find_prev_call();
-	    }
-
-	    if (current_call != -1) {
-		
-		pjsua_call_get_info(current_call, &call_info);
-		PJ_LOG(3,(THIS_FILE,"Current dialog: %.*s", 
-			  (int)call_info.remote_info.slen, 
-			  call_info.remote_info.ptr));
-
-	    } else {
-		PJ_LOG(3,(THIS_FILE,"No current dialog"));
-	    }
-	    break;
-
-
-	case '>':
-	case '<':
-	    if (!simple_input("Enter account ID to select", buf, sizeof(buf)))
-		break;
-
-	    i = my_atoi(buf);
-	    if (pjsua_acc_is_valid(i)) {
-		pjsua_acc_set_default(i);
-		PJ_LOG(3,(THIS_FILE, "Current account changed to %d", i));
-	    } else {
-		PJ_LOG(3,(THIS_FILE, "Invalid account id %d", i));
-	    }
-	    break;
-
-
-	case '+':
-	    if (menuin[1] == 'b') {
-	    
-		pjsua_buddy_config buddy_cfg;
-		pjsua_buddy_id buddy_id;
-		pj_status_t status;
-
-		if (!simple_input("Enter buddy's URI:", buf, sizeof(buf)))
-		    break;
-
-		if (pjsua_verify_url(buf) != PJ_SUCCESS) {
-		    printf("Invalid URI '%s'\n", buf);
-		    break;
-		}
-
-		pj_bzero(&buddy_cfg, sizeof(pjsua_buddy_config));
-
-		buddy_cfg.uri = pj_str(buf);
-		buddy_cfg.subscribe = PJ_TRUE;
-
-		status = pjsua_buddy_add(&buddy_cfg, &buddy_id);
-		if (status == PJ_SUCCESS) {
-		    printf("New buddy '%s' added at index %d\n",
-			   buf, buddy_id+1);
-		}
-
-	    } else if (menuin[1] == 'a') {
-
-		char id[80], registrar[80], realm[80], uname[80], passwd[30];
-		pjsua_acc_config acc_cfg;
-		pj_status_t status;
-
-		if (!simple_input("Your SIP URL:", id, sizeof(id)))
-		    break;
-		if (!simple_input("URL of the registrar:", registrar, sizeof(registrar)))
-		    break;
-		if (!simple_input("Auth Realm:", realm, sizeof(realm)))
-		    break;
-		if (!simple_input("Auth Username:", uname, sizeof(uname)))
-		    break;
-		if (!simple_input("Auth Password:", passwd, sizeof(passwd)))
-		    break;
-
-		pjsua_acc_config_default(&acc_cfg);
-		acc_cfg.id = pj_str(id);
-		acc_cfg.reg_uri = pj_str(registrar);
-		acc_cfg.cred_count = 1;
-		acc_cfg.cred_info[0].scheme = pj_str("Digest");
-		acc_cfg.cred_info[0].realm = pj_str(realm);
-		acc_cfg.cred_info[0].username = pj_str(uname);
-		acc_cfg.cred_info[0].data_type = 0;
-		acc_cfg.cred_info[0].data = pj_str(passwd);
-
-		acc_cfg.rtp_cfg = app_config.rtp_cfg;
-		app_config_init_video(&acc_cfg);
-
-		status = pjsua_acc_add(&acc_cfg, PJ_TRUE, NULL);
-		if (status != PJ_SUCCESS) {
-		    pjsua_perror(THIS_FILE, "Error adding new account", status);
-		}
-
-	    } else {
-		printf("Invalid input %s\n", menuin);
-	    }
-	    break;
-
-	case '-':
-	    if (menuin[1] == 'b') {
-		if (!simple_input("Enter buddy ID to delete",buf,sizeof(buf)))
-		    break;
-
-		i = my_atoi(buf) - 1;
-
-		if (!pjsua_buddy_is_valid(i)) {
-		    printf("Invalid buddy id %d\n", i);
-		} else {
-		    pjsua_buddy_del(i);
-		    printf("Buddy %d deleted\n", i);
-		}
-
-	    } else if (menuin[1] == 'a') {
-
-		if (!simple_input("Enter account ID to delete",buf,sizeof(buf)))
-		    break;
-
-		i = my_atoi(buf);
-
-		if (!pjsua_acc_is_valid(i)) {
-		    printf("Invalid account id %d\n", i);
-		} else {
-		    pjsua_acc_del(i);
-		    printf("Account %d deleted\n", i);
-		}
-
-	    } else {
-		printf("Invalid input %s\n", menuin);
-	    }
-	    break;
-
-	case 'H':
-	    /*
-	     * Hold call.
-	     */
-	    if (current_call != -1) {
-		
-		pjsua_call_set_hold(current_call, NULL);
-
-	    } else {
-		PJ_LOG(3,(THIS_FILE, "No current call"));
-	    }
-	    break;
-
-	case 'v':
-#if PJSUA_HAS_VIDEO
-	    if (menuin[1]=='i' && menuin[2]=='d' && menuin[3]==' ') {
-
-		vid_handle_menu(menuin);
-
-	    } else
-#endif
-	    if (current_call != -1) {
-		/*
-		 * re-INVITE
-		 */
-		call_opt.flag |= PJSUA_CALL_UNHOLD;
-		pjsua_call_reinvite2(current_call, &call_opt, NULL);
-
-	    } else {
-		PJ_LOG(3,(THIS_FILE, "No current call"));
-	    }
-	    break;
-
-	case 'U':
-	    /*
-	     * Send UPDATE
-	     */
-	    if (current_call != -1) {
-		
-		pjsua_call_update2(current_call, &call_opt, NULL);
-
-	    } else {
-		PJ_LOG(3,(THIS_FILE, "No current call"));
-	    }
-	    break;
-
-	case 'C':
-	    if (menuin[1] == 'p') {
-		manage_codec_prio();
-	    }
-	    break;
-
-	case 'x':
-	    /*
-	     * Transfer call.
-	     */
-	    if (current_call == -1) {
-		
-		PJ_LOG(3,(THIS_FILE, "No current call"));
-
-	    } else {
-		int call = current_call;
-		pjsip_generic_string_hdr refer_sub;
-		pj_str_t STR_REFER_SUB = { "Refer-Sub", 9 };
-		pj_str_t STR_FALSE = { "false", 5 };
-		pjsua_call_info ci;
-
-		pjsua_call_get_info(current_call, &ci);
-		printf("Transfering current call [%d] %.*s\n",
-		       current_call,
-		       (int)ci.remote_info.slen, ci.remote_info.ptr);
-
-		ui_input_url("Transfer to URL", buf, sizeof(buf), &result);
-
-		/* Check if call is still there. */
-
-		if (call != current_call) {
-		    puts("Call has been disconnected");
-		    continue;
-		}
-
-		pjsua_msg_data_init(&msg_data);
-		if (app_config.no_refersub) {
-		    /* Add Refer-Sub: false in outgoing REFER request */
-		    pjsip_generic_string_hdr_init2(&refer_sub, &STR_REFER_SUB,
-						   &STR_FALSE);
-		    pj_list_push_back(&msg_data.hdr_list, &refer_sub);
-		}
-		if (result.nb_result != NO_NB) {
-		    if (result.nb_result == -1 || result.nb_result == 0)
-			puts("You can't do that with transfer call!");
-		    else {
-			pjsua_buddy_info binfo;
-			pjsua_buddy_get_info(result.nb_result-1, &binfo);
-			pjsua_call_xfer( current_call, &binfo.uri, &msg_data);
-		    }
-
-		} else if (result.uri_result) {
-		    pj_str_t tmp;
-		    tmp = pj_str(result.uri_result);
-		    pjsua_call_xfer( current_call, &tmp, &msg_data);
-		}
-	    }
-	    break;
-
-	case 'X':
-	    /*
-	     * Transfer call with replaces.
-	     */
-	    if (current_call == -1) {
-		
-		PJ_LOG(3,(THIS_FILE, "No current call"));
-
-	    } else {
-		int call = current_call;
-		int dst_call;
-		pjsip_generic_string_hdr refer_sub;
-		pj_str_t STR_REFER_SUB = { "Refer-Sub", 9 };
-		pj_str_t STR_FALSE = { "false", 5 };
-		pjsua_call_id ids[PJSUA_MAX_CALLS];
-		pjsua_call_info ci;
-		unsigned i, count;
-
-		count = PJ_ARRAY_SIZE(ids);
-		pjsua_enum_calls(ids, &count);
-
-		if (count <= 1) {
-		    puts("There are no other calls");
-		    continue;
-		}
-
-		pjsua_call_get_info(current_call, &ci);
-		printf("Transfer call [%d] %.*s to one of the following:\n",
-		       current_call,
-		       (int)ci.remote_info.slen, ci.remote_info.ptr);
-
-		for (i=0; i<count; ++i) {
-		    pjsua_call_info call_info;
-
-		    if (ids[i] == call)
-			continue;
-
-		    pjsua_call_get_info(ids[i], &call_info);
-		    printf("%d  %.*s [%.*s]\n",
-			   ids[i],
-			   (int)call_info.remote_info.slen,
-			   call_info.remote_info.ptr,
-			   (int)call_info.state_text.slen,
-			   call_info.state_text.ptr);
-		}
-
-		if (!simple_input("Enter call number to be replaced", 
-			          buf, sizeof(buf)))
-		    continue;
-
-		dst_call = my_atoi(buf);
-
-		/* Check if call is still there. */
-
-		if (call != current_call) {
-		    puts("Call has been disconnected");
-		    continue;
-		}
-
-		/* Check that destination call is valid. */
-		if (dst_call == call) {
-		    puts("Destination call number must not be the same "
-			 "as the call being transfered");
-		    continue;
-		}
-		if (dst_call >= PJSUA_MAX_CALLS) {
-		    puts("Invalid destination call number");
-		    continue;
-		}
-		if (!pjsua_call_is_active(dst_call)) {
-		    puts("Invalid destination call number");
-		    continue;
-		}
-
-		pjsua_msg_data_init(&msg_data);
-		if (app_config.no_refersub) {
-		    /* Add Refer-Sub: false in outgoing REFER request */
-		    pjsip_generic_string_hdr_init2(&refer_sub, &STR_REFER_SUB,
-						   &STR_FALSE);
-		    pj_list_push_back(&msg_data.hdr_list, &refer_sub);
-		}
-
-		pjsua_call_xfer_replaces(call, dst_call, 
-					 PJSUA_XFER_NO_REQUIRE_REPLACES, 
-					 &msg_data);
-	    }
-	    break;
-
-	case '#':
-	    /*
-	     * Send DTMF strings.
-	     */
-	    if (current_call == -1) {
-		
-		PJ_LOG(3,(THIS_FILE, "No current call"));
-
-	    } else if (!pjsua_call_has_media(current_call)) {
-
-		PJ_LOG(3,(THIS_FILE, "Media is not established yet!"));
-
-	    } else {
-		pj_str_t digits;
-		int call = current_call;
-		pj_status_t status;
-
-		if (!simple_input("DTMF strings to send (0-9*#A-B)", buf, 
-				  sizeof(buf)))
-		{
-			break;
-		}
-
-		if (call != current_call) {
-		    puts("Call has been disconnected");
-		    continue;
-		}
-
-		digits = pj_str(buf);
-		status = pjsua_call_dial_dtmf(current_call, &digits);
-		if (status != PJ_SUCCESS) {
-		    pjsua_perror(THIS_FILE, "Unable to send DTMF", status);
-		} else {
-		    puts("DTMF digits enqueued for transmission");
-		}
-	    }
-	    break;
-
-	case '*':
-	    /* Send DTMF with INFO */
-	    if (current_call == -1) {
-		
-		PJ_LOG(3,(THIS_FILE, "No current call"));
-
-	    } else {
-		const pj_str_t SIP_INFO = pj_str("INFO");
-		pj_str_t digits;
-		int call = current_call;
-		int i;
-		pj_status_t status;
-
-		if (!simple_input("DTMF strings to send (0-9*#A-B)", buf, 
-				  sizeof(buf)))
-		{
-			break;
-		}
-
-		if (call != current_call) {
-		    puts("Call has been disconnected");
-		    continue;
-		}
-
-		digits = pj_str(buf);
-		for (i=0; i<digits.slen; ++i) {
-		    char body[80];
-
-		    pjsua_msg_data_init(&msg_data);
-		    msg_data.content_type = pj_str("application/dtmf-relay");
-		    
-		    pj_ansi_snprintf(body, sizeof(body),
-				     "Signal=%c\r\n"
-				     "Duration=160",
-				     buf[i]);
-		    msg_data.msg_body = pj_str(body);
-
-		    status = pjsua_call_send_request(current_call, &SIP_INFO, 
-						     &msg_data);
-		    if (status != PJ_SUCCESS) {
-			break;
-		    }
-		}
-	    }
-	    break;
-
-	case 'S':
-	    /*
-	     * Send arbitrary request
-	     */
-	    if (pjsua_acc_get_count() == 0) {
-		puts("Sorry, need at least one account configured");
-		break;
-	    }
-
-	    puts("Send arbitrary request to remote host");
-
-	    /* Input METHOD */
-	    if (!simple_input("Request method:",text,sizeof(text)))
-		break;
-
-	    /* Input destination URI */
-	    uri = NULL;
-	    ui_input_url("Destination URI", buf, sizeof(buf), &result);
-	    if (result.nb_result != NO_NB) {
-
-		if (result.nb_result == -1) {
-		    puts("Sorry you can't do that!");
-		    continue;
-		} else if (result.nb_result == 0) {
-		    uri = NULL;
-		    if (current_call == PJSUA_INVALID_ID) {
-			puts("No current call");
-			continue;
-		    }
-		} else {
-		    pjsua_buddy_info binfo;
-		    pjsua_buddy_get_info(result.nb_result-1, &binfo);
-		    tmp.ptr = buf;
-		    pj_strncpy_with_null(&tmp, &binfo.uri, sizeof(buf));
-		    uri = buf;
-		}
-
-	    } else if (result.uri_result) {
-		uri = result.uri_result;
-	    } else {
-		continue;
-	    }
-	    
-	    if (uri) {
-		tmp = pj_str(uri);
-		send_request(text, &tmp);
-	    } else {
-		/* If you send call control request using this method
-		 * (such requests includes BYE, CANCEL, etc.), it will
-		 * not go well with the call state, so don't do it
-		 * unless it's for testing.
-		 */
-		pj_str_t method = pj_str(text);
-		pjsua_call_send_request(current_call, &method, NULL);
-	    }
-	    break;
-
-	case 'e':
-	    if (pj_ansi_strnicmp(menuin, "echo", 4)==0) {
-		pj_str_t tmp;
-
-		tmp.ptr = menuin+5;
-		tmp.slen = pj_ansi_strlen(menuin)-6;
-
-		if (tmp.slen < 1) {
-		    puts("Usage: echo [0|1]");
-		    break;
-		}
-
-		cmd_echo = *tmp.ptr != '0' || tmp.slen!=1;
-	    }
-	    break;
-
-	case 's':
-	    if (pj_ansi_strnicmp(menuin, "sleep", 5)==0) {
-		pj_str_t tmp;
-		int delay;
-
-		tmp.ptr = menuin+6;
-		tmp.slen = pj_ansi_strlen(menuin)-7;
-
-		if (tmp.slen < 1) {
-		    puts("Usage: sleep MSEC");
-		    break;
-		}
-
-		delay = pj_strtoul(&tmp);
-		if (delay < 0) delay = 0;
-		pj_thread_sleep(delay);
-		break;
-	    }
-	    /* Continue below */
-
-	case 'u':
-	    /*
-	     * Subscribe/unsubscribe presence.
-	     */
-	    ui_input_url("(un)Subscribe presence of", buf, sizeof(buf), &result);
-	    if (result.nb_result != NO_NB) {
-		if (result.nb_result == -1) {
-		    int i, count;
-		    count = pjsua_get_buddy_count();
-		    for (i=0; i<count; ++i)
-			pjsua_buddy_subscribe_pres(i, menuin[0]=='s');
-		} else if (result.nb_result == 0) {
-		    puts("Sorry, can only subscribe to buddy's presence, "
-			 "not from existing call");
-		} else {
-		    pjsua_buddy_subscribe_pres(result.nb_result-1, (menuin[0]=='s'));
-		}
-
-	    } else if (result.uri_result) {
-		puts("Sorry, can only subscribe to buddy's presence, "
-		     "not arbitrary URL (for now)");
-	    }
-
-	    break;
-
-	case 'r':
-	    switch (menuin[1]) {
-	    case 'r':
-		/*
-		 * Re-Register.
-		 */
-		pjsua_acc_set_registration(current_acc, PJ_TRUE);
-		break;
-	    case 'u':
-		/*
-		 * Unregister
-		 */
-		pjsua_acc_set_registration(current_acc, PJ_FALSE);
-		break;
-	    }
-	    break;
-	    
-	case 't':
-	    pjsua_acc_get_info(current_acc, &acc_info);
-	    acc_info.online_status = !acc_info.online_status;
-	    pjsua_acc_set_online_status(current_acc, acc_info.online_status);
-	    printf("Setting %s online status to %s\n",
-		   acc_info.acc_uri.ptr,
-		   (acc_info.online_status?"online":"offline"));
-	    break;
-
-	case 'T':
-	    change_online_status();
-	    break;
-
-	case 'c':
-	    switch (menuin[1]) {
-	    case 'l':
-		conf_list();
-		break;
-	    case 'c':
-	    case 'd':
-		{
-		    char tmp[10], src_port[10], dst_port[10];
-		    pj_status_t status;
-		    int cnt;
-		    const char *src_title, *dst_title;
-
-		    cnt = sscanf(menuin, "%s %s %s", tmp, src_port, dst_port);
-
-		    if (cnt != 3) {
-			conf_list();
-
-			src_title = (menuin[1]=='c'?
-				     "Connect src port #":
-				     "Disconnect src port #");
-			dst_title = (menuin[1]=='c'?
-				     "To dst port #":
-				     "From dst port #");
-
-			if (!simple_input(src_title, src_port, sizeof(src_port)))
-			    break;
-
-			if (!simple_input(dst_title, dst_port, sizeof(dst_port)))
-			    break;
-		    }
-
-		    if (menuin[1]=='c') {
-			status = pjsua_conf_connect(my_atoi(src_port), 
-						    my_atoi(dst_port));
-		    } else {
-			status = pjsua_conf_disconnect(my_atoi(src_port), 
-						       my_atoi(dst_port));
-		    }
-		    if (status == PJ_SUCCESS) {
-			puts("Success");
-		    } else {
-			puts("ERROR!!");
-		    }
-		}
-		break;
-	    }
-	    break;
-
-	case 'V':
-	    /* Adjust audio volume */
-	    sprintf(buf, "Adjust mic level: [%4.1fx] ", app_config.mic_level);
-	    if (simple_input(buf,text,sizeof(text))) {
-		char *err;
-		app_config.mic_level = (float)strtod(text, &err);
-		pjsua_conf_adjust_rx_level(0, app_config.mic_level);
-	    }
-	    sprintf(buf, "Adjust speaker level: [%4.1fx] ", 
-		    app_config.speaker_level);
-	    if (simple_input(buf,text,sizeof(text))) {
-		char *err;
-		app_config.speaker_level = (float)strtod(text, &err);
-		pjsua_conf_adjust_tx_level(0, app_config.speaker_level);
-	    }
-
-	    break;
-
-	case 'd':
-	    if (menuin[1] == 'c') {
-		char settings[2000];
-		int len;
-
-		len = write_settings(&app_config, settings, sizeof(settings));
-		if (len < 1)
-		    PJ_LOG(1,(THIS_FILE, "Error: not enough buffer"));
-		else
-		    PJ_LOG(3,(THIS_FILE, 
-			      "Dumping configuration (%d bytes):\n%s\n",
-			      len, settings));
-
-	    } else if (menuin[1] == 'q') {
-
-		if (current_call != PJSUA_INVALID_ID) {
-		    log_call_dump(current_call);
-		} else {
-		    PJ_LOG(3,(THIS_FILE, "No current call"));
-		}
-
-	    } else {
-		app_dump(menuin[1]=='d');
-	    }
-	    break;
-
-
-	case 'f':
-	    if (simple_input("Enter output filename", buf, sizeof(buf))) {
-		char settings[2000];
-		int len;
-
-		len = write_settings(&app_config, settings, sizeof(settings));
-		if (len < 1)
-		    PJ_LOG(1,(THIS_FILE, "Error: not enough buffer"));
-		else {
-		    pj_oshandle_t fd;
-		    pj_status_t status;
-
-		    status = pj_file_open(app_config.pool, buf, 
-					  PJ_O_WRONLY, &fd);
-		    if (status != PJ_SUCCESS) {
-			pjsua_perror(THIS_FILE, "Unable to open file", status);
-		    } else {
-			pj_ssize_t size = len;
-			pj_file_write(fd, settings, &size);
-			pj_file_close(fd);
-
-			printf("Settings successfully written to '%s'\n", buf);
-		    }
-		}
-		
-	    }
-	    break;
-
-
-	case 'L':   /* Restart */
-	    app_restart = PJ_TRUE;
-	    /* Continues below */
-
-	case 'q':
-	    goto on_exit;
-
-	case 'R':
-	    if (!pjsua_call_is_active(current_call)) {
-		PJ_LOG(1,(THIS_FILE, "Call %d has gone", current_call));
-	    } else if (menuin[1] == 'a') {
-		pjsua_call_process_redirect(current_call, 
-					    PJSIP_REDIRECT_ACCEPT_REPLACE);
-	    } else if (menuin[1] == 'A') {
-		pjsua_call_process_redirect(current_call, 
-					    PJSIP_REDIRECT_ACCEPT);
-	    } else if (menuin[1] == 'r') {
-		pjsua_call_process_redirect(current_call,
-					    PJSIP_REDIRECT_REJECT);
-	    } else {
-		pjsua_call_process_redirect(current_call,
-					    PJSIP_REDIRECT_STOP);
-	    }
-	    break;
-
-	default:
-	    if (menuin[0] != '\n' && menuin[0] != '\r') {
-		printf("Invalid input %s", menuin);
-	    }
-	    keystroke_help();
-	    break;
-	}
-    }
-
-on_exit:
-    ;
-}
-
-/*
  * A simple registrar, invoked by default_mod_on_rx_request()
  */
@@ -5460,6 +2593,4 @@
 		       rdata, tdata, NULL, NULL);
 }
-
-
 
 /*****************************************************************************
@@ -5539,5 +2670,4 @@
     return PJ_TRUE;
 }
-
 
 /* The module instance. */
@@ -5559,7 +2689,4 @@
 
 };
-
-
-
 
 /*****************************************************************************
@@ -6110,4 +3237,16 @@
     }
 
+    if (app_config.use_cli) {
+	/*
+	 * Init CLI
+	 */    
+	status = setup_cli();
+	if (status != PJ_SUCCESS)
+	    goto on_error;
+	
+	PJ_LOG(3,(THIS_FILE, "CLI telnet daemon listening at port %d", 
+		  app_config.cli_telnet_port));
+    }
+
     return PJ_SUCCESS;
 
@@ -6115,24 +3254,4 @@
     app_destroy();
     return status;
-}
-
-
-static int stdout_refresh_proc(void *arg)
-{
-    PJ_UNUSED_ARG(arg);
-
-    /* Set thread to lowest priority so that it doesn't clobber
-     * stdout output
-     */
-    pj_thread_set_prio(pj_thread_this(), 
-		       pj_thread_get_prio_min(pj_thread_this()));
-
-    while (!stdout_refresh_quit) {
-	pj_thread_sleep(stdout_refresh * 1000);
-	puts(stdout_refresh_text);
-	fflush(stdout);
-    }
-
-    return 0;
 }
 
@@ -6155,5 +3274,8 @@
     }
 
-    console_app_main(&uri_arg);
+    if (app_config.use_cli)
+	cli_console_app_main(&uri_arg, &app_restart);
+    else 
+	console_app_main(&uri_arg, &app_restart);
 
     if (stdout_refresh_thread) {
@@ -6219,4 +3341,8 @@
     for (i=0; i<app_config.tone_count; ++i) {
 	pjsua_conf_remove_port(app_config.tone_slots[i]);
+    }
+
+    if (app_config.use_cli) {	
+	destroy_cli();
     }
 
@@ -6303,5 +3429,4 @@
     status = pjmedia_snd_port_connect(app_config.snd, app_config.sc);
     pj_assert(status == PJ_SUCCESS);
-
 }
 #endif
