diff options
| author | Vasil Velichkov <vvvelichkov@gmail.com> | 2018-08-01 11:05:05 +0300 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-08-01 13:04:58 +0000 |
| commit | ad145baeee9e43616b23539e8cdd90aaba0088eb (patch) | |
| tree | 065f7f078a2c3e09d5c3605a427db26d7f3876e1 /ui/tap_export_pdu.c | |
| parent | f1e036b8697b59b8088ad2cc39012881cc62bf98 (diff) | |
tshark: Allow exporting of PDUs to stdout
The following command will export the PDUs to stdout
tshark -r ./test.pcapng -U "OSI layer 3" -w -
Change-Id: Idddded6bfcac458d82cdc033babc7546b67f7327
Reviewed-on: https://code.wireshark.org/review/28919
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/tap_export_pdu.c')
| -rw-r--r-- | ui/tap_export_pdu.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index 9578c86a53..f385499674 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -142,9 +142,15 @@ exp_pdu_open(exp_pdu_t *exp_pdu_tap_data, int fd, char *comment) g_array_append_val(shb_hdrs, shb_hdr); - /* Use a random name for the temporary import buffer */ - exp_pdu_tap_data->wdh = wtap_dump_fdopen_ng(fd, WTAP_FILE_TYPE_SUBTYPE_PCAPNG, WTAP_ENCAP_WIRESHARK_UPPER_PDU, WTAP_MAX_PACKET_SIZE_STANDARD, FALSE, - shb_hdrs, idb_inf, NULL, &err); + if (fd == 1) { + exp_pdu_tap_data->wdh = wtap_dump_open_stdout_ng(WTAP_FILE_TYPE_SUBTYPE_PCAPNG, + WTAP_ENCAP_WIRESHARK_UPPER_PDU, WTAP_MAX_PACKET_SIZE_STANDARD, FALSE, + shb_hdrs, idb_inf, NULL, &err); + } else { + exp_pdu_tap_data->wdh = wtap_dump_fdopen_ng(fd, WTAP_FILE_TYPE_SUBTYPE_PCAPNG, + WTAP_ENCAP_WIRESHARK_UPPER_PDU, WTAP_MAX_PACKET_SIZE_STANDARD, FALSE, + shb_hdrs, idb_inf, NULL, &err); + } if (exp_pdu_tap_data->wdh == NULL) { g_assert(err != 0); return err; |