diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-01-08 16:38:10 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-01-09 00:38:51 +0000 |
| commit | af0f49e80dce20b50ca757b52c2454e137ce1c74 (patch) | |
| tree | f4bdde99005a0d8374ebea72ff76f58b4c30073c /epan/dissectors | |
| parent | 94479aded162aecce6289bdf26f95073bed0dc55 (diff) | |
Use pcapng as the name of the file format.
At one point, I remember a discussion resulting in the official name of
the next-generation replacement for pcap format being changed to
"pcapng", with no hyphen.
Make Wireshark reflect that.
Change-Id: Ie66fb13a0fe3a8682143106dab601952e9154e2a
Reviewed-on: https://code.wireshark.org/review/25214
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-erf.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-pcapng_block.c | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-sysdig-event.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index 428b397bbb..cb1f30efe8 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -846,7 +846,7 @@ static const erf_meta_hf_template_t erf_meta_tags[] = { { ERF_META_TAG_ns_dns_ipv6, { "Nameserver IPv6 address", "ns_dns_ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { ERF_META_TAG_exthdr, { "ERF Extension Header", "exthdr", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { ERF_META_TAG_pcap_ng_block, { "PCAP-NG Block", "pcap_ng_block", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { ERF_META_TAG_pcap_ng_block, { "Pcapng Block", "pcap_ng_block", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { ERF_META_TAG_asn1, { "ASN.1", "asn1", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { ERF_META_TAG_clk_source, { "Clock Source", "clk_source", FT_UINT32, BASE_DEC, VALS(erf_clk_source), 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-pcapng_block.c b/epan/dissectors/packet-pcapng_block.c index f139f8303c..26e8c50d02 100644 --- a/epan/dissectors/packet-pcapng_block.c +++ b/epan/dissectors/packet-pcapng_block.c @@ -1,5 +1,5 @@ /* packet-pcapng.c - * Dissector to handle pcap-ng file-type-specific blocks. + * Dissector to handle pcapng file-type-specific blocks. * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -45,8 +45,8 @@ dissect_pcapng_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* /* * There isn't one; just do a minimal display. */ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCAP-NG"); - col_add_fstr(pinfo->cinfo, COL_INFO, "PCAP-NG block, type %u", + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCAPNG"); + col_add_fstr(pinfo->cinfo, COL_INFO, "Pcapng block, type %u", pinfo->pseudo_header->ftsrec.record_type); proto_tree_add_item(tree, proto_pcapng_block, tvb, 0, -1, ENC_NA); @@ -56,10 +56,10 @@ dissect_pcapng_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* void proto_register_pcapng_block(void) { - proto_pcapng_block = proto_register_protocol("PCAP-NG block", - "PCAP-NG", "pcapng"); + proto_pcapng_block = proto_register_protocol("Pcapng block", + "PCAPNG", "pcapng"); pcapng_block_type_dissector_table = register_dissector_table("pcapng.block_type", - "pcap-ng block type", proto_pcapng_block, FT_UINT32, BASE_DEC); + "pcapng block type", proto_pcapng_block, FT_UINT32, BASE_DEC); } void diff --git a/epan/dissectors/packet-sysdig-event.c b/epan/dissectors/packet-sysdig-event.c index 93e27b4949..c5e468ff5d 100644 --- a/epan/dissectors/packet-sysdig-event.c +++ b/epan/dissectors/packet-sysdig-event.c @@ -28,7 +28,7 @@ /* * Sysdig is a tool that captures and analyzes system state. - * This dissects pcap-ng Sysdig Event Blocks (0x00000204), which contains + * This dissects pcapng Sysdig Event Blocks (0x00000204), which contains * a system call entry or exit along with its associated parameters. */ |