merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),

and doing some more code cleanup

svn path=/trunk/; revision=11176

1 files changed, 16 insertions, 351 deletions

diff --git a/mergecap.c b/mergecap.c
index 6aebba7a88..16365786c7 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -1,6 +1,6 @@
 /* Combine two dump files, either by appending or by merging by timestamp
  *
- * $Id: mergecap.c,v 1.20 2004/03/04 08:20:46 jmayer Exp $
+ * $Id: mergecap.c,v 1.21 2004/06/18 10:01:59 ulfl Exp $
  *
  * Written by Scott Renfro <scott@renfro.org> based on
  * editcap by Richard Sharpe and Guy Harris
@@ -31,346 +31,7 @@
 #endif
 
 #include "cvsversion.h"
-
-/*
- * Global variables
- */
-static int verbose = 0;                      /* Not so verbose         */
-
-/*
- * Structures to manage our files
- */
-typedef struct in_file_t {
-  const char *filename;
-  wtap       *wth;
-  int         err;
-  gchar      *err_info;
-  long        data_offset;
-  gboolean    ok;
-} in_file_t;
-
-typedef struct out_file_t {
-  const char  *filename;
-  wtap_dumper *pdh;
-  int          file_type;
-  int          frame_type;
-  unsigned int snaplen;
-  int          count;
-} out_file_t;
-static out_file_t out_file;
-
-/*
- * Routine to write frame to output file
- */
-static void
-write_frame(guchar *user, const struct wtap_pkthdr *phdr, long offset _U_,
-            union wtap_pseudo_header *pseudo_header, const guchar *buf)
-{
-  wtap_dumper *pdh = (wtap_dumper*)user;
-  int err;
-  struct wtap_pkthdr snap_phdr;
-
-  if (verbose)
-    printf("Record: %u\n", out_file.count++);
-
-  /* We simply write it, perhaps after truncating it; we could do other
-   * things, like modify it. */
-  if (out_file.snaplen != 0 && phdr->caplen > out_file.snaplen) {
-    snap_phdr = *phdr;
-    snap_phdr.caplen = out_file.snaplen;
-    phdr = &snap_phdr;
-  }
-
-  if (!wtap_dump(pdh, phdr, pseudo_header, buf, &err)) {
-    fprintf(stderr, "mergecap: Error writing to %s: %s\n",
-            out_file.filename, wtap_strerror(err));
-    exit(1);
-  }
-}
-
-
-/*
- * routine to concatenate files
- */
-static void
-append(int count, in_file_t in_files[], out_file_t *out_file)
-{
-  int i;
-  int err;
-  gchar *err_info;
-
-  for (i = 0; i < count; i++) {
-    if (!wtap_loop(in_files[i].wth, 0, write_frame,
-                   (guchar*)out_file->pdh, &err, &err_info)) {
-      fprintf(stderr, "mergecap: Error reading %s to append to %s: %s\n",
-              in_files[i].filename, out_file->filename, wtap_strerror(err));
-      switch (err) {
-
-      case WTAP_ERR_UNSUPPORTED:
-      case WTAP_ERR_UNSUPPORTED_ENCAP:
-      case WTAP_ERR_BAD_RECORD:
-	fprintf(stderr, "(%s)\n", err_info);
-	break;
-      }
-    }
-  }
-}
-
-
-/*
- * returns TRUE if first argument is earlier than second
- */
-static gboolean
-is_earlier(struct timeval *l, struct timeval *r) {
-  if (l->tv_sec > r->tv_sec) {  /* left is later */
-    return FALSE;
-  } else if (l->tv_sec < r->tv_sec) { /* left is earlier */
-    return TRUE;
-  } else if (l->tv_usec > r->tv_usec) { /* tv_sec equal, l.usec later */
-    return FALSE;
-  }
-  /* either one < two or one == two
-   * either way, return one
-   */
-  return TRUE;
-}
-
-
-/*
- * returns index of earliest timestamp in set of input files
- * or -1 if no valid files remain
- */
-static int
-earliest(int count, in_file_t in_files[]) {
-  int i;
-  int ei = -1;
-  struct timeval tv = {LONG_MAX, LONG_MAX};
-
-  for (i = 0; i < count; i++) {
-    struct wtap_pkthdr *phdr = wtap_phdr(in_files[i].wth);
-
-    if (in_files[i].ok && is_earlier(&(phdr->ts), &tv)) {
-      tv = phdr->ts;
-      ei = i;
-    }
-  }
-  return ei;
-}
-
-/*
- * actually merge the files
- */
-static void
-merge(int count, in_file_t in_files[], out_file_t *out_file)
-{
-  int i;
-
-  /* prime the pump (read in first frame from each file) */
-  for (i = 0; i < count; i++) {
-    in_files[i].ok = wtap_read(in_files[i].wth, &(in_files[i].err),
-                               &(in_files[i].err_info),
-                               &(in_files[i].data_offset));
-  }
-
-  /* now keep writing the earliest frame until we're out of frames */
-  while ( -1 != (i = earliest(count, in_files))) {
-
-    /* write out earliest frame, and fetch another from its
-     * input file
-     */
-    write_frame((guchar*)out_file->pdh,
-                wtap_phdr(in_files[i].wth),
-                in_files[i].data_offset,
-                wtap_pseudoheader(in_files[i].wth),
-                wtap_buf_ptr(in_files[i].wth));
-    in_files[i].ok = wtap_read(in_files[i].wth, &(in_files[i].err),
-                               &(in_files[i].err_info),
-                               &(in_files[i].data_offset));
-  }
-}
-
-
-/*
- * Select an output frame type based on the input files
- * From Guy: If all files have the same frame type, then use that.
- *           Otherwise select WTAP_ENCAP_PER_PACKET.  If the selected
- *           output file type doesn't support per packet frame types,
- *           then the wtap_dump_open call will fail with a reasonable
- *           error condition.
- */
-static int
-select_frame_type(int count, in_file_t files[])
-{
-  int i;
-  int selected_frame_type;
-
-  selected_frame_type = wtap_file_encap(files[0].wth);
-
-  for (i = 1; i < count; i++) {
-    int this_frame_type = wtap_file_encap(files[i].wth);
-    if (selected_frame_type != this_frame_type) {
-      selected_frame_type = WTAP_ENCAP_PER_PACKET;
-      if (verbose) {
-        fprintf(stderr, "mergecap: multiple frame encapsulation types detected\n");
-        fprintf(stderr, "          defaulting to WTAP_ENCAP_PER_PACKET\n");
-        fprintf(stderr, "          %s had type %s (%s)\n",
-                files[0].filename,
-                wtap_encap_string(selected_frame_type),
-                wtap_encap_short_string(selected_frame_type));
-        fprintf(stderr, "          %s had type %s (%s)\n",
-                files[i].filename,
-                wtap_encap_string(this_frame_type),
-                wtap_encap_short_string(this_frame_type));
-      }
-      break;
-    }
-  }
-
-  if (verbose) {
-      fprintf(stderr, "mergecap: selected frame_type %s (%s)\n",
-              wtap_encap_string(selected_frame_type),
-              wtap_encap_short_string(selected_frame_type));
-  }
-
-  return selected_frame_type;
-}
-
-
-/*
- * Close the output file
- */
-static void
-close_outfile(out_file_t *out_file)
-{
-  int err;
-  if (!wtap_dump_close(out_file->pdh, &err)) {
-    fprintf(stderr, "mergecap: Error closing file %s: %s\n",
-            out_file->filename, wtap_strerror(err));
-    exit(1);
-  }
-}
-
-
-/*
- * Open the output file
- *
- * Return FALSE if file cannot be opened (so caller can clean up)
- */
-static gboolean
-open_outfile(out_file_t *out_file, int snapshot_len)
-{
-  int err;
-  if (!out_file) {
-    fprintf(stderr, "mergecap: internal error (null out_file)\n");
-    exit(1);
-  }
-
-  /* Allow output to stdout by using - */
-  if (strncmp(out_file->filename, "-", 2) == 0)
-    out_file->filename = "";
-
-
-  out_file->pdh = wtap_dump_open(out_file->filename, out_file->file_type,
-                                 out_file->frame_type, snapshot_len, &err);
-  if (!out_file->pdh) {
-    fprintf(stderr, "mergecap: Can't open/create %s:\n", out_file->filename);
-    fprintf(stderr, "          %s\n", wtap_strerror(err));
-    return FALSE;
-  }
-  return TRUE;
-}
-
-
-/*
- * Scan through input files and find maximum snapshot length
- */
-static int
-max_snapshot_length(int count, in_file_t in_files[])
-{
-  int i;
-  int max_snapshot = 0;
-  int snapshot_length;
-
-  for (i = 0; i < count; i++) {
-    snapshot_length = wtap_snapshot_length(in_files[i].wth);
-    if (snapshot_length == 0) {
-      /* Snapshot length of input file not known. */
-      snapshot_length = WTAP_MAX_PACKET_SIZE;
-    }
-    if (snapshot_length > max_snapshot)
-      max_snapshot = snapshot_length;
-  }
-  return max_snapshot;
-}
-
-
-/*
- * Scan through and close each input file
- */
-static void
-close_in_files(int count, in_file_t in_files[])
-{
-  int i;
-  for (i = 0; i < count; i++) {
-    wtap_close(in_files[i].wth);
-  }
-}
-
-
-/*
- * Scan through the arguments and open the input files
- */
-static int
-open_in_files(int argc, char *argv[], in_file_t *in_files[])
-{
-  int i;
-  int count = 0;
-  int err;
-  gchar *err_info;
-  in_file_t *files;
-  int files_size = argc * sizeof(in_file_t);
-
-
-  files = malloc(files_size);
-  if (!files) {
-    fprintf(stderr, "mergecap: error allocating %d bytes of memory\n",
-            files_size);
-    exit(1);
-  }
-  *in_files = files;
-
-  for (i = 0; i < argc; i++) {
-    files[count].filename    = argv[i];
-    files[count].wth         = wtap_open_offline(argv[i], &err, &err_info, FALSE);
-    files[count].err         = 0;
-    files[count].data_offset = 0;
-    files[count].ok          = TRUE;
-    if (!files[count].wth) {
-      fprintf(stderr, "mergecap: skipping %s: %s\n", argv[i],
-              wtap_strerror(err));
-      switch (err) {
-
-      case WTAP_ERR_UNSUPPORTED:
-      case WTAP_ERR_UNSUPPORTED_ENCAP:
-      case WTAP_ERR_BAD_RECORD:
-        fprintf(stderr, "(%s)\n", err_info);
-        g_free(err_info);
-        break;
-      }
-    } else {
-      if (verbose) {
-        fprintf(stderr, "mergecap: %s is type %s.\n", argv[i],
-                wtap_file_type_string(wtap_file_type(files[count].wth)));
-      }
-      count++;
-    }
-  }
-  if (verbose)
-    fprintf(stderr, "mergecap: opened %d of %d input files\n", count,
-    argc);
-
-  return count;
-}
+#include "merge.h"
 
 
 /*
@@ -418,7 +79,9 @@ main(int argc, char *argv[])
   char        *p;
   gboolean     do_append     = FALSE;
   int          in_file_count = 0;
-  in_file_t   *in_files      = NULL;
+  merge_in_file_t   *in_files      = NULL;
+  merge_out_file_t   out_file;
+  int          err;
 
   /* initialize out_file */
   out_file.filename   = NULL;
