aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-pcapng_block.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-01-08 16:38:10 -0800
committerGuy Harris <guy@alum.mit.edu>2018-01-09 00:38:51 +0000
commitaf0f49e80dce20b50ca757b52c2454e137ce1c74 (patch)
treef4bdde99005a0d8374ebea72ff76f58b4c30073c /epan/dissectors/packet-pcapng_block.c
parent94479aded162aecce6289bdf26f95073bed0dc55 (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/packet-pcapng_block.c')
-rw-r--r--epan/dissectors/packet-pcapng_block.c12
1 files changed, 6 insertions, 6 deletions
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