diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-06-20 23:31:26 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-06-20 23:31:26 +0000 |
| commit | 57fbe9a762a864905d5f518d1301d838967c611d (patch) | |
| tree | 3845500655c387c851d83257bd2befe49e4d0ee5 /mergecap.c | |
| parent | 2e20a601771ecd9b79b594b9a0901b0af1a009bc (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37736 f5534014-38df-0310-8fa8-9805f1628bb7
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; |