From 5727ebe6890bc263b90b3a77435b7aa7ae0ca411 Mon Sep 17 00:00:00 2001 From: Roland Knall Date: Tue, 28 Apr 2015 10:26:46 +0200 Subject: extcap: Implement QT extcap options Implementing a button in the interface list, to bring up the extcap options dialog, as well as a dialog, which will be generated depending on the selected extcap options. Change-Id: I1733dc6a8c1a121089a9c353aff10bc4a53e86de Reviewed-on: https://code.wireshark.org/review/8224 Petri-Dish: Michal Labedzki Reviewed-by: Roland Knall Reviewed-by: Pascal Quantin --- extcap_parser.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'extcap_parser.h') diff --git a/extcap_parser.h b/extcap_parser.h index feb7f11c2b..9e1e51b388 100644 --- a/extcap_parser.h +++ b/extcap_parser.h @@ -46,7 +46,6 @@ typedef enum { EXTCAP_ARG_BOOLFLAG, EXTCAP_ARG_STRING, /* Complex GUI types which are populated with value sentences */ - EXTCAP_ARG_MENU, EXTCAP_ARG_SELECTOR, EXTCAP_ARG_RADIO, EXTCAP_ARG_MULTICHECK, @@ -128,9 +127,6 @@ typedef struct _extcap_interface { struct _extcap_interface *next_interface; } extcap_interface; -extcap_interface *extcap_new_interface(void); -void extcap_free_interface(extcap_interface *interface); - typedef struct _extcap_dlt { gint number; gchar *name; @@ -139,9 +135,6 @@ typedef struct _extcap_dlt { struct _extcap_dlt *next_dlt; } extcap_dlt; -extcap_dlt *extcap_new_dlt(void); -void extcap_free_dlt(extcap_dlt *dlt); - /* Parser internals */ typedef struct _extcap_token_param { gchar *arg; @@ -160,6 +153,16 @@ typedef struct _extcap_token_sentence { struct _extcap_token_sentence *next_sentence; } extcap_token_sentence; +#ifdef __cplusplus +extern "C" { +#endif + +extcap_interface *extcap_new_interface(void); +void extcap_free_interface(extcap_interface *interface); + +extcap_dlt *extcap_new_dlt(void); +void extcap_free_dlt(extcap_dlt *dlt); + /* Parse a string into a complex type */ extcap_complex *extcap_parse_complex(extcap_arg_type complex_type, const gchar *data); @@ -239,6 +242,10 @@ int extcap_parse_dlt_sentence(extcap_token_sentence *s, extcap_dlt **ri); /* Parse all sentences for DLTs */ int extcap_parse_dlts(extcap_token_sentence *first_s, extcap_dlt **first_dlt); +#ifdef __cplusplus +} +#endif + #endif /* -- cgit v1.2.1