-/* 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.15 2001/06/19 23:08:55 guy Exp $
+ * $Id: editcap.c,v 1.22 2002/03/31 20:39:08 guy Exp $
*
* Originally written by Richard Sharpe.
* Improved by Guy Harris.
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 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 */
*/
static void
-edit_callback(u_char *user, const struct wtap_pkthdr *phdr, int offset,
+edit_callback(u_char *user, const struct wtap_pkthdr *phdr, long offset _U_,
union wtap_pseudo_header *pseudo_header, const u_char *buf)
{
callback_arg *argp = (callback_arg *)user;
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;
+ }
+
+ /* 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,
}
+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;
const char *string;
fprintf(stderr, "Usage: editcap [-r] [-h] [-v] [-T <encap type>] [-F <capture type>]\n");
- fprintf(stderr, " [-s <snaplen>] <infile> <outfile> [ <record#>[-<record#>] ... ]\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 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");
}
callback_arg args;
extern char *optarg;
extern int optind;
- char opt;
+ int opt;
char *p;
+ int snapshot_length;
/* Process the options first */
- while ((opt = getopt(argc, argv, "T:F:rvs:h")) != EOF) {
+ while ((opt = getopt(argc, argv, "T:F:rvs:t:h")) !=-1) {
switch (opt) {
}
break;
+ case 't':
+ set_time_adjustment(optarg);
+ break;
+
case 'h':
usage();
exit(1);
if (out_frame_type == -2)
out_frame_type = wtap_file_encap(wth);
+ snapshot_length = wtap_snapshot_length(wth);
+ if (snapshot_length == 0) {
+ /* Snapshot length of input file not known. */
+ snapshot_length = WTAP_MAX_PACKET_SIZE;
+ }
args.pdh = wtap_dump_open(argv[optind + 1], out_file_type,
out_frame_type, wtap_snapshot_length(wth), &err);
if (args.pdh == NULL) {
git.samba.org / obnox / wireshark / wip.git / blobdiff