diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-06-01 10:11:46 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-06-01 22:58:06 +0000 |
| commit | 614d09af132be967b89103efb85721fa043929c9 (patch) | |
| tree | 2be3f9f0b52f80b40fd3bb98ced1c3251ac95af9 /wiretap/pcapng.c | |
| parent | dcf7ac4aa6e2c4fe64d8d81ab628a98ecb4e66bb (diff) | |
Add data structures necessary to support multiple Name Resolution blocks.
This doesn't try to use any data from multiple Name Resolution blocks, it
just converts single Name Resolution block usage into a GArray, so the
potential is there to then use/support multiple Name Resolution blocks
within a file format (like pcapng)
Change-Id: Ib0b584af0bd263f183bd6d31ba18275ab0577d0c
Reviewed-on: https://code.wireshark.org/review/15684
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wiretap/pcapng.c')
| -rw-r--r-- | wiretap/pcapng.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 464cae763e..4ff3afeaa2 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -3260,12 +3260,12 @@ pcapng_write_name_resolution_block(wtap_dumper *wdh, int *err) } /* add options, if any */ - if (wdh->nrb_hdr) { + if (wdh->nrb_hdrs && wdh->nrb_hdrs->len > 0) { gboolean have_options = FALSE; guint32 options_total_length = 0; struct option option_hdr; guint32 comment_len = 0, comment_pad_len = 0; - wtap_optionblock_t nrb_hdr = wdh->nrb_hdr; + wtap_optionblock_t nrb_hdr = g_array_index(wdh->nrb_hdrs, wtap_optionblock_t, 0); guint32 prev_rec_off = rec_off; char* opt_comment; |