diff options
| author | Riza Sulistyo <riza@teluu.com> | 2013-05-03 08:47:14 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2013-05-03 08:47:14 +0000 |
| commit | 024789d21681848c4eff7a72e824f0b7b0791759 (patch) | |
| tree | bd32265ff1eb26b47133d096dcf646df0697c7ec /pjsip-apps | |
| parent | 5cc521af437a46dfeea6a5f76b33e46fbff6c732 (diff) | |
Re #1643: - Modification to shortcut handling(execution&display).
- Add exact match check to the parse input command process.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4513 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app_cli.c | 10 | ||||
| -rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app_config.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pjsip-apps/src/pjsua/pjsua_app_cli.c b/pjsip-apps/src/pjsua/pjsua_app_cli.c index f46be780..1288ec81 100644 --- a/pjsip-apps/src/pjsua/pjsua_app_cli.c +++ b/pjsip-apps/src/pjsua/pjsua_app_cli.c @@ -245,7 +245,7 @@ pj_status_t cli_main(pj_bool_t wait_telnet_cli) if (app_config.cli_cfg.cli_fe & CLI_FE_CONSOLE) { /* Main loop for CLI FE console */ while (!pj_cli_is_quitting(cli)) { - pj_cli_console_process(cli_cons_sess, &cmdline[0], sizeof(cmdline)); + pj_cli_console_process(cli_cons_sess, cmdline, sizeof(cmdline)); } } else if (wait_telnet_cli) { /* Just wait for CLI quit */ @@ -2631,7 +2631,7 @@ static pj_status_t add_call_command(pj_cli_t *cli) { char* call_command = "<CMD name='call' id='100' desc='Call related commands'>" - " <CMD name='new' id='1001' desc='Show Help'>" + " <CMD name='new' id='1001' desc='Make a new call/INVITE'>" " <ARG name='buddy_id' type='choice' id='9901' validate='0' " " desc='Buddy Id'>" " <CHOICE value='-1' desc='All buddies'/>" @@ -2657,8 +2657,8 @@ static pj_status_t add_call_command(pj_cli_t *cli) " <CMD name='reinvite' id='1007' sc='v' " " desc='Re-invite (release hold)'/>" " <CMD name='update' id='1008' sc='U' desc='Send Update request'/>" - " <CMD name='next' id='1009' sc='>' desc='Select next call'/>" - " <CMD name='previous' id='1010' sc='<' desc='Select previous call'/>" + " <CMD name='next' id='1009' sc=']' desc='Select next call'/>" + " <CMD name='previous' id='1010' sc='[' desc='Select previous call'/>" " <CMD name='transfer' id='1011' sc='x' desc='Transfer call'>" " <ARG name='buddy_id' type='choice' id='9901' validate='0' " " desc='Buddy Id'>" @@ -2750,7 +2750,7 @@ static pj_status_t add_presence_command(pj_cli_t *cli) " <CHOICE value='7' desc='Offline'/>" " </ARG>" " </CMD>" - " <CMD name='bud_list' id='2008' sc='l' desc='Show buddy list'/>" + " <CMD name='bud_list' id='2008' sc='bl' desc='Show buddy list'/>" "</CMD>"; pj_str_t xml = pj_str(presence_command); diff --git a/pjsip-apps/src/pjsua/pjsua_app_config.c b/pjsip-apps/src/pjsua/pjsua_app_config.c index 0cf8512c..cdcc3cf4 100644 --- a/pjsip-apps/src/pjsua/pjsua_app_config.c +++ b/pjsip-apps/src/pjsua/pjsua_app_config.c @@ -523,7 +523,7 @@ static pj_status_t parse_args(int argc, char *argv[], } cfg->acc_cnt = 0; - cur_acc = &cfg->acc_cfg[0]; + cur_acc = cfg->acc_cfg; /* Reinitialize and re-run pj_getopt again, possibly with new arguments |