osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Ulf Lamping 2004-06-18 10:01:59 +00:00
parent fa46f7a6db
commit a43f7d1f88
4 changed files with 262 additions and 451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.common
View File

@ -3,7 +3,7 @@
# a) common to both files and
# b) portable between both files
#
# $Id: Makefile.common,v 1.47 2004/06/17 21:53:24 ulfl Exp $
# $Id: Makefile.common,v 1.48 2004/06/18 10:01:59 ulfl Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@ -348,6 +348,7 @@ ethereal_INCLUDES = \
g711.h \
globals.h \
menu.h \
merge.h \
progress_dlg.h \
proto_hier_stats.h \
simple_dialog.h \
@ -371,6 +372,7 @@ text2pcap_SOURCES = \
# mergecap specifics
mergecap_SOURCES = \
mergecap.c \
merge.c \
cvsversion.h
# editcap specifics

179
merge.c
View File

@ -1,6 +1,6 @@
/* Combine two dump files, either by appending or by merging by timestamp
*
* $Id: merge.c,v 1.2 2004/06/18 07:41:20 ulfl Exp $
* $Id: merge.c,v 1.3 2004/06/18 10:01:59 ulfl Exp $
*
* Written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris
@ -25,65 +25,38 @@
#include <string.h>
#include "wtap.h"
#ifdef NEED_GETOPT_H
#include "getopt.h"
#endif
#include "cvsversion.h"
#include "merge.h"
/*
* Global variables
*/
static int verbose = 0; /* Not so verbose */
int merge_verbose = VERBOSE_NONE;
/*
* 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 gboolean
write_frame(guchar *user, const struct wtap_pkthdr *phdr, long offset _U_,
union wtap_pseudo_header *pseudo_header, const guchar *buf)
write_frame(wtap *wth, merge_out_file_t *out_file, int *err)
{
wtap_dumper *pdh = (wtap_dumper*)user;
int err;
const struct wtap_pkthdr *phdr = wtap_phdr(wth);
struct wtap_pkthdr snap_phdr;
if (verbose)
printf("Record: %u\n", out_file.count++);
if (merge_verbose == VERBOSE_ALL)
fprintf(stderr, "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) {
if (out_file->snaplen != 0 && phdr->caplen > out_file->snaplen) {
snap_phdr = *phdr;
snap_phdr.caplen = out_file.snaplen;
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));
if (!wtap_dump(out_file->pdh, phdr, wtap_pseudoheader(wth), wtap_buf_ptr(wth), err)) {
if (merge_verbose == VERBOSE_ERRORS)
fprintf(stderr, "mergecap: Error writing to %s: %s\n",
out_file->filename, wtap_strerror(*err));
return FALSE;
}
@ -92,7 +65,7 @@ write_frame(guchar *user, const struct wtap_pkthdr *phdr, long offset _U_,
static gboolean
append_loop(wtap *wth, int count, wtap_handler callback, guchar* user, int *err,
append_loop(wtap *wth, int count, merge_out_file_t *out_file, int *err,
gchar **err_info)
{
long data_offset;
@ -102,9 +75,8 @@ append_loop(wtap *wth, int count, wtap_handler callback, guchar* user, int *err,
*err = 0;
while ( (wtap_read(wth, err, err_info, &data_offset)) ) {
if(!write_frame(user, wtap_phdr(wth), data_offset,
wtap_pseudoheader(wth), wtap_buf_ptr(wth)))
return FALSE;
if(!write_frame(wth, out_file, err))
return FALSE; /* failure */
if (count > 0 && ++loop >= count)
break;
}
@ -121,29 +93,31 @@ append_loop(wtap *wth, int count, wtap_handler callback, guchar* user, int *err,
/*
* routine to concatenate files
*/
static void
append_files(int count, in_file_t in_files[], out_file_t *out_file)
boolean
merge_append_files(int count, merge_in_file_t in_files[], merge_out_file_t *out_file, int *err)
{
int i;
int err;
gchar *err_info;
for (i = 0; i < count; i++) {
if (!append_loop(in_files[i].wth, 0, write_frame,
(guchar*)out_file->pdh, &err, &err_info)) {
if (!append_loop(in_files[i].wth, 0, out_file, err, &err_info)) {
if (merge_verbose == VERBOSE_ERRORS)
fprintf(stderr, "mergecap: Error appending %s to %s: %s\n",
in_files[i].filename, out_file->filename, wtap_strerror(err));
switch (err) {
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);
fprintf(stderr, "(%s)\n", err_info);
break;
}
return FALSE;
}
}
return TRUE;
}
@ -171,7 +145,7 @@ is_earlier(struct timeval *l, struct timeval *r) {
* or -1 if no valid files remain
*/
static int
earliest(int count, in_file_t in_files[]) {
earliest(int count, merge_in_file_t in_files[]) {
int i;
int ei = -1;
struct timeval tv = {LONG_MAX, LONG_MAX};
@ -190,8 +164,8 @@ earliest(int count, in_file_t in_files[]) {
/*
* actually merge the files
*/
static gboolean
merge(int count, in_file_t in_files[], out_file_t *out_file)
gboolean
merge_files(int count, merge_in_file_t in_files[], merge_out_file_t *out_file, int *err)
{
int i;
@ -208,11 +182,7 @@ merge(int count, in_file_t in_files[], out_file_t *out_file)
/* write out earliest frame, and fetch another from its
* input file
*/
if(!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)))
if(!write_frame(in_files[i].wth, out_file, err))
return FALSE;
in_files[i].ok = wtap_read(in_files[i].wth, &(in_files[i].err),
&(in_files[i].err_info),
@ -231,8 +201,8 @@ merge(int count, in_file_t in_files[], out_file_t *out_file)
* 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
merge_select_frame_type(int count, merge_in_file_t files[])
{
int i;
int selected_frame_type;
@ -243,7 +213,7 @@ select_frame_type(int count, in_file_t files[])
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) {
if (merge_verbose == VERBOSE_ALL) {
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",
@ -259,7 +229,7 @@ select_frame_type(int count, in_file_t files[])
}
}
if (verbose) {
if (merge_verbose == VERBOSE_ALL) {
fprintf(stderr, "mergecap: selected frame_type %s (%s)\n",
wtap_encap_string(selected_frame_type),
wtap_encap_short_string(selected_frame_type));
@ -272,12 +242,13 @@ select_frame_type(int count, in_file_t files[])
/*
* Close the output file
*/
static void
close_outfile(out_file_t *out_file)
void
merge_close_outfile(merge_out_file_t *out_file)
{
int err;
if (!wtap_dump_close(out_file->pdh, &err)) {
fprintf(stderr, "mergecap: Error closing file %s: %s\n",
if (merge_verbose == VERBOSE_ERRORS)
fprintf(stderr, "mergecap: Error closing file %s: %s\n",
out_file->filename, wtap_strerror(err));
}
}
@ -288,13 +259,13 @@ close_outfile(out_file_t *out_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)
gboolean
merge_open_outfile(merge_out_file_t *out_file, int snapshot_len, int *err)
{
int err;
if (!out_file) {
fprintf(stderr, "mergecap: internal error (null out_file)\n");
if (merge_verbose == VERBOSE_ERRORS)
fprintf(stderr, "mergecap: internal error (null out_file)\n");
return FALSE;
}
@ -304,10 +275,12 @@ open_outfile(out_file_t *out_file, int snapshot_len)
out_file->pdh = wtap_dump_open(out_file->filename, out_file->file_type,
out_file->frame_type, snapshot_len, &err);
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));
if (merge_verbose == VERBOSE_ERRORS) {
fprintf(stderr, "mergecap: Can't open/create %s:\n", out_file->filename);
fprintf(stderr, " %s\n", wtap_strerror(*err));
}
return FALSE;
}
return TRUE;
@ -317,8 +290,8 @@ open_outfile(out_file_t *out_file, int snapshot_len)
/*
* Scan through input files and find maximum snapshot length
*/
static int
max_snapshot_length(int count, in_file_t in_files[])
int
merge_max_snapshot_length(int count, merge_in_file_t in_files[])
{
int i;
int max_snapshot = 0;
@ -340,8 +313,8 @@ max_snapshot_length(int count, in_file_t in_files[])
/*
* Scan through and close each input file
*/
static void
close_in_files(int count, in_file_t in_files[])
void
merge_close_in_files(int count, merge_in_file_t in_files[])
{
int i;
for (i = 0; i < count; i++) {
@ -353,27 +326,28 @@ close_in_files(int count, in_file_t in_files[])
/*
* Scan through the arguments and open the input files
*/
static int
open_in_files(int in_file_count, char *argv[], in_file_t *in_files[], int *err)
int
merge_open_in_files(int in_file_count, char *in_file_names[], merge_in_file_t *in_files[], int *err)
{
int i;
int count = 0;
gchar *err_info;
in_file_t *files;
int files_size = in_file_count * sizeof(in_file_t);
int files_size = in_file_count * sizeof(merge_in_file_t);
merge_in_file_t *files;
files = g_malloc(files_size);
*in_files = files;
for (i = 0; i < in_file_count; i++) {
files[count].filename = argv[i];
files[count].wth = wtap_open_offline(argv[i], err, &err_info, FALSE);
files[count].filename = in_file_names[i];
files[count].wth = wtap_open_offline(in_file_names[i], err, &err_info, FALSE);
files[count].err = 0;
files[count].data_offset = 0;
files[count].ok = TRUE;
if (!files[count].wth) {
fprintf(stderr, "merge: skipping %s: %s\n", argv[i],
if (merge_verbose == VERBOSE_ERRORS) {
fprintf(stderr, "mergecap: skipping %s: %s\n", in_file_names[i],
wtap_strerror(*err));
switch (*err) {
@ -384,15 +358,16 @@ open_in_files(int in_file_count, char *argv[], in_file_t *in_files[], int *err)
g_free(err_info);
break;
}
}
} else {
if (verbose) {
fprintf(stderr, "mergecap: %s is type %s.\n", argv[i],
if (merge_verbose == VERBOSE_ALL) {
fprintf(stderr, "mergecap: %s is type %s.\n", in_file_names[i],
wtap_file_type_string(wtap_file_type(files[count].wth)));
}
count++;
}
}
if (verbose)
if (merge_verbose == VERBOSE_ALL)
fprintf(stderr, "mergecap: opened %d of %d input files\n", count,
in_file_count);
@ -400,14 +375,19 @@ open_in_files(int in_file_count, char *argv[], in_file_t *in_files[], int *err)
}
/*
* Convenience function: merge two files into one.
*/
gboolean
merge_two_files(char *out_filename, char *in_file0, char *in_file1, gboolean do_append, int *err)
{
extern char *optarg;
extern int optind;
int in_file_count = 0;
in_file_t *in_files = NULL;
char *in_filenames[2];
merge_in_file_t *in_files = NULL;
merge_out_file_t out_file;
gboolean ret;
/* initialize out_file */
out_file.filename = out_filename;
@ -426,32 +406,33 @@ merge_two_files(char *out_filename, char *in_file0, char *in_file1, gboolean do_
in_filenames[1] = in_file1;
/* open the input files */
in_file_count = open_in_files(in_file_count, in_filenames, &in_files, err);
in_file_count = merge_open_in_files(in_file_count, in_filenames, &in_files, err);
if (in_file_count < 2) {
fprintf(stderr, "mergecap: Not all input files valid\n");
if (merge_verbose == VERBOSE_ALL)
fprintf(stderr, "mergecap: Not all input files valid\n");
return FALSE;
}
/* 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);
return FALSE;
}
/* do the merge (or append) */
if (do_append)
append_files(in_file_count, in_files, &out_file);
ret = merge_append_files(in_file_count, in_files, &out_file, err);
else
merge(in_file_count, in_files, &out_file);
ret = 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);
return TRUE;
return ret;
}

163
merge.h Normal file
View File

@ -0,0 +1,163 @@
/* merge.h
* Definitions for menu routines with toolkit-independent APIs but
* toolkit-dependent implementations.
*
* $Id: merge.h,v 1.1 2004/06/18 10:01:59 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __MERGE_H__
#define __MERGE_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/**
* Structures to manage our input files.
*/
typedef struct merge_in_file_s {
const char *filename;
wtap *wth;
int err;
gchar *err_info;
long data_offset;
gboolean ok;
} merge_in_file_t;
/**
* Structures to manage our output file.
*/
typedef struct merge_out_file_s {
const char *filename;
wtap_dumper *pdh;
int file_type;
int frame_type;
unsigned int snaplen;
int count;
} merge_out_file_t;
/** Verbosity levels. */
typedef enum {
VERBOSE_NONE,
VERBOSE_ERRORS,
VERBOSE_ALL,
} verbose_e;
/** Current verbosity level, default is VERBOSE_NONE. */
extern int merge_verbose;
/** Open a number of input files to merge.
*
* @param in_file_count number of entries in in_file_names and in_files
* @param in_file_names filenames of the input files
* @param in_files input file array to be filled (>= sizeof(merge_in_file_t) * in_file_count)
* @param err wiretap error, if failed
* @return number of opened input files
*/
extern int
merge_open_in_files(int in_file_count, char *in_file_names[], merge_in_file_t *in_files[], int *err);
/** Close the input files again.
*
* @param in_file_count number of entries in in_files
* @param in_files input file array to be closed
*/
extern void
merge_close_in_files(int in_file_count, merge_in_file_t in_files[]);
/** Open the output file.
*
* @param out_file the prefilled output file array
* @param snapshot_len the snapshot length of the output file
* @param err wiretap error, if failed
* @return TRUE, if the output file could be opened
*/
extern gboolean
merge_open_outfile(merge_out_file_t *out_file, int snapshot_len, int *err);
/** Close the output file again.
*
* @param out_file the output file array
*/
extern void
merge_close_outfile(merge_out_file_t *out_file);
/** Try to get the frame type from the input files.
*
* @param in_file_count number of entries in in_files
* @param in_files input file array
* @return the frame type
*/
extern int
merge_select_frame_type(int in_file_count, merge_in_file_t in_files[]);
/** Try to get the snapshot length from the input files.
*
* @param in_file_count number of entries in in_files
* @param in_files input file array
* @return the snapshot length
*/
extern int
merge_max_snapshot_length(int in_file_count, merge_in_file_t in_files[]);
/** Merge the packets from the input files into the output file sorted chronologically.
*
* @param in_file_count number of entries in in_files
* @param in_files input file array
* @param out_file the output file array
* @param err wiretap error, if failed
* @return TRUE if function succeeded
*/
extern gboolean
merge_files(int in_file_count, merge_in_file_t in_files[], merge_out_file_t *out_file, int *err);
/** Append the packets from the input files into the output file.
*
* @param in_file_count number of entries in in_files
* @param in_files input file array
* @param out_file the output file array
* @param err wiretap error, if failed
* @return TRUE if function succeeded
*/
extern boolean
merge_append_files(int in_file_count, merge_in_file_t in_files[], merge_out_file_t *out_file, int *err);
/*
* Convenience function: merge two files into one.
*
* @param out_filename the output filename
* @param in_file0 first input filename
* @param in_file1 second input filename
* @param do_append TRUE to append, FALSE to merge chronologically
* @param err wiretap error, if failed
* @return TRUE if function succeeded
*/
extern gboolean
merge_two_files(char *out_filename, char *in_file0, char *in_file1, gboolean do_append, int *err);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __MERGE_H__ */

367
mergecap.c
View File

@ -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);