@@ -428,6 +91,8 @@ main(int argc, char *argv[])
   out_file.snaplen    = 0;                 /* no limit */
   out_file.count      = 1;                 /* frames output */
 
+  merge_verbose = VERBOSE_ERRORS;
+
   /* Process the options first */
   while ((opt = getopt(argc, argv, "hvas:T:F:w:")) != -1) {
 
@@ -459,7 +124,7 @@ main(int argc, char *argv[])
       break;
 
     case 'v':
-      verbose = !verbose;  /* Just invert */
+      merge_verbose = VERBOSE_ALL;
       break;
 
     case 's':
@@ -501,7 +166,7 @@ main(int argc, char *argv[])
   }
 
   /* open the input files */
-  in_file_count = open_in_files(in_file_count, &argv[optind], &in_files);
+  in_file_count = merge_open_in_files(in_file_count, &argv[optind], &in_files, &err);
   if (in_file_count < 1) {
     fprintf(stderr, "mergecap: No valid input files\n");
     exit(1);
@@ -509,22 +174,22 @@ main(int argc, char *argv[])
 
   /* set the outfile frame type */
   if (out_file.frame_type == -2)
-    out_file.frame_type = select_frame_type(in_file_count, in_files);
+    out_file.frame_type = merge_select_frame_type(in_file_count, in_files);
 
   /* open the outfile */
-  if (!open_outfile(&out_file, max_snapshot_length(in_file_count, in_files))) {
-    close_in_files(in_file_count, in_files);
+  if (!merge_open_outfile(&out_file, merge_max_snapshot_length(in_file_count, in_files), &err)) {
+    merge_close_in_files(in_file_count, in_files);
     exit(1);
   }
 
   /* do the merge (or append) */
   if (do_append)
-    append(in_file_count, in_files, &out_file);
+    merge_append_files(in_file_count, in_files, &out_file, &err);
   else
-    merge(in_file_count, in_files, &out_file);
+    merge_files(in_file_count, in_files, &out_file, &err);
 
-  close_in_files(in_file_count, in_files);
-  close_outfile(&out_file);
+  merge_close_in_files(in_file_count, in_files);
+  merge_close_outfile(&out_file);
 
   free(in_files);