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/wtap-int.h | |
| parent | dcf7ac4aa6e2c4fe64d8d81ab628a98ecb4e66bb (diff) | |
| download | wireshark-614d09af132be967b89103efb85721fa043929c9.tar.gz wireshark-614d09af132be967b89103efb85721fa043929c9.tar.bz2 wireshark-614d09af132be967b89103efb85721fa043929c9.zip | |
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/wtap-int.h')
| -rw-r--r-- | wiretap/wtap-int.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h index 55512dc908..bf3feae6f3 100644 --- a/wiretap/wtap-int.h +++ b/wiretap/wtap-int.h @@ -53,7 +53,7 @@ struct wtap { struct wtap_pkthdr phdr; GArray *shb_hdrs; GArray *interface_data; /**< An array holding the interface data from pcapng IDB:s or equivalent(?)*/ - wtap_optionblock_t nrb_hdr; /**< holds the Name Res Block's comment/custom_opts, or NULL */ + GArray *nrb_hdrs; /**< holds the Name Res Block's comment/custom_opts, or NULL */ void *priv; /* this one holds per-file state and is free'd automatically by wtap_close() */ void *wslua_data; /* this one holds wslua state info and is not free'd */ @@ -115,7 +115,7 @@ struct wtap_dumper { */ addrinfo_lists_t *addrinfo_lists; /**< Struct containing lists of resolved addresses */ GArray *shb_hdrs; - wtap_optionblock_t nrb_hdr; /**< name resolution comment/custom_opt, or NULL */ + GArray *nrb_hdrs; /**< name resolution comment/custom_opt, or NULL */ GArray *interface_data; /**< An array holding the interface data from pcapng IDB:s or equivalent(?) NULL if not present.*/ }; |