1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tshark: Fix compilation without libpcap.

Browse Source 
Change-Id: Ie238089cc23d1fefb976060b7d4f424da039712d
Reviewed-on: https://code.wireshark.org/review/36394
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Gerald Combs 2020-03-13 10:24:42 -07:00 committed by Guy Harris
parent 012695d944
commit f9af3ec4d5
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tshark.c
View File

@ -715,6 +715,7 @@ main(int argc, char *argv[])
gboolean start_capture = FALSE; gboolean start_capture = FALSE;
GList *if_list; GList *if_list;
gchar *err_str; gchar *err_str;
struct bpf_program fcode;
#else #else
gboolean capture_option_specified = FALSE; gboolean capture_option_specified = FALSE;
volatile int max_packet_count = 0; volatile int max_packet_count = 0;
@ -730,7 +731,6 @@ main(int argc, char *argv[])
gchar *volatile cf_name = NULL; gchar *volatile cf_name = NULL;
gchar *rfilter = NULL; gchar *rfilter = NULL;
gchar *dfilter = NULL; gchar *dfilter = NULL;
struct bpf_program fcode;
dfilter_t *rfcode = NULL; dfilter_t *rfcode = NULL;
dfilter_t *dfcode = NULL; dfilter_t *dfcode = NULL;
e_prefs *prefs_p; e_prefs *prefs_p;
@ -1878,12 +1878,13 @@ main(int argc, char *argv[])
if (rfilter != NULL) { if (rfilter != NULL) {
tshark_debug("Compiling read filter: '%s'", rfilter); tshark_debug("Compiling read filter: '%s'", rfilter);
if (!dfilter_compile(rfilter, &rfcode, &err_msg)) { if (!dfilter_compile(rfilter, &rfcode, &err_msg)) {
pcap_t *pc;
cmdarg_err("%s", err_msg); cmdarg_err("%s", err_msg);
g_free(err_msg); g_free(err_msg);
epan_cleanup(); epan_cleanup();
extcap_cleanup(); extcap_cleanup();
#ifdef HAVE_LIBPCAP
pcap_t *pc;
pc = pcap_open_dead(DLT_EN10MB, MIN_PACKET_SIZE); pc = pcap_open_dead(DLT_EN10MB, MIN_PACKET_SIZE);
if (pc != NULL) { if (pc != NULL) {
if (pcap_compile(pc, &fcode, rfilter, 0, 0) != -1) { if (pcap_compile(pc, &fcode, rfilter, 0, 0) != -1) {
@ -1893,6 +1894,8 @@ main(int argc, char *argv[])
} }
pcap_close(pc); pcap_close(pc);
} }
#endif
exit_status = INVALID_INTERFACE; exit_status = INVALID_INTERFACE;
goto clean_exit; goto clean_exit;
} }
@ -1902,12 +1905,13 @@ main(int argc, char *argv[])
if (dfilter != NULL) { if (dfilter != NULL) {
tshark_debug("Compiling display filter: '%s'", dfilter); tshark_debug("Compiling display filter: '%s'", dfilter);
if (!dfilter_compile(dfilter, &dfcode, &err_msg)) { if (!dfilter_compile(dfilter, &dfcode, &err_msg)) {
pcap_t *pc;
cmdarg_err("%s", err_msg); cmdarg_err("%s", err_msg);
g_free(err_msg); g_free(err_msg);
epan_cleanup(); epan_cleanup();
extcap_cleanup(); extcap_cleanup();
#ifdef HAVE_LIBPCAP
pcap_t *pc;
pc = pcap_open_dead(DLT_EN10MB, MIN_PACKET_SIZE); pc = pcap_open_dead(DLT_EN10MB, MIN_PACKET_SIZE);
if (pc != NULL) { if (pc != NULL) {
if (pcap_compile(pc, &fcode, dfilter, 0, 0) != -1) { if (pcap_compile(pc, &fcode, dfilter, 0, 0) != -1) {
@ -1917,6 +1921,8 @@ main(int argc, char *argv[])
} }
pcap_close(pc); pcap_close(pc);
} }
#endif
exit_status = INVALID_FILTER; exit_status = INVALID_FILTER;
goto clean_exit; goto clean_exit;
} }