diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-06-20 23:31:26 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-06-20 23:31:26 +0000 |
| commit | 4d603719d021936bc90c926f449989f0f6695627 (patch) | |
| tree | 3845500655c387c851d83257bd2befe49e4d0ee5 /mergecap.c | |
| parent | 61915bdfb1f8f36fd312b42b348266a2155ed01a (diff) | |
Have mergecap, tshark, and editcap write pcap-ng files by default. This
is mainly an attempt to fix the currently-broken "test.sh" step on the
XP buildbot. If this causes too many problems we might want to have
suite-capture.sh:capture_step_snapshot pass "-P" to dumpcap instead.
svn path=/trunk/; revision=37736
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mergecap.c b/mergecap.c index 9c658cb433..1d970def01 100644 --- a/mergecap.c +++ b/mergecap.c @@ -152,7 +152,11 @@ main(int argc, char *argv[]) gboolean verbose = FALSE; int in_file_count = 0; guint snaplen = 0; - int file_type = WTAP_FILE_PCAP; /* default to libpcap format */ +#ifdef PCAP_NG_DEFAULT + int file_type = WTAP_FILE_PCAPNG; /* default to pcap format */ +#else + int file_type = WTAP_FILE_PCAP; /* default to pcapng format */ +#endif int frame_type = -2; int out_fd; merge_in_file_t *in_files = NULL; |