aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/erf.c12
-rw-r--r--wiretap/file_access.c6
-rw-r--r--wiretap/netmon.c4
-rw-r--r--wiretap/netscreen.c6
-rw-r--r--wiretap/nettrace_3gpp_32_423.c2
-rw-r--r--wiretap/pcap-common.c8
-rw-r--r--wiretap/pcap-common.h4
-rw-r--r--wiretap/pcap-encap.h4
-rw-r--r--wiretap/pcapng.c50
-rw-r--r--wiretap/pcapng_module.h8
-rw-r--r--wiretap/visual.c2
-rw-r--r--wiretap/wtap.h8
12 files changed, 57 insertions, 57 deletions
diff --git a/wiretap/erf.c b/wiretap/erf.c
index 2012638f22..9955d68aa1 100644
--- a/wiretap/erf.c
+++ b/wiretap/erf.c
@@ -730,16 +730,16 @@ static gboolean erf_read_header(wtap *wth, FILE_T fh,
/*
* XXX: ERF_TYPE_META records should ideally be FT_SPECIFIC for display
* purposes, but currently ft_specific_record_phdr clashes with erf_mc_phdr
- * and the PCAP-NG dumper assumes it is a PCAP-NG block type. Ideally we
- * would register a block handler with PCAP-NG and write out the closest
- * PCAP-NG block, or a custom block/Provenance record.
+ * and the pcapng dumper assumes it is a pcapng block type. Ideally we
+ * would register a block handler with pcapng and write out the closest
+ * pcapng block, or a custom block/Provenance record.
*
*/
#if 0
} else {
/*
* TODO: how to identify, distinguish and timestamp events?
- * What to do about ENCAP_ERF in PCAP/PCAP-NG? Filetype dissector is
+ * What to do about ENCAP_ERF in pcap/pcapng? Filetype dissector is
* chosen by wth->file_type_subtype?
*/
/* For now just treat all Provenance records as reports */
@@ -1154,7 +1154,7 @@ static void erf_write_wtap_option_to_interface_tag(wtap_block_t block _U_,
#if 0
tag_ptr->type = ERF_META_TAG_if_mac;
tag_ptr->length = 6;
- /*value same format as PCAP-NG (6-byte canonical, padded by write
+ /*value same format as pcapng (6-byte canonical, padded by write
* function automatically to 32-bit boundary)*/
tag_ptr->value = (guint8*)g_malloc(sizeof(optval->macval));
memcpy(tag_ptr->value, &optval->macval, sizeof(optval->macval));
@@ -1961,7 +1961,7 @@ static gboolean erf_dump(
/*XXX: The user may have changed the comment to cleared! */
if(phdr->opt_comment || phdr->has_comment_changed) {
if (encap == WTAP_ENCAP_ERF) {
- /* XXX: What about ERF-in-PCAPNG with existing comment (that wasn't
+ /* XXX: What about ERF-in-pcapng with existing comment (that wasn't
* modified)? */
if(phdr->has_comment_changed) {
memcpy(&other_phdr, pseudo_header, sizeof(union wtap_pseudo_header));
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 307fa17e55..8bfecfd427 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -1917,9 +1917,9 @@ wtap_get_savable_file_types_subtypes(int file_type_subtype,
/* Put the default file type/subtype first in the list. */
g_array_append_val(savable_file_types_subtypes, default_file_type_subtype);
- /* If the default is pcap, put pcap-NG right after it if we can
- also write it in pcap-NG format; otherwise, if the default is
- pcap-NG, put pcap right after it if we can also write it in
+ /* If the default is pcap, put pcapng right after it if we can
+ also write it in pcapng format; otherwise, if the default is
+ pcapng, put pcap right after it if we can also write it in
pcap format. */
if (default_file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_PCAP) {
if (wtap_dump_can_write_format(WTAP_FILE_TYPE_SUBTYPE_PCAPNG, file_encaps,
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index 3eac8007a8..6558a6663c 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -1114,8 +1114,8 @@ netmon_process_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
/*
* List of adapters on which the capture
* was done.
- * XXX - This could be translated into PCAP-NG blocks
- * but for now, just treat as a frame
+ * XXX - this could be translated into pcapng
+ * blocks but for now, just treat as a frame.
*/
pkt_encap = WTAP_ENCAP_NETMON_NETWORK_INFO_EX;
break;
diff --git a/wiretap/netscreen.c b/wiretap/netscreen.c
index f3f76a318c..3328368a7c 100644
--- a/wiretap/netscreen.c
+++ b/wiretap/netscreen.c
@@ -35,7 +35,7 @@
* o Construct a list of interfaces, with interface names, give
* them link-layer types based on the interface name and packet
* data, and supply interface IDs with each packet (i.e., make
- * this supply a pcap-ng-style set of interfaces and associate
+ * this supply a pcapng-style set of interfaces and associate
* packets with interfaces). This is probably the right way
* to "Pass the interface names and the traffic direction to either
* the frame-structure, a pseudo-header or use PPI." See the
@@ -44,7 +44,7 @@
* http://www.wireshark.org/lists/wireshark-dev/200708/msg00029.html
*
* to see whether any further discussion is still needed. I suspect
- * it doesn't; pcap-NG existed at the time, as per the final
+ * it doesn't; pcapng existed at the time, as per the final
* message in that thread:
*
* http://www.wireshark.org/lists/wireshark-dev/200708/msg00039.html
@@ -56,7 +56,7 @@
* information as part of the packet metadata from Wiretap modules.
* That should be fixed so that we can show interface information,
* such as the interface name, in packet dissections from, for example,
- * pcap-NG captures.
+ * pcapng captures.
*/
static gboolean info_line(const gchar *line);
diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c
index 233c898c9b..1504ea3529 100644
--- a/wiretap/nettrace_3gpp_32_423.c
+++ b/wiretap/nettrace_3gpp_32_423.c
@@ -805,7 +805,7 @@ create_temp_pcapng_file(wtap *wth, int *err, gchar **err_info, nettrace_3gpp_32_
goto end;
}
- /* OK we've opend a new pcap-ng file and written the headers, time to do the packets, strt by finding the file size */
+ /* OK we've opend a new pcapng file and written the headers, time to do the packets, strt by finding the file size */
if ((file_size = wtap_file_size(wth, err)) == -1) {
result = WTAP_OPEN_ERROR;
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index 95b416e177..b47ff3e2ae 100644
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -1,10 +1,10 @@
/* pcap-common.c
- * Code common to libpcap and pcap-NG file formats
+ * Code common to pcap and pcapng file formats
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * File format support for pcap-ng file format
+ * File format support for pcapng file format
* Copyright (c) 2007 by Ulf Lamping <ulf.lamping@web.de>
*
* This program is free software; you can redistribute it and/or
@@ -492,7 +492,7 @@ static const struct {
*
* We put these *after* the entries for the LINKTYPE_ values for
* those Wiretap encapsulation types, so that, when writing a
- * pcap or pcap-ng file, Wireshark writes the LINKTYPE_ value,
+ * pcap or pcapng file, Wireshark writes the LINKTYPE_ value,
* not the OS's DLT_ value, as the file's link-layer header type
* for pcap or the interface's link-layer header type.
*/
@@ -1729,7 +1729,7 @@ pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap,
* at least in pcap files. For radiotap, that's indicated in
* the radiotap header.
*
- * XXX - in pcap-ng, there *could* be a packet option
+ * XXX - in pcapng, there *could* be a packet option
* indicating the FCS length.
*/
memset(&phdr->pseudo_header.ieee_802_11, 0, sizeof(phdr->pseudo_header.ieee_802_11));
diff --git a/wiretap/pcap-common.h b/wiretap/pcap-common.h
index da95cf546f..285daf7385 100644
--- a/wiretap/pcap-common.h
+++ b/wiretap/pcap-common.h
@@ -1,10 +1,10 @@
/* pcap-common.h
- * Declarations for code common to libpcap and pcap-NG file formats
+ * Declarations for code common to pcap and pcapng file formats
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * File format support for pcap-ng file format
+ * File format support for pcapng file format
* Copyright (c) 2007 by Ulf Lamping <ulf.lamping@web.de>
*
* This program is free software; you can redistribute it and/or
diff --git a/wiretap/pcap-encap.h b/wiretap/pcap-encap.h
index 8804886828..8c9ef931b4 100644
--- a/wiretap/pcap-encap.h
+++ b/wiretap/pcap-encap.h
@@ -1,10 +1,10 @@
/* pcap-encap.h
- * Declarations for routines to handle libpcap/pcap-NG linktype values
+ * Declarations for routines to handle pcap/pcapng linktype values
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * File format support for pcap-ng file format
+ * File format support for pcapng file format
* Copyright (c) 2007 by Ulf Lamping <ulf.lamping@web.de>
*
* This program is free software; you can redistribute it and/or
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c
index 6d82f42a7d..0575339e7c 100644
--- a/wiretap/pcapng.c
+++ b/wiretap/pcapng.c
@@ -3,7 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * File format support for pcap-ng file format
+ * File format support for pcapng file format
* Copyright (c) 2007 by Ulf Lamping <ulf.lamping@web.de>
*
* This program is free software; you can redistribute it and/or
@@ -485,7 +485,7 @@ pcapng_read_section_header_block(FILE_T fh, pcapng_block_header_t *bh,
* This block is too short to be an SHB.
*
* If we're reading this as part of an open,
- * the file is too short to be a pcap-ng file.
+ * the file is too short to be a pcapng file.
*
* If we're not, we treat PCAPNG_BLOCK_NOT_SHB and
* PCAPNG_BLOCK_ERROR the same, so we can just return
@@ -543,7 +543,7 @@ pcapng_read_section_header_block(FILE_T fh, pcapng_block_header_t *bh,
return PCAPNG_BLOCK_ERROR;
}
- /* OK, at this point we assume it's a pcap-ng file.
+ /* OK, at this point we assume it's a pcapng file.
Don't try to allocate memory for a huge number of options, as
that might fail and, even if it succeeds, it might not leave
@@ -551,8 +551,8 @@ pcapng_read_section_header_block(FILE_T fh, pcapng_block_header_t *bh,
We do that by imposing a maximum block size of MAX_BLOCK_SIZE.
We check for this *after* checking the SHB for its byte
- order magic number, so that non-pcap-ng files are less
- likely to be treated as bad pcap-ng files. */
+ order magic number, so that non-pcapng files are less
+ likely to be treated as bad pcapng files. */
if (bh->block_total_length > MAX_BLOCK_SIZE) {
*err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup_printf("pcapng_read_section_header_block: total block length %u is too large (> %u)",
@@ -702,8 +702,8 @@ pcapng_read_if_descr_block(wtap *wth, FILE_T fh, pcapng_block_header_t *bh,
We do that by imposing a maximum block size of MAX_BLOCK_SIZE.
We check for this *after* checking the SHB for its byte
- order magic number, so that non-pcap-ng files are less
- likely to be treated as bad pcap-ng files. */
+ order magic number, so that non-pcapng files are less
+ likely to be treated as bad pcapng files. */
if (bh->block_total_length > MAX_BLOCK_SIZE) {
*err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup_printf("pcapng_read_if_descr_block: total block length %u is too large (> %u)",
@@ -1036,8 +1036,8 @@ pcapng_read_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wta
We do that by imposing a maximum block size of MAX_BLOCK_SIZE.
We check for this *after* checking the SHB for its byte
- order magic number, so that non-pcap-ng files are less
- likely to be treated as bad pcap-ng files. */
+ order magic number, so that non-pcapng files are less
+ likely to be treated as bad pcapng files. */
if (bh->block_total_length > MAX_BLOCK_SIZE) {
*err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup_printf("pcapng_read_packet_block: total block length %u is too large (> %u)",
@@ -1397,8 +1397,8 @@ pcapng_read_simple_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *
We do that by imposing a maximum block size of MAX_BLOCK_SIZE.
We check for this *after* checking the SHB for its byte
- order magic number, so that non-pcap-ng files are less
- likely to be treated as bad pcap-ng files. */
+ order magic number, so that non-pcapng files are less
+ likely to be treated as bad pcapng files. */
if (bh->block_total_length > MAX_BLOCK_SIZE) {
*err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup_printf("pcapng_read_simple_packet_block: total block length %u is too large (> %u)",
@@ -1428,7 +1428,7 @@ pcapng_read_simple_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *
/*
* The captured length is not a field in the SPB; it can be
* calculated as the minimum of the snapshot length from the
- * IDB and the packet length, as per the pcap-ng spec. An IDB
+ * IDB and the packet length, as per the pcapng spec. An IDB
* snapshot length of 0 means no limit.
*/
simple_packet.cap_len = simple_packet.packet_len;
@@ -1614,8 +1614,8 @@ pcapng_read_name_resolution_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t
We do that by imposing a maximum block size of MAX_BLOCK_SIZE.
We check for this *after* checking the SHB for its byte
- order magic number, so that non-pcap-ng files are less
- likely to be treated as bad pcap-ng files. */
+ order magic number, so that non-pcapng files are less
+ likely to be treated as bad pcapng files. */
if (bh->block_total_length > MAX_BLOCK_SIZE) {
*err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup_printf("pcapng_read_name_resolution_block: total block length %u is too large (> %u)",
@@ -1682,7 +1682,7 @@ pcapng_read_name_resolution_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t
* a 4-byte IPv4 address, hence a minimum
* of 4 bytes.
*
- * (The pcap-NG spec really indicates
+ * (The pcapng spec really indicates
* that it must be at least 5 bytes,
* as there must be at least one name,
* and it really must be at least 6
@@ -1744,7 +1744,7 @@ pcapng_read_name_resolution_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t
* a 16-byte IPv6 address, hence a minimum
* of 16 bytes.
*
- * (The pcap-NG spec really indicates
+ * (The pcapng spec really indicates
* that it must be at least 17 bytes,
* as there must be at least one name,
* and it really must be at least 18
@@ -1922,8 +1922,8 @@ pcapng_read_interface_statistics_block(FILE_T fh, pcapng_block_header_t *bh, pca
We do that by imposing a maximum block size of MAX_BLOCK_SIZE.
We check for this *after* checking the SHB for its byte
- order magic number, so that non-pcap-ng files are less
- likely to be treated as bad pcap-ng files. */
+ order magic number, so that non-pcapng files are less
+ likely to be treated as bad pcapng files. */
if (bh->block_total_length > MAX_BLOCK_SIZE) {
*err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup_printf("pcapng_read_interface_statistics_block: total block length %u is too large (> %u)",
@@ -2311,7 +2311,7 @@ pcapng_read_block(wtap *wth, FILE_T fh, pcapng_t *pn, wtapng_block_t *wblock, in
* Short read or EOF.
*
* If we're reading this as part of an open,
- * the file is too short to be a pcap-ng file.
+ * the file is too short to be a pcapng file.
*
* If we're not, we treat PCAPNG_BLOCK_NOT_SHB and
* PCAPNG_BLOCK_ERROR the same, so we can just return
@@ -2325,7 +2325,7 @@ pcapng_read_block(wtap *wth, FILE_T fh, pcapng_t *pn, wtapng_block_t *wblock, in
/*
* SHBs have to be treated differently from other blocks, as we
* might be doing an open and attempting to read a block at the
- * beginning of the file to see if it's a pcap-ng file or not,
+ * beginning of the file to see if it's a pcapng file or not,
* and as they do not necessarily have the same byte order as
* previous blocks.
*/
@@ -2356,7 +2356,7 @@ pcapng_read_block(wtap *wth, FILE_T fh, pcapng_t *pn, wtapng_block_t *wblock, in
/*
* No SHB seen yet, so we're trying to read the first block
* during an open, to see whether it's an SHB; if what we
- * read doesn't look like an SHB, this isn't a pcap-ng file.
+ * read doesn't look like an SHB, this isn't a pcapng file.
*/
*err = 0;
*err_info = NULL;
@@ -2476,14 +2476,14 @@ pcapng_open(wtap *wth, int *err, gchar **err_info)
break;
case PCAPNG_BLOCK_NOT_SHB:
- /* An error indicating that this isn't a pcap-ng file. */
+ /* An error indicating that this isn't a pcapng file. */
wtap_block_free(wblock.block);
*err = 0;
*err_info = NULL;
return WTAP_OPEN_NOT_MINE;
case PCAPNG_BLOCK_ERROR:
- /* An I/O error, or this probably *is* a pcap-ng file but not a valid one. */
+ /* An I/O error, or this probably *is* a pcapng file but not a valid one. */
wtap_block_free(wblock.block);
return WTAP_OPEN_ERROR;
}
@@ -2502,7 +2502,7 @@ pcapng_open(wtap *wth, int *err, gchar **err_info)
pn.shb_read = TRUE;
/*
- * At this point, we've decided this is a pcap-NG file, not
+ * At this point, we've decided this is a pcapng file, not
* some other type of file, so we can't return WTAP_OPEN_NOT_MINE
* past this point.
*/
@@ -3000,7 +3000,7 @@ pcapng_write_enhanced_packet_block(wtap_dumper *wdh,
else {
/*
* XXX - we should support writing WTAP_ENCAP_PER_PACKET
- * data to pcap-NG files even if we *don't* have interface
+ * data to pcapng files even if we *don't* have interface
* IDs.
*/
epb.interface_id = 0;
diff --git a/wiretap/pcapng_module.h b/wiretap/pcapng_module.h
index 7cd33e356b..4792818636 100644
--- a/wiretap/pcapng_module.h
+++ b/wiretap/pcapng_module.h
@@ -41,7 +41,7 @@
*/
/*
- * Reader and writer routines for pcap-ng block types.
+ * Reader and writer routines for pcapng block types.
*/
typedef gboolean (*block_reader)(FILE_T, guint32, gboolean, struct wtap_pkthdr *,
Buffer *, int *, gchar **);
@@ -49,19 +49,19 @@ typedef gboolean (*block_writer)(wtap_dumper *, const struct wtap_pkthdr *,
const guint8 *, int *);
/*
- * Register a handler for a pcap-ng block type.
+ * Register a handler for a pcapng block type.
*/
WS_DLL_PUBLIC
void register_pcapng_block_type_handler(guint block_type, block_reader read,
block_writer write);
/*
- * Handler routine for pcap-ng option type.
+ * Handler routine for pcapng option type.
*/
typedef gboolean (*option_handler_fn)(gboolean, guint, guint8 *, int *, gchar **);
/*
- * Register a handler for a pcap-ng option code for a particular block
+ * Register a handler for a pcapng option code for a particular block
* type.
*/
WS_DLL_PUBLIC
diff --git a/wiretap/visual.c b/wiretap/visual.c
index 90e607ef52..0c085ec393 100644
--- a/wiretap/visual.c
+++ b/wiretap/visual.c
@@ -347,7 +347,7 @@ visual_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
Most Visual capture types include the FCS in the original length
value, but don't include the FCS as part of the payload or captured
length. This is different from the model used in most other capture
- file formats, including pcap and pcap-ng in cases where the FCS isn't
+ file formats, including pcap and pcapng in cases where the FCS isn't
captured (which are the typical cases), and causes the RTP audio
payload save to fail since then captured len != orig len.
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index dbbaf83667..8fd101d098 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1223,7 +1223,7 @@ union wtap_pseudo_header {
*
* For file-type-specific records, the "ftsrec" field of the pseudo-header
* contains a file-type-specific subtype value, such as a block type for
- * a pcap-ng file.
+ * a pcapng file.
*
* An "event" is an indication that something happened during the capture
* process, such as a status transition of some sort on the network.
@@ -1234,7 +1234,7 @@ union wtap_pseudo_header {
* packets are.
*
* A "report" supplies information not corresponding to an event;
- * for example, a pcap-ng Interface Statistics Block would be a report,
+ * for example, a pcapng Interface Statistics Block would be a report,
* as it doesn't correspond to something happening on the network.
* They may have a time stamp, and should be dissected and displayed
* just as packets are.
@@ -1352,7 +1352,7 @@ typedef struct wtapng_if_descr_filter_s {
} wtapng_if_descr_filter_t;
/**
- * Holds the required data for pcap-ng Interface Statistics Block (ISB).
+ * Holds the required data for pcapng Interface Statistics Block (ISB).
*/
typedef struct wtapng_if_stats_mandatory_s {
guint32 interface_id;
@@ -1476,7 +1476,7 @@ typedef wtap_open_return_val (*wtap_open_routine_t)(struct wtap*, int *,
/*
* Some file formats have defined magic numbers at fixed offsets from
* the beginning of the file; those routines should return 1 if and
- * only if the file has the magic number at that offset. (pcap-ng
+ * only if the file has the magic number at that offset. (pcapng
* is a bit of a special case, as it has both the Section Header Block
* type field and its byte-order magic field; it checks for both.)
* Those file formats do not require a file name extension in order
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 23:02:57 +0000