diff options
Diffstat (limited to 'epan')
| -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 | ||||
| -rw-r--r-- | epan/prefs.c | 4 | ||||
| -rw-r--r-- | epan/tvbuff.h | 2 |
5 files changed, 11 insertions, 11 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. */ diff --git a/epan/prefs.c b/epan/prefs.c index e44f47d0b5..b06e7dfb30 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -3464,8 +3464,8 @@ prefs_register_modules(void) "Interface capture filter (Ex: en0(tcp),en1(udp),...)", &prefs.capture_devices_filter, PREF_STRING, NULL, FALSE); - prefs_register_bool_preference(capture_module, "pcap_ng", "Capture in Pcap-NG format", - "Capture in Pcap-NG format?", &prefs.capture_pcap_ng); + prefs_register_bool_preference(capture_module, "pcap_ng", "Capture in pcapng format", + "Capture in pcapng format?", &prefs.capture_pcap_ng); prefs_register_bool_preference(capture_module, "real_time_update", "Update packet list in real time during capture", "Update packet list in real time during capture?", &prefs.capture_real_time); diff --git a/epan/tvbuff.h b/epan/tvbuff.h index 52fdb3e862..9fa4108f27 100644 --- a/epan/tvbuff.h +++ b/epan/tvbuff.h @@ -332,7 +332,7 @@ WS_DLL_PUBLIC gdouble tvb_get_ieee_double(tvbuff_t *tvb, const gint offset, cons /* * Fetch 16-bit and 32-bit values in host byte order. - * Used for some pseudo-headers in pcap/pcap-ng files, in which the + * Used for some pseudo-headers in pcap/pcapng files, in which the * headers are, when capturing, in the byte order of the host, and * are converted to the byte order of the host reading the file * when reading a capture file. |