summaryrefslogtreecommitdiffstats
path: root/src/vlib
diff options
context:
space:
mode:
authorIvan Shvedunov <ivan4th@gmail.com>2021-02-01 14:11:10 +0300
committerAndrew Yourtchenko <ayourtch@gmail.com>2021-02-08 12:32:04 +0000
commit7f23ecd151be06ac6f234224628ea305c5e0b41c (patch)
tree7e1c77c1bef2d3fa7f98cafccb3bf86a9b8b161a /src/vlib
parenta91cb45909642978592c7e21a8f6d2da2e44e506 (diff)
ping: fix aborting on keypress
Type: fix Currently ping stops on events like SOCKET_READ_EVENT, which makes it hard to use over e.g. govpp as it aborts immediately most of the time. With this patch, ping only stops upon real CLI read / quit events. Signed-off-by: Ivan Shvedunov <ivan4th@gmail.com> Change-Id: Id7a8d0b0fdeb7bbc7b85240e398d27bd5199345b
Diffstat (limited to 'src/vlib')
-rw-r--r--src/vlib/unix/cli.c7
-rw-r--r--src/vlib/unix/unix.h8
2 files changed, 8 insertions, 7 deletions
diff --git a/src/vlib/unix/cli.c b/src/vlib/unix/cli.c
index 8120befef71..96e22a25313 100644
--- a/src/vlib/unix/cli.c
+++ b/src/vlib/unix/cli.c
@@ -449,13 +449,6 @@ static unix_cli_parse_actions_t unix_cli_parse_pager[] = {
#undef _
-/** CLI session events. */
-typedef enum
-{
- UNIX_CLI_PROCESS_EVENT_READ_READY, /**< A file descriptor has data to be read. */
- UNIX_CLI_PROCESS_EVENT_QUIT, /**< A CLI session wants to close. */
-} unix_cli_process_event_type_t;
-
/** CLI session telnet negotiation timer events. */
typedef enum
{
diff --git a/src/vlib/unix/unix.h b/src/vlib/unix/unix.h
index 44dcf712e8d..4b5f98a2e66 100644
--- a/src/vlib/unix/unix.h
+++ b/src/vlib/unix/unix.h
@@ -111,6 +111,14 @@ typedef struct
} unix_main_t;
+/** CLI session events. */
+typedef enum
+{
+ UNIX_CLI_PROCESS_EVENT_READ_READY, /**< A file descriptor has data to be
+ read. */
+ UNIX_CLI_PROCESS_EVENT_QUIT, /**< A CLI session wants to close. */
+} unix_cli_process_event_type_t;
+
/* Global main structure. */
extern unix_main_t unix_main;
extern clib_file_main_t file_main;