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 /editcap.c | |
| parent | 61915bdfb1f8f36fd312b42b348266a2155ed01a (diff) | |
| download | wireshark-4d603719d021936bc90c926f449989f0f6695627.tar.gz | |
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 'editcap.c')
| -rw-r--r-- | editcap.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -123,7 +123,11 @@ struct time_adjustment { static struct select_item selectfrm[MAX_SELECTIONS]; static int max_selected = -1; static int keep_em = 0; -static int out_file_type = WTAP_FILE_PCAP; /* default to "libpcap" */ +#ifdef PCAP_NG_DEFAULT +static int out_file_type = WTAP_FILE_PCAPNG; /* default to pcapng */ +#else +static int out_file_type = WTAP_FILE_PCAP; /* default to pcap */ +#endif static int out_frame_type = -2; /* Leave frame type alone */ static int verbose = 0; /* Not so verbose */ static struct time_adjustment time_adj = {{0, 0}, 0}; /* no adjustment */ |