#include "netdissect.h"
#include "interface.h"
#include "addrtoname.h"
-#include "pcap-missing.h"
#include "ascii_strcasecmp.h"
#include "print.h"
#endif
static int Bflag; /* buffer size */
-#ifdef HAVE_PCAP_DUMP_FTELL64
static int64_t Cflag; /* rotate dump files after this many bytes */
-#else
-static long Cflag; /* rotate dump files after this many bytes */
-#endif
static int Cflag_count; /* Keep track of which file number we're writing */
static int Dflag; /* list available devices and exit */
#ifdef HAVE_PCAP_FINDALLDEVS_EX
static int immediate_mode;
#endif
static int count_mode;
-static u_int packets_skipped;
+static u_int packets_to_skip;
static int infodelay;
static int infoprint;
char *program_name;
/* Forwards */
+static int parse_int(const char *argname, const char *string, char **endp,
+ int minval, int maxval, int base);
+static u_int parse_u_int(const char *argname, const char *string, char **endp,
+ u_int minval, u_int maxval, int base);
+static int64_t parse_int64(const char *argname, const char *string,
+ char **endp, int64_t minval, int64_t maxval, int base);
static void (*setsignal (int sig, void (*func)(int)))(int);
static void cleanup(int);
static void child_cleanup(int);
} else if (status == PCAP_ERROR_PERM_DENIED && *cp != '\0')
error("%s: %s\n(%s)", device,
pcap_statustostr(status), cp);
+#ifdef PCAP_ERROR_CAPTURE_NOTSUP
+ else if (status == PCAP_ERROR_CAPTURE_NOTSUP && *cp != '\0')
+ error("%s: %s\n(%s)", device,
+ pcap_statustostr(status), cp);
+#endif
#ifdef __FreeBSD__
else if (status == PCAP_ERROR_RFMON_NOTSUP &&
strncmp(device, "wlan", 4) == 0) {
const char *chroot_dir = NULL;
#endif
char *ret = NULL;
- char *end;
pcap_if_t *devlist;
long devnum;
int status;
break;
case 'B':
- Bflag = atoi(optarg)*1024;
- if (Bflag <= 0)
- error("invalid packet buffer size %s", optarg);
+ Bflag = parse_int("packet buffer size", optarg, NULL, 1,
+ INT_MAX, 10);
+ /*
+ * Will multiplying it by 1024 overflow?
+ */
+ if (Bflag > INT_MAX / 1024)
+ error("packet buffer size %s is too large", optarg);
+ Bflag *= 1024;
break;
case 'c':
- cnt = atoi(optarg);
- if (cnt <= 0)
- error("invalid packet count %s", optarg);
+ cnt = parse_int("packet count", optarg, NULL, 1,
+ INT_MAX, 10);
break;
case 'C':
- errno = 0;
-#ifdef HAVE_PCAP_DUMP_FTELL64
- Cflag = strtoint64_t(optarg, &endp, 10);
-#else
- Cflag = strtol(optarg, &endp, 10);
-#endif
- if (endp == optarg || errno != 0 || Cflag <= 0)
- error("invalid file size %s", optarg);
+ Cflag = parse_int64("file size", optarg, &endp, 1,
+ INT64_MAX, 10);
if (*endp == '\0') {
/*
break;
default:
- error("invalid file size %s", optarg);
+ error("invalid file size %s (invalid units)", optarg);
}
/*
endp++;
if (*endp != '\0') {
/* Yes - error */
- error("invalid file size %s", optarg);
+ error("invalid file size %s (invalid units)", optarg);
}
}
break;
case 'G':
- Gflag = atoi(optarg);
- if (Gflag < 0)
- error("invalid number of seconds %s", optarg);
+ Gflag = parse_int("number of seconds", optarg, NULL, 0,
+ INT_MAX, 10);
/* We will create one file initially. */
Gflag_count = 0;
break;
case 's':
- ndo->ndo_snaplen = (int)strtol(optarg, &end, 0);
- if (optarg == end || *end != '\0'
- || ndo->ndo_snaplen < 0 || ndo->ndo_snaplen > MAXIMUM_SNAPLEN)
- error("invalid snaplen %s (must be >= 0 and <= %d)",
- optarg, MAXIMUM_SNAPLEN);
+ ndo->ndo_snaplen = parse_int("snaplen", optarg, NULL,
+ 0, MAXIMUM_SNAPLEN, 0);
break;
case 'S':
break;
case 'W':
- Wflag = atoi(optarg);
- if (Wflag <= 0)
- error("invalid number of output files %s", optarg);
+ Wflag = parse_int("number of output files", optarg,
+ NULL, 1, INT_MAX, 10);
WflagChars = getWflagChars(Wflag);
break;
case OPTION_PRINT_SAMPLING:
print = 1;
++ndo->ndo_Sflag;
- ndo->ndo_print_sampling = atoi(optarg);
- if (ndo->ndo_print_sampling <= 0)
- error("invalid print sampling %s", optarg);
+ ndo->ndo_print_sampling = parse_int("print sampling",
+ optarg, NULL, 1, INT_MAX, 10);
break;
case OPTION_SKIP:
- errno = 0;
- packets_skipped = (u_int)strtoul(optarg, &end, 0);
- if (optarg[0] == '-' || optarg == end || *end != '\0' ||
- errno != 0)
- error("invalid packet skipped %s", optarg);
+ packets_to_skip = parse_u_int("packet skip count",
+ optarg, NULL, 0, INT_MAX, 0);
break;
#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
if (ndo->ndo_xflag && ndo->ndo_Xflag)
warning("-x[x] and -X[X] are mutually exclusive. -x[x] ignored.");
+ if (cnt != -1)
+ if ((int)packets_to_skip > (INT_MAX - cnt))
+ // cnt + (int)packets_to_skip used in pcap_loop() call
+ error("Overflow (-c count) %d + (--skip count) %d", cnt,
+ (int)packets_to_skip);
+
if (Dflag)
show_devices_and_exit();
#ifdef HAVE_PCAP_FINDALLDEVS_EX
#ifdef HAVE_PCAP_SET_OPTIMIZER_DEBUG
pcap_set_optimizer_debug(dflag);
#endif
- if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
+ /*
+ * netmask is in network byte order, pcap_compile() takes it
+ * in host byte order.
+ */
+ if (pcap_compile(pd, &fcode, cmdbuf, Oflag, ntohl(netmask)) < 0)
error("%s", pcap_geterr(pd));
if (dflag) {
bpf_dump(&fcode, dflag);
capdns = capdns_setup();
#endif /* HAVE_CASPER */
+ // Both localnet and netmask are in network byte order.
init_print(ndo, localnet, netmask);
#ifndef _WIN32
do {
status = pcap_loop(pd,
- cnt + (cnt == -1 ? 0 : packets_skipped),
+ (cnt == -1 ? -1 : cnt + (int)packets_to_skip),
callback, pcap_userdata);
if (WFileName == NULL) {
/*
ndo->ndo_if_printer = get_if_printer(dlt);
/* Free the old filter */
pcap_freecode(&fcode);
- if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
+ /*
+ * netmask is in network byte order, pcap_compile() takes it
+ * in host byte order.
+ */
+ if (pcap_compile(pd, &fcode, cmdbuf, Oflag, ntohl(netmask)) < 0)
error("%s", pcap_geterr(pd));
}
exit_tcpdump(status == -1 ? S_ERR_HOST_PROGRAM : S_SUCCESS);
}
+/*
+ * Routines to parse numerical command-line arguments and check for
+ * errors, including "too large for that type".
+ */
+static int
+parse_int(const char *argname, const char *string, char **endpp,
+ int minval, int maxval, int base)
+{
+ long val;
+ char *endp;
+
+ errno = 0;
+ val = strtol(string, &endp, base);
+
+ /*
+ * Did it either not parse any of the string, find extra stuff
+ * at the end that the caller isn't interested in, or get
+ * another parsing error?
+ */
+ if (string == endp || (endpp == NULL && *endp != '\0') ||
+ (val == 0 && errno == EINVAL)) {
+ error("invalid %s \"%s\" (not a valid number)", argname,
+ string);
+ }
+
+ /*
+ * Did it get a value that's out of range?
+ */
+ if (((val == LONG_MAX || val == LONG_MIN) && errno == ERANGE) ||
+ val < minval || val > maxval) {
+ error("invalid %s %s (must be >= %d and <= %d)",
+ argname, string, minval, maxval);
+ }
+
+ /*
+ * OK, it passes all the tests.
+ */
+ if (endpp != NULL)
+ *endpp = endp;
+ return ((int)val);
+}
+
+static u_int
+parse_u_int(const char *argname, const char *string, char **endpp,
+ u_int minval, u_int maxval, int base)
+{
+ unsigned long val;
+ char *endp;
+
+ errno = 0;
+
+ /*
+ * strtoul() does *NOT* report an error if the string
+ * begins with a minus sign. We do.
+ */
+ if (*string == '-') {
+ error("invalid %s \"%s\" (not a valid unsigned number)",
+ argname, string);
+ }
+
+ val = strtoul(string, &endp, base);
+
+ /*
+ * Did it either not parse any of the string, find extra stuff
+ * at the end that the caller isn't interested in, or get
+ * another parsing error?
+ */
+ if (string == endp || (endpp == NULL && *endp != '\0') ||
+ (val == 0 && errno == EINVAL)) {
+ error("invalid %s \"%s\" (not a valid unsigned number)",
+ argname, string);
+ }
+
+ /*
+ * Did it get a value that's out of range?
+ */
+ if ((val == ULONG_MAX && errno == ERANGE) ||
+ val < minval || val > maxval) {
+ error("invalid %s %s (must be >= %u and <= %u)",
+ argname, string, minval, maxval);
+ }
+
+ /*
+ * OK, it passes all the tests.
+ */
+ if (endpp != NULL)
+ *endpp = endp;
+ return ((u_int)val);
+}
+
+static int64_t
+parse_int64(const char *argname, const char *string, char **endpp,
+ int64_t minval, int64_t maxval, int base)
+{
+ intmax_t val;
+ char *endp;
+
+ errno = 0;
+ val = strtoimax(string, &endp, base);
+
+ /*
+ * Did it either not parse any of the string, find extra stuff
+ * at the end that the caller isn't interested in, or get
+ * another parsing error?
+ */
+ if (string == endp || (endpp == NULL && *endp != '\0') ||
+ (val == 0 && errno == EINVAL)) {
+ error("invalid %s \"%s\" (not a valid number)", argname,
+ string);
+ }
+
+ /*
+ * Did it get a value that's out of range?
+ */
+ if (((val == INTMAX_MAX || val == INTMAX_MIN) && errno == ERANGE) ||
+ val < minval || val > maxval) {
+ error("invalid %s %s (must be >= %" PRId64 " and <= %" PRId64 ")",
+ argname, string, minval, maxval);
+ }
+
+ /*
+ * OK, it passes all the tests.
+ */
+ if (endpp != NULL)
+ *endpp = endp;
+ return ((int64_t)val);
+}
+
/*
* Catch a signal.
*/
dump_info = (struct dump_info *)user;
- if (packets_captured <= packets_skipped)
+ if (packets_captured <= packets_to_skip)
return;
/*
dump_info = (struct dump_info *)user;
- if (packets_captured <= packets_skipped)
+ if (packets_captured <= packets_to_skip)
return;
pcap_dump((u_char *)dump_info->pdd, h, sp);
++infodelay;
- if (!count_mode && packets_captured > packets_skipped)
+ if (!count_mode && packets_captured > packets_to_skip)
pretty_print_packet((netdissect_options *)user, h, sp, packets_captured);
--infodelay;
projects / tcpdump / blobdiff