Changeset 4729 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_cli.c

Timestamp:

Feb 4, 2014 1:13:02 PM (11 years ago)

Author:

bennylp

Message:

Misc (re #1630): fix gcc warnings

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_cli.c (modified) (155 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
-/* 
+/*
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -16 +16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -156 +156 @@
 void cli_destroy();
 
-PJ_DEF(void) cli_get_info(char *info, pj_size_t size) 
+PJ_DEF(void) cli_get_info(char *info, pj_size_t size)
 {
     pj_cli_telnet_info telnet_info;
@@ -162 +162 @@
 
     pj_ansi_snprintf(info, size, "Telnet to %.*s:%d",
-                     (int)telnet_info.ip_address.slen, 
-                     telnet_info.ip_address.ptr, 
+                     (int)telnet_info.ip_address.slen,
+                     telnet_info.ip_address.ptr,
                      telnet_info.port);
 }
@@ -221 +221 @@
     if (app_config.cli_cfg.cli_fe & CLI_FE_CONSOLE) {
         pj_cli_console_cfg *fe_cfg = &app_config.cli_cfg.console_cfg;
-        
+
         fe_cfg->quit_command = pj_str("shutdown");
         status = pj_cli_console_create(cli, fe_cfg,
@@ -262 +262 @@
 {
     /* Destroy CLI, it will automatically destroy any FEs */
-    if (cli) {          
+    if (cli) {
         pj_cli_destroy(cli);
         cli = NULL;
@@ -281 +281 @@
 
 /* Get input URL */
-static void get_input_url(char *buf, 
+static void get_input_url(char *buf,
                           pj_size_t len,
                           pj_cli_cmd_val *cval,
@@ -316 +316 @@
         for (; i<len; ++i) {
             if (!pj_isdigit(buf[i])) {
-                pj_cli_sess_write_msg(cval->sess, err_invalid_input.ptr, 
+                pj_cli_sess_write_msg(cval->sess, err_invalid_input.ptr,
                                       (int)err_invalid_input.slen);
                 return;
@@ -324 +324 @@
         result->nb_result = my_atoi(buf);
 
-        if (result->nb_result >= 0 && 
-            result->nb_result <= (int)pjsua_get_buddy_count()) 
+        if (result->nb_result >= 0 &&
+            result->nb_result <= (int)pjsua_get_buddy_count())
         {
             return;
@@ -332 +332 @@
             return;
 
-        pj_cli_sess_write_msg(cval->sess, err_invalid_input.ptr, 
+        pj_cli_sess_write_msg(cval->sess, err_invalid_input.ptr,
                               (int)err_invalid_input.slen);
         result->nb_result = PJSUA_APP_NO_NB;
@@ -353 +353 @@
 static void get_buddy_id(pj_cli_dyn_choice_param *param)
 {
-    if (param->cnt < param->max_cnt) {  
+    if (param->cnt < param->max_cnt) {
         pjsua_buddy_id ids[64];
         int i = 0;
@@ -360 +360 @@
 
         pjsua_enum_buddies(ids, &count);
-        
+
         if (count > 0) {
             for (i=0; i<(int)count; ++i) {
@@ -372 +372 @@
                 pj_strdup2(param->pool, &param->choice[i].value, data_out);
                 pj_bzero(data_out, PJ_ARRAY_SIZE(data_out));
-            
+
                 /* Format & fill description */
-                pj_ansi_snprintf(data_out, 
+                pj_ansi_snprintf(data_out,
                                 sizeof(data_out),
-                                "<%.*s>  %.*s",                     
+                                "<%.*s>  %.*s",
                                 (int)info.status_text.slen,
-                                info.status_text.ptr, 
+                                info.status_text.ptr,
                                 (int)info.uri.slen,
                                 info.uri.ptr);
 
-                pj_strdup2(param->pool, &param->choice[i].desc, data_out);              
+                pj_strdup2(param->pool, &param->choice[i].desc, data_out);
                 if (++param->cnt >= (param->max_cnt-1))
-                    break;      
+                    break;
             }
         }
@@ -400 +400 @@
 static void get_account_id(pj_cli_dyn_choice_param *param)
 {
-    if (param->cnt < param->max_cnt) {  
+    if (param->cnt < param->max_cnt) {
         char buf[8];
         char buf_out[80];
@@ -407 +407 @@
         pjsua_acc_id acc_ids[16];
         unsigned count = PJ_ARRAY_SIZE(acc_ids);
-        int i;    
+        int i;
 
         pjsua_enum_accs(acc_ids, &count);
-        
-        for (i=0; i<(int)count; ++i) {  
+
+        for (i=0; i<(int)count; ++i) {
             pj_bzero(&buf_out[0], PJ_ARRAY_SIZE(buf_out));
 
             pjsua_acc_get_info(acc_ids[i], &info);
 
-            pj_ansi_snprintf(buf_out, 
+            pj_ansi_snprintf(buf_out,
                              sizeof(buf_out),
-                             "%c%.*s", 
+                             "%c%.*s",
                              (acc_ids[i]==current_acc?'*':' '),
-                             (int)info.acc_uri.slen, 
+                             (int)info.acc_uri.slen,
                              info.acc_uri.ptr);
 
@@ -428 +428 @@
             pj_strdup2(param->pool, &param->choice[i].desc, buf_out);
             if (++param->cnt >= param->max_cnt)
-                break;  
+                break;
         }
     }
@@ -450 +450 @@
         pjsua_conf_get_port_info(id[i], &info);
 
-        pj_ansi_snprintf(slot_id, sizeof(slot_id), 
+        pj_ansi_snprintf(slot_id, sizeof(slot_id),
                          "%d", info.slot_id);
         pj_strdup2(param->pool, &param->choice[i].value, slot_id);
@@ -459 +459 @@
             pj_ansi_snprintf(s, sizeof(s), "#%d ", info.listeners[j]);
             pj_ansi_strcat(txlist, s);
-        }       
-
-        pj_ansi_snprintf(desc,  
+        }
+
+        pj_ansi_snprintf(desc,
                sizeof(desc),
-               "[%2dKHz/%dms/%d] %20.*s  transmitting to: %s",         
+               "[%2dKHz/%dms/%d] %20.*s  transmitting to: %s",
                info.clock_rate/1000,
                info.samples_per_frame*1000/info.channel_count/info.clock_rate,
                info.channel_count,
-               (int)info.name.slen, 
+               (int)info.name.slen,
                info.name.ptr,
                txlist);
 
-        pj_strdup2(param->pool, &param->choice[i].desc, desc);  
+        pj_strdup2(param->pool, &param->choice[i].desc, desc);
         if (++param->cnt >= param->max_cnt)
-            break;      
+            break;
     }
 }
@@ -479 +479 @@
 static void get_audio_codec_id(pj_cli_dyn_choice_param *param)
 {
-    if (param->cnt < param->max_cnt) {  
+    if (param->cnt < param->max_cnt) {
         pjsua_codec_info c[32];
         unsigned i, count = PJ_ARRAY_SIZE(c);
         char codec_id[64];
         char desc[128];
-        
+
         pjsua_enum_codecs(c, &count);
-        for (i=0; i<count; ++i) {       
-            pj_ansi_snprintf(codec_id, sizeof(codec_id), 
-                             "%.*s", (int)c[i].codec_id.slen, 
+        for (i=0; i<count; ++i) {
+            pj_ansi_snprintf(codec_id, sizeof(codec_id),
+                             "%.*s", (int)c[i].codec_id.slen,
                              c[i].codec_id.ptr);
 
             pj_strdup2(param->pool, &param->choice[param->cnt].value, codec_id);
 
-            pj_ansi_snprintf(desc, sizeof(desc), 
-                             "Audio, prio: %d%s%.*s", 
-                             c[i].priority, 
+            pj_ansi_snprintf(desc, sizeof(desc),
+                             "Audio, prio: %d%s%.*s",
+                             c[i].priority,
                              c[i].desc.slen? " - ":"",
                              (int)c[i].desc.slen,
@@ -502 +502 @@
             pj_strdup2(param->pool, &param->choice[param->cnt].desc, desc);
             if (++param->cnt >= param->max_cnt)
-                break;  
-        }
-    }
-}
-
-#if PJSUA_HAS_VIDEO  
+                break;
+        }
+    }
+}
+
+#if PJSUA_HAS_VIDEO
 static void get_video_stream_id(pj_cli_dyn_choice_param *param)
 {
-    if (param->cnt < param->max_cnt) {  
+    if (param->cnt < param->max_cnt) {
         pjsua_call_info call_info;
 
@@ -519 +519 @@
                 if (call_info.media[i].type == PJMEDIA_TYPE_VIDEO) {
                     char med_idx[8];
-                    pj_ansi_snprintf(med_idx, sizeof(med_idx), "%d", 
+                    pj_ansi_snprintf(med_idx, sizeof(med_idx), "%d",
                                      call_info.media[i].index);
                     pj_strdup2(param->pool, &param->choice[i].value, med_idx);
 
-                    switch (call_info.media[i].status) {                    
+                    switch (call_info.media[i].status) {
                     case PJSUA_CALL_MEDIA_NONE:
-                        pj_strdup2(param->pool, &param->choice[i].desc, 
+                        pj_strdup2(param->pool, &param->choice[i].desc,
                                    "Status:None");
                         break;
                     case PJSUA_CALL_MEDIA_ACTIVE:
-                        pj_strdup2(param->pool, &param->choice[i].desc, 
+                        pj_strdup2(param->pool, &param->choice[i].desc,
                                    "Status:Active");
                         break;
                     case PJSUA_CALL_MEDIA_LOCAL_HOLD:
-                        pj_strdup2(param->pool, &param->choice[i].desc, 
+                        pj_strdup2(param->pool, &param->choice[i].desc,
                                    "Status:Local Hold");
                         break;
                     case PJSUA_CALL_MEDIA_REMOTE_HOLD:
-                        pj_strdup2(param->pool, &param->choice[i].desc, 
+                        pj_strdup2(param->pool, &param->choice[i].desc,
                                    "Status:Remote Hold");
                         break;
                     case PJSUA_CALL_MEDIA_ERROR:
-                        pj_strdup2(param->pool, &param->choice[i].desc, 
+                        pj_strdup2(param->pool, &param->choice[i].desc,
                                    "Status:Media Error");
                         break;
                     }
                     if (++param->cnt >= param->max_cnt)
-                        break;  
+                        break;
                 }
             }
@@ -552 +552 @@
     }
 }
-  
-static void get_video_dev_hint(pj_cli_dyn_choice_param *param, 
+
+static void get_video_dev_hint(pj_cli_dyn_choice_param *param,
                                pjmedia_vid_dev_info *vdi,
-                               unsigned vid_dev_id) 
+                               unsigned vid_dev_id)
 {
     char desc[128];
@@ -561 +561 @@
     pj_ansi_snprintf(dev_id, sizeof(dev_id),
         "%d", vid_dev_id);
-    pj_ansi_snprintf(desc, sizeof(desc), "%s [%s]", 
+    pj_ansi_snprintf(desc, sizeof(desc), "%s [%s]",
         vdi->name, vdi->driver);
 
-    pj_strdup2(param->pool, &param->choice[param->cnt].value, 
+    pj_strdup2(param->pool, &param->choice[param->cnt].value,
                dev_id);
-    pj_strdup2(param->pool, &param->choice[param->cnt].desc, 
-               desc);    
-}
-
-static void get_video_dev_id(pj_cli_dyn_choice_param *param, 
+    pj_strdup2(param->pool, &param->choice[param->cnt].desc,
+               desc);
+}
+
+static void get_video_dev_id(pj_cli_dyn_choice_param *param,
                              pj_bool_t all,
                              pj_bool_t capture)
 {
-    if (param->cnt < param->max_cnt) {  
+    if (param->cnt < param->max_cnt) {
         unsigned i, count;
         pjmedia_vid_dev_info vdi;
@@ -580 +580 @@
 
         count = pjsua_vid_dev_count();
-        if (count == 0) {       
+        if (count == 0) {
             return;
-        } 
+        }
 
         for (i=0; i<count; ++i) {
@@ -590 +590 @@
                     ((capture) && (vdi.dir == PJMEDIA_DIR_CAPTURE)) ||
                     ((!capture) && (vdi.dir == PJMEDIA_DIR_RENDER)))
-                {               
+                {
                     get_video_dev_hint(param, &vdi, i);
                     if (++param->cnt >= param->max_cnt)
-                        break;  
-                } 
+                        break;
+                }
             }
         }
@@ -601 +601 @@
 
 static void get_video_codec_id(pj_cli_dyn_choice_param *param)
-{    
-    if (param->cnt < param->max_cnt) {  
+{
+    if (param->cnt < param->max_cnt) {
         pjsua_codec_info ci[32];
         unsigned i, count = PJ_ARRAY_SIZE(ci);
@@ -620 +620 @@
             vfd = pjmedia_format_get_video_format_detail(&cp.enc_fmt, PJ_TRUE);
 
-            pj_ansi_snprintf(codec_id, sizeof(codec_id), 
-                             "%.*s", (int)ci[i].codec_id.slen, 
+            pj_ansi_snprintf(codec_id, sizeof(codec_id),
+                             "%.*s", (int)ci[i].codec_id.slen,
                              ci[i].codec_id.ptr);
 
             pj_strdup2(param->pool, &param->choice[param->cnt].value, codec_id);
 
-            pj_ansi_snprintf(desc, sizeof(desc), 
-                             "Video, p[%d], f[%.2f], b[%d/%d], s[%dx%d]", 
-                             ci[i].priority, 
+            pj_ansi_snprintf(desc, sizeof(desc),
+                             "Video, p[%d], f[%.2f], b[%d/%d], s[%dx%d]",
+                             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);
 
-            pj_strdup2(param->pool, &param->choice[param->cnt].desc, desc);     
+            pj_strdup2(param->pool, &param->choice[param->cnt].desc, desc);
             if (++param->cnt >= param->max_cnt)
-                break;  
+                break;
         }
     }
@@ -642 +642 @@
 static void get_video_window_id(pj_cli_dyn_choice_param *param)
 {
-    if (param->cnt < param->max_cnt) {  
+    if (param->cnt < param->max_cnt) {
         pjsua_vid_win_id wids[PJSUA_MAX_VID_WINS];
         unsigned i, cnt = PJ_ARRAY_SIZE(wids);
@@ -657 +657 @@
             pj_strdup2(param->pool, &param->choice[i].value, win_id);
 
-            pj_ansi_snprintf(desc, sizeof(desc), 
-                             "Show:%c Pos(%d,%d)  Size(%dx%d)", 
+            pj_ansi_snprintf(desc, sizeof(desc),
+                             "Show:%c Pos(%d,%d)  Size(%dx%d)",
                              (wi.show?'Y':'N'), wi.pos.x, wi.pos.y,
                              wi.size.w, wi.size.h);
 
-            pj_strdup2(param->pool, &param->choice[i].desc, desc);      
+            pj_strdup2(param->pool, &param->choice[i].desc, desc);
             if (++param->cnt >= param->max_cnt)
-                break;  
+                break;
         }
     }
@@ -671 +671 @@
 static void get_call_id(pj_cli_dyn_choice_param *param)
 {
-    if (param->cnt < param->max_cnt) {  
+    if (param->cnt < param->max_cnt) {
         char call_id[64];
         char desc[128];
@@ -691 +691 @@
                 pj_ansi_snprintf(call_id, sizeof(call_id), "%d", ids[i]);
                 pj_strdup2(param->pool, &param->choice[i].value, call_id);
-                pj_ansi_snprintf(desc, sizeof(desc), "%.*s [%.*s]", 
+                pj_ansi_snprintf(desc, sizeof(desc), "%.*s [%.*s]",
                     (int)call_info.remote_info.slen,
                     call_info.remote_info.ptr,
@@ -698 +698 @@
                 pj_strdup2(param->pool, &param->choice[i].desc, desc);
                 if (++param->cnt >= param->max_cnt)
-                    break;      
+                    break;
 
             }
@@ -723 +723 @@
         get_audio_codec_id(param);
         break;
-#if PJSUA_HAS_VIDEO    
-    case DYN_CHOICE_CAP_DEV_ID: 
+#if PJSUA_HAS_VIDEO
+    case DYN_CHOICE_CAP_DEV_ID:
     case DYN_CHOICE_REN_DEV_ID:
     case DYN_CHOICE_VID_DEV_ID:
-        get_video_dev_id(param, 
+        get_video_dev_id(param,
                          (param->arg_id==DYN_CHOICE_VID_DEV_ID),
                          (param->arg_id==DYN_CHOICE_CAP_DEV_ID));
@@ -750 +750 @@
 }
 
-/* 
+/*
  * CLI command handler
  */
@@ -777 +777 @@
         pjsua_perror(THIS_FILE, "Error adding new account", status);
     }
-    
+
     return status;
 }
@@ -790 +790 @@
 
     if (!pjsua_acc_is_valid(i)) {
-        pj_ansi_snprintf(out_str, sizeof(out_str), 
+        pj_ansi_snprintf(out_str, sizeof(out_str),
                         "Invalid account id %d\n", i);
         str_len = (unsigned)pj_ansi_strlen(out_str);
@@ -813 +813 @@
 /* Register account */
 static pj_status_t cmd_reg_account()
-{    
+{
     pjsua_acc_set_registration(current_acc, PJ_TRUE);
     return PJ_SUCCESS;
@@ -820 +820 @@
 /* Unregister account */
 static pj_status_t cmd_unreg_account()
-{    
+{
     pjsua_acc_set_registration(current_acc, PJ_FALSE);
     return PJ_SUCCESS;
@@ -834 +834 @@
     } else {
         PJ_LOG(3,(THIS_FILE, "Invalid account id %d", i));
-    }    
+    }
     return PJ_SUCCESS;
 }
@@ -844 +844 @@
     unsigned count = PJ_ARRAY_SIZE(acc_ids);
     int i;
-    static const pj_str_t header = {"Account list:\n", 15};    
+    static const pj_str_t header = {"Account list:\n", 15};
 
     pjsua_enum_accs(acc_ids, &count);
@@ -857 +857 @@
 
         if (!info.has_registration) {
-            pj_ansi_snprintf(acc_info, sizeof(acc_info), "%.*s", 
+            pj_ansi_snprintf(acc_info, sizeof(acc_info), "%.*s",
                              (int)info.status_text.slen,
                              info.status_text.ptr);
@@ -871 +871 @@
         }
 
-        pj_ansi_snprintf(out_str, sizeof(out_str), 
-                         " %c[%2d] %.*s: %s\n", 
-                         (acc_ids[i]==current_acc?'*':' '), acc_ids[i],  
-                         (int)info.acc_uri.slen, info.acc_uri.ptr, 
+        pj_ansi_snprintf(out_str, sizeof(out_str),
+                         " %c[%2d] %.*s: %s\n",
+                         (acc_ids[i]==current_acc?'*':' '), acc_ids[i],
+                         (int)info.acc_uri.slen, info.acc_uri.ptr,
                          acc_info);
         pj_cli_sess_write_msg(cval->sess, out_str, pj_ansi_strlen(out_str));
@@ -880 +880 @@
         pj_bzero(out_str, sizeof(out_str));
         pj_ansi_snprintf(out_str, sizeof(out_str),
-                         "       Online status: %.*s\n", 
+                         "       Online status: %.*s\n",
                          (int)info.online_status_text.slen,
                          info.online_status_text.ptr);
@@ -892 +892 @@
 /* Account command handler */
 pj_status_t cmd_account_handler(pj_cli_cmd_val *cval)
-{    
+{
     pj_status_t status = PJ_SUCCESS;
 
@@ -913 +913 @@
         status = cmd_unreg_account();
         break;
-    case CMD_ACCOUNT_NEXT:      
+    case CMD_ACCOUNT_NEXT:
     case CMD_ACCOUNT_PREV:
-        status = cmd_next_account(cval);        
+        status = cmd_next_account(cval);
         break;
     case CMD_ACCOUNT_SHOW:
         status = cmd_show_account(cval);
         break;
-    }    
+    }
     return status;
 }
@@ -926 +926 @@
 /* Add buddy */
 static pj_status_t cmd_add_buddy(pj_cli_cmd_val *cval)
-{    
+{
     char out_str[80];
     pjsua_buddy_config buddy_cfg;
@@ -934 +934 @@
 
     if (pjsua_verify_url(cval->argv[1].ptr) != PJ_SUCCESS) {
-        pj_ansi_snprintf(out_str, sizeof(out_str), 
+        pj_ansi_snprintf(out_str, sizeof(out_str),
                          "Invalid URI '%s'\n", cval->argv[1].ptr);
     } else {
@@ -944 +944 @@
         status = pjsua_buddy_add(&buddy_cfg, &buddy_id);
         if (status == PJ_SUCCESS) {
-            pj_ansi_snprintf(out_str, sizeof(out_str), 
+            pj_ansi_snprintf(out_str, sizeof(out_str),
                               "New buddy '%s' added at index %d\n",
                               cval->argv[1].ptr, buddy_id+1);
-        }   
+        }
     }
     pj_cli_sess_write_msg(cval->sess, out_str, pj_ansi_strlen(out_str));
@@ -955 +955 @@
 /* Delete buddy */
 static pj_status_t cmd_del_buddy(pj_cli_cmd_val *cval)
-{    
+{
     int i = my_atoi(cval->argv[1].ptr) - 1;
     char out_str[80];
 
     if (!pjsua_buddy_is_valid(i)) {
-        pj_ansi_snprintf(out_str, sizeof(out_str), 
-                         "Invalid buddy id %d\n", i);   
+        pj_ansi_snprintf(out_str, sizeof(out_str),
+                         "Invalid buddy id %d\n", i);
     } else {
         pjsua_buddy_del(i);
-        pj_ansi_snprintf(out_str, sizeof(out_str), 
-                         "Buddy %d deleted\n", i);              
+        pj_ansi_snprintf(out_str, sizeof(out_str),
+                         "Buddy %d deleted\n", i);
     }
     pj_cli_sess_write_msg(cval->sess, out_str, pj_ansi_strlen(out_str));
@@ -973 +973 @@
 /* Send IM */
 static pj_status_t cmd_send_im(pj_cli_cmd_val *cval)
-{    
-    int i = -1;    
+{
+    int i = -1;
     struct input_result result;
     char dest[64];
-    pj_str_t tmp = pj_str(dest);    
+    pj_str_t tmp = pj_str(dest);
 
     /* make compiler happy. */
@@ -983 +983 @@
 
     pj_strncpy_with_null(&tmp, &cval->argv[1], sizeof(dest));
-    
+
     /* input destination. */
     get_input_url(tmp.ptr, tmp.slen, cval, &result);
     if (result.nb_result != PJSUA_APP_NO_NB) {
 
-        if (result.nb_result == -1) {       
+        if (result.nb_result == -1) {
             static const pj_str_t err_msg = {"you can't send broadcast im "
-                                             "like that!\n", 40 };          
+                                             "like that!\n", 40 };
             pj_cli_sess_write_msg(cval->sess, err_msg.ptr, err_msg.slen);
             return PJ_SUCCESS;
@@ -997 +997 @@
         } else {
             pjsua_buddy_info binfo;
-            pjsua_buddy_get_info(result.nb_result-1, &binfo);       
+            pjsua_buddy_get_info(result.nb_result-1, &binfo);
             pj_strncpy_with_null(&tmp, &binfo.uri, sizeof(dest));
             uri = tmp.ptr;
@@ -1026 +1026 @@
 /* Subscribe/unsubscribe presence */
 static pj_status_t cmd_subs_pres(pj_cli_cmd_val *cval, pj_bool_t subscribe)
-{   
-    struct input_result result;    
+{
+    struct input_result result;
     char dest[64] = {0};
     pj_str_t tmp = pj_str(dest);
-    
+
     pj_strncpy_with_null(&tmp, &cval->argv[1], sizeof(dest));
-    get_input_url(tmp.ptr, tmp.slen, cval, &result);    
+    get_input_url(tmp.ptr, tmp.slen, cval, &result);
     if (result.nb_result != PJSUA_APP_NO_NB) {
         if (result.nb_result == -1) {
@@ -1059 +1059 @@
 /* Toggle online state */
 static pj_status_t cmd_toggle_state(pj_cli_cmd_val *cval)
-{    
+{
     char out_str[128];
     pjsua_acc_info acc_info;
@@ -1066 +1066 @@
     acc_info.online_status = !acc_info.online_status;
     pjsua_acc_set_online_status(current_acc, acc_info.online_status);
-    pj_ansi_snprintf(out_str, sizeof(out_str), 
+    pj_ansi_snprintf(out_str, sizeof(out_str),
                      "Setting %s online status to %s\n",
                      acc_info.acc_uri.ptr,
@@ -1076 +1076 @@
 /* Set presence text */
 static pj_status_t cmd_set_presence_text(pj_cli_cmd_val *cval)
-{    
+{
     pjrpid_element elem;
     int choice;
@@ -1125 +1125 @@
 /* Show buddy list */
 static pj_status_t cmd_show_buddy(pj_cli_cmd_val *cval)
-{        
+{
     pjsua_buddy_id ids[64];
     int i;
     unsigned count = PJ_ARRAY_SIZE(ids);
-    static const pj_str_t header = {"Buddy list:\n", 13};    
+    static const pj_str_t header = {"Buddy list:\n", 13};
     char out_str[64];
 
@@ -1140 +1140 @@
         pj_cli_sess_write_msg(cval->sess, out_str, pj_ansi_strlen(out_str));
     } else {
-        for (i=0; i<(int)count; ++i) {      
+        for (i=0; i<(int)count; ++i) {
             pjsua_buddy_info info;
             pj_bzero(out_str, sizeof(out_str));
@@ -1147 +1147 @@
                 continue;
 
-            pj_ansi_snprintf(out_str, sizeof(out_str), 
-                    " [%2d] <%.*s>  %.*s\n", 
-                    ids[i]+1, 
+            pj_ansi_snprintf(out_str, sizeof(out_str),
+                    " [%2d] <%.*s>  %.*s\n",
+                    ids[i]+1,
                     (int)info.status_text.slen,
-                    info.status_text.ptr, 
+                    info.status_text.ptr,
                     (int)info.uri.slen,
                     info.uri.ptr);
@@ -1157 +1157 @@
             pj_cli_sess_write_msg(cval->sess, out_str, pj_ansi_strlen(out_str));
         }
-    }        
+    }
     return PJ_SUCCESS;
 }
@@ -1163 +1163 @@
 /* Presence/buddy command handler */
 pj_status_t cmd_presence_handler(pj_cli_cmd_val *cval)
-{    
+{
     pj_status_t status = PJ_SUCCESS;
 
@@ -1178 +1178 @@
         status = cmd_send_im(cval);
         break;
-    case CMD_PRESENCE_SUB:      
+    case CMD_PRESENCE_SUB:
     case CMD_PRESENCE_UNSUB:
-        status = cmd_subs_pres(cval, 
-                               pj_cli_get_cmd_id(cval->cmd)==CMD_PRESENCE_SUB); 
+        status = cmd_subs_pres(cval,
+                               pj_cli_get_cmd_id(cval->cmd)==CMD_PRESENCE_SUB);
         break;
     case CMD_PRESENCE_TOG_STATE:
@@ -1192 +1192 @@
         status = cmd_show_buddy(cval);
         break;
-    }    
+    }
 
     return status;
@@ -1204 +1204 @@
     static const pj_str_t header = {"Conference ports:\n", 19};
 
-    pj_cli_sess_write_msg(cval->sess, header.ptr, header.slen);    
+    pj_cli_sess_write_msg(cval->sess, header.ptr, header.slen);
 
     count = PJ_ARRAY_SIZE(id);
@@ -1223 +1223 @@
             pj_ansi_strcat(txlist, s);
         }
-        pj_ansi_snprintf(out_str, 
+        pj_ansi_snprintf(out_str,
                sizeof(out_str),
-               "Port #%02d[%2dKHz/%dms/%d] %20.*s  transmitting to: %s\n", 
-               info.slot_id, 
+               "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, 
+               (int)info.name.slen,
                info.name.ptr,
                txlist);
-        pj_cli_sess_write_msg(cval->sess, out_str, pj_ansi_strlen(out_str));    
-    }    
+        pj_cli_sess_write_msg(cval->sess, out_str, pj_ansi_strlen(out_str));
+    }
     return PJ_SUCCESS;
 }
@@ -1242 +1242 @@
 {
     pj_status_t status;
-    
+
     if (connect)
-        status = pjsua_conf_connect(pj_strtol(&cval->argv[1]), 
+        status = pjsua_conf_connect(pj_strtol(&cval->argv[1]),
                                     pj_strtol(&cval->argv[2]));
     else
-        status = pjsua_conf_disconnect(pj_strtol(&cval->argv[1]), 
+        status = pjsua_conf_disconnect(pj_strtol(&cval->argv[1]),
                                        pj_strtol(&cval->argv[2]));
 
     if (status == PJ_SUCCESS) {
         static const pj_str_t success_msg = {"Success\n", 9};
-        pj_cli_sess_write_msg(cval->sess, success_msg.ptr, success_msg.slen);   
+        pj_cli_sess_write_msg(cval->sess, success_msg.ptr, success_msg.slen);
     } else {
         static const pj_str_t err_msg = {"ERROR!!\n", 9};
@@ -1270 +1270 @@
 
     /* Adjust mic level */
-    orig_level = app_config.mic_level;    
+    orig_level = app_config.mic_level;
     pj_strncpy_with_null(&tmp, &cval->argv[1], sizeof(level_val));
     app_config.mic_level = (float)strtod(level_val, &err);
@@ -1276 +1276 @@
 
     pj_ansi_snprintf(buf, sizeof(buf),
-                     "Adjust mic level: [%4.1fx] -> [%4.1fx]\n", 
+                     "Adjust mic level: [%4.1fx] -> [%4.1fx]\n",
                      orig_level, app_config.mic_level);
 
@@ -1282 +1282 @@
 
     /* Adjust speaker level */
-    orig_level = app_config.speaker_level;        
+    orig_level = app_config.speaker_level;
     pj_strncpy_with_null(&tmp, &cval->argv[2], sizeof(level_val));
     app_config.speaker_level = (float)strtod(level_val, &err);
@@ -1288 +1288 @@
 
     pj_ansi_snprintf(buf, sizeof(buf),
-                      "Adjust speaker level: [%4.1fx] -> [%4.1fx]\n", 
+                      "Adjust speaker level: [%4.1fx] -> [%4.1fx]\n",
                       orig_level, app_config.speaker_level);
 
@@ -1298 +1298 @@
 /* Set codec priority */
 static pj_status_t cmd_set_codec_prio(pj_cli_cmd_val *cval)
-{        
-    int new_prio;    
-    pj_status_t status;    
+{
+    int new_prio;
+    pj_status_t status;
 
     new_prio = pj_strtol(&cval->argv[2]);
-    if (new_prio < 0) 
+    if (new_prio < 0)
         new_prio = 0;
-    else if (new_prio > PJMEDIA_CODEC_PRIO_HIGHEST) 
+    else if (new_prio > PJMEDIA_CODEC_PRIO_HIGHEST)
         new_prio = PJMEDIA_CODEC_PRIO_HIGHEST;
 
-    status = pjsua_codec_set_priority(&cval->argv[1], 
+    status = pjsua_codec_set_priority(&cval->argv[1],
                                       (pj_uint8_t)new_prio);
 #if PJSUA_HAS_VIDEO
     if (status != PJ_SUCCESS) {
-        status = pjsua_vid_codec_set_priority(&cval->argv[1], 
+        status = pjsua_vid_codec_set_priority(&cval->argv[1],
                                               (pj_uint8_t)new_prio);
     }
@@ -1335 +1335 @@
     case CMD_MEDIA_CONF_CONNECT:
     case CMD_MEDIA_CONF_DISCONNECT:
-        status = cmd_media_connect(cval, 
-                          pj_cli_get_cmd_id(cval->cmd)==CMD_MEDIA_CONF_CONNECT);        
-        break;
-    case CMD_MEDIA_ADJUST_VOL:  
+        status = cmd_media_connect(cval,
+                          pj_cli_get_cmd_id(cval->cmd)==CMD_MEDIA_CONF_CONNECT);
+        break;
+    case CMD_MEDIA_ADJUST_VOL:
         status = cmd_adjust_vol(cval);
         break;
     case CMD_MEDIA_CODEC_PRIO:
-        status = cmd_set_codec_prio(cval);      
+        status = cmd_set_codec_prio(cval);
         break;
     case CMD_MEDIA_SPEAKER_TOGGLE:
@@ -1369 +1369 @@
         }
         break;
-    }    
+    }
 
     return status;
@@ -1390 +1390 @@
         PJ_LOG(1,(THIS_FILE, "Error: not enough buffer"));
     else
-        PJ_LOG(3,(THIS_FILE, 
+        PJ_LOG(3,(THIS_FILE,
                   "Dumping configuration (%d bytes):\n%s\n",
                   len, settings));
@@ -1404 +1404 @@
     pj_str_t tmp = pj_str(buf);
 
-    pj_strncpy_with_null(&tmp, &cval->argv[1], sizeof(buf));    
+    pj_strncpy_with_null(&tmp, &cval->argv[1], sizeof(buf));
 
     len = write_settings(&app_config, settings, sizeof(settings));
@@ -1447 +1447 @@
         break;
     case CMD_CONFIG_DUMP_CONF:
-        status = cmd_show_config();     
-        break;
-    case CMD_CONFIG_WRITE_SETTING:      
+        status = cmd_show_config();
+        break;
+    case CMD_CONFIG_WRITE_SETTING:
         status = cmd_write_config(cval);
         break;
-    }    
+    }
 
     return status;
@@ -1463 +1463 @@
     char dest[64] = {0};
     char out_str[128];
-    pj_str_t tmp = pj_str(dest);      
-
-    pj_strncpy_with_null(&tmp, &cval->argv[1], sizeof(dest));    
-
-    pj_ansi_snprintf(out_str, 
-                     sizeof(out_str), 
+    pj_str_t tmp = pj_str(dest);
+
+    pj_strncpy_with_null(&tmp, &cval->argv[1], sizeof(dest));
+
+    pj_ansi_snprintf(out_str,
+                     sizeof(out_str),
                      "(You currently have %d calls)\n",
                      pjsua_call_get_count());
 
     pj_cli_sess_write_msg(cval->sess, out_str, pj_ansi_strlen(out_str));
-    
+
     /* input destination. */
-    get_input_url(tmp.ptr, tmp.slen, cval, &result);    
+    get_input_url(tmp.ptr, tmp.slen, cval, &result);
     if (result.nb_result != PJSUA_APP_NO_NB) {
         pjsua_buddy_info binfo;
         if (result.nb_result == -1 || result.nb_result == 0) {
-            static const pj_str_t err_msg = 
+            static const pj_str_t err_msg =
                     {"You can't do that with make call!\n", 35};
             pj_cli_sess_write_msg(cval->sess, err_msg.ptr, err_msg.slen);
             return PJ_SUCCESS;
-        }       
-        pjsua_buddy_get_info(result.nb_result-1, &binfo);           
+        }
+        pjsua_buddy_get_info(result.nb_result-1, &binfo);
         pj_strncpy(&tmp, &binfo.uri, sizeof(dest));
     } else if (result.uri_result) {
@@ -1494 +1494 @@
     pjsua_msg_data_init(&msg_data);
     TEST_MULTIPART(&msg_data);
-    pjsua_call_make_call(current_acc, &tmp, &call_opt, NULL, 
+    pjsua_call_make_call(current_acc, &tmp, &call_opt, NULL,
                          &msg_data, &current_call);
     return PJ_SUCCESS;
@@ -1503 +1503 @@
 {
     struct input_result result;
-    char dest[64] = {0};    
+    char dest[64] = {0};
     char out_str[128];
     int i, count;
     pj_str_t tmp = pj_str(dest);
 
-    pj_ansi_snprintf(out_str, 
-                     sizeof(out_str), 
+    pj_ansi_snprintf(out_str,
+                     sizeof(out_str),
                      "(You currently have %d calls)\n",
                      pjsua_call_get_count());
-    
+
     count = pj_strtol(&cval->argv[1]);
     if (count < 1)
         return PJ_SUCCESS;
-    
+
     pj_strncpy_with_null(&tmp, &cval->argv[2], sizeof(dest));
-    
+
     /* input destination. */
-    get_input_url(tmp.ptr, tmp.slen, cval, &result);    
+    get_input_url(tmp.ptr, tmp.slen, cval, &result);
     if (result.nb_result != PJSUA_APP_NO_NB) {
         pjsua_buddy_info binfo;
         if (result.nb_result == -1 || result.nb_result == 0) {
-            static const pj_str_t err_msg = 
+            static const pj_str_t err_msg =
                             {"You can't do that with make call!\n", 35};
             pj_cli_sess_write_msg(cval->sess, err_msg.ptr, err_msg.slen);
             return PJ_SUCCESS;
-        }       
-        pjsua_buddy_get_info(result.nb_result-1, &binfo);           
-        pj_strncpy(&tmp, &binfo.uri, sizeof(dest));     
+        }
+        pjsua_buddy_get_info(result.nb_result-1, &binfo);
+        pj_strncpy(&tmp, &binfo.uri, sizeof(dest));
     } else {
         tmp = pj_str(result.uri_result);
-    } 
+    }
 
     for (i=0; i<count; ++i) {
@@ -1559 +1559 @@
     }
 
-    if (current_call == PJSUA_INVALID_ID || 
+    if (current_call == PJSUA_INVALID_ID ||
         call_info.role != PJSIP_ROLE_UAS ||
         call_info.state >= PJSIP_INV_STATE_CONNECTING)
-    {   
-        static const pj_str_t err_msg = {"No pending incoming call\n", 26};       
+    {
+        static const pj_str_t err_msg = {"No pending incoming call\n", 26};
         pj_cli_sess_write_msg(cval->sess, err_msg.ptr, err_msg.slen);
 
@@ -1570 +1570 @@
         char contact[120];
         pj_str_t hname = { "Contact", 7 };
-        pj_str_t hvalue;        
-        pjsip_generic_string_hdr hcontact;      
+        pj_str_t hvalue;
+        pjsip_generic_string_hdr hcontact;
 
         st_code = pj_strtol(&cval->argv[1]);
@@ -1583 +1583 @@
                 static const pj_str_t err_msg = {"Enter URL to be put "
                                                  "in Contact\n",  32};
-                pj_cli_sess_write_msg(cval->sess, err_msg.ptr, err_msg.slen);           
+                pj_cli_sess_write_msg(cval->sess, err_msg.ptr, err_msg.slen);
                 return PJ_SUCCESS;
             }
@@ -1595 +1595 @@
         /*
         * Must check again!
-        * Call may have been disconnected while we're waiting for 
+        * Call may have been disconnected while we're waiting for
         * keyboard input.
         */
         if (current_call == PJSUA_INVALID_ID) {
-            static const pj_str_t err_msg = {"Call has been disconnected\n", 
-                                             28};           
+            static const pj_str_t err_msg = {"Call has been disconnected\n",
+                                             28};
             pj_cli_sess_write_msg(cval->sess, err_msg.ptr, err_msg.slen);
         }
@@ -1617 +1617 @@
     } else {
         if (all)
-            pjsua_call_hangup_all();        
+            pjsua_call_hangup_all();
         else
             pjsua_call_hangup(current_call, 0, NULL, NULL);
@@ -1627 +1627 @@
 static pj_status_t cmd_hold_call()
 {
-    if (current_call != PJSUA_INVALID_ID) {     
+    if (current_call != PJSUA_INVALID_ID) {
         pjsua_call_set_hold(current_call, NULL);
 
@@ -1675 +1675 @@
     }
 
-    if (current_call != PJSUA_INVALID_ID) {     
+    if (current_call != PJSUA_INVALID_ID) {
         pjsua_call_info call_info;
 
         pjsua_call_get_info(current_call, &call_info);
-        PJ_LOG(3,(THIS_FILE,"Current dialog: %.*s", 
-                  (int)call_info.remote_info.slen, 
+        PJ_LOG(3,(THIS_FILE,"Current dialog: %.*s",
+                  (int)call_info.remote_info.slen,
                   call_info.remote_info.ptr));
 
@@ -1706 +1706 @@
         pj_str_t STR_FALSE = { "false", 5 };
         pjsua_call_info ci;
-        
-        pj_strncpy_with_null(&tmp, &cval->argv[1], sizeof(dest));       
+
+        pj_strncpy_with_null(&tmp, &cval->argv[1], sizeof(dest));
 
         pjsua_call_get_info(current_call, &ci);
-        pj_ansi_snprintf(out_str, 
-                         sizeof(out_str), 
+        pj_ansi_snprintf(out_str,
+                         sizeof(out_str),
                          "Transferring current call [%d] %.*s\n",
                          current_call,
-                         (int)ci.remote_info.slen, 
+                         (int)ci.remote_info.slen,
                          ci.remote_info.ptr);
 
@@ -1749 +1749 @@
             pjsua_call_xfer( current_call, &tmp, &msg_data);
         }
-    }       
+    }
     return PJ_SUCCESS;
 }
@@ -1755 +1755 @@
 /* Transfer call */
 static pj_status_t cmd_transfer_replace_call(pj_cli_cmd_val *cval)
-{    
+{
     if (current_call == -1) {
         PJ_LOG(3,(THIS_FILE, "No current call"));
@@ -1764 +1764 @@
         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_id ids[PJSUA_MAX_CALLS];
         pjsua_msg_data msg_data;
-        char buf[8] = {0};      
+        char buf[8] = {0};
         pj_str_t tmp = pj_str(buf);
-        unsigned count; 
-        static const pj_str_t err_invalid_num = 
+        unsigned count;
+        static const pj_str_t err_invalid_num =
                                     {"Invalid destination call number\n", 32 };
         count = PJ_ARRAY_SIZE(ids);
         pjsua_enum_calls(ids, &count);
 
-        if (count <= 1) {           
-            static const pj_str_t err_no_other_call = 
+        if (count <= 1) {
+            static const pj_str_t err_no_other_call =
                                     {"There are no other calls\n", 25};
 
-            pj_cli_sess_write_msg(cval->sess, err_no_other_call.ptr, 
+            pj_cli_sess_write_msg(cval->sess, err_no_other_call.ptr,
                                   err_no_other_call.slen);
             return PJ_SUCCESS;
@@ -1787 +1787 @@
 
         /* Check if call is still there. */
-        if (call != current_call) {         
-            static pj_str_t err_call_dc = 
+        if (call != current_call) {
+            static pj_str_t err_call_dc =
                                     {"Call has been disconnected\n", 27};
 
-            pj_cli_sess_write_msg(cval->sess, err_call_dc.ptr, 
+            pj_cli_sess_write_msg(cval->sess, err_call_dc.ptr,
                                   err_call_dc.slen);
             return PJ_SUCCESS;
@@ -1798 +1798 @@
         /* Check that destination call is valid. */
         if (dst_call == call) {
-            static pj_str_t err_same_num = 
+            static pj_str_t err_same_num =
                                     {"Destination call number must not be the "
                                      "same as the call being transferred\n", 74};
 
-            pj_cli_sess_write_msg(cval->sess, err_same_num.ptr, 
+            pj_cli_sess_write_msg(cval->sess, err_same_num.ptr,
                                   err_same_num.slen);
             return PJ_SUCCESS;
@@ -1808 +1808 @@
 
         if (dst_call >= PJSUA_MAX_CALLS) {
-            pj_cli_sess_write_msg(cval->sess, err_invalid_num.ptr, 
+            pj_cli_sess_write_msg(cval->sess, err_invalid_num.ptr,
                                   err_invalid_num.slen);
             return PJ_SUCCESS;
@@ -1814 +1814 @@
 
         if (!pjsua_call_is_active(dst_call)) {
-            pj_cli_sess_write_msg(cval->sess, err_invalid_num.ptr, 
+            pj_cli_sess_write_msg(cval->sess, err_invalid_num.ptr,
                                   err_invalid_num.slen);
             return PJ_SUCCESS;
@@ -1822 +1822 @@
         if (app_config.no_refersub) {
             /* Add Refer-Sub: false in outgoing REFER request */
-            pjsip_generic_string_hdr_init2(&refer_sub, &STR_REFER_SUB, 
+            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, 
+        pjsua_call_xfer_replaces(call, dst_call,
+                                 PJSUA_XFER_NO_REQUIRE_REPLACES,
                                  &msg_data);
     }
@@ -1835 +1835 @@
 
 static pj_status_t cmd_redirect_call(pj_cli_cmd_val *cval)
-{  
+{
     if (current_call == PJSUA_INVALID_ID) {
         PJ_LOG(3,(THIS_FILE, "No current call"));
@@ -1842 +1842 @@
     if (!pjsua_call_is_active(current_call)) {
         PJ_LOG(1,(THIS_FILE, "Call %d has gone", current_call));
-    } else {    
+    } else {
         enum {
             ACCEPT_REPLACE, ACCEPT, REJECT, STOP
@@ -1850 +1850 @@
         switch (choice) {
         case ACCEPT_REPLACE:
-            pjsua_call_process_redirect(current_call, 
-                                        PJSIP_REDIRECT_ACCEPT_REPLACE);     
+            pjsua_call_process_redirect(current_call,
+                                        PJSIP_REDIRECT_ACCEPT_REPLACE);
             break;
         case ACCEPT:
@@ -1862 +1862 @@
             pjsua_call_process_redirect(current_call, PJSIP_REDIRECT_STOP);
             break;
-        }       
+        }
     }
     return PJ_SUCCESS;
@@ -1878 +1878 @@
         PJ_LOG(3,(THIS_FILE, "Media is not established yet!"));
 
-    } else {    
+    } else {
         int call = current_call;
         pj_status_t status;
@@ -1888 +1888 @@
             return PJ_SUCCESS;;
         }
-        
+
         status = pjsua_call_dial_dtmf(current_call, &cval->argv[1]);
         if (status != PJ_SUCCESS) {
@@ -1909 +1909 @@
 
     } else {
-        const pj_str_t SIP_INFO = pj_str("INFO");       
+        const pj_str_t SIP_INFO = pj_str("INFO");
         int call = current_call;
         int i;
@@ -1920 +1920 @@
             return PJ_SUCCESS;;
         }
-        
+
         for (i=0; i<cval->argv[1].slen; ++i) {
             char body[64];
@@ -1927 +1927 @@
             msg_data.content_type = pj_str("application/dtmf-relay");
 
-            pj_ansi_snprintf(body, 
+            pj_ansi_snprintf(body,
                              sizeof(body),
                              "Signal=%c\n"
@@ -1935 +1935 @@
             msg_data.msg_body = pj_str(body);
 
-            status = pjsua_call_send_request(current_call, &SIP_INFO, 
+            status = pjsua_call_send_request(current_call, &SIP_INFO,
                 &msg_data);
             if (status != PJ_SUCCESS) {
@@ -1962 +1962 @@
         static const pj_str_t err_msg = {"Sorry, need at least one "
                                          "account configured\n", 45};
-        pj_cli_sess_write_msg(cval->sess, err_msg.ptr, err_msg.slen);   
+        pj_cli_sess_write_msg(cval->sess, err_msg.ptr, err_msg.slen);
     } else {
         char *uri;
         char dest[64] = {0};
-        pj_str_t tmp = pj_str(dest);    
+        pj_str_t tmp = pj_str(dest);
         struct input_result result;
         static const pj_str_t header = {"Send arbitrary request to "
                                         "remote host\n", 39};
-        
-        pj_cli_sess_write_msg(cval->sess, header.ptr, header.slen);     
-        
-        pj_strncpy_with_null(&tmp, &cval->argv[2], sizeof(dest));       
+
+        pj_cli_sess_write_msg(cval->sess, header.ptr, header.slen);
+
+        pj_strncpy_with_null(&tmp, &cval->argv[2], sizeof(dest));
         /* Input destination URI */
         uri = NULL;
         get_input_url(tmp.ptr, tmp.slen, cval, &result);
         if (result.nb_result != PJSUA_APP_NO_NB) {
-            if (result.nb_result == -1) {               
+            if (result.nb_result == -1) {
                 static const pj_str_t err_msg = {"Sorry you can't do that!\n",
                                                  26};
@@ -1995 +1995 @@
             } else {
                 pjsua_buddy_info binfo;
-                pjsua_buddy_get_info(result.nb_result-1, &binfo);               
+                pjsua_buddy_get_info(result.nb_result-1, &binfo);
                 pj_strncpy_with_null(&tmp, &binfo.uri, sizeof(dest));
                 uri = tmp.ptr;
@@ -2007 +2007 @@
         if (uri) {
             char method[64] = {0};
-            pj_str_t tmp_method = pj_str(method);           
+            pj_str_t tmp_method = pj_str(method);
             pj_strncpy_with_null(&tmp_method, &cval->argv[1], sizeof(method));
             tmp = pj_str(uri);
@@ -2016 +2016 @@
             * not go well with the call state, so don't do it
             * unless it's for testing.
-            */      
+            */
             pjsua_call_send_request(current_call, &cval->argv[1], NULL);
-        }    
+        }
     }
     return PJ_SUCCESS;
@@ -2030 +2030 @@
                      "You have %d active call%s\n", i, (i>1?"s":""));
 
-    pj_cli_sess_write_msg(cval->sess, out_str, 
+    pj_cli_sess_write_msg(cval->sess, out_str,
         pj_ansi_strlen(out_str));
 
     if (current_call != PJSUA_INVALID_ID) {
         pjsua_call_info ci;
-        if (pjsua_call_get_info(current_call, &ci)==PJ_SUCCESS) {           
-            pj_ansi_snprintf(out_str, sizeof(out_str), 
+        if (pjsua_call_get_info(current_call, &ci)==PJ_SUCCESS) {
+            pj_ansi_snprintf(out_str, sizeof(out_str),
                    "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);
 
-            pj_cli_sess_write_msg(cval->sess, out_str, 
+            pj_cli_sess_write_msg(cval->sess, out_str,
                                   pj_ansi_strlen(out_str));
         }
-    } 
+    }
     return PJ_SUCCESS;
 }
@@ -2050 +2050 @@
 /* Call handler */
 pj_status_t cmd_call_handler(pj_cli_cmd_val *cval)
-{    
+{
     pj_status_t status = PJ_SUCCESS;
     pj_cli_cmd_id cmd_id = pj_cli_get_cmd_id(cval->cmd);
@@ -2064 +2064 @@
         break;
     case CMD_CALL_ANSWER:
-        status = cmd_answer_call(cval); 
-        break;
-    case CMD_CALL_HANGUP:       
-    case CMD_CALL_HANGUP_ALL:   
+        status = cmd_answer_call(cval);
+        break;
+    case CMD_CALL_HANGUP:
+    case CMD_CALL_HANGUP_ALL:
         status = cmd_hangup_call(cval, (cmd_id==CMD_CALL_HANGUP_ALL));
         break;
-    case CMD_CALL_HOLD: 
+    case CMD_CALL_HOLD:
         status = cmd_hold_call();
         break;
-    case CMD_CALL_REINVITE:     
+    case CMD_CALL_REINVITE:
         status = cmd_call_reinvite();
         break;
-    case CMD_CALL_UPDATE:       
+    case CMD_CALL_UPDATE:
         status = cmd_call_update();
         break;
-    case CMD_CALL_NEXT:                 
-    case CMD_CALL_PREVIOUS:     
-        status = cmd_next_call(cmd_id==CMD_CALL_NEXT);  
-        break;
-    case CMD_CALL_TRANSFER:     
+    case CMD_CALL_NEXT:
+    case CMD_CALL_PREVIOUS:
+        status = cmd_next_call(cmd_id==CMD_CALL_NEXT);
+        break;
+    case CMD_CALL_TRANSFER:
         status = cmd_transfer_call(cval);
         break;
-    case CMD_CALL_TRANSFER_REPLACE:     
+    case CMD_CALL_TRANSFER_REPLACE:
         status = cmd_transfer_replace_call(cval);
         break;
@@ -2092 +2092 @@
         status = cmd_redirect_call(cval);
         break;
-    case CMD_CALL_D2833:        
+    case CMD_CALL_D2833:
         status = cmd_dtmf_2833(cval);
         break;
-    case CMD_CALL_INFO: 
+    case CMD_CALL_INFO:
         status = cmd_call_info(cval);
         break;
-    case CMD_CALL_DUMP_Q:       
+    case CMD_CALL_DUMP_Q:
         status = cmd_call_quality();
         break;
-    case CMD_CALL_SEND_ARB:     
+    case CMD_CALL_SEND_ARB:
         status = cmd_send_arbitrary(cval);
         break;
@@ -2107 +2107 @@
         status = cmd_show_current_call(cval);
         break;
-    }    
+    }
 
     return status;
 }
 
-#if PJSUA_HAS_VIDEO 
+#if PJSUA_HAS_VIDEO
 static pj_status_t cmd_set_video_enable(pj_bool_t enabled)
-{    
+{
     app_config.vid.vid_cnt = (enabled ? 1 : 0);
     PJ_LOG(3,(THIS_FILE, "Video will be %s in next offer/answer",
@@ -2136 +2136 @@
     pjsua_acc_config acc_cfg;
     pj_pool_t *pool = pjsua_pool_create("tmp-pjsua", 1000, 1000);
-    
+
     pjsua_acc_get_config(current_acc, pool, &acc_cfg);
     app_config_show_video(current_acc, &acc_cfg);
@@ -2154 +2154 @@
 
     switch(cmd_id) {
-    case CMD_VIDEO_ACC_AUTORX:  
-    case CMD_VIDEO_ACC_AUTOTX:  
+    case CMD_VIDEO_ACC_AUTORX:
+    case CMD_VIDEO_ACC_AUTOTX:
         {
             int on = (pj_ansi_strnicmp(cval->argv[1].ptr, "On", 2)==0);
-        
+
             if (cmd_id == CMD_VIDEO_ACC_AUTORX)
                 acc_cfg.vid_in_auto_show = on;
@@ -2165 +2165 @@
         }
         break;
-    case CMD_VIDEO_ACC_CAP_ID:          
+    case CMD_VIDEO_ACC_CAP_ID:
     case CMD_VIDEO_ACC_REN_ID:
         {
-            int dev = pj_strtol(&cval->argv[1]);                    
+            int dev = pj_strtol(&cval->argv[1]);
 
             if (cmd_id == CMD_VIDEO_ACC_CAP_ID)
                 acc_cfg.vid_cap_dev = dev;
-            else 
-                acc_cfg.vid_rend_dev = dev;             
-        }       
+            else
+                acc_cfg.vid_rend_dev = dev;
+        }
         break;
     }
@@ -2190 +2190 @@
 static pj_status_t cmd_enable_vid_rx(pj_cli_cmd_val *cval)
 {
-    pjsua_call_vid_strm_op_param param;    
-    pjsua_stream_info si;    
+    pjsua_call_vid_strm_op_param param;
+    pjsua_stream_info si;
     pj_status_t status = PJ_SUCCESS;
     pj_bool_t on = (pj_ansi_strnicmp(cval->argv[1].ptr, "On", 2) == 0);
 
-    pjsua_call_vid_strm_op_param_default(&param);    
-
-    param.med_idx = pj_strtol(&cval->argv[2]); 
+    pjsua_call_vid_strm_op_param_default(&param);
+
+    param.med_idx = pj_strtol(&cval->argv[2]);
     if (pjsua_call_get_stream_info(current_call, param.med_idx, &si) ||
         si.type != PJMEDIA_TYPE_VIDEO)
@@ -2216 +2216 @@
 static pj_status_t cmd_enable_vid_tx(pj_cli_cmd_val *cval)
 {
-    pjsua_call_vid_strm_op_param param;    
+    pjsua_call_vid_strm_op_param param;
     pj_status_t status = PJ_SUCCESS;
-    pj_bool_t on = (pj_ansi_strnicmp(cval->argv[1].ptr, "On", 2) == 0);    
-    
+    pj_bool_t on = (pj_ansi_strnicmp(cval->argv[1].ptr, "On", 2) == 0);
+
     pjsua_call_vid_strm_op op = on? PJSUA_CALL_VID_STRM_START_TRANSMIT :
                                 PJSUA_CALL_VID_STRM_STOP_TRANSMIT;
 
     pjsua_call_vid_strm_op_param_default(&param);
-    
+
     param.med_idx = pj_strtol(&cval->argv[2]);
 
-    status = pjsua_call_set_vid_strm(current_call, op, &param);    
+    status = pjsua_call_set_vid_strm(current_call, op, &param);
     return status;
 }
 
-static pj_status_t cmd_enable_vid_stream(pj_cli_cmd_val *cval, 
+static pj_status_t cmd_enable_vid_stream(pj_cli_cmd_val *cval,
                                            pj_bool_t enable)
-{    
-    pjsua_call_vid_strm_op_param param;    
+{
+    pjsua_call_vid_strm_op_param param;
     pjsua_call_vid_strm_op op = enable? PJSUA_CALL_VID_STRM_CHANGE_DIR :
                                 PJSUA_CALL_VID_STRM_REMOVE;
@@ -2242 +2242 @@
     param.med_idx = cval->argc > 1 ? pj_strtol(&cval->argv[1]) : -1;
     param.dir = PJMEDIA_DIR_ENCODING_DECODING;
-    return pjsua_call_set_vid_strm(current_call, op, &param);    
+    return pjsua_call_set_vid_strm(current_call, op, &param);
 }
 
@@ -2251 +2251 @@
     pjsua_call_vid_strm_op_param_default(&param);
     param.med_idx = cval->argc > 1? pj_strtol(&cval->argv[1]) : -1;
-    param.cap_dev = cval->argc > 2? pj_strtol(&cval->argv[2]) : 
+    param.cap_dev = cval->argc > 2? pj_strtol(&cval->argv[2]) :
                                     PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
 
@@ -2272 +2272 @@
 
 static pj_status_t cmd_vid_device_preview(pj_cli_cmd_val *cval)
-{        
-    int dev_id = pj_strtol(&cval->argv[2]);    
-    pj_bool_t on = (pj_ansi_strnicmp(cval->argv[1].ptr, "On", 2) == 0);          
+{
+    int dev_id = pj_strtol(&cval->argv[2]);
+    pj_bool_t on = (pj_ansi_strnicmp(cval->argv[1].ptr, "On", 2) == 0);
 
     if (on) {
@@ -2293 +2293 @@
             pjsua_vid_preview_stop(dev_id);
         }
-    }    
+    }
     return PJ_SUCCESS;
 }
 
 static pj_status_t cmd_vid_codec_list()
-{    
+{
     pjsua_codec_info ci[PJMEDIA_CODEC_MGR_MAX_CODECS];
     unsigned count = PJ_ARRAY_SIZE(ci);
@@ -2319 +2319 @@
             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", 
+            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, "                ",
@@ -2332 +2332 @@
 
 static pj_status_t cmd_set_vid_codec_prio(pj_cli_cmd_val *cval)
-{    
+{
     int prio = pj_strtol(&cval->argv[2]);
     pj_status_t status;
-        
+
     status = pjsua_vid_codec_set_priority(&cval->argv[1], (pj_uint8_t)prio);
     if (status != PJ_SUCCESS)
@@ -2344 +2344 @@
 
 static pj_status_t cmd_set_vid_codec_fps(pj_cli_cmd_val *cval)
-{    
+{
     pjmedia_vid_codec_param cp;
-    int M, N;    
+    int M, N;
     pj_status_t status;
 
@@ -2364 +2364 @@
 
 static pj_status_t cmd_set_vid_codec_bitrate(pj_cli_cmd_val *cval)
-{    
-    pjmedia_vid_codec_param cp;    
+{
+    pjmedia_vid_codec_param cp;
     int M, N;
     pj_status_t status;
@@ -2385 +2385 @@
 static pj_status_t cmd_set_vid_codec_size(pj_cli_cmd_val *cval)
 {
-    pjmedia_vid_codec_param cp;    
+    pjmedia_vid_codec_param cp;
     int M, N;
     pj_status_t status;
@@ -2430 +2430 @@
 
 static pj_status_t cmd_show_vid_win(pj_cli_cmd_val *cval, pj_bool_t show)
-{            
+{
     pjsua_vid_win_id wid = pj_strtol(&cval->argv[1]);
     return pjsua_vid_win_set_show(wid, show);
@@ -2457 +2457 @@
 /* Video handler */
 static pj_status_t cmd_video_handler(pj_cli_cmd_val *cval)
-{    
+{
     pj_status_t status = PJ_SUCCESS;
-    pj_cli_cmd_id cmd_id = pj_cli_get_cmd_id(cval->cmd);    
+    pj_cli_cmd_id cmd_id = pj_cli_get_cmd_id(cval->cmd);
 
     CHECK_PJSUA_RUNNING();
@@ -2525 +2525 @@
         status = cmd_arrange_vid_win();
         break;
-    case CMD_VIDEO_WIN_SHOW:    
+    case CMD_VIDEO_WIN_SHOW:
     case CMD_VIDEO_WIN_HIDE:
         status = cmd_show_vid_win(cval, (cmd_id==CMD_VIDEO_WIN_SHOW));
@@ -2535 +2535 @@
         status = cmd_resize_vid_win(cval);
         break;
-    }    
+    }
 
     return status;
@@ -2543 +2543 @@
 /* Other command handler */
 static pj_status_t cmd_sleep_handler(pj_cli_cmd_val *cval)
-{    
+{
     int delay;
 
     delay = pj_strtoul(&cval->argv[1]);
     if (delay < 0) delay = 0;
-    pj_thread_sleep(delay);    
+    pj_thread_sleep(delay);
 
     return PJ_SUCCESS;
@@ -2559 +2559 @@
 
     CHECK_PJSUA_RUNNING();
-    
+
     status = pjsua_detect_nat_type();
     if (status != PJ_SUCCESS)
@@ -2578 +2578 @@
 }
 
-/* 
- * Syntax error handler for parser. 
+/*
+ * Syntax error handler for parser.
  */
 static void on_syntax_error(pj_scanner *scanner)
@@ -2587 +2587 @@
 }
 
-/* 
+/*
  * This method will parse buffer string info array of argument string
- * @argc On input, maximum array size of argument. On output, number of argument 
+ * @argc On input, maximum array size of argument. On output, number of argument
  * parsed
  * @argv Array of argument string
@@ -2598 +2598 @@
     pj_scanner scanner;
     unsigned max_argc = *argc;
-    
+
     PJ_USE_EXCEPTION;
 
@@ -2604 +2604 @@
         return PJ_SUCCESS;
 
-    pj_scan_init(&scanner, options->ptr, options->slen, PJ_SCAN_AUTOSKIP_WS, 
+    pj_scan_init(&scanner, options->ptr, options->slen, PJ_SCAN_AUTOSKIP_WS,
                  &on_syntax_error);
     PJ_TRY {
@@ -2610 +2610 @@
         while (!pj_scan_is_eof(&scanner) && (max_argc > *argc)) {
             pj_str_t str;
-            
+
             pj_scan_get_until_chr(&scanner, " \t\r\n", &str);
             argv[*argc] = str;
@@ -2617 +2617 @@
     }
     PJ_CATCH_ANY {
-        pj_scan_fini(&scanner); 
+        pj_scan_fini(&scanner);
         return PJ_GET_EXCEPTION();
     }
@@ -2636 +2636 @@
     pj_cli_quit(cval->sess->fe->cli, cval->sess, PJ_TRUE);
 
-    /** Get the pjsua option **/       
+    /** Get the pjsua option **/
     for (i=1; i < cval->argc; i++) {
         pj_str_t argvst[MAX_ARGC];
@@ -2659 +2659 @@
 
 static pj_status_t add_call_command(pj_cli_t *cli)
-{  
-    char* call_command = 
+{
+    char* call_command =
         "<CMD name='call' id='100' desc='Call related commands'>"
         "  <CMD name='new' id='1001' desc='Make a new call/INVITE'>"
@@ -2699 +2699 @@
         "  <CMD name='transfer_replaces' id='1012' sc='X' "
         "   desc='Transfer replace call'>"
-        "    <ARG name='call_id' type='choice' id='9911' desc='Call Id'/>"      
+        "    <ARG name='call_id' type='choice' id='9911' desc='Call Id'/>"
         "  </CMD>"
         "  <CMD name='redirect' id='1013' sc='R' desc='Redirect call'>"
@@ -2730 +2730 @@
 
     pj_str_t xml = pj_str(call_command);
-    return pj_cli_add_cmd_from_xml(cli, NULL, 
+    return pj_cli_add_cmd_from_xml(cli, NULL,
                                    &xml, cmd_call_handler,
                                    NULL, get_choice_value);
@@ -2786 +2786 @@
     pj_str_t xml = pj_str(presence_command);
 
-    return pj_cli_add_cmd_from_xml(cli, NULL, 
-                                   &xml, cmd_presence_handler, 
+    return pj_cli_add_cmd_from_xml(cli, NULL,
+                                   &xml, cmd_presence_handler,
                                    NULL, get_choice_value);
 }
@@ -2793 +2793 @@
 static pj_status_t add_account_command(pj_cli_t *cli)
 {
-    char* account_command = 
+    char* account_command =
         "<CMD name='acc' id='300' desc='Account commands'>"
         "  <CMD name='add' id='3001' sc='+a' desc='Add new account'>"
@@ -2831 +2831 @@
 
     pj_str_t xml = pj_str(account_command);
-    return pj_cli_add_cmd_from_xml(cli, NULL, 
-                                   &xml, cmd_account_handler, 
+    return pj_cli_add_cmd_from_xml(cli, NULL,
+                                   &xml, cmd_account_handler,
                                    NULL, get_choice_value);
 }
@@ -2838 +2838 @@
 static pj_status_t add_media_command(pj_cli_t *cli)
 {
-    char* media_command = 
+    char* media_command =
         "<CMD name='audio' id='400' desc='Conference and Media commands'>"
         "  <CMD name='list' id='4001' sc='cl' desc='Show conference list'/>"
@@ -2866 +2866 @@
 
     pj_str_t xml = pj_str(media_command);
-    return pj_cli_add_cmd_from_xml(cli, NULL, 
-                                   &xml, cmd_media_handler, 
+    return pj_cli_add_cmd_from_xml(cli, NULL,
+                                   &xml, cmd_media_handler,
                                    NULL, get_choice_value);
 }
@@ -2873 +2873 @@
 static pj_status_t add_config_command(pj_cli_t *cli)
 {
-    char* config_command = 
+    char* config_command =
         "<CMD name='stat' id='500' desc='Status and config commands'>"
         "  <CMD name='dump_stat' id='5001' sc='ds' desc='Dump status'/>"
@@ -2887 +2887 @@
 
     pj_str_t xml = pj_str(config_command);
-    return pj_cli_add_cmd_from_xml(cli, NULL, 
+    return pj_cli_add_cmd_from_xml(cli, NULL,
                                    &xml, cmd_config_handler,
                                    NULL, get_choice_value);
 }
 
-#if PJSUA_HAS_VIDEO    
+#if PJSUA_HAS_VIDEO
 static pj_status_t add_video_command(pj_cli_t *cli)
 {
@@ -3032 +3032 @@
 
     pj_str_t xml = pj_str(video_command);
-    return pj_cli_add_cmd_from_xml(cli, NULL, 
-                                   &xml, cmd_video_handler, 
+    return pj_cli_add_cmd_from_xml(cli, NULL,
+                                   &xml, cmd_video_handler,
                                    NULL, get_choice_value);
 }
@@ -3060 +3060 @@
 
     pj_status_t status;
-    pj_str_t sleep_xml = pj_str(sleep_command);    
+    pj_str_t sleep_xml = pj_str(sleep_command);
     pj_str_t network_xml = pj_str(network_command);
     pj_str_t shutdown_xml = pj_str(shutdown_command);
     pj_str_t restart_xml = pj_str(restart_command);
 
-    status = pj_cli_add_cmd_from_xml(cli, NULL, 
-                                     &sleep_xml, cmd_sleep_handler, 
+    status = pj_cli_add_cmd_from_xml(cli, NULL,
+                                     &sleep_xml, cmd_sleep_handler,
                                      NULL, NULL);
     if (status != PJ_SUCCESS)
         return status;
 
-    status = pj_cli_add_cmd_from_xml(cli, NULL, 
-                                     &network_xml, cmd_network_handler, 
+    status = pj_cli_add_cmd_from_xml(cli, NULL,
+                                     &network_xml, cmd_network_handler,
                                      NULL, NULL);
     if (status != PJ_SUCCESS)
         return status;
 
-    status = pj_cli_add_cmd_from_xml(cli, NULL, 
-                                     &shutdown_xml, cmd_quit_handler, 
+    status = pj_cli_add_cmd_from_xml(cli, NULL,
+                                     &shutdown_xml, cmd_quit_handler,
                                      NULL, NULL);
 
@@ -3084 +3084 @@
         return status;
 
-    status = pj_cli_add_cmd_from_xml(cli, NULL, 
-                                     &restart_xml, cmd_restart_handler, 
+    status = pj_cli_add_cmd_from_xml(cli, NULL,
+                                     &restart_xml, cmd_restart_handler,
                                      NULL, NULL);
 
@@ -3115 +3115 @@
         return status;
 
-#if PJSUA_HAS_VIDEO    
+#if PJSUA_HAS_VIDEO
     status = add_video_command(cli);
     if (status != PJ_SUCCESS)