diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-11-11 15:49:12 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2018-11-12 23:00:44 +0000 |
| commit | 1e76e1355ab2cafba517a1ba556450ded397d885 (patch) | |
| tree | 3a5f314fe1170be611080700655a7aab9f42fa17 /wiretap/nettrace_3gpp_32_423.c | |
| parent | 791a9a9b8e1ad1c5f2ac31fd5fb830f6b4d30135 (diff) | |
wiretap: refactor common parameters for pcapng dump routines
Four variants of wtap_dump_open_ng exists, each of them take the same
three parameters for the SHB, IDB and NRB blocks that has to be written
before packets are even written. Similarly, a lot of tools always create
these arguments based on an existing capture file session (wth).
Address the former duplication by creating a new data structure to hold
the arguments. Address the second issue by creating new helper functions
to initialize the parameters based on a wth. This refactoring should
make it easier to add the new Decryption Secrets Block (DSB).
No functional change intended.
Change-Id: I42c019dc1d48a476773459212ca213de91a55684
Reviewed-on: https://code.wireshark.org/review/30578
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'wiretap/nettrace_3gpp_32_423.c')
| -rw-r--r-- | wiretap/nettrace_3gpp_32_423.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c index 52c6bf3a7c..c1c036b9ad 100644 --- a/wiretap/nettrace_3gpp_32_423.c +++ b/wiretap/nettrace_3gpp_32_423.c @@ -783,8 +783,12 @@ create_temp_pcapng_file(wtap *wth, int *err, gchar **err_info, nettrace_3gpp_32_ g_array_append_val(idb_inf->interface_data, int_data); + const wtapng_dump_params ng_params = { + .shb_hdrs = shb_hdrs, + .idb_inf = idb_inf, + }; wdh_exp_pdu = wtap_dump_fdopen_ng(import_file_fd, WTAP_FILE_TYPE_SUBTYPE_PCAPNG, WTAP_ENCAP_WIRESHARK_UPPER_PDU, - WTAP_MAX_PACKET_SIZE_STANDARD, FALSE, shb_hdrs, idb_inf, NULL, &exp_pdu_file_err); + WTAP_MAX_PACKET_SIZE_STANDARD, FALSE, &ng_params, &exp_pdu_file_err); if (wdh_exp_pdu == NULL) { result = WTAP_OPEN_ERROR; goto end; |