From 167874a62bb8375eb07637d28e98ea45e497075f Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Mon, 16 Nov 2015 12:23:17 +0100 Subject: Extcap: allow Wireshark to list extcap interfaces even when WinPcap / Npcap is not installed Bug: 11715 Change-Id: I4a043c4a298506d51cb6bf8b97aac787113a7dfa Reviewed-on: https://code.wireshark.org/review/11869 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Reviewed-by: Guenter Ebermann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- caputils/capture-wpcap.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'caputils') diff --git a/caputils/capture-wpcap.c b/caputils/capture-wpcap.c index 3342276569..87262dcfa9 100644 --- a/caputils/capture-wpcap.c +++ b/caputils/capture-wpcap.c @@ -553,9 +553,7 @@ pcap_datalink_name_to_val(const char *name) { int i; - g_assert(has_wpcap); - - if (p_pcap_datalink_name_to_val != NULL) + if (has_wpcap && (p_pcap_datalink_name_to_val != NULL)) return p_pcap_datalink_name_to_val(name); else { /* @@ -605,9 +603,7 @@ pcap_datalink_val_to_name(int dlt) { int i; - g_assert(has_wpcap); - - if (p_pcap_datalink_val_to_name != NULL) + if (has_wpcap && (p_pcap_datalink_val_to_name != NULL)) return p_pcap_datalink_val_to_name(dlt); else { /* @@ -628,9 +624,7 @@ pcap_datalink_val_to_description(int dlt) { int i; - g_assert(has_wpcap); - - if (p_pcap_datalink_val_to_description != NULL) + if (has_wpcap && (p_pcap_datalink_val_to_description != NULL)) return p_pcap_datalink_val_to_description(dlt); else { /* -- cgit v1.2.3