2004-06-17 21:53:26 +00:00
|
|
|
/* Combine two dump files, either by appending or by merging by timestamp
|
|
|
|
*
|
2004-07-18 00:24:25 +00:00
|
|
|
* $Id$
|
2004-06-17 21:53:26 +00:00
|
|
|
*
|
|
|
|
* Written by Scott Renfro <scott@renfro.org> based on
|
|
|
|
* editcap by Richard Sharpe and Guy Harris
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#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
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
#include "wtap.h"
|
2004-06-18 10:01:59 +00:00
|
|
|
#include "merge.h"
|
2004-06-17 21:53:26 +00:00
|
|
|
|
|
|
|
/*
|
2004-10-28 01:06:11 +00:00
|
|
|
* Scan through the arguments and open the input files
|
2004-06-17 21:53:26 +00:00
|
|
|
*/
|
2004-10-28 01:06:11 +00:00
|
|
|
gboolean
|
|
|
|
merge_open_in_files(int in_file_count, char *const *in_file_names,
|
|
|
|
merge_in_file_t **in_files, int *err, gchar **err_info,
|
|
|
|
int *err_fileno)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
int files_size = in_file_count * sizeof(merge_in_file_t);
|
|
|
|
merge_in_file_t *files;
|
2004-06-17 21:53:26 +00:00
|
|
|
|
2004-10-28 01:06:11 +00:00
|
|
|
files = g_malloc(files_size);
|
|
|
|
*in_files = files;
|
|
|
|
|
|
|
|
for (i = 0; i < in_file_count; i++) {
|
|
|
|
files[i].filename = in_file_names[i];
|
|
|
|
files[i].wth = wtap_open_offline(in_file_names[i], err, err_info, FALSE);
|
|
|
|
files[i].err = 0;
|
|
|
|
files[i].data_offset = 0;
|
|
|
|
files[i].ok = TRUE;
|
|
|
|
if (!files[i].wth) {
|
|
|
|
/* Close the files we've already opened. */
|
|
|
|
for (j = 0; j < i; j++)
|
|
|
|
wtap_close(files[j].wth);
|
|
|
|
*err_fileno = i;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
2004-06-17 21:53:26 +00:00
|
|
|
|
|
|
|
/*
|
2004-10-28 01:06:11 +00:00
|
|
|
* Scan through and close each input file
|
2004-06-17 21:53:26 +00:00
|
|
|
*/
|
2004-10-28 01:06:11 +00:00
|
|
|
void
|
|
|
|
merge_close_in_files(int count, merge_in_file_t in_files[])
|
2004-06-17 21:53:26 +00:00
|
|
|
{
|
2004-10-28 01:06:11 +00:00
|
|
|
int i;
|
|
|
|
for (i = 0; i < count; i++) {
|
|
|
|
wtap_close(in_files[i].wth);
|
2004-06-17 21:53:26 +00:00
|
|
|
}
|
2004-10-28 01:06:11 +00:00
|
|
|
}
|
2004-06-17 21:53:26 +00:00
|
|
|
|
2004-10-28 01:06:11 +00:00
|
|
|
/*
|
|
|
|
* Open the output file
|
|
|
|
*
|
|
|
|
* Return FALSE if file cannot be opened (so caller can report an error
|
|
|
|
* and clean up)
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
merge_open_outfile(merge_out_file_t *out_file, int fd, int file_type,
|
|
|
|
int frame_type, int snapshot_len, int *err)
|
|
|
|
{
|
|
|
|
out_file->pdh = wtap_dump_fdopen(fd, file_type, frame_type, snapshot_len,
|
|
|
|
err);
|
|
|
|
if (!out_file->pdh)
|
2004-06-17 21:53:26 +00:00
|
|
|
return FALSE;
|
|
|
|
|
2004-10-28 01:06:11 +00:00
|
|
|
out_file->snaplen = snapshot_len;
|
|
|
|
out_file->count = 1;
|
2004-06-17 21:53:26 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2004-10-28 01:06:11 +00:00
|
|
|
/*
|
|
|
|
* Close the output file
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
merge_close_outfile(merge_out_file_t *out_file, int *err)
|
2004-06-17 21:53:26 +00:00
|
|
|
{
|
2004-10-28 01:06:11 +00:00
|
|
|
if (!wtap_dump_close(out_file->pdh, err))
|
|
|
|
return FALSE;
|
|
|
|
return TRUE;
|
2004-06-17 21:53:26 +00:00
|
|
|
}
|
|
|
|
|
2004-10-28 01:06:11 +00:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
merge_select_frame_type(int count, merge_in_file_t files[])
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int selected_frame_type;
|
2004-06-17 21:53:26 +00:00
|
|
|
|
2004-10-28 01:06:11 +00:00
|
|
|
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;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return selected_frame_type;
|
|
|
|
}
|
2004-06-17 21:53:26 +00:00
|
|
|
|
|
|
|
/*
|
2004-10-28 01:06:11 +00:00
|
|
|
* Scan through input files and find maximum snapshot length
|
2004-06-17 21:53:26 +00:00
|
|
|
*/
|
2004-10-28 01:06:11 +00:00
|
|
|
int
|
|
|
|
merge_max_snapshot_length(int count, merge_in_file_t in_files[])
|
2004-06-17 21:53:26 +00:00
|
|
|
{
|
|
|
|
int i;
|
2004-10-28 01:06:11 +00:00
|
|
|
int max_snapshot = 0;
|
|
|
|
int snapshot_length;
|
2004-06-17 21:53:26 +00:00
|
|
|
|
|
|
|
for (i = 0; i < count; i++) {
|
2004-10-28 01:06:11 +00:00
|
|
|
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;
|
2004-06-17 21:53:26 +00:00
|
|
|
}
|
2004-10-28 01:06:11 +00:00
|
|
|
if (snapshot_length > max_snapshot)
|
|
|
|
max_snapshot = snapshot_length;
|
2004-06-17 21:53:26 +00:00
|
|
|
}
|
2004-10-28 01:06:11 +00:00
|
|
|
return max_snapshot;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Routine to write frame to output file
|
|
|
|
*/
|
|
|
|
static gboolean
|
|
|
|
write_frame(wtap *wth, merge_out_file_t *out_file, int *err)
|
|
|
|
{
|
|
|
|
const struct wtap_pkthdr *phdr = wtap_phdr(wth);
|
|
|
|
struct wtap_pkthdr snap_phdr;
|
|
|
|
|
|
|
|
/* 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(out_file->pdh, phdr, wtap_pseudoheader(wth), wtap_buf_ptr(wth), err))
|
|
|
|
return FALSE;
|
2004-06-18 10:01:59 +00:00
|
|
|
|
|
|
|
return TRUE;
|
2004-06-17 21:53:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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
|
2004-06-18 10:01:59 +00:00
|
|
|
earliest(int count, merge_in_file_t in_files[]) {
|
2004-06-17 21:53:26 +00:00
|
|
|
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
|
|
|
|
*/
|
2004-10-28 01:52:05 +00:00
|
|
|
merge_status_e
|
2004-06-18 10:01:59 +00:00
|
|
|
merge_files(int count, merge_in_file_t in_files[], merge_out_file_t *out_file, int *err)
|
2004-06-17 21:53:26 +00:00
|
|
|
{
|
|
|
|
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));
|
2004-10-28 01:52:05 +00:00
|
|
|
if (!in_files[i].ok)
|
|
|
|
return MERGE_READ_ERROR;
|
2004-06-17 21:53:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* 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
|
|
|
|
*/
|
2004-06-18 10:01:59 +00:00
|
|
|
if(!write_frame(in_files[i].wth, out_file, err))
|
2004-10-28 01:52:05 +00:00
|
|
|
return MERGE_WRITE_ERROR;
|
2004-06-17 21:53:26 +00:00
|
|
|
in_files[i].ok = wtap_read(in_files[i].wth, &(in_files[i].err),
|
|
|
|
&(in_files[i].err_info),
|
|
|
|
&(in_files[i].data_offset));
|
2004-10-28 01:52:05 +00:00
|
|
|
if (!in_files[i].ok)
|
|
|
|
return MERGE_READ_ERROR;
|
2004-06-17 21:53:26 +00:00
|
|
|
}
|
|
|
|
|
2004-10-28 01:52:05 +00:00
|
|
|
return MERGE_SUCCESS;
|
2004-06-17 21:53:26 +00:00
|
|
|
}
|
|
|
|
|
2004-10-28 01:52:05 +00:00
|
|
|
static merge_status_e
|
2004-10-28 01:06:11 +00:00
|
|
|
append_loop(merge_in_file_t in_files[], int i, int count,
|
|
|
|
merge_out_file_t *out_file, int *err)
|
2004-06-17 21:53:26 +00:00
|
|
|
{
|
2004-10-28 01:06:11 +00:00
|
|
|
gchar *err_info;
|
|
|
|
long data_offset;
|
|
|
|
int loop = 0;
|
2004-06-17 21:53:26 +00:00
|
|
|
|
2004-10-28 01:06:11 +00:00
|
|
|
/* Start by clearing error flag */
|
|
|
|
*err = 0;
|
2004-06-17 21:53:26 +00:00
|
|
|
|
2004-10-28 01:06:11 +00:00
|
|
|
while ( (wtap_read(in_files[i].wth, err, &err_info, &data_offset)) ) {
|
|
|
|
if(!write_frame(in_files[i].wth, out_file, err))
|
2004-10-28 01:52:05 +00:00
|
|
|
return MERGE_WRITE_ERROR;
|
2004-10-28 01:06:11 +00:00
|
|
|
if (count > 0 && ++loop >= count)
|
2004-06-17 21:53:26 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2004-10-28 01:06:11 +00:00
|
|
|
if (*err != 0) {
|
|
|
|
in_files[i].ok = FALSE;
|
|
|
|
in_files[i].err = *err;
|
|
|
|
in_files[i].err_info = err_info;
|
2004-10-28 01:52:05 +00:00
|
|
|
return MERGE_READ_ERROR;
|
2004-06-17 21:53:26 +00:00
|
|
|
}
|
2004-10-28 01:52:05 +00:00
|
|
|
return MERGE_SUCCESS;
|
2004-06-17 21:53:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2004-10-28 01:06:11 +00:00
|
|
|
* routine to concatenate files
|
2004-06-17 21:53:26 +00:00
|
|
|
*/
|
2004-10-28 01:52:05 +00:00
|
|
|
merge_status_e
|
2004-10-28 01:06:11 +00:00
|
|
|
merge_append_files(int count, merge_in_file_t in_files[],
|
|
|
|
merge_out_file_t *out_file, int *err)
|
2004-06-17 21:53:26 +00:00
|
|
|
{
|
|
|
|
int i;
|
2004-10-28 01:52:05 +00:00
|
|
|
merge_status_e status;
|
2004-06-17 21:53:26 +00:00
|
|
|
|
|
|
|
for (i = 0; i < count; i++) {
|
2004-10-28 01:52:05 +00:00
|
|
|
status = append_loop(in_files, i, 0, out_file, err);
|
|
|
|
if (status != MERGE_SUCCESS)
|
|
|
|
return status;
|
2004-06-17 21:53:26 +00:00
|
|
|
}
|
|
|
|
|
2004-10-28 01:52:05 +00:00
|
|
|
return MERGE_SUCCESS;
|
2004-06-17 21:53:26 +00:00
|
|
|
}
|