From 03c6937e62b9b35960b65d573399d64b7a8fd147 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 30 Oct 2016 14:07:33 -0700 Subject: Have routines for parsing options that affect dissection. Have them handle -d, -t, --disable-protocol, --disable-heuristic, and --enable-heuristic for TShark and both flavors of Wireshark. Change-Id: I612c276b1f9df8a2092202d23ab3d48be7857e85 Reviewed-on: https://code.wireshark.org/review/18583 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- capture_opts.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'capture_opts.h') diff --git a/capture_opts.h b/capture_opts.h index 944a5c1d3c..9a85526f45 100644 --- a/capture_opts.h +++ b/capture_opts.h @@ -50,8 +50,8 @@ extern "C" { * component of the entry for the long option, and have a case for that * option in the switch statement. * - * We also pick values <= 65535, so as to leave values > 65535 for - * options specific to a program. + * We also pick values < 4096, so as to leave values >= 4096 for + * other long options. * * NOTE: * for tshark, we're using a leading - in the optstring to prevent getopt() @@ -62,15 +62,6 @@ extern "C" { */ #define LONGOPT_NUM_CAP_COMMENT 128 -/* - * Non-capture long-only options should start here, to avoid collision - * with capture options. - */ -#define MIN_NON_CAPTURE_LONGOPT 129 -#define LONGOPT_DISABLE_PROTOCOL 130 -#define LONGOPT_ENABLE_HEURISTIC 131 -#define LONGOPT_DISABLE_HEURISTIC 132 - /* * Options for capturing common to all capturing programs. */ @@ -109,9 +100,6 @@ extern "C" { {"no-promiscuous-mode", no_argument, NULL, 'p'}, \ {"snapshot-length", required_argument, NULL, 's'}, \ {"linktype", required_argument, NULL, 'y'}, \ - {"disable-protocol", required_argument, NULL, LONGOPT_DISABLE_PROTOCOL }, \ - {"enable-heuristic", required_argument, NULL, LONGOPT_ENABLE_HEURISTIC }, \ - {"disable-heuristic", required_argument, NULL, LONGOPT_DISABLE_HEURISTIC }, \ #define OPTSTRING_CAPTURE_COMMON \ "a:" OPTSTRING_A "b:" OPTSTRING_B "c:Df:i:" OPTSTRING_I "Lps:y:" -- cgit v1.2.1