-/* Edit capture files. We can delete records, or simply convert from one
- * format to another format.
+/* Edit capture files. We can delete records, adjust timestamps, or
+ * simply convert from one format to another format.
*
- * $Id: editcap.c,v 1.3 1999/12/05 01:27:14 guy Exp $
+ * $Id: editcap.c,v 1.18 2001/10/04 08:30:33 guy Exp $
*
* Originally written by Richard Sharpe.
* Improved by Guy Harris.
+ * Further improved by Richard Sharpe.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
+#include <stdlib.h>
#include <glib.h>
+
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
+#endif
+
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+
+#include <string.h>
#include "wtap.h"
+#ifdef NEED_GETOPT_H
+#include "getopt.h"
+#endif
+
/*
* Some globals so we can pass things to various routines
*/
-int selectfrm[100], max_selected = -1;
+struct select_item {
+
+ int inclusive;
+ int first, second;
+
+} select_item;
+
+#define ONE_MILLION 1000000
+
+struct time_adjustment {
+ struct timeval tv;
+ int is_negative;
+};
+
+struct select_item selectfrm[100];
+int max_selected = -1;
static int count = 1;
static int keep_em = 0;
-static int out_file_type = WTAP_FILE_PCAP; /* default to "libpcap" */
-static int out_frame_type = -2; /* Leave frame type alone */
+static int out_file_type = WTAP_FILE_PCAP; /* default to "libpcap" */
+static int out_frame_type = -2; /* Leave frame type alone */
+static int verbose = 0; /* Not so verbose */
+static unsigned int snaplen = 0; /* No limit */
+static struct time_adjustment time_adj = {{0, 0}, 0}; /* no adjustment */
+
+/* Add a selection item, a simple parser for now */
+
+void add_selection(char *sel)
+{
+ char *locn;
+ char *next;
+
+ if (max_selected == (sizeof(selectfrm)/sizeof(struct select_item)) - 1)
+ return;
+
+ printf("Add_Selected: %s\n", sel);
+
+ if ((locn = strchr(sel, '-')) == NULL) { /* No dash, so a single number? */
+
+ printf("Not inclusive ...");
+
+ max_selected++;
+ selectfrm[max_selected].inclusive = 0;
+ selectfrm[max_selected].first = atoi(sel);
+
+ printf(" %i\n", selectfrm[max_selected].first);
+
+ }
+ else {
+
+ printf("Inclusive ...");
+
+ next = locn + 1;
+ max_selected++;
+ selectfrm[max_selected].inclusive = 1;
+ selectfrm[max_selected].first = atoi(sel);
+ selectfrm[max_selected].second = atoi(next);
+
+ printf(" %i, %i\n", selectfrm[max_selected].first, selectfrm[max_selected].second);
+
+ }
+
+
+}
/* Was the record selected? */
for (i = 0; i<= max_selected; i++) {
- if (recno == selectfrm[i]) return 1;
-
+ if (selectfrm[i].inclusive) {
+ if (selectfrm[i].first <= recno && selectfrm[i].second >= recno)
+ return 1;
+ }
+ else {
+ if (recno == selectfrm[i].first)
+ return 1;
+ }
}
return 0;
*/
static void
-edit_callback(u_char *user, const struct wtap_pkthdr *phdr, int offset,
- const u_char *buf)
+edit_callback(u_char *user, const struct wtap_pkthdr *phdr, long offset,
+ union wtap_pseudo_header *pseudo_header, const u_char *buf)
{
callback_arg *argp = (callback_arg *)user;
int err;
+ struct wtap_pkthdr snap_phdr;
if ((!selected(count) && !keep_em) ||
(selected(count) && keep_em)) {
- printf("Record: %u\n", count);
+ if (verbose)
+ printf("Record: %u\n", count);
+
+ /* We simply write it, perhaps after truncating it; we could do other
+ things, like modify it. */
- /* We simply write it, we could do other things, like modify it */
+ if (snaplen != 0 && phdr->caplen > snaplen) {
+ snap_phdr = *phdr;
+ snap_phdr.caplen = snaplen;
+ phdr = &snap_phdr;
+ }
+
+ /* assume that if the frame's tv_sec is 0, then
+ * the timestamp isn't supported */
+ if (phdr->ts.tv_sec > 0 && time_adj.tv.tv_sec != 0) {
+ snap_phdr = *phdr;
+ if (time_adj.is_negative)
+ snap_phdr.ts.tv_sec -= time_adj.tv.tv_sec;
+ else
+ snap_phdr.ts.tv_sec += time_adj.tv.tv_sec;
+ phdr = &snap_phdr;
+ }
- if (!wtap_dump(argp->pdh, phdr, buf, &err)) {
+ /* assume that if the frame's tv_sec is 0, then
+ * the timestamp isn't supported */
+ if (phdr->ts.tv_sec > 0 && time_adj.tv.tv_usec != 0) {
+ snap_phdr = *phdr;
+ if (time_adj.is_negative) { /* subtract */
+ if (snap_phdr.ts.tv_usec < time_adj.tv.tv_usec) { /* borrow */
+ snap_phdr.ts.tv_sec--;
+ snap_phdr.ts.tv_usec += ONE_MILLION;
+ }
+ snap_phdr.ts.tv_usec -= time_adj.tv.tv_usec;
+ } else { /* add */
+ if (snap_phdr.ts.tv_usec + time_adj.tv.tv_usec > ONE_MILLION) {
+ /* carry */
+ snap_phdr.ts.tv_sec++;
+ snap_phdr.ts.tv_usec += time_adj.tv.tv_usec - ONE_MILLION;
+ } else {
+ snap_phdr.ts.tv_usec += time_adj.tv.tv_usec;
+ }
+ }
+ phdr = &snap_phdr;
+ }
+
+ if (!wtap_dump(argp->pdh, phdr, pseudo_header, buf, &err)) {
fprintf(stderr, "editcap: Error writing to %s: %s\n", argp->filename,
wtap_strerror(err));
}
+static void
+set_time_adjustment(char *optarg)
+{
+ char *frac, *end;
+ long val;
+ int frac_digits;
+
+ if (!optarg)
+ return;
+
+ /* skip leading whitespace */
+ while (*optarg == ' ' || *optarg == '\t') {
+ optarg++;
+ }
+
+ /* check for a negative adjustment */
+ if (*optarg == '-') {
+ time_adj.is_negative = 1;
+ optarg++;
+ }
+
+ /* collect whole number of seconds, if any */
+ if (*optarg == '.') { /* only fractional (i.e., .5 is ok) */
+ val = 0;
+ frac = optarg;
+ } else {
+ val = strtol(optarg, &frac, 10);
+ if (frac == NULL || frac == optarg || val == LONG_MIN || val == LONG_MAX) {
+ fprintf(stderr, "editcap: \"%s\" is not a valid time adjustment\n",
+ optarg);
+ exit(1);
+ }
+ if (val < 0) { /* implies '--' since we caught '-' above */
+ fprintf(stderr, "editcap: \"%s\" is not a valid time adjustment\n",
+ optarg);
+ exit(1);
+ }
+ }
+ time_adj.tv.tv_sec = val;
+
+ /* now collect the partial seconds, if any */
+ if (*frac != '\0') { /* chars left, so get fractional part */
+ val = strtol(&(frac[1]), &end, 10);
+ if (*frac != '.' || end == NULL || end == frac
+ || val < 0 || val > ONE_MILLION || val == LONG_MIN || val == LONG_MAX) {
+ fprintf(stderr, "editcap: \"%s\" is not a valid time adjustment\n",
+ optarg);
+ exit(1);
+ }
+ }
+ else {
+ return; /* no fractional digits */
+ }
+
+ /* adjust fractional portion from fractional to numerator
+ * e.g., in "1.5" from 5 to 500000 since .5*10^6 = 500000 */
+ if (frac && end) { /* both are valid */
+ frac_digits = end - frac - 1; /* fractional digit count (remember '.') */
+ while(frac_digits < 6) { /* this is frac of 10^6 */
+ val *= 10;
+ frac_digits++;
+ }
+ }
+ time_adj.tv.tv_usec = val;
+}
+
void usage()
{
int i;
- char *string;
+ const char *string;
- fprintf(stderr, "Usage: editcap [-r] [-T <encap type>] [-F <capture type>] <infile> <outfile>\\\n");
- fprintf(stderr, " [ <record#> ... ]\n");
+ fprintf(stderr, "Usage: editcap [-r] [-h] [-v] [-T <encap type>] [-F <capture type>]\n");
+ fprintf(stderr, " [-s <snaplen>] [-t <time adjustment\n");
+ fprintf(stderr, " <infile> <outfile> [ <record#>[-<record#>] ... ]\n");
fprintf(stderr, " where\t-r specifies that the records specified should be kept, not deleted, \n");
fprintf(stderr, " default is to delete\n");
+ fprintf(stderr, " \t-v specifies verbose operation, default is silent\n");
+ fprintf(stderr, " \t-h produces this help listing.\n");
fprintf(stderr, " \t-T <encap type> specifies the encapsulation type to use:\n");
for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) {
string = wtap_encap_short_string(i);
fprintf(stderr, " \t %s - %s\n",
string, wtap_encap_string(i));
}
- fprintf(stderr, " \t default is the same as the input file\n");
+ fprintf(stderr, " \t default is the same as the input file\n");
fprintf(stderr, " \t-F <capture type> specifies the capture file type to write:\n");
for (i = 0; i < WTAP_NUM_FILE_TYPES; i++) {
if (wtap_dump_can_open(i))
fprintf(stderr, " \t %s - %s\n",
wtap_file_type_short_string(i), wtap_file_type_string(i));
}
- fprintf(stderr, " \t default is libpcap\n");
+ fprintf(stderr, " \t default is libpcap\n");
+ fprintf(stderr, " \t-s <snaplen> specifies that packets should be truncated to\n");
+ fprintf(stderr, " \t <snaplen> bytes of data\n");
+ fprintf(stderr, " \t-t <time adjustment> specifies the time adjustment\n");
+ fprintf(stderr, " \t to be applied to selected packets\n");
+ fprintf(stderr, "\n \t A range of records can be specified as well\n");
}
int main(int argc, char *argv[])
{
wtap *wth;
- int read_bytes, pcnt = 0, i, err;
+ int i, err;
callback_arg args;
extern char *optarg;
- extern int optind, opterr, optopt;
+ extern int optind;
char opt;
+ char *p;
/* Process the options first */
- while ((opt = getopt(argc, argv, "T:F:r")) != EOF) {
+ while ((opt = getopt(argc, argv, "T:F:rvs:t:h")) != EOF) {
switch (opt) {
}
break;
+ case 'v':
+ verbose = !verbose; /* Just invert */
+ break;
+
case 'r':
keep_em = !keep_em; /* Just invert */
break;
+ case 's':
+ snaplen = strtol(optarg, &p, 10);
+ if (p == optarg || *p != '\0') {
+ fprintf(stderr, "editcap: \"%s\" is not a valid snapshot length\n",
+ optarg);
+ exit(1);
+ }
+ break;
+
+ case 't':
+ set_time_adjustment(optarg);
+ break;
+
+ case 'h':
+ usage();
+ exit(1);
+ break;
+
case '?': /* Bad options if GNU getopt */
usage();
exit(1);
}
+#ifdef DEBUG
printf("Optind = %i, argc = %i\n", optind, argc);
+#endif
- if ((argc - optind) < 2) {
+ if ((argc - optind) < 1) {
usage();
exit(1);
}
- wth = wtap_open_offline(argv[optind], &err);
+ wth = wtap_open_offline(argv[optind], &err, FALSE);
if (!wth) {
}
- args.filename = argv[optind + 1];
- if (out_frame_type == -2)
- out_frame_type = wtap_file_encap(wth);
+ if (verbose) {
- args.pdh = wtap_dump_open(argv[optind + 1], out_file_type,
- out_frame_type, wtap_snapshot_length(wth), &err);
- if (args.pdh == NULL) {
-
- fprintf(stderr, "editcap: Can't open or create %s: %s\n", argv[optind+1],
- wtap_strerror(err));
- exit(1);
+ fprintf(stderr, "File %s is a %s capture file.\n", argv[optind],
+ wtap_file_type_string(wtap_file_type(wth)));
}
- for (i = optind + 2; i < argc; i++)
- selectfrm[++max_selected] = atoi(argv[i]);
+ /*
+ * Now, process the rest, if any ... we only write if there is an extra
+ * argument or so ...
+ */
- wtap_loop(wth, 0, edit_callback, (char *)&args, &err);
+ if ((argc - optind) >= 2) {
- if (!wtap_dump_close(args.pdh, &err)) {
+ args.filename = argv[optind + 1];
+ if (out_frame_type == -2)
+ out_frame_type = wtap_file_encap(wth);
- fprintf(stderr, "editcap: Error writing to %s: %s\n", argv[2],
- wtap_strerror(err));
- exit(1);
+ args.pdh = wtap_dump_open(argv[optind + 1], out_file_type,
+ out_frame_type, wtap_snapshot_length(wth), &err);
+ if (args.pdh == NULL) {
+
+ fprintf(stderr, "editcap: Can't open or create %s: %s\n", argv[optind+1],
+ wtap_strerror(err));
+ exit(1);
+
+ }
+
+ for (i = optind + 2; i < argc; i++)
+ add_selection(argv[i]);
+
+ wtap_loop(wth, 0, edit_callback, (char *)&args, &err);
+
+ if (!wtap_dump_close(args.pdh, &err)) {
+ fprintf(stderr, "editcap: Error writing to %s: %s\n", argv[2],
+ wtap_strerror(err));
+ exit(1);
+
+ }
}
- exit(0);
+
+ return 0;
}
git.samba.org / obnox / wireshark / wip.git / blobdiff