diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-07-20 10:35:06 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-08-06 03:32:13 +0000 |
| commit | 910438b17f3f8b9ca9cfdbb87b3daf49dd7eb9a0 (patch) | |
| tree | f57b1dd36c4e20cd7b9758476cb862b74cd1a320 /mergecap.c | |
| parent | 1420f3df6376f45157b7f363c6c07da3a9ac6f29 (diff) | |
Pcapng: support Name Resolution Block options
Make pcapng decode options in an NRB during read, and store the comment
option, and write it back out as well. Also make it handle plugin handlers
for unknown options in received NRB(s).
Change-Id: I81863ef8d85cb1c8b5ba6673ba0e562efe77714f
Reviewed-on: https://code.wireshark.org/review/9723
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mergecap.c b/mergecap.c index 2af10dea19..3f1d192891 100644 --- a/mergecap.c +++ b/mergecap.c @@ -524,7 +524,7 @@ DIAG_ON(cast-qual) } pdh = wtap_dump_fdopen_ng(out_fd, file_type, frame_type, snaplen, - FALSE /* compressed */, shb_hdr, idb_inf, &open_err); + FALSE /* compressed */, shb_hdr, idb_inf, NULL, &open_err); g_string_free(comment_gstr, TRUE); } else { pdh = wtap_dump_fdopen(out_fd, file_type, frame_type, snaplen, FALSE /* compressed */, &open_err); |