wiretap: Preserve NRBs with editcap, mergecap, and tshark

Use a pointer to the growing array of NRBs from the source
file, as with DSBs, so as to handle reading NRBs in the middle
of a file in one-pass mode.

Write NRBs when reading a file with editcap, or in tshark when
not dissecting packets and writing our own NRB. Continue not
to write the NRB if we're supplying our own list of address info
instead.

If we have already read the entire source file in (such as in
two-pass tshark), move all the NRBs to the beginning of the file
before packets, as done with DSBs.

When merging files with mergecap, write both sets of NRBs. (There
is no attempt to merge the NRBs by looking for common entries.)

Check for name resolution data in the middle of dumping a file,
not just at the end, and check for DSBs at the end of a file,
after all the packets. This means that Wireshark no longer writes
the NRB at the very end of the file after all the packets (which
is worse for future one-pass reads), and DSBs after all packets
are preserved.

Ping #15502

1 files changed, 1 insertions, 1 deletions

diff --git a/wiretap/wtap_opttypes.h b/wiretap/wtap_opttypes.h
index f9553f23b9..6104b18e6c 100644
--- a/wiretap/wtap_opttypes.h
+++ b/wiretap/wtap_opttypes.h
@@ -230,7 +230,7 @@ typedef struct wtapng_if_descr_mandatory_s {
 /**
  * Holds the required data from a WTAP_BLOCK_NAME_RESOLUTION.
  */
-typedef struct wtapnf_nrb_mandatory_s {
+typedef struct wtapng_nrb_mandatory_s {
     GList       *ipv4_addr_list;
     GList       *ipv6_addr_list;
 }  wtapng_nrb_mandatory_t;