From 4e17bd6229a09c149c4e0ac7e5a090febfc15c10 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 13 Nov 2018 16:10:53 -0800 Subject: Use the dump parameters structure for non-pcapng-specific stuff. Use it for all the per-file information, including the per-file link-layer type and the per-file snapshot length. Change-Id: Id75687c7faa6418a2bfcf7f8198206a9f95db629 Reviewed-on: https://code.wireshark.org/review/30616 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu --- wiretap/nettrace_3gpp_32_423.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'wiretap/nettrace_3gpp_32_423.c') diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c index 54b60afa57..7d19e0aed4 100644 --- a/wiretap/nettrace_3gpp_32_423.c +++ b/wiretap/nettrace_3gpp_32_423.c @@ -792,12 +792,14 @@ 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 = { + const wtap_dump_params params = { + .encap = WTAP_ENCAP_WIRESHARK_UPPER_PDU, + .snaplen = WTAP_MAX_PACKET_SIZE_STANDARD, .shb_hdrs = shb_hdrs, .idb_inf = idb_inf, }; - wdh_exp_pdu = wtap_dump_fdopen(import_file_fd, WTAP_FILE_TYPE_SUBTYPE_PCAPNG, WTAP_ENCAP_WIRESHARK_UPPER_PDU, - WTAP_MAX_PACKET_SIZE_STANDARD, FALSE, &ng_params, &exp_pdu_file_err); + wdh_exp_pdu = wtap_dump_fdopen(import_file_fd, WTAP_FILE_TYPE_SUBTYPE_PCAPNG, + FALSE, ¶ms, &exp_pdu_file_err); if (wdh_exp_pdu == NULL) { result = WTAP_OPEN_ERROR; goto end; -- cgit v1.2.3