osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Corrects repeated words throughout the code. 

Repeated words were found with:
egrep "(\b[a-zA-Z]+) +\1\b" . -Ir
and then manually reviewed.
Non-displayed strings (e.g., in comments)
were also corrected, to ease future review.
pespin/osmux-wip
Moshe Kaplan 2021-12-19 21:40:23 -05:00 committed by AndersBroman
parent b5928542b7
commit 69d54d6f8e
97 changed files with 143 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
capture/airpcap.h
View File

@ -245,7 +245,7 @@ typedef struct _AirpcapStats
/* < from the beginning of the current capture. This value includes the packets */
/* < dropped because of buffer full. */
guint Drops; /* < number of packets that the driver dropped from the beginning of a capture. */
/* < A packet is lost when the the buffer of the driver is full. */
/* < A packet is lost when the driver's buffer is full. */
guint IfDrops; /* < Packets dropped by the card before going to the USB bus. */
/* < Not supported at the moment. */
guint Capt; /* < number of packets that pass the BPF filter, find place in the kernel buffer and */
@ -717,7 +717,7 @@ gboolean AirpcapStoreCurConfigAsAdapterDefault(PAirpcapHandle AdapterHandle);
\param Instructions pointer to the first BPF instruction in the array. Corresponds to the bf_insns
in a bpf_program structure (see the WinPcap documentation at https://www.winpcap.org/devel.htm).
\param Len Number of instructions in the array pointed by the previous field. Corresponds to the bf_len in
a a bpf_program structure (see the WinPcap documentation at https://www.winpcap.org/devel.htm).
a bpf_program structure (see the WinPcap documentation at https://www.winpcap.org/devel.htm).
\return TRUE on success.
The AirPcap driver is able to perform kernel-level filtering using the standard BPF pseudo-machine format. You can read

2
capture/airpcap_loader.c
View File

@ -1198,7 +1198,7 @@ get_compiled_airpcap_version(GString *str)
}
/*
* Append the version of AirPcap with which we we're running to a GString.
* Append the version of AirPcap with which we're running to a GString.
*/
void
get_runtime_airpcap_version(GString *str)

2
capture/capture-pcap-util-unix.c
View File

@ -160,7 +160,7 @@ get_compiled_caplibs_version(GString *str)
}
/*
* Append the version of libpcap with which we we're running to a GString.
* Append the version of libpcap with which we're running to a GString.
*/
void
get_runtime_caplibs_version(GString *str)

2
capture/capture-wpcap.c
View File

@ -827,7 +827,7 @@ get_compiled_caplibs_version(GString *str)
}
/*
* Append the version of Npcap with which we we're running to a GString.
* Append the version of Npcap with which we're running to a GString.
*/
void
get_runtime_caplibs_version(GString *str)

4
cmake/modules/FindPCAP.cmake
View File

@ -201,7 +201,7 @@ if(PCAP_FOUND)
set(HAVE_PCAP_SET_TSTAMP_TYPE TRUE)
else(WIN32)
#
# Make sure we have at least libpcap 0.8, because we we require at
# Make sure we have at least libpcap 0.8, because we require at
# least libpcap 0.8's APIs.
#
# We check whether pcap_lib_version is defined in the pcap header,
@ -223,7 +223,7 @@ if(PCAP_FOUND)
# remote capture support.
#
# However, 1) the sampling options are treated as remote options
# in the GUI and and 2) having pcap_setsampling() doesn't mean
# in the GUI and 2) having pcap_setsampling() doesn't mean
# you have sampling support. libpcap needs a way to indicate
# whether a given device supports sampling, and the GUI should
# be changed to decouple them.

2
doc/README.display_filter
View File

@ -160,7 +160,7 @@ operators ("==", "!=", "eq", "ne", etc.), it finds slice operations
( "[0:1]" ), quoted strings, IP addresses, numbers, and any other "special"
keywords or string types.
Anything it doesn't know how to handle is passed to to grammar parser
Anything it doesn't know how to handle is passed to the grammar parser
as an unparsed string (TOKEN_UNPARSED). This includes field names. The
scanner does not interpret any protocol field names at all.

2
doc/README.dissector
View File

@ -1103,7 +1103,7 @@ If the values in the array are not contiguous (ie: there are "gaps"), but are
in ascending order a binary search will be used.
Note: "gaps" in a value_string array can be filled with "empty" entries eg:
{value, "Unknown"} so that direct access to the array is is possible.
{value, "Unknown"} so that direct access to the array is possible.
Note: the value_string array values are *unsigned*; IOW: -1 is greater than 0.
So:

2
doc/dumpcap.adoc
View File

@ -282,7 +282,7 @@ interface or pipe specified before it with *-i*.
--ifname> <name>::
+
--
Use __name__ as the name in the capture file for the the interface or
Use __name__ as the name in the capture file for the interface or
pipe specified before it with *-i*.
--

2
doc/packet-PROTOABBREV.c
View File

@ -276,7 +276,7 @@ proto_register_PROTOABBREV(void)
* should accommodate being called more than once by use of the static
* 'initialized' variable included below.
*
* This form of the reg_handoff function is used if if you perform registration
* This form of the reg_handoff function is used if you perform registration
* functions which are dependent upon prefs. See below this function for a
* simpler form which can be used if there are no prefs-dependent registration
* functions.

2
doc/tshark.adoc
View File

@ -87,7 +87,7 @@ Read filters use the same syntax as display and color filters in
*Wireshark*; a read filter is specified with the *-R* option.
Read filters can be specified when capturing or when reading from a
capture file. Note that that capture filters are much more efficient
capture file. Note that capture filters are much more efficient
than read filters, and it may be more difficult for *TShark* to keep up
with a busy network if a read filter is specified for a live capture, so
you might be more likely to lose packets if you're using a read filter.

