#include "gmt2local.h"
#include "pcap-missing.h"
-#ifndef NAME_MAX
-#define NAME_MAX 255
+#ifndef PATH_MAX
+#define PATH_MAX 1024
#endif
#ifdef SIGINFO
static void
MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
{
- char *filename = malloc(NAME_MAX + 1);
+ char *filename = malloc(PATH_MAX + 1);
+ if (filename == NULL)
+ error("Makefilename: malloc");
/* Process with strftime if Gflag is set. */
if (Gflag != 0) {
/* There's no good way to detect an error in strftime since a return
* value of 0 isn't necessarily failure.
*/
- strftime(filename, NAME_MAX, orig_name, local_tm);
+ strftime(filename, PATH_MAX, orig_name, local_tm);
} else {
- strncpy(filename, orig_name, NAME_MAX);
+ strncpy(filename, orig_name, PATH_MAX);
}
if (cnt == 0 && max_chars == 0)
- strncpy(buffer, filename, NAME_MAX + 1);
+ strncpy(buffer, filename, PATH_MAX + 1);
else
- if (snprintf(buffer, NAME_MAX + 1, "%s%0*d", filename, max_chars, cnt) > NAME_MAX)
+ if (snprintf(buffer, PATH_MAX + 1, "%s%0*d", filename, max_chars, cnt) > PATH_MAX)
/* Report an error if the filename is too large */
- error("too many output files or filename is too long (> %d)", NAME_MAX);
+ error("too many output files or filename is too long (> %d)", PATH_MAX);
free(filename);
}
return ret;
}
-struct print_info get_print_info(int type) {
+static struct print_info
+get_print_info(int type)
+{
struct print_info printinfo;
printinfo.ndo_type = 1;
return (printinfo);
}
+static char *
+get_next_file(FILE *VFile, char *ptr)
+{
+ char *ret;
+
+ ret = fgets(ptr, PATH_MAX, VFile);
+ if (!ret)
+ return NULL;
+
+ if (ptr[strlen(ptr) - 1] == '\n')
+ ptr[strlen(ptr) - 1] = '\0';
+
+ return ret;
+}
+
int
main(int argc, char **argv)
{
struct dump_info dumpinfo;
u_char *pcap_userdata;
char ebuf[PCAP_ERRBUF_SIZE];
- char VFileLine[NAME_MAX + 1];
+ char VFileLine[PATH_MAX + 1];
char *username = NULL;
char *chroot_dir = NULL;
char *ret = NULL;
+ char *end;
#ifdef HAVE_PCAP_FINDALLDEVS
pcap_if_t *devpointer;
int devnum;
infile = NULL;
RFileName = NULL;
VFileName = NULL;
+ VFile = NULL;
WFileName = NULL;
+ dlt = -1;
if ((cp = strrchr(argv[0], '/')) != NULL)
program_name = cp + 1;
else
* It can be useful on Windows, where more than
* one interface can have the same name.
*/
- if ((devnum = atoi(optarg)) != 0) {
+ devnum = strtol(optarg, &end, 10);
+ if (optarg != end && *end == '\0') {
if (devnum < 0)
error("Invalid adapter index");
Rflag = 0;
break;
- case 's': {
- char *end;
-
+ case 's':
snaplen = strtol(optarg, &end, 0);
if (optarg == end || *end != '\0'
|| snaplen < 0 || snaplen > MAXIMUM_SNAPLEN)
else if (snaplen == 0)
snaplen = MAXIMUM_SNAPLEN;
break;
- }
case 'S':
++Sflag;
packettype = PT_CARP;
else if (strcasecmp(optarg, "radius") == 0)
packettype = PT_RADIUS;
+ else if (strcasecmp(optarg, "zmtp1") == 0)
+ packettype = PT_ZMTP1;
+ else if (strcasecmp(optarg, "vxlan") == 0)
+ packettype = PT_VXLAN;
else
error("unknown packet type `%s'", optarg);
break;
#endif
if (RFileName != NULL || VFileName != NULL) {
+ /*
+ * If RFileName is non-null, it's the pathname of a
+ * savefile to read. If VFileName is non-null, it's
+ * the pathname of a file containing a list of pathnames
+ * (one per line) of savefiles to read.
+ *
+ * In either case, we're reading a savefile, not doing
+ * a live capture.
+ */
#ifndef WIN32
/*
* We don't need network access, so relinquish any set-UID
#endif /* WIN32 */
if (VFileName != NULL) {
if (VFileName[0] == '-' && VFileName[1] == '\0')
- VFile = fopen("/dev/stdin", "r");
+ VFile = stdin;
else
VFile = fopen(VFileName, "r");
if (VFile == NULL)
error("Unable to open file: %s\n", strerror(errno));
- ret = fgets(VFileLine, NAME_MAX, VFile);
+ ret = get_next_file(VFile, VFileLine);
if (!ret)
- error("Nothing in %s\n", VFile);
-
- if (VFileLine[strlen(VFileLine) - 1] == '\n')
- VFileLine[strlen(VFileLine) - 1] = '\0';
+ error("Nothing in %s\n", VFileName);
RFileName = VFileLine;
}
localnet = 0;
netmask = 0;
} else {
+ /*
+ * We're doing a live capture.
+ */
if (device == NULL) {
device = pcap_lookupdev(ebuf);
if (device == NULL)
error("%s", ebuf);
}
#ifdef WIN32
+ /*
+ * Print a message to the standard error on Windows.
+ * XXX - why do it here, with a different message?
+ */
if(strlen(device) == 1) //we assume that an ASCII string is always longer than 1 char
{ //a Unicode string has a \0 as second byte (so strlen() is 1)
fprintf(stderr, "%s: listening on %ws\n", program_name, device);
error("%s", pcap_geterr(pd));
if (WFileName) {
pcap_dumper_t *p;
- /* Do not exceed the default NAME_MAX for files. */
- dumpinfo.CurrentFileName = (char *)malloc(NAME_MAX + 1);
+ /* Do not exceed the default PATH_MAX for files. */
+ dumpinfo.CurrentFileName = (char *)malloc(PATH_MAX + 1);
if (dumpinfo.CurrentFileName == NULL)
error("malloc of dumpinfo.CurrentFileName");
#ifndef WIN32
if (RFileName == NULL) {
+ /*
+ * Live capture (if -V was specified, we set RFileName
+ * to a file from the -V file). Print a message to
+ * the standard error on UN*X.
+ */
if (!vflag && !WFileName) {
(void)fprintf(stderr,
"%s: verbose output suppressed, use -v or -vv for full protocol decode\n",
}
(void)fflush(stdout);
}
+ if (status == -2) {
+ /*
+ * We got interrupted. If we are reading multiple
+ * files (via -V) set these so that we stop.
+ */
+ VFileName = NULL;
+ ret = NULL;
+ }
if (status == -1) {
/*
* Error. Report it.
}
pcap_close(pd);
if (VFileName != NULL) {
- ret = fgets(VFileLine, NAME_MAX, VFile);
+ ret = get_next_file(VFile, VFileLine);
if (ret) {
- if (VFileLine[strlen(VFileLine) - 1] == '\n')
- VFileLine[strlen(VFileLine) - 1] = '\0';
RFileName = VFileLine;
pd = pcap_open_offline(RFileName, ebuf);
if (pd == NULL)
if (dump_info->CurrentFileName != NULL)
free(dump_info->CurrentFileName);
/* Allocate space for max filename + \0. */
- dump_info->CurrentFileName = (char *)malloc(NAME_MAX + 1);
+ dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);
if (dump_info->CurrentFileName == NULL)
error("dump_packet_and_trunc: malloc");
/*
}
if (dump_info->CurrentFileName != NULL)
free(dump_info->CurrentFileName);
- dump_info->CurrentFileName = (char *)malloc(NAME_MAX + 1);
+ dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);
if (dump_info->CurrentFileName == NULL)
error("dump_packet_and_trunc: malloc");
MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars);
projects / tcpdump / blobdiff