From 75ff25f2858709ba75aa22046e43ec7e6c3cd9aa Mon Sep 17 00:00:00 2001 From: Roland Knall Date: Tue, 12 Jan 2016 13:45:20 +0100 Subject: extcap: Add list of extcaps to about dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds the list of available extcaps to the plugin list in the About dialog of Wireshark (Qt only). To do this, and additional sentence is provided in the extcap arguments list, which allows for additional information to be passed (as of right now, just version and display is used) Additionally, cleans up the code when using g_free. Bug: 11683 Change-Id: I04a958e2b73c9a707ab1cb4f2fc8345833a854a9 Reviewed-on: https://code.wireshark.org/review/13224 Petri-Dish: Roland Knall Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke Reviewed-by: Roland Knall --- extcap_parser.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'extcap_parser.h') diff --git a/extcap_parser.h b/extcap_parser.h index 158838c16f..d10c5cd8cc 100644 --- a/extcap_parser.h +++ b/extcap_parser.h @@ -30,7 +30,7 @@ typedef enum { EXTCAP_SENTENCE_UNKNOWN, EXTCAP_SENTENCE_ARG, EXTCAP_SENTENCE_VALUE, - EXTCAP_SENTENCE_FLAG, + EXTCAP_SENTENCE_EXTCAP, EXTCAP_SENTENCE_INTERFACE, EXTCAP_SENTENCE_DLT } extcap_sentence_type; @@ -70,7 +70,8 @@ typedef enum { EXTCAP_PARAM_FILE_EXTENSION, EXTCAP_PARAM_PARENT, EXTCAP_PARAM_REQUIRED, - EXTCAP_PARAM_VALIDATION + EXTCAP_PARAM_VALIDATION, + EXTCAP_PARAM_VERSION } extcap_param_type; /* Values for a given sentence; values are all stored as a call @@ -132,7 +133,9 @@ typedef struct _extcap_if { typedef struct _extcap_interface { gchar *call; gchar *display; + gchar *version; + extcap_sentence_type if_type; struct _extcap_interface *next_interface; } extcap_interface; -- cgit v1.2.3