2
docbook/wsdg_src/WSDG_chapter_sources.adoc
View File

@ -320,7 +320,7 @@ There are several reasons why you might want to change Wireshark’s sources:
* Implement a glorious new feature
Wireshark’s developers work on a variety of different platforms and use a variety of different development environments.
Although we we don't enforce or recommend a particular environment, your editor should support https://editorconfig.org/[EditorConfig] in order to make sure you pick up the correct indentation style for any files that you might edit.
Although we don't enforce or recommend a particular environment, your editor should support https://editorconfig.org/[EditorConfig] in order to make sure you pick up the correct indentation style for any files that you might edit.
The internal structure of the Wireshark sources are described in <<PartDevelopment>>.

2
docbook/wsug_src/WSUG_chapter_capture.adoc
View File

@ -114,7 +114,7 @@ If you are unsure which options to choose in this dialog box, leaving the defaul
.The “Capture Options” input tab
image::wsug_graphics/ws-capture-options.png[{screenshot-attrs}]
The “Input” tab contains the the “Interface” table, which shows the following columns:
The “Input” tab contains the “Interface” table, which shows the following columns:
Interface::
The interface name.

2
epan/addr_resolv.h
View File

@ -10,7 +10,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
/* The buffers returned by these functions are all allocated with a
* packet lifetime and does not have have to be freed.
* packet lifetime and does not have to be freed.
* However, take into account that when the packet dissection
* completes, these buffers will be automatically reclaimed/freed.
* If you need the buffer to remain for a longer scope than packet lifetime

6
epan/color_filters.h
View File

@ -119,7 +119,7 @@ color_filters_colorize_packet(struct epan_dissect *edt);
/** Clone the currently active filter list.
*
* @param user_data will be returned by each call to to color_filter_add_cb()
* @param user_data will be returned by each call to color_filter_add_cb()
* @param add_cb the callback function to add color filter
*/
WS_DLL_PUBLIC void color_filters_clone(gpointer user_data, color_filter_add_cb_func add_cb);
@ -127,7 +127,7 @@ WS_DLL_PUBLIC void color_filters_clone(gpointer user_data, color_filter_add_cb_f
/** Load filters (import) from some other filter file.
*
* @param path the path to the import file
* @param user_data will be returned by each call to to color_filter_add_cb()
* @param user_data will be returned by each call to color_filter_add_cb()
* @param err_msg a string with error message
* @param add_cb the callback function to add color filter
* @return TRUE, if read succeeded
@ -136,7 +136,7 @@ WS_DLL_PUBLIC gboolean color_filters_import(const gchar *path, gpointer user_dat
/** Read filters from the global filter file (not the users file).
*
* @param user_data will be returned by each call to to color_filter_add_cb()
* @param user_data will be returned by each call to color_filter_add_cb()
* @param err_msg a string with error message
* @param add_cb the callback function to add color filter
* @return TRUE, if read succeeded

2
epan/crypt/dot11decrypt.c
View File

@ -527,7 +527,7 @@ Dot11DecryptDecryptKeyData(PDOT11DECRYPT_CONTEXT ctx,
* @param ctx [IN] pointer to the current context
* @param id [IN] id of the association (composed by BSSID and MAC of
* the station)
* @return a pointer the the requested SA. NULL if it doesn't exist.
* @return a pointer of the requested SA. NULL if it doesn't exist.
*/
static PDOT11DECRYPT_SEC_ASSOCIATION
Dot11DecryptGetSa(

4
epan/dissectors/asn1/ldap/packet-ldap-template.c
View File

@ -830,7 +830,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu
case LDAP_REQ_COMPARE:
case LDAP_REQ_EXTENDED:
/* this a a request - add it to the unmatched list */
/* this a request - add it to the unmatched list */
/* check that we don't already have one of those in the
unmatched list and if so remove it */
@ -2097,7 +2097,7 @@ void proto_register_ldap(void) {
{ &hf_mscldap_netlogon_flags_fnc,
{ "FDC", "mscldap.netlogon.flags.forestnc", FT_BOOLEAN, 32,
TFS(&tfs_ads_fnc), 0x80000000, "Is the the NC the default forest root(Windows 2008)?", HFILL }},
TFS(&tfs_ads_fnc), 0x80000000, "Is the NC the default forest root(Windows 2008)?", HFILL }},
{ &hf_ldap_guid,
{ "GUID", "ldap.guid", FT_GUID, BASE_NONE,

2
epan/dissectors/asn1/ranap/packet-ranap-template.c
View File

@ -99,7 +99,7 @@ static ranap_private_data_t* ranap_get_private_data(asn1_ctx_t *actx)
return private_data;
}
/* Helper function to reset the the private data struct */
/* Helper function to reset the private data struct */
static void ranap_reset_private_data(packet_info *pinfo)
{
p_remove_proto_data(pinfo->pool, pinfo, proto_ranap, 0);

2
epan/dissectors/asn1/ros/packet-ros-template.c
View File

@ -296,7 +296,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
/* we haven't found a match - try and match it up */
if(isInvoke) {
/* this a a request - add it to the unmatched list */
/* this a request - add it to the unmatched list */
/* check that we don't already have one of those in the
unmatched list and if so remove it */

4
epan/dissectors/asn1/tcap/packet-tcap-template.c
View File

@ -772,7 +772,7 @@ create_tcaphash_cont(struct tcaphash_cont_info_key_t *p_tcaphash_cont_key,
if (p_tcaphash_contcall1) {
/* Walk through list of transaction with identical keys */
/* go the the end to insert new record */
/* go to the end to insert new record */
do {
if (!p_tcaphash_contcall1->next_contcall) {
p_tcaphash_contcall=append_tcaphash_contcall(p_tcaphash_contcall1,
@ -801,7 +801,7 @@ create_tcaphash_end(struct tcaphash_end_info_key_t *p_tcaphash_end_key,
if (p_tcaphash_endcall1) {
/* Walk through list of transaction with identical keys */
/* go the the end to insert new record */
/* go to the end to insert new record */
do {
if (!p_tcaphash_endcall1->next_endcall) {
p_tcaphash_endcall=append_tcaphash_endcall(p_tcaphash_endcall1,

2
epan/dissectors/file-elf.c
View File

@ -2266,7 +2266,7 @@ proto_register_elf(void)
{ &hf_elf_eh_frame_fde_cie_pointer,
{ "CIE Pointer", "elf.eh_frame.fde.cie_pointer",
FT_UINT32, BASE_DEC_HEX, NULL, 0x00,
"A 4 byte unsigned value that when subtracted from the offset of the the CIE Pointer in the current FDE yields the offset of the start of the associated CIE. This value shall never be 0.", HFILL }
"A 4 byte unsigned value that when subtracted from the offset of the CIE Pointer in the current FDE yields the offset of the start of the associated CIE. This value shall never be 0.", HFILL }
},
{ &hf_elf_eh_frame_fde_pc_begin,
{ "PC Begin", "elf.eh_frame.fde.pc_begin",

2
epan/dissectors/packet-afs.c
View File

@ -1452,7 +1452,7 @@ afs_hash (gconstpointer v)
*
* "positive" and "negative" are integers which contain the number of
* positive and negative ACL's in the string. The uid/aclbits pair are
* ASCII strings containing the UID/PTS record and and a ascii number
* ASCII strings containing the UID/PTS record and a ascii number
* representing a logical OR of all the ACL permission bits
*/
/*

2
epan/dissectors/packet-bpq.c
View File

@ -17,7 +17,7 @@
* Information was drawn from:
* ?
*
* It uses Ether ID 0x08ff which is not not officially registered.
* It uses Ether ID 0x08ff which is not officially registered.
*
*/

4
epan/dissectors/packet-bssap.c
View File

@ -701,7 +701,7 @@ dissect_bssap_cell_global_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo
proto_tree_add_item(ie_tree, hf_bssap_plus_ie_len, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/*
* The rest of the information element is coded as the the value part
* The rest of the information element is coded as the value part
* of the cell global id IE defined in 3GPP TS 48.018 (not including
* 3GPP TS 48.018 IEI and 3GPP TS 48.018 length indicator).
*/
@ -1356,7 +1356,7 @@ dissect_bssap_service_area_id(tvbuff_t *tvb, proto_tree *tree, int offset)
offset++;
proto_tree_add_item(ie_tree, hf_bssap_plus_ie_len, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* The rest of the information element is coded as the the value part
/* The rest of the information element is coded as the value part
* of the SAI IE defined in 3GPP TS 25.413 (not including
* 3GPP TS 25.413 IEI and 3GPP TS 25.413 length indicator).
*/

2
epan/dissectors/packet-dsr.c
View File

@ -295,7 +295,7 @@ dissect_dsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_tree_add_item(opt_tree, hf_dsr_opt_err_unknownflow_dest, tvb, offset_in_option, 4, ENC_NA);/* Opt err unknown flow original ip destination address */
offset_in_option += 4;
proto_tree_add_item(opt_tree, hf_dsr_opt_err_unknownflow_id, tvb, offset_in_option, 2, ENC_BIG_ENDIAN);/* Opt err unknown flow flow id */
proto_tree_add_item(opt_tree, hf_dsr_opt_err_unknownflow_id, tvb, offset_in_option, 2, ENC_BIG_ENDIAN);/* Opt err unknown flow id */
/*offset_in_option += 1;*/
break;
case DSR_RERR_TYPE_DEFAULTFLOWUNKNOWN:

4
epan/dissectors/packet-dtls.c
View File

@ -442,7 +442,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
* figure out what flavor of DTLS it is */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTLS");
/* clear the the info column */
/* clear the info column */
col_clear(pinfo->cinfo, COL_INFO);
/* Create display subtree for SSL as a whole */
@ -888,7 +888,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo,
/*
* if we don't already have a version set for this conversation,
* but this message's version is authoritative (i.e., it's
* not client_hello, then save the version to to conversation
* not client_hello, then save the version to the conversation
* structure and print the column version
*/
next_byte = tvb_get_guint8(tvb, offset);

2
epan/dissectors/packet-eigrp.c
View File

@ -3371,7 +3371,7 @@ proto_register_eigrp(void)
* @par
* If this dissector uses sub-dissector registration add a registration routine.
*
* This form of the reg_handoff function is used if if you perform registration
* This form of the reg_handoff function is used if you perform registration
* functions which are dependent upon prefs. If this function is registered as
* a prefs callback (see prefs_register_protocol above) this function is also
* called by preferences whenever "Apply" is pressed;

8
epan/dissectors/packet-f5ethtrailer.c
View File

@ -1176,7 +1176,7 @@ static const guint8 fileinfomagic1[] = {
*
* The analysis in this dissector is meant to correlate data in the F5 Ethernet trailer with other
* data in the frame (e.g. IP, TCP) and highlight things that don't look right. They might be
* perfectly valid, but in most cases, they are are not.
* perfectly valid, but in most cases, they are not.
*
* How it works:
*
@ -1624,7 +1624,7 @@ render_f5_legacy_hdr(tvbuff_t *tvb, proto_tree *tree, gint offset)
* @param tvb Pointer to the tvb to be processed
* @param pinfo Pointer to packet_info struct
* @param tree Pointer to protocol tree
* @param offset Offset int the the tvb where trailer begins
* @param offset Offset into the tvb where trailer begins
* @param trailer_length Length of the trailer data to process
* @param trailer_ver Version of the trailer detected
* @param tdata Pointer to tap data structure
@ -1737,7 +1737,7 @@ dissect_high_trailer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint
* @param tvb Pointer to the tvb to be processed
* @param pinfo Pointer to packet_info struct
* @param tree Pointer to protocol tree
* @param offset Offset int the the tvb where trailer begins
* @param offset Offset into the tvb where trailer begins
* @param trailer_length Length of the trailer data to process
* @param trailer_ver Version of the trailer detected
* @param tdata Pointer to tap data structure
@ -1944,7 +1944,7 @@ dissect_med_trailer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint o
* @param tvb Pointer to the tvb to be processed
* @param pinfo Pointer to packet_info struct
* @param tree Pointer to protocol tree
* @param offset Offset int the the tvb where trailer begins
* @param offset Offset into the tvb where trailer begins
* @param trailer_length Length of the trailer data to process
* @param trailer_ver Version of the trailer detected
* @param tdata Pointer to tap data structure

2
epan/dissectors/packet-ftdi-mpsse.c
View File

@ -110,7 +110,7 @@ static dissector_handle_t ftdi_mpsse_handle;
* not have is_response_set flag set, is added to rx_command_info with the current packet number in the key.
*
* After first pass, RX packets always obtain relevant command_data_t entry without traversing the list.
* If there wasn't a separate tree TX packets (tx_command_info), TX packet dissection would have to to
* If there wasn't a separate tree TX packets (tx_command_info), TX packet dissection would have to
* traverse the list from the pointer obtained from rx_command_info. In normal conditions the number of
* entries to skip in such case is low. However, when the capture file has either:
* * A lot of TX packets with commands expecting response but no RX packets, or

2
epan/dissectors/packet-gfp.c
View File

@ -582,7 +582,7 @@ proto_register_gfp(void)
* should accommodate being called more than once by use of the static
* 'initialized' variable included below.
*
* This form of the reg_handoff function is used if if you perform registration
* This form of the reg_handoff function is used if you perform registration
* functions which are dependent upon prefs.
*/
void

8
epan/dissectors/packet-giop.c
View File

@ -3120,7 +3120,7 @@ void get_CDR_interface(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
/* Copy a 4 octet sequence from the tvbuff
* which represents a signed long value, and convert
* it to an signed long vaule, taking into account byte order.
* it to an signed long value, taking into account byte order.
* offset is first incremented so that it falls on a proper alignment
* boundary for long values.
* offset is then incremented by 4, to indicate the 4 octets which
@ -3144,7 +3144,7 @@ gint32 get_CDR_long(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian, i
/* Copy a 8 octet sequence from the tvbuff
* which represents a signed long long value, and convert
* it to an signed long long vaule, taking into account byte order.
* it to an signed long long value, taking into account byte order.
* offset is first incremented so that it falls on a proper alignment
* boundary for long long values.
* offset is then incremented by 8, to indicate the 8 octets which
@ -3489,7 +3489,7 @@ guint32 get_CDR_ulong(tvbuff_t *tvb, int *offset, gboolean stream_is_big_endian,
/* Copy a 8 octet sequence from the tvbuff
* which represents an unsigned long long value, and convert
* it to an unsigned long long vaule, taking into account byte order.
* it to an unsigned long long value, taking into account byte order.
* offset is first incremented so that it falls on a proper alignment
* boundary for unsigned long long values.
* offset is then incremented by 4, to indicate the 4 octets which
@ -5806,7 +5806,7 @@ static void decode_IIOP_IOR_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tre
}
/*
* Now see if if it's v1.1 or 1.2, as they can contain
* Now see if it's v1.1 or 1.2, as they can contain
* extra sequence of IOP::TaggedComponents
*
*/

4
epan/dissectors/packet-gquic.c
View File

@ -2832,7 +2832,7 @@ proto_register_gquic(void)
"Specifying the number of missing packet ranges between largest observed and least unacked", HFILL }
},
{ &hf_gquic_frame_type_ack_missing_packet,
{ "Missing Packet Packet Number Delta", "gquic.frame_type.ack.missing_packet",
{ "Missing Packet Number Delta", "gquic.frame_type.ack.missing_packet",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
@ -2847,7 +2847,7 @@ proto_register_gquic(void)
"Specifying the number of revived packets, recovered via FEC", HFILL }
},
{ &hf_gquic_frame_type_ack_revived_packet,
{ "Revived Packet Packet Number", "gquic.frame_type.ack.revived_packet",
{ "Revived Packet Number", "gquic.frame_type.ack.revived_packet",
FT_UINT64, BASE_DEC, NULL, 0x0,
"Representing a packet the peer has revived via FEC", HFILL }
},

2
epan/dissectors/packet-gsm_a_bssmap.c
View File

@ -1429,7 +1429,7 @@ static const range_string gsm_a_bssap_channel_rate_and_type_rvals[] = {
{ 0x1a, 0x1a, "Full or Half rate TCH channel, Full rate preferred, changes allowed also after first channel allocation as a result of the request" },
{ 0x1b, 0x1b, "Full or Half rate TCH channel, Half rate preferred, changes allowed also after first channel allocation as a result of the request" },
{ 0x1c, 0x1f, "Reserved" },
{ 0x20, 0x27, "Full rate TCH channels in a multislot configuration, changes by the BSS of the the number of TCHs and if applicable the used radio interface rate per channel allowed after first channel allocation as a result of the request" },
{ 0x20, 0x27, "Full rate TCH channels in a multislot configuration, changes by the BSS of the number of TCHs and if applicable the used radio interface rate per channel allowed after first channel allocation as a result of the request" },
{ 0x28, 0x2f, "Reserved" },
{ 0x30, 0x37, "Full rate TCH channels in a multislot configuration, changes by the BSS of the number of TCHs or the used radio interface rate per channel not allowed after first channel allocation as a result of the request" },
{ 0x38, 0xff, "Reserved" },

2
epan/dissectors/packet-gsm_rlcmac.h
View File

@ -4671,7 +4671,7 @@ typedef struct
guint8 MESSAGE_TYPE;
guint8 PAGE_MODE;
PacketDownlinkID_t ID; /* use the PDA ID as it is the same as as the PMO */
PacketDownlinkID_t ID; /* use the PDA ID as it is the same as the PMO */
guint8 PMO_INDEX;
guint8 PMO_COUNT;

2
epan/dissectors/packet-gtp.c
View File

@ -6216,7 +6216,7 @@ decode_gtp_tft(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree *
* UMTS: 3GPP TS 29.060 version 10.4.0 Release 10, chapter 7.7.37
* Type = 138 (Decimal)
* 25.413(RANAP) TargetID
* There are several CRs to to this IE make sure to check with a recent spec if dissection is questioned.
* There are several CRs to this IE make sure to check with a recent spec if dissection is questioned.
*/
static int
decode_gtp_target_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, session_args_t * args _U_)

2
epan/dissectors/packet-gtpv2.c
View File

@ -5878,7 +5878,7 @@ dissect_gtpv2_source_ident(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
break;
case 1:
/* The Source Type is RNC ID for PS handover from GERAN Iu mode or for inter-RAT handover from UTRAN. In this
* case the Source ID field shall be encoded as as the Source RNC-ID part of the "Source ID" parameter in 3GPP TS
* case the Source ID field shall be encoded as the Source RNC-ID part of the "Source ID" parameter in 3GPP TS
* 25.413 [33].
*/
/* RNC-ID M INTEGER (0..4095) */

2
epan/dissectors/packet-hl7.c
View File

@ -124,7 +124,7 @@ static const string_string hl7_msg_type_vals[] = {
{ "ORM", "Pharmacy/treatment order" },
{ "ORN", "Non-stock requisition - General order acknowledgment" },
{ "ORP", "Pharmacy/treatment order acknowledgment" },
{ "ORR", "General order response response to any ORM" },
{ "ORR", "General order response message response to any ORM" },
{ "ORS", "Stock requisition - Order acknowledgment" },
{ "ORU", "Unsolicited transmission of an observation" },
{ "OSQ", "Query response for order status" },

10
epan/dissectors/packet-ieee80211.c
View File

@ -19196,7 +19196,7 @@ static guint16 determine_mic_len(packet_info *pinfo, gboolean assoc_frame,
conversation_data->last_akm_suite_set) {
/* 3rd - Use AKMS negotiated during association to determine MIC length */
if (conversation_data->last_akm_suite == AKMS_OWE) {
/* For OWE the the length of MIC depends on the selected group */
/* For OWE the length of MIC depends on the selected group */
eapol_key_mic_len = get_mic_len_owe(conversation_data->owe_group);
}
else {
@ -19206,7 +19206,7 @@ static guint16 determine_mic_len(packet_info *pinfo, gboolean assoc_frame,
else if (packet_data && packet_data->last_akm_suite_set) {
/* 3rd - Use AKMS from current packet to determine MIC length */
if (packet_data->last_akm_suite == AKMS_OWE) {
/* For OWE the the length of MIC depends on the selected group */
/* For OWE the length of MIC depends on the selected group */
eapol_key_mic_len = get_mic_len_owe(packet_data->owe_group);
}
else {
@ -34099,7 +34099,7 @@ dissect_ieee80211_pv0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
ti = proto_tree_add_string(wep_tree, hf_ieee80211_fc_analysis_tk, tvb, 0, 0, out_buff);
proto_item_set_generated(ti);
/* Also add the PMK used to to decrypt the packet. (PMK==PSK) */
/* Also add the PMK used to decrypt the packet. (PMK==PSK) */
if (used_key.KeyData.Wpa.PskLen > 0) {
bytes_to_hexstr(out_buff, used_key.KeyData.Wpa.Psk, used_key.KeyData.Wpa.PskLen);
@ -34182,7 +34182,7 @@ dissect_ieee80211_pv0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* We have the entire packet, and it includes a 4-byte ICV.
* Slice it off, and put it into the tree.
*
* We only support decrypting if we have the the ICV.
* We only support decrypting if we have the ICV.
*
* XXX - the ICV is encrypted; we're putting the encrypted
* value, not the decrypted value, into the tree.
@ -35441,7 +35441,7 @@ dissect_wlan_rsna_eapol_wpa_or_rsn_key(tvbuff_t *tvb, packet_info *pinfo, proto_
padding_len, ENC_NA);
}
}
/* Also add the PTK used to to decrypt and validate the keydata. */
/* Also add the PTK used to decrypt and validate the keydata. */
add_ptk_analysis(tvb, keydes_tree, &eapol->used_key);
}
} else {

2
epan/dissectors/packet-ip.c
View File

@ -1181,7 +1181,7 @@ dissect_ipopt_route(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int pro
dissect_option_route(field_tree, tvb, offset + optoffset, hf_ip_rec_rt,
hf_ip_rec_rt_host, FALSE);
} else if (optoffset == (len - 4)) {
/* This is the the destination */
/* This is the destination */
proto_item *item;
guint32 addr;
const char *dst_host;

2
epan/dissectors/packet-kt.c
View File

@ -35,7 +35,7 @@ static int proto_kt = -1;
* for which it has been written, the way it has been written makes
* dissection a bit tricky. Requests and responses have the same
* "magic" identifier, but there is no clear cut way to distinguish
* between them. This means that a few dirty tricks have have to be
* between them. This means that a few dirty tricks have to be
* employed for dissecting... and the dissector is based on sample
* captures from two different clients working with the same version
* of the server.

4
epan/dissectors/packet-ldap.c
View File

@ -1044,7 +1044,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu
case LDAP_REQ_COMPARE:
case LDAP_REQ_EXTENDED:
/* this a a request - add it to the unmatched list */
/* this is a request - add it to the unmatched list */
/* check that we don't already have one of those in the
unmatched list and if so remove it */
@ -5007,7 +5007,7 @@ void proto_register_ldap(void) {
{ &hf_mscldap_netlogon_flags_fnc,
{ "FDC", "mscldap.netlogon.flags.forestnc", FT_BOOLEAN, 32,
TFS(&tfs_ads_fnc), 0x80000000, "Is the the NC the default forest root(Windows 2008)?", HFILL }},
TFS(&tfs_ads_fnc), 0x80000000, "Is the NC the default forest root(Windows 2008)?", HFILL }},
{ &hf_ldap_guid,
{ "GUID", "ldap.guid", FT_GUID, BASE_NONE,

2
epan/dissectors/packet-megaco.c
View File

@ -999,7 +999,7 @@ nextcontext:
/* Find Commands */
/* If Transaction is is Request, Reply or Pending */
/* If Transaction is Request, Reply or Pending */
tvb_command_start_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset +1);
tvb_command_end_offset = tvb_command_start_offset;

4
epan/dissectors/packet-metamako.c
View File

@ -143,8 +143,8 @@ dissect_metamako(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
/* Loop through the trailer bytes, try to find a valid trailer.
* Only try twice:
* - First try the case there there IS NO trailing FCS
* - Second try the case where where IS a trailing FCS
* - First try the case where IS NO trailing FCS
* - Second try the case where there IS a trailing FCS
*/
for ( i = 0; i < 2 && metamako_trailer_bytes >= 12 && !trailer_valid; i++ ) {
/* Start at the tail of the trailer and work inwards */

2
epan/dissectors/packet-mpeg-descriptor.c
View File

@ -237,7 +237,7 @@ static int hf_mpeg_descr_audio_stream_reserved = -1;
static const value_string mpeg_descr_audio_stream_free_format_flag_vals[] = {
{ 0x00, "bitrate_index is not 0" },
{ 0x01, "One more more audio frame has bitrate_index = 0" },
{ 0x01, "One or more audio frame has bitrate_index = 0" },
{ 0x00, NULL }
};

2
epan/dissectors/packet-mtp2.c
View File

@ -984,7 +984,7 @@ dissect_mtp2_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
/* if there is no per packet data -> create it */
if (mtp2_ppd == NULL) {
mtp2_ppd = wmem_new(wmem_file_scope(), mtp2_ppd_t);
/* set the the proto_data_fields
/* set the proto_data_fields
* because these are the values which we would like to see
* if this packet is seen again */
if (dir_state == FORWARD) {

2
epan/dissectors/packet-netflow.c
View File

@ -18081,7 +18081,7 @@ proto_register_netflow(void)
/* ixia, 3054 / 176 */
{&hf_pie_ixia_reverse_octet_delta_count,
{"Reverse octet octet count", "cflow.pie.ixia.reverse-octet-delta-count",
{"Reverse octet delta count", "cflow.pie.ixia.reverse-octet-delta-count",
FT_UINT64, BASE_DEC, NULL, 0x0,
"In bi-directional flows, byte count for the server back to client", HFILL}
},

2
epan/dissectors/packet-ntlmssp.c
View File

@ -2518,7 +2518,7 @@ decrypt_verifier(tvbuff_t *tvb, int offset, guint32 encrypted_block_length,
/*if (!(NTLMSSP_NEGOTIATE_KEY_EXCH & packet_ntlmssp_info->flags)) {*/
if (conv_ntlmssp_info->flags & NTLMSSP_NEGOTIATE_EXTENDED_SECURITY) {
if ((NTLMSSP_NEGOTIATE_KEY_EXCH & conv_ntlmssp_info->flags)) {
/* The spec says that if we have have a key exchange then we have a the signature that is crypted
/* The spec says that if we have a key exchange then we have the signature that is crypted
* otherwise it's just a hmac_md5(keysign, concat(message, sequence))[0..7]
*/
if (gcry_cipher_decrypt(rc4_handle, packet_ntlmssp_info->verifier, 8, NULL, 0)) {

2
epan/dissectors/packet-ros.c
View File

@ -350,7 +350,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
/* we haven't found a match - try and match it up */
if(isInvoke) {
/* this a a request - add it to the unmatched list */
/* this is a request - add it to the unmatched list */
/* check that we don't already have one of those in the
unmatched list and if so remove it */

4
epan/dissectors/packet-s7comm_szl_ids.c
View File

@ -1499,7 +1499,7 @@ static const value_string szl_bart_sch_names[] = {
};
static gint hf_s7comm_szl_0132_0004_crst_wrst = -1;
static const value_string szl_crst_wrst_names[] = {
{ 0, "undefined, does not exist or cannot be be ascertained" },
{ 0, "undefined, does not exist or cannot be ascertained" },
{ 1, "CRST" },
{ 2, "WRST" },
{ 0, NULL }
@ -3598,7 +3598,7 @@ s7comm_decode_szl_id_0131_idx_0006(tvbuff_t *tvb,
* Index: 0x0007
* Content:
* The partial list extract with SZL-ID W#16#0131 and the index W#16#0007
* contains information about the functions available available for global data
* contains information about the functions available for global data
* communication on the module.
*
*******************************************************************************************************/

4
epan/dissectors/packet-sbus.c
View File

@ -1017,7 +1017,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
switch (sbus_cmd_code){
case SBUS_WEB_SERVER_SERIAL_COMM:
/* Special treatment of web server request
* as is is very helpful to see more information in the packetlist */
* as this is very helpful to see more information in the packetlist */
sbus_web_aid = tvb_get_guint8(tvb, 12);
sbus_web_seq = tvb_get_guint8(tvb, 13);
col_add_fstr(pinfo->cinfo, COL_INFO,
@ -1095,7 +1095,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
case SBUS_RESPONSE:
/* Special treatment of web server request
* as is is very helpful to see more information in the packetlist */
* as this is very helpful to see more information in the packetlist */
if (request_val && ((request_val->cmd_code) == SBUS_WEB_SERVER_SERIAL_COMM)) {
sbus_web_size = tvb_get_guint8(tvb,9);
sbus_web_aid = tvb_get_guint8(tvb,10);

24
epan/dissectors/packet-smb.c
View File

@ -11692,7 +11692,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo,
/*
* XXX - "Microsoft Networks SMB File Sharing Protocol
* Extensions Version 3.0, Document Version 1.11,
* July 19, 1990" says this this contains a
* July 19, 1990" says this contains a
* "File system specific parameter block". (That means
* we may not be able to dissect it in any case.)
*/
@ -11703,7 +11703,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo,
/*
* XXX - "Microsoft Networks SMB File Sharing Protocol
* Extensions Version 3.0, Document Version 1.11,
* July 19, 1990" says this this contains a
* July 19, 1990" says this contains a
* "Device/function specific parameter block". (That
* means we may not be able to dissect it in any case.)
*/
@ -14028,7 +14028,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo,
/*
* XXX - "Microsoft Networks SMB File Sharing Protocol
* Extensions Version 3.0, Document Version 1.11,
* July 19, 1990" says this this contains a
* July 19, 1990" says this contains a
* "File system specific data block". (That means we
* may not be able to dissect it in any case.)
*/
@ -14039,7 +14039,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo,
/*
* XXX - "Microsoft Networks SMB File Sharing Protocol
* Extensions Version 3.0, Document Version 1.11,
* July 19, 1990" says this this contains a
* July 19, 1990" says this contains a
* "Device/function specific data block". (That
* means we may not be able to dissect it in any case.)
*/
@ -14050,7 +14050,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo,
/*
* XXX - "Microsoft Networks SMB File Sharing Protocol
* Extensions Version 3.0, Document Version 1.11,
* July 19, 1990" says this this contains "additional
* July 19, 1990" says this contains "additional
* level dependent match data".
*/
break;
@ -14060,7 +14060,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo,
/*
* XXX - "Microsoft Networks SMB File Sharing Protocol
* Extensions Version 3.0, Document Version 1.11,
* July 19, 1990" says this this contains "additional
* July 19, 1990" says this contains "additional
* level dependent monitor information".
*/
break;
@ -16468,7 +16468,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo,
/*
* XXX - "Microsoft Networks SMB File Sharing Protocol
* Extensions Version 3.0, Document Version 1.11,
* July 19, 1990" says this this contains a
* July 19, 1990" says this contains a
* "File system specific return data block".
* (That means we may not be able to dissect it in any
* case.)
@ -16480,7 +16480,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo,
/*
* XXX - "Microsoft Networks SMB File Sharing Protocol
* Extensions Version 3.0, Document Version 1.11,
* July 19, 1990" says this this contains a
* July 19, 1990" says this contains a
* "Device/function specific return data block".
* (That means we may not be able to dissect it in any
* case.)
@ -16492,7 +16492,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo,
/*
* XXX - "Microsoft Networks SMB File Sharing Protocol
* Extensions Version 3.0, Document Version 1.11,
* July 19, 1990" says this this contains "the level
* July 19, 1990" says this contains "the level
* dependent information about the changes which
* occurred".
*/
@ -16503,7 +16503,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo,
/*
* XXX - "Microsoft Networks SMB File Sharing Protocol
* Extensions Version 3.0, Document Version 1.11,
* July 19, 1990" says this this contains "the level
* July 19, 1990" says this contains "the level
* dependent information about the changes which
* occurred".
*/
@ -16715,7 +16715,7 @@ dissect_transaction2_response_parameters(tvbuff_t *tvb, packet_info *pinfo, prot
/*
* XXX - "Microsoft Networks SMB File Sharing Protocol
* Extensions Version 3.0, Document Version 1.11,
* July 19, 1990" says this this contains a
* July 19, 1990" says this contains a
* "File system specific return parameter block".
* (That means we may not be able to dissect it in any
* case.)
@ -16727,7 +16727,7 @@ dissect_transaction2_response_parameters(tvbuff_t *tvb, packet_info *pinfo, prot
/*
* XXX - "Microsoft Networks SMB File Sharing Protocol
* Extensions Version 3.0, Document Version 1.11,
* July 19, 1990" says this this contains a
* July 19, 1990" says this contains a
* "Device/function specific return parameter block".
* (That means we may not be able to dissect it in any
* case.)

2
epan/dissectors/packet-smb2.c
View File

@ -9018,7 +9018,7 @@ dissect_smb2_create_extra_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
/*
* These things are all either 4-char strings, like DH2C, or GUIDs,
* however, at least one of them appears to be a GUID as a string and
* one appears to be a binary guid. So, check if the the length is
* one appears to be a binary guid. So, check if the length is
* 16, and if so, pull the GUID and convert it to a string. Otherwise
* call dissect_smb2_olb_string.
*/

2
epan/dissectors/packet-sndcp-xid.c
View File

@ -54,7 +54,7 @@ typedef struct
*/
static int proto_sndcp_xid = -1;
/* These fields are used to store store the algorithm ID
/* These fields are used to store the algorithm ID
* When the P bit is not set, try to decode the algo based on what whas stored.
* Entity ranges from 0 to 31 (6.5.1.1.3)
*/

4
epan/dissectors/packet-sprt.c
View File

@ -674,8 +674,8 @@ static const value_string sprt_prof_xchg_support[] = {
static const range_string sprt_payload_dlci1[] = {
{ SPRT_VALUE_RANGE(SPRT_PAYLOAD_DLCI1_DTE2DTE), "DTE-to-DTE (V.24 interfaces) data" },
{ SPRT_PAYLOAD_DLCI1_RESERVED_START, SPRT_PAYLOAD_DLCI1_RESERVED_END, "Reserved for for ITU-T" },
{ SPRT_PAYLOAD_DLCI1_NOT_RESERVED_START, SPRT_PAYLOAD_DLCI1_NOT_RESERVED_END, "Not reserved for for ITU-T" },
{ SPRT_PAYLOAD_DLCI1_RESERVED_START, SPRT_PAYLOAD_DLCI1_RESERVED_END, "Reserved for ITU-T" },
{ SPRT_PAYLOAD_DLCI1_NOT_RESERVED_START, SPRT_PAYLOAD_DLCI1_NOT_RESERVED_END, "Not reserved for ITU-T" },
{ SPRT_VALUE_RANGE(SPRT_PAYLOAD_DLCI1_CTRLFN2CTRLFN), "Control-function to control-function information" },
{ 0, 0, NULL }
};

2
epan/dissectors/packet-sua.c
View File

@ -1097,7 +1097,7 @@ dissect_receive_sequence_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
static const value_string interworking_values[] = {
{ 0x0, "No Interworking with SS7 Networks" },
{ 0x1, "IP-Signalling Endpoint interworking with with SS7 networks" },
{ 0x1, "IP-Signalling Endpoint interworking with SS7 networks" },
{ 0x2, "Signalling Gateway" },
{ 0x3, "Relay Node Support" },
{ 0, NULL } };

4
epan/dissectors/packet-tcap.c
View File

@ -2064,7 +2064,7 @@ create_tcaphash_cont(struct tcaphash_cont_info_key_t *p_tcaphash_cont_key,
if (p_tcaphash_contcall1) {
/* Walk through list of transaction with identical keys */
/* go the the end to insert new record */
/* go to the end to insert new record */
do {
if (!p_tcaphash_contcall1->next_contcall) {
p_tcaphash_contcall=append_tcaphash_contcall(p_tcaphash_contcall1,
@ -2093,7 +2093,7 @@ create_tcaphash_end(struct tcaphash_end_info_key_t *p_tcaphash_end_key,
if (p_tcaphash_endcall1) {
/* Walk through list of transaction with identical keys */
/* go the the end to insert new record */
/* go to the end to insert new record */
do {
if (!p_tcaphash_endcall1->next_endcall) {
p_tcaphash_endcall=append_tcaphash_endcall(p_tcaphash_endcall1,

6
epan/dissectors/packet-tcp.c
View File

@ -1044,7 +1044,7 @@ typedef struct tcp_follow_tap_data
* dummy data to mark packet loss if any).
*
* Returns TRUE if one fragment has been applied or FALSE if no more fragments
* can be added the the payload (there might still be unacked fragments with
* can be added to the payload (there might still be unacked fragments with
* missing segments before them).
*/
static gboolean
@ -3387,7 +3387,7 @@ again:
* The next TCP_A_RETRANSMISSION hopefully takes care of it though.
*
* Only shortcircuit here when the first segment of the MSP is known,
* and when this this first segment is not one to complete the MSP.
* and when this first segment is not one to complete the MSP.
*/
if ((msp = (struct tcp_multisegment_pdu *)wmem_tree_lookup32(tcpd->fwd->multisegment_pdus, seq)) &&
nxtseq <= msp->nxtpdu &&
@ -6311,7 +6311,7 @@ decode_tcp_ports(tvbuff_t *tvb, int offset, packet_info *pinfo,
1) we pick the same dissector for traffic going in both directions;
2) we prefer the port number that's more likely to be the right
one (as that prefers prefers well-known ports to reserved ports);
one (as that prefers well-known ports to reserved ports);
although there is, of course, no guarantee that any such strategy
will always pick the right port number.

4
epan/dissectors/packet-tls.c
View File

@ -668,7 +668,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
* throw an exception before we get the chance to do so). */
col_set_str(pinfo->cinfo, COL_PROTOCOL,
val_to_str_const(session->version, ssl_version_short_names, "SSL"));
/* clear the the info column */
/* clear the info column */
col_clear(pinfo->cinfo, COL_INFO);
/* TCP packets and TLS records are orthogonal.
@ -1900,7 +1900,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo,
/*
* if we don't already have a version set for this conversation,
* but this message's version is authoritative (i.e., it's
* not client_hello, then save the version to to conversation
* not client_hello, then save the version to the conversation
* structure and print the column version. If the message is not authorative
* (i.e. it is a Client Hello), then this version will still be used for
* display purposes only (it will not be stored in the conversation).

2
epan/dissectors/packet-umts_fp.c
View File

@ -5314,7 +5314,7 @@ heur_dissect_fp_unknown_format(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
}