diff options
| -rw-r--r-- | conf.c | 18 | ||||
| -rw-r--r-- | passt.1 | 10 | ||||
| -rw-r--r-- | pcap.c | 28 |
3 files changed, 3 insertions, 53 deletions
@@ -737,14 +737,7 @@ static void usage(const char *name) UNIX_SOCK_PATH, 1); } - info( " -p, --pcap [FILE] Log tap-facing traffic to pcap file"); - info( " if FILE is not given, log to:"); - - if (strstr(name, "pasta")) - info(" /tmp/pasta_ISO8601-TIMESTAMP_PID.pcap"); - else - info(" /tmp/passt_ISO8601-TIMESTAMP_PID.pcap"); - + info( " -p, --pcap FILE Log tap-facing traffic to pcap file"); info( " -P, --pid FILE Write own PID to the given file"); info( " -m, --mtu MTU Assign MTU via DHCP/NDP"); info( " a zero value disables assignment"); @@ -1021,7 +1014,7 @@ void conf(struct ctx *c, int argc, char **argv) {"help", no_argument, NULL, 'h' }, {"socket", required_argument, NULL, 's' }, {"ns-ifname", required_argument, NULL, 'I' }, - {"pcap", optional_argument, NULL, 'p' }, + {"pcap", required_argument, NULL, 'p' }, {"pid", required_argument, NULL, 'P' }, {"mtu", required_argument, NULL, 'm' }, {"address", required_argument, NULL, 'a' }, @@ -1084,7 +1077,7 @@ void conf(struct ctx *c, int argc, char **argv) name = getopt_long(argc, argv, optstring, options, NULL); - if ((name == 'p' || name == 'D' || name == 'S') && !optarg && + if ((name == 'D' || name == 'S') && !optarg && optind < argc && *argv[optind] && *argv[optind] != '-') { if (c->mode == MODE_PASTA) { if (conf_ns_opt(c, nsdir, userns, argv[optind])) @@ -1289,11 +1282,6 @@ void conf(struct ctx *c, int argc, char **argv) usage(argv[0]); } - if (!optarg) { - *c->pcap = 1; - break; - } - ret = snprintf(c->pcap, sizeof(c->pcap), "%s", optarg); if (ret <= 0 || ret >= (int)sizeof(c->pcap)) { err("Invalid pcap path: %s", optarg); @@ -111,16 +111,6 @@ Display a help message and exit. Capture tap-facing (that is, guest-side or namespace-side) network packets to \fIfile\fR in \fBpcap\fR format. -If \fIfile\fR is not given, capture packets to - - \fB/tmp/passt_\fIISO8601-timestamp\fR_\fIPID\fB.pcap\fR - -in \fBpasst\fR mode and to - - \fB/tmp/pasta_\fIISO8601-timestamp\fR_\fIPID\fB.pcap\fR - -in \fBpasta\fR mode, where \fIPID\fR is the ID of the running process. - .TP .BR \-P ", " \-\-pid " " \fIfile Write own PID to \fIfile\fR once initialisation is done, before forking to @@ -31,11 +31,6 @@ #include "util.h" #include "passt.h" -#define PCAP_PREFIX "/tmp/passt_" -#define PCAP_PREFIX_PASTA "/tmp/pasta_" -#define PCAP_ISO8601_FORMAT "%FT%H:%M:%SZ" -#define PCAP_ISO8601_STR "YYYY-MM-ddTHH:mm:ssZ" - #define PCAP_VERSION_MINOR 4 static int pcap_fd = -1; @@ -171,7 +166,6 @@ fail: void pcap_init(struct ctx *c) { int flags = O_WRONLY | O_CREAT | O_TRUNC; - struct timeval tv; if (pcap_fd != -1) return; @@ -179,28 +173,6 @@ void pcap_init(struct ctx *c) if (!*c->pcap) return; - if (*c->pcap == 1) { - char name[] = PCAP_PREFIX PCAP_ISO8601_STR STR(UINT_MAX) - ".pcap"; - struct tm *tm; - - if (c->mode == MODE_PASTA) - memcpy(name, PCAP_PREFIX_PASTA, - sizeof(PCAP_PREFIX_PASTA)); - - gettimeofday(&tv, NULL); - tm = localtime(&tv.tv_sec); - strftime(name + strlen(PCAP_PREFIX), - sizeof(PCAP_ISO8601_STR) - 1, PCAP_ISO8601_FORMAT, tm); - - snprintf(name + strlen(PCAP_PREFIX) + strlen(PCAP_ISO8601_STR), - sizeof(name) - strlen(PCAP_PREFIX) - - strlen(PCAP_ISO8601_STR), - "_%i.pcap", getpid()); - - strncpy(c->pcap, name, PATH_MAX); - } - flags |= c->foreground ? O_CLOEXEC : 0; pcap_fd = open(c->pcap, flags, S_IRUSR | S_IWUSR); if (pcap_fd == -1) { |