diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-07-21 21:40:02 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-07-21 21:40:02 +0100 |
| commit | 228e06bad624a33090da4a09f32f8fed84a7e15c (patch) | |
| tree | 507a6f0a491d8e5322645cc3ee825711a2dbd20d /lib | |
| parent | aee26f69df6bd90c9fe8e9eb8f8ce405ed12ffe5 (diff) | |
| download | quagga-228e06bad624a33090da4a09f32f8fed84a7e15c.tar.bz2 quagga-228e06bad624a33090da4a09f32f8fed84a7e15c.tar.xz | |
Disable the "~" VTY Terminal prompt.
Commands sent to the Routing Engine are now sent as priority
messages, so should no longer be a need for the "~" prompt
which kept the CLI "live" while a command was waiting for the
Routing Engine to pay attention.
Also: reinstated test-vector.c tests for vector_move_item_here(),
which seem somehow to have got lost.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/vty_cli.c | 12 | ||||
| -rw-r--r-- | lib/vty_cli.h | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/vty_cli.c b/lib/vty_cli.c index 83f156ef..a6a276e8 100644 --- a/lib/vty_cli.c +++ b/lib/vty_cli.c @@ -179,7 +179,9 @@ uty_cli_new(vio_vf vf) { cli->pause_timer = qtimer_init_new(NULL, vty_cli_nexus->pile, vty_term_pause_timeout, cli) ; - cli->tilde_enabled = vty_multi_nexus && false ; +#if 0 + cli->tilde_enabled = vty_multi_nexus ; +#endif } ; /* Ready to be started -- paused, out_active & more_wait are false. @@ -259,7 +261,9 @@ uty_cli_close(vty_cli cli, bool final) /* Discard any pause_timer, and suppress */ cli->pause_timer = qtimer_free(cli->pause_timer) ; cli->paused = false ; +#if 0 cli->tilde_enabled = false ; +#endif /* If final, free the CLI object. */ if (final) @@ -813,7 +817,11 @@ uty_cli_dispatch(vty_cli cli) uty_cmd_signal(vio, CMD_SUCCESS) ; - cli->blocked = (to_do_now != cmd_do_command) || !cli->tilde_enabled ; + cli->blocked = (to_do_now != cmd_do_command) +#if 0 + || !cli->tilde_enabled +#endif + ; } else { diff --git a/lib/vty_cli.h b/lib/vty_cli.h index e366ecdf..ec00965a 100644 --- a/lib/vty_cli.h +++ b/lib/vty_cli.h @@ -95,7 +95,9 @@ struct vty_cli bool drawn ; bool tilde_prompt ; +#if 0 bool tilde_enabled ; +#endif int prompt_len ; int extra_len ; |