diff options
| author | Roland Knall <roland.knall@br-automation.com> | 2016-02-23 11:12:17 +0100 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2016-02-29 12:32:03 +0000 |
| commit | a4e2263ac4c15c9bfb78444b0b0747cae8022a9c (patch) | |
| tree | 4c23b02d465011888441692b92e45de5b03a3357 /extcap/extcap-base.h | |
| parent | 0e5a73fa4e8804c07cf56d6b0e47232ba536621c (diff) | |
| download | wireshark-a4e2263ac4c15c9bfb78444b0b0747cae8022a9c.tar.gz | |
extcap: Move extcap handling to base
Also add the extcap-version parameter to enable parsing of
version and helppage separately
Change-Id: I35ba5aa992940ffbb0cd9ebea8b7c3a1e8629d74
Reviewed-on: https://code.wireshark.org/review/14094
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'extcap/extcap-base.h')
| -rw-r--r-- | extcap/extcap-base.h | 65 |
1 files changed, 47 insertions, 18 deletions
diff --git a/extcap/extcap-base.h b/extcap/extcap-base.h index 07617b15df..3e2f847b84 100644 --- a/extcap/extcap-base.h +++ b/extcap/extcap-base.h @@ -27,6 +27,7 @@ #include <glib.h> #include <glib/gprintf.h> #include <stdlib.h> +#include <stdint.h> #ifdef HAVE_GETOPT_H #include <getopt.h> @@ -65,31 +66,59 @@ #endif #define EXTCAP_BASE_OPTIONS_ENUM \ - OPT_LIST_INTERFACES, \ - OPT_LIST_DLTS, \ - OPT_INTERFACE, \ - OPT_CONFIG, \ - OPT_CAPTURE, \ - OPT_CAPTURE_FILTER, \ - OPT_FIFO \ + EXTCAP_OPT_LIST_INTERFACES, \ + EXTCAP_OPT_VERSION, \ + EXTCAP_OPT_LIST_DLTS, \ + EXTCAP_OPT_INTERFACE, \ + EXTCAP_OPT_CONFIG, \ + EXTCAP_OPT_CAPTURE, \ + EXTCAP_OPT_CAPTURE_FILTER, \ + EXTCAP_OPT_FIFO \ #define EXTCAP_BASE_OPTIONS \ - { "extcap-interfaces", no_argument, NULL, OPT_LIST_INTERFACES}, \ - { "extcap-dlts", no_argument, NULL, OPT_LIST_DLTS}, \ - { "extcap-interface", required_argument, NULL, OPT_INTERFACE}, \ - { "extcap-config", no_argument, NULL, OPT_CONFIG}, \ - { "capture", no_argument, NULL, OPT_CAPTURE}, \ - { "extcap-capture-filter", required_argument, NULL, OPT_CAPTURE_FILTER}, \ - { "fifo", required_argument, NULL, OPT_FIFO} \ - -#ifdef _WIN32 -BOOLEAN IsHandleRedirected(DWORD handle); -void attach_parent_console(); + { "extcap-interfaces", no_argument, NULL, EXTCAP_OPT_LIST_INTERFACES}, \ + { "extcap-version", optional_argument, NULL, EXTCAP_OPT_VERSION}, \ + { "extcap-dlts", no_argument, NULL, EXTCAP_OPT_LIST_DLTS}, \ + { "extcap-interface", required_argument, NULL, EXTCAP_OPT_INTERFACE}, \ + { "extcap-config", no_argument, NULL, EXTCAP_OPT_CONFIG}, \ + { "capture", no_argument, NULL, EXTCAP_OPT_CAPTURE}, \ + { "extcap-capture-filter", required_argument, NULL, EXTCAP_OPT_CAPTURE_FILTER}, \ + { "fifo", required_argument, NULL, EXTCAP_OPT_FIFO} \ + +#if defined(_WIN32) + BOOLEAN IsHandleRedirected(DWORD handle); + void attach_parent_console(); #endif #define errmsg_print(...) { fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); } +typedef struct _extcap_parameters +{ + char * fifo; + char * interface; + char * capture_filter; + + char * version; + char * helppage; + uint8_t capture; + uint8_t show_config; + + /* private content */ + GList * interfaces; + uint8_t do_version; + uint8_t do_list_dlts; + uint8_t do_list_interfaces; + +} extcap_parameters; + +void extcap_base_register_interface(extcap_parameters * extcap, const char * interface, const char * ifdescription, uint16_t dlt, const char * dltdescription ); +void extcap_base_register_interface_ext(extcap_parameters * extcap, const char * interface, const char * ifdescription, uint16_t dlt, const char * dltname, const char * dltdescription ); +void extcap_base_set_util_info(extcap_parameters * extcap, const char * major, const char * minor, const char * release, const char * helppage); +uint8_t extcap_base_parse_options(extcap_parameters * extcap, int result, char * optargument); +uint8_t extcap_base_handle_interface(extcap_parameters * extcap); +void extcap_base_cleanup(extcap_parameters ** extcap); + #endif /* |