diff options
207 files changed, 324 insertions, 319 deletions
diff --git a/docbook/wsug_src/wsug_customize.adoc b/docbook/wsug_src/wsug_customize.adoc index 251d853f35..15d6c8cb19 100644 --- a/docbook/wsug_src/wsug_customize.adoc +++ b/docbook/wsug_src/wsug_customize.adoc @@ -707,7 +707,7 @@ These preferences allow you to define the layout of the GUI once a capture file image::images/ws-pref-appearance-layout.png[{screenshot-attrs}] Make sure that you have at least one pane configured to contain the Packet list. -Three panes can be active at the same time and they can be layed out as shown in the top layer. +Three panes can be active at the same time and they can be laid out as shown in the top layer. The exact sizes of these panes can be changed as needed once a capture file is opened. Selecting _Show packet list separator_ causes the packet list entries to be slightly set apart, which may improve readability at the cost of the amount of packets shown in the packet list. diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 7e8425ca17..17282b6342 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -343,7 +343,7 @@ extern void add_ether_byip(const guint ip, const guint8 *eth); /** Translates a string representing a hostname or dotted-decimal IPv4 address * into a numeric IPv4 address value in network byte order. If compiled with * c-ares, the request will wait a maximum of 250ms for the request to finish. - * Otherwise the wait time will be system-dependent, ususally much longer. + * Otherwise the wait time will be system-dependent, usually much longer. * Immediately returns FALSE for hostnames if network name resolution is * disabled. * diff --git a/epan/crypt/dot11decrypt.c b/epan/crypt/dot11decrypt.c index dc4cea4a29..1164a04866 100644 --- a/epan/crypt/dot11decrypt.c +++ b/epan/crypt/dot11decrypt.c @@ -256,7 +256,7 @@ Dot11DecryptFtDerivePtk( * @param action [IN] Tdls Action code (response or confirm) * * @return - * DOT11DECRYPT_RET_SUCCESS if Key has been sucessfully derived (and MIC verified) + * DOT11DECRYPT_RET_SUCCESS if Key has been successfully derived (and MIC verified) * DOT11DECRYPT_RET_UNSUCCESS otherwise */ static int @@ -503,7 +503,7 @@ Dot11DecryptDecryptKeyData(PDOT11DECRYPT_CONTEXT ctx, memcpy(decrypted_data, data, key_bytes_len); g_free(data); } else { - /* Ideally AKM from EAPOL message 2 of 4 should be used to determine Key-wrap algoritm to use */ + /* Ideally AKM from EAPOL message 2 of 4 should be used to determine Key-wrap algorithm to use */ /* Though fortunately IEEE802.11-2016 Table 12-8 state that all AKMs use "NIST AES Key Wrap" */ /* algorithm so no AKM lookup is needed. */ @@ -2043,7 +2043,7 @@ Dot11DecryptRsnaMicCheck( algo = GCRY_MD_SHA1; hmac = true; } else { - /* Mic check algoritm determined by AKM type */ + /* Mic check algorithm determined by AKM type */ if (Dot11DecryptGetIntegrityAlgoFromAkm(akm, &algo, &hmac)) { ws_warning("Unknown Mic check algo"); return DOT11DECRYPT_RET_UNSUCCESS; diff --git a/epan/decode_as.h b/epan/decode_as.h index 2df629271f..c13b59db8d 100644 --- a/epan/decode_as.h +++ b/epan/decode_as.h @@ -56,7 +56,7 @@ be passed to the dissector table to change the dissection output. typedef struct decode_as_value_s { build_label_func label_func; /**< function pointer to the function used to create the label*/ guint num_values; /**< Number of values */ - build_valid_func* build_values; /**< Function used to build the value to go into the table. Retreive from current frame */ + build_valid_func* build_values; /**< Function used to build the value to go into the table. Retrieve from current frame */ } decode_as_value_t; /** diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l index 6c435941da..e4d4862b2f 100644 --- a/epan/dfilter/scanner.l +++ b/epan/dfilter/scanner.l @@ -455,7 +455,7 @@ HexExponent ([pP][+-]?[[:digit:]]+) update_location(yyextra, yytext); /* Check if we have a protocol or protocol field, otherwise assume a literal. */ /* It is only reasonable to assume a literal here, instead of a - * (possibly non-existant) protocol field, because protocol field filter names + * (possibly non-existent) protocol field, because protocol field filter names * should not start with a digit (the lexical syntax for numbers). */ header_field_info *hfinfo = dfilter_resolve_unparsed(yytext, yyextra->deprecated); if (hfinfo != NULL) { @@ -484,7 +484,7 @@ HexExponent ([pP][+-]?[[:digit:]]+) update_location(yyextra, yytext); /* Check if we have a protocol or protocol field, otherwise assume a literal. */ /* It is only reasonable to assume a literal here, instead of a - * (possibly non-existant) protocol field, because protocol field filter names + * (possibly non-existent) protocol field, because protocol field filter names * should not start with a digit (the lexical syntax for numbers). */ header_field_info *hfinfo = dfilter_resolve_unparsed(yytext, yyextra->deprecated); if (hfinfo != NULL) { diff --git a/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c b/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c index dd2b4912dd..7b37a64222 100644 --- a/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c +++ b/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c @@ -149,7 +149,7 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){ if ((!pinfo->fd->visited)&&(ansi_tcap_private.TransactionID_str)){ /* Only do this once XXX I hope it's the right thing to do */ - /* The hash string needs to contain src and dest to distiguish differnt flows */ + /* The hash string needs to contain src and dest to distiguish different flows */ switch(ansi_tcap_response_matching_type){ case ANSI_TCAP_TID_ONLY: buf = wmem_strdup(pinfo->pool, ansi_tcap_private.TransactionID_str); @@ -191,7 +191,7 @@ find_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U src = address_to_str(pinfo->pool, &(pinfo->src)); dst = address_to_str(pinfo->pool, &(pinfo->dst)); - /* The hash string needs to contain src and dest to distiguish differnt flows */ + /* The hash string needs to contain src and dest to distiguish different flows */ buf = (char *)wmem_alloc(pinfo->pool, MAX_TID_STR_LEN); buf[0] = '\0'; /* Reverse order to invoke */ diff --git a/epan/dissectors/asn1/atn-ulcs/atn-ulcs.cnf b/epan/dissectors/asn1/atn-ulcs/atn-ulcs.cnf index 793a450945..c6a1765f56 100644 --- a/epan/dissectors/asn1/atn-ulcs/atn-ulcs.cnf +++ b/epan/dissectors/asn1/atn-ulcs/atn-ulcs.cnf @@ -62,7 +62,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar NULL); if (tvb_usr) { - /* call appropiate dissector for bitstring data */ + /* call appropriate dissector for bitstring data */ switch(ulcs_context_value){ case 1: /* ACSE PDU*/ atn_ulcs_tree = proto_tree_add_subtree( diff --git a/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c b/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c index 5093700389..19a421c974 100644 --- a/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -38,10 +38,10 @@ why not using existing ses, pres and acse dissectors ? ATN upper layers are derived from OSI standards for session, presentation and application but the encoding differs - (it's PER instead of BER encoding to save bandwith). + (it's PER instead of BER encoding to save bandwidth). Session and presentation use the "null" encoding option, meaning that they are only present at connection establishment - and ommitted otherwise. + and omitted otherwise. Instead of adapting existing dissectors it seemed simpler and cleaner to implement everything the new atn-ulcs dissector. diff --git a/epan/dissectors/asn1/gsm_map/gsm_map.cnf b/epan/dissectors/asn1/gsm_map/gsm_map.cnf index 69017b798e..cbbc8fca7e 100644 --- a/epan/dissectors/asn1/gsm_map/gsm_map.cnf +++ b/epan/dissectors/asn1/gsm_map/gsm_map.cnf @@ -906,7 +906,7 @@ if (!gsm_map_priv || !gsm_map_priv->signal_info_tvb) case 1: /* gsm-0408 */ /* As per comment abowe Individual IE:(s) will be found here in TLV format - * Unfortunatly a branch for each IE must be made to call the apropriate + * Unfortunately a branch for each IE must be made to call the appropriate * function */ /* Get tag */ @@ -988,7 +988,7 @@ MAP interfaces case 1: /* gsm-0408 */ /* As per comment abowe Individual IE:(s) will be found here in TLV format - * Unfortunatly a branch for each IE must be made to call the apropriate + * Unfortunately a branch for each IE must be made to call the appropriate * function */ /* Get tag */ diff --git a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c index 77b8ed42c9..657323a9b8 100644 --- a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c +++ b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c @@ -1137,7 +1137,7 @@ typedef int (* dissect_function_t)( bool, /* * Dissect Multiple Choice Message * This function is used to decode a message, when several encoding may be used. - * For exemple, in the last MAP version, the Cancel Location is defined like this: + * For example, in the last MAP version, the Cancel Location is defined like this: * CancelLocationArg ::= [3] IMPLICIT SEQUENCE * But in the previous MAP version, it was a CHOICE between a SEQUENCE and an IMSI * As ASN1 encoders (or software) still uses the old encoding, this function allows diff --git a/epan/dissectors/asn1/nbap/nbap.cnf b/epan/dissectors/asn1/nbap/nbap.cnf index 9b251c857d..22e03a9c4f 100644 --- a/epan/dissectors/asn1/nbap/nbap.cnf +++ b/epan/dissectors/asn1/nbap/nbap.cnf @@ -1633,7 +1633,7 @@ nbap_private_data->binding_id_port = 0; expert_add_info(actx->pinfo, NULL, &ei_nbap_no_set_comm_context_id); } - /* Check if we allready have this context */ + /* Check if we already have this context */ e_dch_macdflow_id = nbap_private_data->e_dch_macdflow_id; if( (old_info = (nbap_edch_port_info_t *)wmem_tree_lookup32(edch_flow_port_map,nbap_private_data->com_context_id)) == NULL ){ nbap_edch_port_info_t * nbap_edch_port_info; @@ -1723,7 +1723,7 @@ nbap_edch_channel_info = nbap_private_data->nbap_edch_channel_info; * MAC-i/is => Type 2 * The specifications isn't very clear about the indicator for what entity * should be used. For now, it seems like the presence of the "Maximum MAC-d PDU Size Extended IE" - * indicates MAC-i/is and it's absense means MAC-e/es + * indicates MAC-i/is and it's absence means MAC-e/es */ if(nbap_private_data->max_mac_d_pdu_size_ext_ie_present){ fp_edch_channel_info->edch_type = 1; /* 1 means Type 2 */ @@ -1906,7 +1906,7 @@ nbap_private_data->num_items = 1; * MAC-i/is => Type 2 * The specifications isn't very clear about the indicator for what entity * should be used. For now, it seems like the presence of the "Maximum MAC-d PDU Size Extended IE" - * indicates MAC-i/is and it's absense means MAC-e/es + * indicates MAC-i/is and it's absence means MAC-e/es */ if(nbap_private_data->max_mac_d_pdu_size_ext_ie_present){ fp_edch_channel_info->edch_type = 1; /* 1 means Type 2 */ @@ -2503,7 +2503,7 @@ nbap_hsdsch_channel_info = nbap_private_data->nbap_hsdsch_channel_info; return offset; } - /*Find the conversations assoicated with the HS-DSCH flows in this packet and set proper H-RNTI*/ + /*Find the conversations associated with the HS-DSCH flows in this packet and set proper H-RNTI*/ clear_address(&null_addr); for (i = 0; i < maxNrOfMACdFlows; i++) { if (nbap_hsdsch_channel_info[i].crnc_port != 0){ diff --git a/epan/dissectors/asn1/pkix1explicit/PKIX1EXPLICIT93.asn b/epan/dissectors/asn1/pkix1explicit/PKIX1EXPLICIT93.asn index 030640a701..9ee85d600e 100644 --- a/epan/dissectors/asn1/pkix1explicit/PKIX1EXPLICIT93.asn +++ b/epan/dissectors/asn1/pkix1explicit/PKIX1EXPLICIT93.asn @@ -238,7 +238,7 @@ Extension ::= SEQUENCE { -- invalidityDate | -- certificateIssuer } -- --- information object classes used in the defintion +-- information object classes used in the definition -- of certificates and CRLs -- -- Parameterized Type SIGNED @@ -499,7 +499,7 @@ RelativeDistinguishedName ::= SET OF AttributeTypeAndValue --id-at-dnQualifier OBJECT IDENTIFIER ::= {id-at 46} -- -- Directory string type, used extensively in Name types ---Make it a PrintableString will amke it look prettier +--Make it a PrintableString will make it look prettier DirectoryString ::= PrintableString --DirectoryString { INTEGER:maxSize } ::= CHOICE { -- teletexString TeletexString (SIZE (1..maxSize)), diff --git a/epan/dissectors/asn1/rnsap/rnsap.cnf b/epan/dissectors/asn1/rnsap/rnsap.cnf index 432bdaf38d..dad130413d 100644 --- a/epan/dissectors/asn1/rnsap/rnsap.cnf +++ b/epan/dissectors/asn1/rnsap/rnsap.cnf @@ -118,7 +118,7 @@ ProtocolIE-ContainerPairList switch (pdata->ProcedureCode) { case RNSAP_ID_DOWNLINKSIGNALLINGTRANSFER: - /* TODO: seperate into Iur and Iur-g cases: */ + /* TODO: separate into Iur and Iur-g cases: */ /* For the Iur-g interface, L3 message is a GERAN-RRC message for which a dissector does not currently exist */ /* For the Iur interface, L3 message is a UMTS RRC DL-CCCH message */ parameter_handle = rrc_dl_ccch_handle; diff --git a/epan/dissectors/file-pcapng-darwin.c b/epan/dissectors/file-pcapng-darwin.c index b88d6f4d47..57b1d18bb0 100644 --- a/epan/dissectors/file-pcapng-darwin.c +++ b/epan/dissectors/file-pcapng-darwin.c @@ -53,7 +53,7 @@ * o Block Type: The block type of a Darwin Process Event Block is 2147483649. * * Note: This specific block type number falls into the range defined - * for "local use" but has in fact been available publically since Darwin + * for "local use" but has in fact been available publicly since Darwin * 13.0 for pcapng files generated by Apple's tcpdump when using the PKTAP * enhanced interface. * diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index 43b68ad967..99d9600d5c 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -14,7 +14,7 @@ /* Todo: - Add reading of DDL files so we can futher explode DMP packets + Add reading of DDL files so we can further explode DMP packets For some of the Set/Get properties where we have a range of data it would be better to show the block of data rather and address-data pair on each line... diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c index 43ade73c61..110384dfb6 100644 --- a/epan/dissectors/packet-adwin.c +++ b/epan/dissectors/packet-adwin.c @@ -1108,7 +1108,7 @@ dissect_adwin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U dissect_UDPR1(tvb, pinfo, adwin_tree, adwin_debug_tree, &info_string); break; case UDPH2_LENGTH: /* to the best of my knowledge, this struct - * has never been used publically! */ + * has never been used publicly! */ /* dissect_UDPH2(tvb, pinfo, adwin_tree, adwin_debug_tree); */ info_string = wmem_strdup(pinfo->pool, "UDPH2 - UNUSED"); break; diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c index c438556285..06aa210fd6 100644 --- a/epan/dissectors/packet-ansi_637.c +++ b/epan/dissectors/packet-ansi_637.c @@ -2002,7 +2002,7 @@ trans_param_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint l email_addr = (((oct & 0x38) >> 3) == 0x02) ? TRUE : FALSE; /* - * do not change to ...add_item() with VALS in hf defintion because this parameter is + * do not change to ...add_item() with VALS in hf definition because this parameter is * used below in the 'else' with a different string array */ proto_tree_add_uint_format_value(tree, hf_ansi_637_trans_addr_param_ton, tvb, offset, 1, diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index 47afca6bd4..4af76526ba 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -790,7 +790,7 @@ static const value_string cell_disc_vals[] = { }; /* - * Not strictly A-interface info, but put here to avoid file polution + * Not strictly A-interface info, but put here to avoid file pollution * * Title 3GPP2 Other * diff --git a/epan/dissectors/packet-ansi_a.h b/epan/dissectors/packet-ansi_a.h index 60a9ec9b01..35d408b585 100644 --- a/epan/dissectors/packet-ansi_a.h +++ b/epan/dissectors/packet-ansi_a.h @@ -42,7 +42,7 @@ WS_DLL_PUBLIC const ext_value_string_t ansi_a_ios401_bsmap_strings[]; WS_DLL_PUBLIC const ext_value_string_t ansi_a_ios401_dtap_strings[]; /* - * Not strictly A-interface info, but put here to avoid file polution + * Not strictly A-interface info, but put here to avoid file pollution * * Title 3GPP2 Other * diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index cbff2d3efe..447a04495b 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -225,7 +225,7 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){ if ((!pinfo->fd->visited)&&(ansi_tcap_private.TransactionID_str)){ /* Only do this once XXX I hope it's the right thing to do */ - /* The hash string needs to contain src and dest to distiguish differnt flows */ + /* The hash string needs to contain src and dest to distiguish different flows */ switch(ansi_tcap_response_matching_type){ case ANSI_TCAP_TID_ONLY: buf = wmem_strdup(pinfo->pool, ansi_tcap_private.TransactionID_str); @@ -267,7 +267,7 @@ find_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U src = address_to_str(pinfo->pool, &(pinfo->src)); dst = address_to_str(pinfo->pool, &(pinfo->dst)); - /* The hash string needs to contain src and dest to distiguish differnt flows */ + /* The hash string needs to contain src and dest to distiguish different flows */ buf = (char *)wmem_alloc(pinfo->pool, MAX_TID_STR_LEN); buf[0] = '\0'; /* Reverse order to invoke */ diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c index aa4371c266..a1c1f666fd 100644 --- a/epan/dissectors/packet-aruba-erm.c +++ b/epan/dissectors/packet-aruba-erm.c @@ -78,7 +78,7 @@ * * Radiotap (type 6): * - * As part of 802.11ax developement, Aruba has added radiotap capture + * As part of 802.11ax development, Aruba has added radiotap capture * encapsulation. This new format can be used with any model of AP * be it 11ax, 11ac or 11n. * Note: type 6 is _only_ supported in ArubaOS 8.6 and higher. diff --git a/epan/dissectors/packet-ath.c b/epan/dissectors/packet-ath.c index 54b542b036..07660d508d 100644 --- a/epan/dissectors/packet-ath.c +++ b/epan/dissectors/packet-ath.c @@ -30,7 +30,7 @@ static dissector_handle_t ath_handle; * * - UDP heartbeats to maintain a status of all the members of the cluster * - * - TCP RMI to send data accross members + * - TCP RMI to send data across members * * This dissector is about UDP heartbeats, that we will call ATH, standing for * Apache Tribes Heartbeat. Tribes is the name of the clustering libraries diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c index a505db316b..707bf6fe4e 100644 --- a/epan/dissectors/packet-atn-ulcs.c +++ b/epan/dissectors/packet-atn-ulcs.c @@ -43,10 +43,10 @@ why not using existing ses, pres and acse dissectors ? ATN upper layers are derived from OSI standards for session, presentation and application but the encoding differs - (it's PER instead of BER encoding to save bandwith). + (it's PER instead of BER encoding to save bandwidth). Session and presentation use the "null" encoding option, meaning that they are only present at connection establishment - and ommitted otherwise. + and omitted otherwise. Instead of adapting existing dissectors it seemed simpler and cleaner to implement everything the new atn-ulcs dissector. @@ -363,7 +363,7 @@ dissect_atn_ulcs_T_pdv_list_presentation_data_values_arbitrary(tvbuff_t *tvb _U_ NULL); if (tvb_usr) { - /* call appropiate dissector for bitstring data */ + /* call appropriate dissector for bitstring data */ switch(ulcs_context_value){ case 1: /* ACSE PDU*/ atn_ulcs_tree = proto_tree_add_subtree( diff --git a/epan/dissectors/packet-awdl.c b/epan/dissectors/packet-awdl.c index fd414ada5b..c22669ee10 100644 --- a/epan/dissectors/packet-awdl.c +++ b/epan/dissectors/packet-awdl.c @@ -2218,7 +2218,7 @@ void proto_register_awdl(void) } }, - /* Service Reponse */ + /* Service Response */ { &hf_awdl_dns_name_len, { "Name Length", "awdl.dns.name.len", FT_UINT16, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index f2ae2b7136..94efea0348 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -6541,7 +6541,7 @@ BACnetVendorIdentifiers [] = { { 1268, "Lion Controls Co., LTD" }, { 1269, "Sinux" }, { 1270, "Avnet Inc." }, - { 1271, "Somfy Activites SA" }, + { 1271, "Somfy Activities SA" }, { 1272, "Amico" }, { 1273, "SageGlass" }, { 1274, "AuVerte" }, diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index dee3030669..7d32bc2040 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -1793,7 +1793,7 @@ dissect_ber_octet_string_wcb(bool implicit_tag, asn1_ctx_t *actx, proto_tree *tr if (func && out_tvb && (tvb_reported_length(out_tvb) > 0)) { if (hf_id > 0) tree = proto_item_add_subtree(actx->created_item, ett_ber_octet_string); - /* TODO Should hf_id2 be pased as last parameter???*/ + /* TODO Should hf_id2 be passed as last parameter???*/ func(FALSE, out_tvb, 0, actx, tree, -1); } return offset; diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index bb7f9c08e9..661b4e7349 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -3276,7 +3276,7 @@ load_afi_safi_data(packet_info *pinfo) { * A real BGP speaker would rely on the BGP Additional Path in the BGP Open messages. * But it is not suitable for a packet analyse because the BGP sessions are not supposed to * restart very often, and Open messages from both sides of the session would be needed - * to determine the result of the capability negociation. + * to determine the result of the capability negotiation. * Code inspired from the decode_prefix4 function */ static int @@ -13475,7 +13475,7 @@ proto_register_bgp(void) { &hf_bgp_evpn_nlri_ipv6_gtw, { "IPv6 Gateway address", "bgp.evpn.nlri.ipv6.gtw_addr", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - /* segment routing extentions to link state */ + /* segment routing extensions to link state */ /* Node Attributes TLVs */ { &hf_bgp_ls_sr_tlv_capabilities, { "SR Capabilities", "bgp.ls.sr.tlv.capabilities", FT_NONE, diff --git a/epan/dissectors/packet-bitcoin.c b/epan/dissectors/packet-bitcoin.c index 46fb25db9c..81e9efd39c 100644 --- a/epan/dissectors/packet-bitcoin.c +++ b/epan/dissectors/packet-bitcoin.c @@ -1530,7 +1530,7 @@ proto_register_bitcoin(void) NULL, HFILL } }, { &hf_msg_version_addr_me, - { "Address of emmitting node", "bitcoin.version.addr_me", + { "Address of emitting node", "bitcoin.version.addr_me", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-bpv7.c b/epan/dissectors/packet-bpv7.c index f7b7d48af3..b412db80a3 100644 --- a/epan/dissectors/packet-bpv7.c +++ b/epan/dissectors/packet-bpv7.c @@ -1467,7 +1467,7 @@ static int dissect_bp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void const wmem_list_t *seen_list = wmem_map_lookup(bp_history->bundles, bundle->ident); wmem_list_frame_t *seen_it = seen_list ? wmem_list_head(seen_list) : NULL; const bp_bundle_t *seen_first = seen_it ? wmem_list_frame_data(seen_it) : NULL; - // show first occurance if not this one + // show first occurrence if not this one if (seen_first && (seen_first->frame_num != pinfo->num)) { proto_item *item_seen = proto_tree_add_uint(tree_ident, hf_bundle_first_seen, tvb, 0, 0, seen_first->frame_num); proto_item_set_generated(item_seen); diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index 1841f5c35e..7f271dffcd 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -11984,7 +11984,7 @@ proto_register_btatt(void) module_t *module; expert_module_t *expert_btatt; - //src_port will be filled wiht handle + //src_port will be filled with handle //dst_port will be filled with opcode reassembly_table_register(&msg_reassembly_table, &addresses_ports_reassembly_table_functions); diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index 8902a88cd2..c668d1cf0a 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -2522,7 +2522,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) case 0x02: /* AUX_SYNC_IND */ case 0x03: /* AUX_SCAN_RSP */ if (aux_pointer_present) { - /* Begining of new sequence of fragments */ + /* Beginning of new sequence of fragments */ if (!pinfo->fd->visited && adi_present) { ae_had_info = wmem_new0(wmem_file_scope(), ae_had_info_t); ae_had_info->first_frame_num=pinfo->num; diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c index b6190a01f2..9ee61f4adf 100644 --- a/epan/dissectors/packet-btmesh.c +++ b/epan/dissectors/packet-btmesh.c @@ -3171,7 +3171,7 @@ upper_transport_init_routine(void) reassembly_table_register(&upper_transport_reassembly_table, &upper_transport_reassembly_table_functions); } -/* A BT Mesh dissector is not realy useful without decryption as all packets are encrypted. Just leave a stub dissector outside of */ +/* A BT Mesh dissector is not really useful without decryption as all packets are encrypted. Just leave a stub dissector outside of */ /* BT Mesh s1 function */ static gboolean diff --git a/epan/dissectors/packet-c15ch.c b/epan/dissectors/packet-c15ch.c index 4d25cd3173..ecb24d05e9 100644 --- a/epan/dissectors/packet-c15ch.c +++ b/epan/dissectors/packet-c15ch.c @@ -3986,7 +3986,7 @@ static int hf_c15ch_tone_tone_control_tone_type; max_num_digits is used in a call to proto_tree_add_string(). - offset_from_digits_to_consume: This number is substracted from first_offset to give the location + offset_from_digits_to_consume: This number is subtracted from first_offset to give the location where the num_digits field was read e.g. offset_from_digits_to_consume == 1 if length is given in one byte just before digits offset_from_digits_to_consume == 4 if length is given in four bytes just before digits diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 0a930f07a3..9d05f0e2e9 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later * - * Contributers: + * Contributors: * Kyle J. Harms <kyle.j.harms@boeing.com> * Brian M. Ames <bmames@apk.net> */ diff --git a/epan/dissectors/packet-cipsafety.h b/epan/dissectors/packet-cipsafety.h index 6849087b0c..f697634b7e 100644 --- a/epan/dissectors/packet-cipsafety.h +++ b/epan/dissectors/packet-cipsafety.h @@ -16,7 +16,7 @@ #include "packet-enip.h" -/* Classes that have class-specfic dissectors */ +/* Classes that have class-specific dissectors */ #define CI_CLS_SAFETY_SUPERVISOR 0x39 /* Safety Supervisor */ #define CI_CLS_SAFETY_VALIDATOR 0x3A /* Safety Validator */ diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 85416b19bf..d003f7fca0 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1658,7 +1658,7 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, packet_info *pinfo, guint3 asn_tree = proto_tree_add_subtree(tree, tvb, offset, len, ett_cops_asn1, NULL, "Contents:"); /* - * XXX: LAZYNESS WARNING: + * XXX: LAZINESS WARNING: * We are assuming that for the first element in the sequence * that describes an entry subid==1, and, that the subsequent elements * use ++subid; This is true for all IETF's PIBs (and good sense @@ -1690,7 +1690,7 @@ static int dissect_cops_pr_object_data(tvbuff_t *tvb, packet_info *pinfo, guint3 if (oid_info) { /* - * XXX: LAZYNESS WARNING: + * XXX: LAZINESS WARNING: * We are assuming that the value of the sequenced item is of * the right class, the right type and the right length. * We should check that to avoid throwing a Malformed packet and diff --git a/epan/dissectors/packet-dcc.h b/epan/dissectors/packet-dcc.h index 26a7d65cf7..332a113158 100644 --- a/epan/dissectors/packet-dcc.h +++ b/epan/dissectors/packet-dcc.h @@ -163,7 +163,7 @@ typedef struct { * Each client can have many hosts, each host can be multi-homed, * and each host can be running many processes talking to the * server. Each packet needs to be uniquely numbered, so that the - * server can recognize as interchangable all of the (re)transmissions + * server can recognize as interchangeable all of the (re)transmissions * of a single report (rid) from a client process (pid) on a single * host (hid), and the client can know which transmission (tid) * produced a given server response to maintain the client's RTT diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index 59734813a2..bc74a77440 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -2404,7 +2404,7 @@ netlogon_dissect_VALIDATION(tvbuff_t *tvb, int offset, * IDL [in][ref] LOGON_LEVEL *logonlevel, * IDL [in] short ValidationLevel, * IDL [out][ref] VALIDATION *validation, - * IDL [out][ref] boolean Authorative + * IDL [out][ref] boolean Authoritative * IDL [in][out] unsigned long ExtraFlags * IDL ); */ @@ -2477,7 +2477,7 @@ netlogon_dissect_netrlogonsamlogonflags_reply(tvbuff_t *tvb, int offset, * IDL [in][ref] LOGON_LEVEL *logonlevel, * IDL [in] short ValidationLevel, * IDL [out][ref] VALIDATION *validation, - * IDL [out][ref] boolean Authorative + * IDL [out][ref] boolean Authoritative * IDL ); */ static int diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 85bb3deb86..5785987549 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -2947,7 +2947,7 @@ dissect_ndr_wchar_vstring(tvbuff_t *tvb, int offset, packet_info *pinfo, /* ndr pointer handling */ /* Should we re-read the size of the list ? - * Instead of re-calculating the size everytime, use the stored value unless this + * Instead of re-calculating the size every time, use the stored value unless this * flag is set which means: re-read the size of the list */ static gboolean must_check_size = FALSE; diff --git a/epan/dissectors/packet-dect-mitel-rfp.c b/epan/dissectors/packet-dect-mitel-rfp.c index fa6a3ee9f2..e5b5e679d6 100644 --- a/epan/dissectors/packet-dect-mitel-rfp.c +++ b/epan/dissectors/packet-dect-mitel-rfp.c @@ -14,7 +14,7 @@ /* * This is a proprietary protocol deveolped by Mitel for communication - * inbetween the DECT system management Software (OMM) and the DECT + * between the DECT system management Software (OMM) and the DECT * base station (RFPs) */ diff --git a/epan/dissectors/packet-docsis-macmgmt.c b/epan/dissectors/packet-docsis-macmgmt.c index 70b80750af..2dab814468 100644 --- a/epan/dissectors/packet-docsis-macmgmt.c +++ b/epan/dissectors/packet-docsis-macmgmt.c @@ -29,7 +29,7 @@ * Copyright 2015, Adrian Simionov <daniel.simionov@gmail.com> * Copyright 2003, Brian Wheeler <brian.wheeler[AT]arrisi.com> * - * Routines for Intial Ranging Request Message dissection + * Routines for Initial Ranging Request Message dissection * Copyright 2003, Brian Wheeler <brian.wheeler[AT]arrisi.com> * * Routines for Baseline Privacy Key Management Attributes dissection @@ -40,7 +40,7 @@ * Copyright 2014, Adrian Simionov <adrian.simionov@arrisi.com> * Copyright 2007, Bruno Verstuyft <bruno.verstuyft@excentis.com> * - * Routines for DOCSIS 3.0 Bonded Intial Ranging Request Message dissection. + * Routines for DOCSIS 3.0 Bonded Initial Ranging Request Message dissection. * Copyright 2009, Geoffrey Kimball <gekimbal[AT]cisco.com> * * Routines for Type 35 UCD - DOCSIS 3.0 only - Message dissection diff --git a/epan/dissectors/packet-dof.c b/epan/dissectors/packet-dof.c index de0809b24d..f32fab3a61 100644 --- a/epan/dissectors/packet-dof.c +++ b/epan/dissectors/packet-dof.c @@ -208,7 +208,7 @@ /** * This structure represents a SID, or Sender ID, in the system. * This is allocated as global memory, and must be freed. SIDs - * are Object IDs, and can be displayed in hex but preferrably + * are Object IDs, and can be displayed in hex but preferably * using the OID output format. Even though the OID contains * a length, we prefix this buffer with a length (which must * be less than 255 by the definition of a SID. @@ -3301,7 +3301,7 @@ typedef struct _tcp_session_data dof_transport_session common; /* This flag is used to determine that an entire TCP session is NOT OpenDOF. - * Because of TCP/IP negotation in the DPS it is easy to confuse arbitrary + * Because of TCP/IP negotiation in the DPS it is easy to confuse arbitrary * protocols as OpenDOF. Once it is determined that it is not then this * flag can be set, which will turn off all the OpenDOF dissectors. */ @@ -4557,7 +4557,7 @@ static guint8 parseAttribute(struct parseCtx *ctx) { if (parseAttributeID(ctx) == 0) { - /* seperated by ':' */ + /* separated by ':' */ if (PARSECTX_READ_CHAR_OID(ctx) == ':' && PARSECTX_CHECK_LEN(ctx, 1) == 0) { guint8 *length = PARSECTX_GET_CURRENT_POS_BUF(ctx); @@ -4590,7 +4590,7 @@ static guint8 parseAttributes(struct parseCtx *ctx) if (parseAttribute(ctx) != 0) return 1; - /* multiple seperated by '|' */ + /* multiple separated by '|' */ if (PARSECTX_PEEK_CHAR_OID(ctx) == '|' && PARSECTX_PEEK_NEXT_CHAR_OID(ctx) != ')') { PARSECTX_OR_AT_POS_BUF(ctx, avpID, 0x80); /* set that there is a next attribute */ @@ -4612,7 +4612,7 @@ static guint8 parseFormatOID(struct parseCtx *ctx) /* Get class id */ if (parseOIDClass(ctx) == 0) { - /* seperated by ':' */ + /* separated by ':' */ if (PARSECTX_READ_CHAR_OID(ctx) == ':' && PARSECTX_CHECK_LEN(ctx, 1) == 0) { guint8 *length = PARSECTX_GET_CURRENT_POS_BUF(ctx); @@ -9603,7 +9603,7 @@ static int dissect_tep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void } - /* Whether or not this can be decrypted, the security mode infomation + /* Whether or not this can be decrypted, the security mode information * should be kept with the session. */ { diff --git a/epan/dissectors/packet-dsr.c b/epan/dissectors/packet-dsr.c index 71cc22599f..a74d030361 100644 --- a/epan/dissectors/packet-dsr.c +++ b/epan/dissectors/packet-dsr.c @@ -73,7 +73,7 @@ static int hf_dsr_opt_srcrt_reserved; static int hf_dsr_opt_srcrt_salvage; static int hf_dsr_opt_srcrt_segsleft; static int hf_dsr_opt_srcrt_address; -/* Flow State Extentions */ +/* Flow State Extensions */ /* Timout option fields */ static int hf_dsr_fs_opt_timeout_timeout; /* Flow ID / destination option fields */ @@ -114,7 +114,7 @@ static gint ett_dsr_srcrt_hoplist; #define DSR_OPT_TYPE_SRCRT 96 #define DSR_OPT_TYPE_PAD1 224 #define DSR_OPT_TYPE_PADN 0 -/* DSR Flow State extention types */ +/* DSR Flow State extension types */ #define DSR_FS_OPT_TYPE_TIMEOUT 128 #define DSR_FS_OPT_TYPE_DESTFLOWID 129 /* Route error types */ diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c index ce98dffe4b..cfa62f438e 100644 --- a/epan/dissectors/packet-dvb-s2-bb.c +++ b/epan/dissectors/packet-dvb-s2-bb.c @@ -1733,7 +1733,7 @@ static int dissect_dvb_s2_bb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree user_packet_length >>= 3; /* UPL should be *at least* MP2T_PACKET_SIZE, depending on npd (1 byte) * and issy (2 or 3 bytes). The fields are overdetermined (something - * addressed in -C2 and -T2's High Efficency Mode for TS), so how to + * addressed in -C2 and -T2's High Efficiency Mode for TS), so how to * process in the case of inconsistency is a judgment call. The * approach here is to disable anything for which there is insufficent * room, but not to enable anything marked as inactive. diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 0701a9f28d..eff4a1fb54 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -25,7 +25,7 @@ * - Multiple SOD Read/Write dissection * - Include AInv message type * - Straighten text formatting - * - Remove unneccessary if(tree) checks + * - Remove unnecessary if(tree) checks * * Copyright (c) 2017: Karlsruhe Institute of Technology (KIT) * Institute for Anthropomatics and Robotics (IAR) @@ -1858,7 +1858,7 @@ epl_address_equal(gconstpointer a, gconstpointer b) /* FIXME * PDO Mappings store object/subobjct pointers and thus need to be * updated after a profile change. We purge them by resetting the - * memory pool. As PDO Mappings are refereneced via Conversations, + * memory pool. As PDO Mappings are referenced via Conversations, * we need to fix up those too. I didn't figure out how to clear * conversations yet, so till now, we keep a variable to tell us * if we have dangling pointers. Courtesy of Peter Wu. @@ -6551,7 +6551,7 @@ device_profile_parse_uat(void) wmem_map_foreach(epl_profiles_by_device, drop_profiles, NULL); /* PDO Mappings will have stale pointers after a profile change - * so we reset the memory pool. As PDO Mappings are refereneced + * so we reset the memory pool. As PDO Mappings are referenced * via Conversations, we need to fixup those too to avoid a use * after free, preferably by clearing them. * This generation++ is a temporary workaround @@ -6643,7 +6643,7 @@ nodeid_profile_parse_uat(void) /* PDO Mappings will have stale pointers after a profile change - * so we reset the memory pool. As PDO Mappings are refereneced + * so we reset the memory pool. As PDO Mappings are referenced * via Conversations, we need to fixup those too to avoid a use * after free, preferably by clearing them. * This generation++ is a temporary workaround diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index b95786a61d..329ee95314 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -772,7 +772,7 @@ static erf_state_t erf_state; /* * XXX: These header_field_info are used as templates for dynamically building - * per-section fields for each tag, as well as appropiate value_string arrays. + * per-section fields for each tag, as well as appropriate value_string arrays. * We abuse the abbrev field to store the short name of the tags. */ static const erf_meta_hf_template_t erf_meta_tags[] = { @@ -1963,7 +1963,7 @@ dissect_host_id_source_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g if (fnum != G_MAXUINT32) { fnum_current = fnum; } else { - /* XXX: Possibly undesireable side effect: first metadata record links to next */ + /* XXX: Possibly undesirable side effect: first metadata record links to next */ fnum_current = fnum_next; } diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index b5c19084b8..f73eacc2ea 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -79,7 +79,7 @@ const value_string etype_vals[] = { { ETHERTYPE_MRP, "MRP" }, { ETHERTYPE_IEEE_802_1AD, "802.1ad Provider Bridge (Q-in-Q)" }, { ETHERTYPE_MACSEC, "802.1AE (MACsec)" }, - { ETHERTYPE_IEEE_1905, "1905.1a Convergent Digital Home Network for Heterogenous Technologies" }, + { ETHERTYPE_IEEE_1905, "1905.1a Convergent Digital Home Network for Heterogeneous Technologies" }, { ETHERTYPE_IEEE_802_1AH, "802.1ah Provider Backbone Bridge (mac-in-mac)" }, { ETHERTYPE_IEEE_802_1BR, "802.1br Bridge Port Extension E-Tag" }, { ETHERTYPE_EAPOL, "802.1X Authentication" }, diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index 60630c99bd..d3126ead1a 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -686,7 +686,7 @@ f5eth_tmmdist_stats_tree_init(stats_tree *st) /*-----------------------------------------------------------------------------------------------*/ /** - * @brief Per-packet tmm distrubution statistics + * @brief Per-packet tmm distribution statistics * * @attention This is an interface function to be called from the rest of wireshark. * diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 6065fc4666..153290e394 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -21,7 +21,7 @@ void proto_register_fcip(void); void proto_reg_handoff_fcip(void); #define FCIP_ENCAP_HEADER_LEN 28 -#define FCIP_MIN_HEADER_LEN 16 /* upto frame len field */ +#define FCIP_MIN_HEADER_LEN 16 /* up to frame len field */ #define FCIP_IS_SF(pflags) ((pflags & 0x1) == 0x1) #define FCIP_IS_CH(pflags) ((pflags & 0x80) == 0x80) diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index 15945be0ab..98585b84e6 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -495,13 +495,13 @@ get_zoneobj_len(tvbuff_t *tvb, gint offset) * id (id_len bytes) */ objtype = tvb_get_guint8(tvb, offset); - len = 4 + ZONENAME_LEN(tvb, offset+4); /* length upto num_of_mbrs field */ + len = 4 + ZONENAME_LEN(tvb, offset+4); /* length up to num_of_mbrs field */ numrec = tvb_get_ntohl(tvb, offset+len); /* gets us num of zone mbrs */ len += 4; /* + num_mbrs */ for (i = 0; i < numrec; i++) { if (objtype == FC_SWILS_ZONEOBJ_ZONESET) { - len += 4 + ZONENAME_LEN(tvb, offset+4+len); /* length upto num_of_mbrs field */ + len += 4 + ZONENAME_LEN(tvb, offset+4+len); /* length up to num_of_mbrs field */ numrec1 = tvb_get_ntohl(tvb, offset+len); len += 4; diff --git a/epan/dissectors/packet-fix.h b/epan/dissectors/packet-fix.h index dfe2c1a0ff..1411d4e35f 100644 --- a/epan/dissectors/packet-fix.h +++ b/epan/dissectors/packet-fix.h @@ -1871,7 +1871,7 @@ typedef struct _fix_field { static const value_string BidType_val[] = { { 1, "NON DISCLOSED STYLE" }, - { 2, "DISCLOSED SYTLE" }, + { 2, "DISCLOSED STYLE" }, { 3, "NO BIDDING PROCESS" }, { 0, NULL } }; @@ -2066,7 +2066,7 @@ typedef struct _fix_field { { 12, "EXECUTING TRADER" }, { 13, "ORDER ORIGINATION FIRM" }, { 14, "GIVEUP CLEARING FIRM" }, - { 15, "CORRESPONDANT CLEARING FIRM" }, + { 15, "CORRESPONDENT CLEARING FIRM" }, { 16, "EXECUTING SYSTEM" }, { 17, "CONTRA FIRM" }, { 18, "CONTRA CLEARING FIRM" }, diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c index e804ecfdff..57a2322049 100644 --- a/epan/dissectors/packet-fmp.c +++ b/epan/dissectors/packet-fmp.c @@ -677,7 +677,7 @@ dissect_fmp_Hiervolume(tvbuff_t *tvb, int offset, proto_tree * tree) offset = dissect_rpc_uint32(tvb, tree, hf_fmp_cookie, offset); /* hierarchical description of volume. Each volume describes a - piece of the entire hierarchy and is guarenteed to only refer to + piece of the entire hierarchy and is guaranteed to only refer to volumes that have already been described by the data structure up to this point in time. In some extreme cases, the number of volumes and their descriptions may be to large to fit in a single diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index d1e8205d3a..6852469a54 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -206,7 +206,7 @@ guint32 eo_row_count = 0; * FTP is complex in that there's no guarantee that the file transmission * was completely captured. It might be possible to infer a successful * transfer with either the "SIZE" command or with a 226 response code - * (indicating that the STOR or RETR command was succesful), but there + * (indicating that the STOR or RETR command was successful), but there * is no guarantee that either of these are present. As such, this * implementation takes a best-effort approach of simply appending * all associated ftp-data packets to the export objects entry. diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c index 0e8e65668f..f75af44235 100644 --- a/epan/dissectors/packet-fw1.c +++ b/epan/dissectors/packet-fw1.c @@ -66,7 +66,7 @@ * Additional interpretation of field Chain Position. * Show the chain position in the interface list. * Support for new format of fw monitor file - * writen by option -u | -s for UUID/SUUID. + * written by option -u | -s for UUID/SUUID. * NOTICE: First paket will have UUID == 0 ! * * SPDX-License-Identifier: GPL-2.0-or-later diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index f60266c57a..a01d6c8f63 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -21,7 +21,7 @@ * TODO: -- FS * 1. heuristic giop dissector table [started] * 2. GUI options, see 20 - * 3. Remove unneccessary reply_status in heuristic dissector calls (now + * 3. Remove unnecessary reply_status in heuristic dissector calls (now * part of MessageHeader) [done] * 4. get_CDR_xxx should be passed an alignment offset value * rather than GIOP_HEADER_SIZE, as alignment can also change in a diff --git a/epan/dissectors/packet-giop.h b/epan/dissectors/packet-giop.h index 98800fb894..00d2cf4b96 100644 --- a/epan/dissectors/packet-giop.h +++ b/epan/dissectors/packet-giop.h @@ -144,7 +144,7 @@ extern void delete_giop_user_module(giop_sub_dissector_t *sub, gchar *name, * - Pseudo Object Types * * - * Altough some of these look redundant, I have separated them + * Although some of these look redundant, I have separated them * out for all CDR types, to assist in auto generation of * IDL dissectors later, see idl2wrs -- FS * diff --git a/epan/dissectors/packet-grpc.c b/epan/dissectors/packet-grpc.c index 942c5d6d4f..120527c369 100644 --- a/epan/dissectors/packet-grpc.c +++ b/epan/dissectors/packet-grpc.c @@ -229,7 +229,7 @@ dissect_body_data(proto_tree *grpc_tree, packet_info *pinfo, tvbuff_t *tvb, cons * the grpc message information might be used by the other Lua dissector in the future. * The grpc message information format is: * http2_content_type "," http2_path "," ("request" / "response") - * Acording to grpc wire format guide, it will be: + * According to grpc wire format guide, it will be: * "application/grpc" [("+proto" / "+json" / {custom})] "," "/" service-name "/" method-name "/" "," ("request" / "response") * For example: * application/grpc,/helloworld.Greeter/SayHello,request diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 77f93e3c62..3db48c14b3 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -7,8 +7,8 @@ * In association with Telos Technology Inc. * * - * Added the GPRS Mobility Managment Protocol and - * the GPRS Session Managment Protocol + * Added the GPRS Mobility Management Protocol and + * the GPRS Session Management Protocol * Copyright 2004, Rene Pilz <rene.pilz [AT] ftw.com> * In association with Telecommunications Research Center * Vienna (ftw.)Betriebs-GmbH within the Project Metawin. @@ -6879,7 +6879,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) return len; } /* - * eventhough we don't know if a TI should be in the message yet + * even though we don't know if a TI should be in the message yet * we rely on the TI/SKIP indicator to be 0 to avoid taking this * octet */ diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index d8ec254cb2..5f000c19ea 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -3985,7 +3985,7 @@ MAP interfaces case 1: /* gsm-0408 */ /* As per comment abowe Individual IE:(s) will be found here in TLV format - * Unfortunatly a branch for each IE must be made to call the apropriate + * Unfortunately a branch for each IE must be made to call the appropriate * function */ /* Get tag */ @@ -18042,7 +18042,7 @@ if (!gsm_map_priv || !gsm_map_priv->signal_info_tvb) case 1: /* gsm-0408 */ /* As per comment abowe Individual IE:(s) will be found here in TLV format - * Unfortunatly a branch for each IE must be made to call the apropriate + * Unfortunately a branch for each IE must be made to call the appropriate * function */ /* Get tag */ @@ -22388,7 +22388,7 @@ typedef int (* dissect_function_t)( bool, /* * Dissect Multiple Choice Message * This function is used to decode a message, when several encoding may be used. - * For exemple, in the last MAP version, the Cancel Location is defined like this: + * For example, in the last MAP version, the Cancel Location is defined like this: * CancelLocationArg ::= [3] IMPLICIT SEQUENCE * But in the previous MAP version, it was a CHOICE between a SEQUENCE and an IMSI * As ASN1 encoders (or software) still uses the old encoding, this function allows diff --git a/epan/dissectors/packet-gsm_rlcmac.h b/epan/dissectors/packet-gsm_rlcmac.h index e70b7f57ec..c1ed3f3bd4 100644 --- a/epan/dissectors/packet-gsm_rlcmac.h +++ b/epan/dissectors/packet-gsm_rlcmac.h @@ -1123,7 +1123,7 @@ typedef struct guint8 Exist_A5_bits; A5_bits_t A5_bits; - /*-- zero means that the same values apply for parameters as in the immediately preceeding Access capabilities field within this IE + /*-- zero means that the same values apply for parameters as in the immediately preceding Access capabilities field within this IE *-- The presence of the A5 bits is mandatory in the 1st Access capabilies struct within this IE. */ @@ -1134,7 +1134,7 @@ typedef struct guint8 Exist_Multislot_capability; Multislot_capability_t Multislot_capability; - /* -- zero means that the same values apply for multislot parameters as in the immediately preceeding Access capabilities field within this IE. + /* -- zero means that the same values apply for multislot parameters as in the immediately preceding Access capabilities field within this IE. * -- The presence of the Multislot capability struct is mandatory in the 1st Access capabilites struct within this IE. */ /* -------- Rel 99 additions */ @@ -2868,7 +2868,7 @@ typedef struct SI13_PBCCH_Location_t SI13_PBCCH_Location; } Cell_Selection_t; -/* Neigbour cell list as used in PSI3 and PSI3bis */ +/* Neighbour cell list as used in PSI3 and PSI3bis */ typedef struct { guint8 FREQ_DIFF_LENGTH; diff --git a/epan/dissectors/packet-http3.c b/epan/dissectors/packet-http3.c index cb75fd1771..052ca7e427 100644 --- a/epan/dissectors/packet-http3.c +++ b/epan/dissectors/packet-http3.c @@ -380,7 +380,7 @@ typedef struct _http3_header_field_def { * - encoded points to the location of the encoded field in the *original* packet TVB. * - decoded points to the formatted header string, which is allocated in a cache map, * to conserve memory. - * The decoded fields are used to create an auxillary TVB which will + * The decoded fields are used to create an auxiliary TVB which will * be used for dissection of decoded header values. */ typedef struct _http3_header_field { diff --git a/epan/dissectors/packet-ieee80211-netmon.c b/epan/dissectors/packet-ieee80211-netmon.c index eff813e9af..9a81bcd43f 100644 --- a/epan/dissectors/packet-ieee80211-netmon.c +++ b/epan/dissectors/packet-ieee80211-netmon.c @@ -175,7 +175,7 @@ dissect_netmon_802_11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* * Furthermore, we may see frames with the A-MSDU Present flag set - * in the QoS Control field but that have a regular frame, nto a + * in the QoS Control field but that have a regular frame, not a * sequence of A-MSDUs, in the payload. */ phdr.no_a_msdus = TRUE; @@ -339,7 +339,7 @@ dissect_netmon_802_11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* * ullTimestamp? * - * If so, should this check the presense flag in flags? + * If so, should this check the presence flag in flags? */ phdr.has_tsf_timestamp = TRUE; phdr.tsf_timestamp = tvb_get_letoh64(tvb, offset); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 288ea87561..8aa08f3a42 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -15254,7 +15254,7 @@ add_ff_action_unprotected_dmg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinf * Table 8-53g IEEE Std 802.11ac-2013 amendment. * * The irregular use of case statements in this function is to improve - * readability in what is otherwise a large funtion that does very little. + * readability in what is otherwise a large function that does very little. */ static inline int vht_compressed_skip_scidx(guint8 nchan_width, guint8 ng, int scidx) diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c index 6227740282..06b705fa58 100644 --- a/epan/dissectors/packet-ifcp.c +++ b/epan/dissectors/packet-ifcp.c @@ -27,7 +27,7 @@ void proto_register_ifcp(void); void proto_reg_handoff_ifcp(void); #define iFCP_ENCAP_HEADER_LEN 28 -#define iFCP_MIN_HEADER_LEN 16 /* upto frame len field */ +#define iFCP_MIN_HEADER_LEN 16 /* up to frame len field */ typedef enum { iFCP_EOFn = 0x41, diff --git a/epan/dissectors/packet-isis-clv.c b/epan/dissectors/packet-isis-clv.c index b9efffd6a1..908967139b 100644 --- a/epan/dissectors/packet-isis-clv.c +++ b/epan/dissectors/packet-isis-clv.c @@ -413,7 +413,7 @@ isis_dissect_te_router_id_clv(proto_tree *tree, packet_info* pinfo, tvbuff_t *tv * Name: isis_dissect_nlpid_clv() * * Description: - * Take apart a NLPID packet and display it. The NLPID (for intergrated + * Take apart a NLPID packet and display it. The NLPID (for integrated * ISIS, contains n network layer protocol IDs that the box supports. * We max out at 256 entries. * diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 523913124c..fcfad27764 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -31,7 +31,7 @@ static int hf_ismp_seq_num; static int hf_ismp_code_length; static int hf_ismp_auth_data; -/* Enterasys/Cabletron Dicovery Protocol fields*/ +/* Enterasys/Cabletron Discovery Protocol fields*/ static int hf_ismp_edp; static int hf_ismp_edp_version; static int hf_ismp_edp_module_ip; diff --git a/epan/dissectors/packet-isobus-parameters.h b/epan/dissectors/packet-isobus-parameters.h index 70adfdc237..37fc5b7d9d 100644 --- a/epan/dissectors/packet-isobus-parameters.h +++ b/epan/dissectors/packet-isobus-parameters.h @@ -3095,7 +3095,7 @@ static const value_string _isobus_pgn_names[] = { { 64176, "High Voltage Energy Storage Pack 8 History" }, { 64177, "High Voltage Energy Storage Pack 7 Configuration" }, { 64178, "High Voltage Energy Storage Pack 7 History" }, - { 64179, "AUTOSAR Time Syncronization" }, + { 64179, "AUTOSAR Time Synchronization" }, { 64180, "EV DC Charging Limits 1" }, { 64181, "EVSE DC Charging Limits 1" }, { 64182, "EVSE DC Charging Limits 2" }, @@ -3264,10 +3264,10 @@ static const value_string _isobus_pgn_names[] = { { 64348, "Vehicle Fire Suppression System Module 2 Detector Data" }, { 64349, "Vehicle Fire Suppression System Module 3 Detector Data" }, { 64350, "Vehicle Fire Suppression System Module 4 Detector Data" }, - { 64351, "Vehicle Fire Suppression System Module 1 Auxilliary Data" }, - { 64352, "Vehicle Fire Suppression System Module 2 Auxilliary Data" }, - { 64353, "Vehicle Fire Suppression System Module 3 Auxilliary Data" }, - { 64354, "Vehicle Fire Suppression System Module 4 Auxilliary Data" }, + { 64351, "Vehicle Fire Suppression System Module 1 Auxiliary Data" }, + { 64352, "Vehicle Fire Suppression System Module 2 Auxiliary Data" }, + { 64353, "Vehicle Fire Suppression System Module 3 Auxiliary Data" }, + { 64354, "Vehicle Fire Suppression System Module 4 Auxiliary Data" }, { 64355, "Vehicle Fire Suppression System Module 1 Names" }, { 64356, "Vehicle Fire Suppression System Module 2 Names" }, { 64357, "Vehicle Fire Suppression System Module 3 Names" }, diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index d65320067f..290afaa67e 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -6586,7 +6586,7 @@ dissect_isup_conference_treatment_indicators_parameter(tvbuff_t *parameter_tvb, * 0 3 Display information (IA5 characters) * etc. * - end - quote - - * Assuming octet 2 and onwards is pased here - just output text ? + * Assuming octet 2 and onwards is passed here - just output text ? */ static void dissect_isup_display_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item _U_) diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index 73fbfbdd1e..4c2ed41fe5 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -678,7 +678,7 @@ before_object(void *tvbparse_data, const void *wanted_data _U_, tvbparse_elem_t } if (data->prev_item_type_raw == JSON_MARK_TYPE_MEMBER_NAME) { - /* this is an object value of an member, add the "{" just after the memeber name */ + /* this is an object value of an member, add the "{" just after the member name */ ti_raw = data->prev_item_raw; proto_item_append_text(ti_raw, " {"); } else { @@ -903,7 +903,7 @@ before_array(void *tvbparse_data, const void *wanted_data _U_, tvbparse_elem_t * } if (data->prev_item_type_raw == JSON_MARK_TYPE_MEMBER_NAME) { - /* this is an array value of an member, add the "[" just after the memeber name */ + /* this is an array value of an member, add the "[" just after the member name */ ti_raw = data->prev_item_raw; proto_item_append_text(ti_raw, " ["); } else { diff --git a/epan/dissectors/packet-lbmsrs.c b/epan/dissectors/packet-lbmsrs.c index 37b0e74635..9a61b5926c 100644 --- a/epan/dissectors/packet-lbmsrs.c +++ b/epan/dissectors/packet-lbmsrs.c @@ -767,7 +767,7 @@ static gboolean check_lbmsrs_packet(tvbuff_t *tvb, guint offset) offset += rsocket_frame_len_field_size; /*check the length*/ - /*rsocket data maybe split accross multiple packets*/ + /*rsocket data maybe split across multiple packets*/ guint32 tvb_length = tvb_captured_length(tvb); if (tvb_length < (offset - start_offset + rsocket_stream_id_field_size)) @@ -896,7 +896,7 @@ static gboolean check_lbmsrs_packet(tvbuff_t *tvb, guint offset) static guint get_rsocket_frame_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_) { /*get the rsocket frame length (3-byte long field)*/ - /*offset argument points to the begining of the Rsocket PDU*/ + /*offset argument points to the beginning of the Rsocket PDU*/ guint32 rsocket_frame_len = tvb_get_guint24(tvb, offset, ENC_BIG_ENDIAN); /*return total RSocket PDU size*/ diff --git a/epan/dissectors/packet-lnet.c b/epan/dissectors/packet-lnet.c index 9db2b7a2a1..dbe1b1b661 100644 --- a/epan/dissectors/packet-lnet.c +++ b/epan/dissectors/packet-lnet.c @@ -791,7 +791,7 @@ dissect_lnet_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * if (msg_filler_length > 72) goto out; */ - /* +24 : ksock_message take 24bytes, and allready in offset */ + /* +24 : ksock_message take 24bytes, and already in offset */ } if (msg_filler_length > 0) { diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c index 3003232b93..df798b6028 100644 --- a/epan/dissectors/packet-ltp.c +++ b/epan/dissectors/packet-ltp.c @@ -937,7 +937,7 @@ dissect_report_segment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ltp_tree, /* There can be multiple reception claims in the same report segment */ for(guint64 ix = 0; ix < rcpt_clm_cnt; ix++){ - /* Peek at the offset to see if there is a preceeding gap */ + /* Peek at the offset to see if there is a preceding gap */ tvb_get_varint(tvb, frame_offset + segment_offset, FT_VARINT_MAX_LEN, &offset, ENC_VARINT_SDNV); clm_fst = lower_bound + offset; ltp_check_reception_gap(ltp_rpt_tree, pinfo, session, clm_lst, clm_fst, &gap_count, &gap_total); diff --git a/epan/dissectors/packet-lustre.c b/epan/dissectors/packet-lustre.c index c77ad26e9b..e727251cca 100644 --- a/epan/dissectors/packet-lustre.c +++ b/epan/dissectors/packet-lustre.c @@ -3458,7 +3458,7 @@ dissect_struct_lov_mds_md(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t offset += 16; } - /* This may happend when, server is just returning the stripe + /* This may happen when, server is just returning the stripe count, but not the stripe data (ie default stripe_count on a directory) */ if (data_len-(offset-old_offset) != stripe_count*24) @@ -4662,7 +4662,7 @@ dissect_struct_llog_log_hdr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto /* * Note: llh_bitmap size is variable because llog chunk size could be */ /* * bigger than LLOG_MIN_CHUNK_SIZE, i.e. sizeof(llog_log_hdr) > 8192 */ /* * bytes, and the real size is stored in llh_hdr.lrh_len, which means */ - /* * llh_tail should only be refered by LLOG_HDR_TAIL(). */ + /* * llh_tail should only be referred by LLOG_HDR_TAIL(). */ /* * But this structure is also used by client/server llog interface */ /* * (see llog_client.c), it will be kept in its original way to avoid */ /* * compatibility issue. *\/ */ diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index 79587e2c7e..dcdc6e4f77 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -1040,7 +1040,7 @@ static guint16 dissect_mausb_mgmt_pkt_ep_handle( proto_tree *tree, tvbuff_t *tvb size_ep_des = mausb_get_size_ep_des(tvb, offset); size_field = proto_tree_add_item(tree, hf_mausb_mgmt_ep_des_size, tvb, - offset, 2, ENC_LITTLE_ENDIAN); /* really 6 bits over a byte boundry */ + offset, 2, ENC_LITTLE_ENDIAN); /* really 6 bits over a byte boundary */ offset += 1; /* Padding to DWORD */ @@ -1331,7 +1331,7 @@ static guint16 dissect_mausb_mgmt_pkt_flds(struct mausb_header *header, break; - /* Managment packets with no additional data */ + /* Management packets with no additional data */ case DevResetReq: case DevResetResp: case UpdateDevResp: @@ -1750,7 +1750,7 @@ proto_register_mausb(void) } }, - /* Managment Packets Only */ + /* Management Packets Only */ { &hf_mausb_token, { "Token", "mausb.token", FT_UINT16, BASE_DEC, NULL, MAUSB_TOKEN_MASK, NULL, HFILL diff --git a/epan/dissectors/packet-mc-nmf.c b/epan/dissectors/packet-mc-nmf.c index 3ac3b4d578..a4cfdbf74f 100644 --- a/epan/dissectors/packet-mc-nmf.c +++ b/epan/dissectors/packet-mc-nmf.c @@ -119,7 +119,7 @@ static expert_field ei_mc_nmf_size_too_big; // [MC-NMF] does not have a defined port https://learn.microsoft.com/en-us/openspecs/windows_protocols/mc-nmf/51b5eb53-f488-4b74-b21d-8a498f016b61 // but 9389 is ADWS port https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-adcap/cfff3d7f-e7cd-4529-86a0-4de89efe3855 -// which relies on [MC-NMF], so by doing this, all ADWS trafic on port 9389 is properly dissected by default +// which relies on [MC-NMF], so by doing this, all ADWS traffic on port 9389 is properly dissected by default #define MC_NMF_TCP_PORT 9389 /* Initialize the subtree pointers */ diff --git a/epan/dissectors/packet-metamako.c b/epan/dissectors/packet-metamako.c index 89218ca2c6..4910dba743 100644 --- a/epan/dissectors/packet-metamako.c +++ b/epan/dissectors/packet-metamako.c @@ -246,7 +246,7 @@ dissect_metamako(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data /* Loop through the trailer bytes, trying to find a valid trailer. * When: * i == 0, we assume there IS NO trailing FCS - * i == 1, we assume ther IS a trailing FCS + * i == 1, we assume there IS a trailing FCS */ for (i = i_start; i < i_end && !trailer_valid; i++) { has_fcs = i == 1; diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c index 512d1fc7a9..546fc27aac 100644 --- a/epan/dissectors/packet-mount.c +++ b/epan/dissectors/packet-mount.c @@ -109,7 +109,7 @@ static const value_string mount3_mountstat3[] = * 3 of the protocol. * Though not formally defined in the standard, we use the same * value-to-string mappings as version 3 since we believe that this mapping - * is consistant with most v1 and v2 implementations. + * is consistent with most v1 and v2 implementations. */ static int dissect_fhstatus(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, rpc_call_info_value* civ) diff --git a/epan/dissectors/packet-mswsp.c b/epan/dissectors/packet-mswsp.c index fcfce7b997..e3b1b7cc30 100644 --- a/epan/dissectors/packet-mswsp.c +++ b/epan/dissectors/packet-mswsp.c @@ -5682,7 +5682,7 @@ static int dissect_CPMGetRows(tvbuff_t *tvb, packet_info *pinfo, proto_tree *par * GetRows response needs information from GetRow & SetBindings * requests */ - /* find the preceeding SetBinding data */ + /* find the preceding SetBinding data */ guint32 num_rows = 0; proto_item *ti; proto_tree *pad_tree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_mswsp_pad, &ti, "Padding"); diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 32e76c3e7c..63012d7d52 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -6692,7 +6692,7 @@ static const value_string nas_eps_esm_bearer_id_vals[] = { /* * EPS session management messages. - * A plain NAS message is pased to this function + * A plain NAS message is passed to this function */ static void dissect_nas_eps_esm_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 1ade213def..9e078c542e 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -10411,7 +10411,7 @@ nbap_hsdsch_channel_info = nbap_private_data->nbap_hsdsch_channel_info; return offset; } - /*Find the conversations assoicated with the HS-DSCH flows in this packet and set proper H-RNTI*/ + /*Find the conversations associated with the HS-DSCH flows in this packet and set proper H-RNTI*/ clear_address(&null_addr); for (i = 0; i < maxNrOfMACdFlows; i++) { if (nbap_hsdsch_channel_info[i].crnc_port != 0){ @@ -18476,7 +18476,7 @@ nbap_edch_channel_info = nbap_private_data->nbap_edch_channel_info; * MAC-i/is => Type 2 * The specifications isn't very clear about the indicator for what entity * should be used. For now, it seems like the presence of the "Maximum MAC-d PDU Size Extended IE" - * indicates MAC-i/is and it's absense means MAC-e/es + * indicates MAC-i/is and it's absence means MAC-e/es */ if(nbap_private_data->max_mac_d_pdu_size_ext_ie_present){ fp_edch_channel_info->edch_type = 1; /* 1 means Type 2 */ @@ -18767,7 +18767,7 @@ nbap_private_data->num_items = 1; * MAC-i/is => Type 2 * The specifications isn't very clear about the indicator for what entity * should be used. For now, it seems like the presence of the "Maximum MAC-d PDU Size Extended IE" - * indicates MAC-i/is and it's absense means MAC-e/es + * indicates MAC-i/is and it's absence means MAC-e/es */ if(nbap_private_data->max_mac_d_pdu_size_ext_ie_present){ fp_edch_channel_info->edch_type = 1; /* 1 means Type 2 */ @@ -29294,7 +29294,7 @@ nbap_private_data->binding_id_port = 0; expert_add_info(actx->pinfo, NULL, &ei_nbap_no_set_comm_context_id); } - /* Check if we allready have this context */ + /* Check if we already have this context */ e_dch_macdflow_id = nbap_private_data->e_dch_macdflow_id; if( (old_info = (nbap_edch_port_info_t *)wmem_tree_lookup32(edch_flow_port_map,nbap_private_data->com_context_id)) == NULL ){ nbap_edch_port_info_t * nbap_edch_port_info; diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index f09ca811ea..8a6dc22c9c 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -254,7 +254,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, nbd_trans=(nbd_transaction_t *)wmem_tree_lookup32_array(nbd_info->acked_pdus, hkey); } - /* The bloody handles are reused !!! eventhough they are 64 bits. + /* The bloody handles are reused !!! even though they are 64 bits. * So we must verify we got the "correct" one */ if( (magic==NBD_RESPONSE_MAGIC) diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc index e648f2cf20..b6f790ffa3 100644 --- a/epan/dissectors/packet-ncp2222.inc +++ b/epan/dissectors/packet-ncp2222.inc @@ -1430,14 +1430,14 @@ static const value_string nds_reply_errors[] = { { 0xffffe880, "(-6016) Error Returning Partial Results" }, { 0xffffe87f, "(-6017) No Such Schema" }, { 0xffffe87e, "(-6018) Serial Number Mismatch" }, - { 0xffffe87d, "(-6019) Bad Referal Database Serial Number" }, - { 0xffffe87c, "(-6020) Bad Referal Serial Number" }, + { 0xffffe87d, "(-6019) Bad Referral Database Serial Number" }, + { 0xffffe87c, "(-6020) Bad Referral Serial Number" }, { 0xffffe87b, "(-6021) Invalid File Sequence" }, - { 0xffffe87a, "(-6022) Error Referal Trans Gap" }, - { 0xffffe879, "(-6023) Bad Referal File Number" }, - { 0xffffe878, "(-6024) Referal File Not Found" }, + { 0xffffe87a, "(-6022) Error Referral Trans Gap" }, + { 0xffffe879, "(-6023) Bad Referral File Number" }, + { 0xffffe878, "(-6024) Referral File Not Found" }, { 0xffffe877, "(-6025) Error Backup Active" }, - { 0xffffe876, "(-6026) Referal Device Full" }, + { 0xffffe876, "(-6026) Referral Device Full" }, { 0xffffe875, "(-6027) Unsupported Version" }, { 0xffffe874, "(-6028) Error Must Wait Checkpoint" }, { 0xffffe873, "(-6029) Attribute Maintenance in Progress" }, @@ -5313,7 +5313,7 @@ process_multivalues(proto_tree *ncp_tree, tvbuff_t *tvb, packet_info *pinfo, nds * over 256 referrals. */ if (number_of_referrals > 256) { - proto_tree_add_expert_format(ntree, pinfo, &ei_ncp_invalid_offset, tvb, 0, 0, "Bad referal at offset: %u", ioffset); + proto_tree_add_expert_format(ntree, pinfo, &ei_ncp_invalid_offset, tvb, 0, 0, "Bad referral at offset: %u", ioffset); THROW(ReportedBoundsError); break; } @@ -7023,7 +7023,7 @@ nds_defrag(tvbuff_t *tvb, packet_info *pinfo, uint32_t nw_connection, uint8_t se } else { - /* This is either a beggining or middle fragment on second dissection */ + /* This is either a beginning or middle fragment on second dissection */ frag_tvb = tvb_new_subset_remaining(tvb, 0); if (request_value->nds_frag) { diff --git a/epan/dissectors/packet-ncsi.c b/epan/dissectors/packet-ncsi.c index 46a32c9182..2dc24095bc 100644 --- a/epan/dissectors/packet-ncsi.c +++ b/epan/dissectors/packet-ncsi.c @@ -1284,7 +1284,7 @@ proto_register_ncsi(void) NULL, HFILL }, }, - /* Get Verison ID */ + /* Get Version ID */ { &hf_ncsi_ver, { "NC-SI version", "ncsi.ver", FT_STRING, BASE_NONE, NULL, 0, diff --git a/epan/dissectors/packet-nfapi.c b/epan/dissectors/packet-nfapi.c index b316f102e2..cfbf88ebd5 100644 --- a/epan/dissectors/packet-nfapi.c +++ b/epan/dissectors/packet-nfapi.c @@ -8563,7 +8563,7 @@ static int dissect_nfapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo msg_id = tvb_get_ntohs(tvb, 2); message_str = val_to_str_const(msg_id, message_id_vals, "Unknown"); - // Flag if this is a vendor extention message, could do it for P4, 5, 7 + // Flag if this is a vendor extension message, could do it for P4, 5, 7 if (msg_id >= 0x0300 && msg_id <= 0x03FF) { col_append_fstr(pinfo->cinfo, COL_INFO, "Vendor Extension"); diff --git a/epan/dissectors/packet-oampdu.c b/epan/dissectors/packet-oampdu.c index bba2a86578..4ea27e9f21 100644 --- a/epan/dissectors/packet-oampdu.c +++ b/epan/dissectors/packet-oampdu.c @@ -1224,7 +1224,7 @@ dissect_cablelabs_event_notification(tvbuff_t *tvb, proto_tree *tree, guint8 byt * Maintenance slow protocol defined in IEEE 802.3 clause 57 (The OAMPDUs * common part is defined in section 57.4). * - * Only the 6 folowing codes are currently defined in the 2004 version of this + * Only the 6 following codes are currently defined in the 2004 version of this * protocol: * OAMPDU_INFORMATION: 0x0 diff --git a/epan/dissectors/packet-opa-mad.c b/epan/dissectors/packet-opa-mad.c index 6bf794a6cb..20015bdef0 100644 --- a/epan/dissectors/packet-opa-mad.c +++ b/epan/dissectors/packet-opa-mad.c @@ -1173,7 +1173,7 @@ static gint hf_opa_sa_ServiceGID; static gint hf_opa_sa_MGID; static gint hf_opa_sa_PortGID; -/* Attribute Specfic Fields */ +/* Attribute Specific Fields */ static gint hf_opa_Notice; static gint hf_opa_Notice_IsGeneric; static gint hf_opa_Notice_Type; diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index c2601c6b9a..252aacc606 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -570,7 +570,7 @@ static gboolean findSafetyFrame ( packet_info *pinfo, tvbuff_t *message_tvb, gui * bit is set */ if ( ( b_ID != 0xFF ) && ( b_ID & 0x80 ) ) { - /* The rem_length value might be poluted, due to the else statement of + /* The rem_length value might be polluted, due to the else statement of * above if-decision (frame at end position detection). Therefore we * calculate it here again, to have a sane value */ rem_length = tvb_reported_length_remaining(message_tvb, ctr); @@ -2120,7 +2120,7 @@ opensafety_package_dissector(const gchar *protocolName, const gchar *sub_diss_ha break; /* Resetting packet, to ensure, that findSafetyFrame starts with a fresh frame. - * As only packet_scope is used, this will not polute memory too much and get's + * As only packet_scope is used, this will not pollute memory too much and get's * cleared with the next packet anyway */ packet = wmem_new0(pinfo->pool, opensafety_packet_info); diff --git a/epan/dissectors/packet-openvpn.c b/epan/dissectors/packet-openvpn.c index 0bf451fc9b..7ccb38f6e4 100644 --- a/epan/dissectors/packet-openvpn.c +++ b/epan/dissectors/packet-openvpn.c @@ -144,7 +144,7 @@ static const fragment_items openvpn_frag_items = { /* we check the leading 4 byte of a suspected hmac for 0x00 bytes, if more than 1 byte out of the 4 provided contains 0x00, the hmac is considered not valid, which suggests that no tls auth is used. - unfortunatly there is no other way to detect tls auth on the fly */ + unfortunately there is no other way to detect tls auth on the fly */ static gboolean check_for_valid_hmac(guint32 hmac) { diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c index df8d59ee96..62075da2a3 100644 --- a/epan/dissectors/packet-opsi.c +++ b/epan/dissectors/packet-opsi.c @@ -49,7 +49,7 @@ typedef struct { guint16 attribute_type; /* attribute code */ const char *tree_text; /* text for fold out */ gint *tree_id; /* id for add_item */ - int *hf_type_attribute; /* id for seach option */ + int *hf_type_attribute; /* id for search option */ void (*dissect)(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *item, int* hfValue, int offset, int length); } opsi_attribute_handle_t; diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 6b772b5bfb..5c9da0119b 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -1,5 +1,5 @@ /* -XXX all this offset>>3 and calculations of bytes in the tvb everytime +XXX all this offset>>3 and calculations of bytes in the tvb every time we put something in the tree is just silly. should be replaced with some proper helper routines */ diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c index 7f2bb6119f..e0ddacc818 100644 --- a/epan/dissectors/packet-pgsql.c +++ b/epan/dissectors/packet-pgsql.c @@ -100,7 +100,7 @@ typedef enum { /* Reserve 0 (== GPOINTER_TO_UINT(NULL)) for no PGSQL detected */ PGSQL_AUTH_STATE_NONE = 1, /* No authentication seen or used */ PGSQL_AUTH_SASL_REQUESTED, /* Server sends SASL auth request with supported SASL mechanisms*/ - PGSQL_AUTH_SASL_CONTINUE, /* Server and/or client send further SASL challange-response messages */ + PGSQL_AUTH_SASL_CONTINUE, /* Server and/or client send further SASL challenge-response messages */ PGSQL_AUTH_GSSAPI_SSPI_DATA, /* GSSAPI/SSPI in use */ PGSQL_AUTH_SSL_REQUESTED, /* Client sends SSL encryption request */ PGSQL_AUTH_GSSENC_REQUESTED, /* Client sends GSSAPI encryption request */ diff --git a/epan/dissectors/packet-ppi-geolocation-common.c b/epan/dissectors/packet-ppi-geolocation-common.c index 2c6e10078b..aa8b927e89 100644 --- a/epan/dissectors/packet-ppi-geolocation-common.c +++ b/epan/dissectors/packet-ppi-geolocation-common.c @@ -16,7 +16,7 @@ /* * input: a unsigned 32-bit (native endian) value between 0 and 3600000000 (inclusive) - * output: a signed floating point value betwen -180.0000000 and + 180.0000000, inclusive) + * output: a signed floating point value between -180.0000000 and + 180.0000000, inclusive) */ gdouble ppi_fixed3_7_to_gdouble(guint32 in) { gint32 remapped_in = in - (180 * 10000000); diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 32610d27bd..33c07729aa 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -1212,7 +1212,7 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) return tvb_captured_length(tvb); } -/* Establish our beachead */ +/* Establish our beachhead */ void proto_register_ppi(void) diff --git a/epan/dissectors/packet-protobuf.c b/epan/dissectors/packet-protobuf.c index bcff0e5772..114cd28447 100644 --- a/epan/dissectors/packet-protobuf.c +++ b/epan/dissectors/packet-protobuf.c @@ -21,7 +21,7 @@ * For example: * application/grpc,/helloworld.Greeter/SayHello,request * In this format, we will try to get real protobuf message type by method (service-name.method-name) - * and in/out type (request / reponse). + * and in/out type (request / response). * For other dissectors can specifies message type directly, like: * "message," message_type_name * For example: @@ -1561,12 +1561,12 @@ dissect_protobuf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* The data_str has two formats: * (1) Come from GRPC dissector like: * http2_content_type "," http2_path "," ("request" / "response") - * Acording to grpc wire format guide, it will be: + * According to grpc wire format guide, it will be: * "application/grpc" ["+proto"] "," "/" service-name "/" method-name "," ("request" / "response") * For example: * application/grpc,/helloworld.Greeter/SayHello,request * In this format, we will try to get real protobuf message type by method (service-name.method-name) - * and in/out type (request / reponse). + * and in/out type (request / response). * (2) Come from other dissector which specifies message type directly, like: * "message," message_type_name * For example: diff --git a/epan/dissectors/packet-q708.c b/epan/dissectors/packet-q708.c index ba5f6ac80c..edba567118 100644 --- a/epan/dissectors/packet-q708.c +++ b/epan/dissectors/packet-q708.c @@ -3350,7 +3350,7 @@ static const value_string q708_ispc_point_name[] = { { 6335, "Dominguez Hills (1), CA" }, { 6336, "Dominguez Hills (2), CA" }, { 6337, "Irving (1), TX" }, - { 6338, "Sacremento, CA" }, + { 6338, "Sacramento, CA" }, { 6339, "Tampa, FL" }, { 6340, "Fort Worth" }, { 6341, "Dallas, TX" }, @@ -3367,7 +3367,7 @@ static const value_string q708_ispc_point_name[] = { { 6352, "New York City, NY" }, { 6353, "Los Angeles, CA" }, { 6354, "Tampa, FL" }, - { 6355, "Sacremento, CA" }, + { 6355, "Sacramento, CA" }, { 6356, "Wentzville, MO" }, { 6357, "Dallas (5), TX" }, { 6358, "Caparra, PR" }, @@ -14105,7 +14105,7 @@ static value_string_ext q708_sanc_areas_ext = VALUE_STRING_EXT_INIT(q708_sanc_ar /* * International signalling point codes (i.e. PCs with ni = 0) are allocated by the ITU, * according to the processes described in Q.708. ITU keeps a database of all registered - * ISPCs which is publically available, with updates being provided in the operational + * ISPCs which is publicly available, with updates being provided in the operational * bulletins. This function takes an ISPC and analyzes it according to these tables. */ void diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index fede8d2a8a..e5773cf897 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -25,7 +25,7 @@ /* Described in: - * 3GPP TS 36.322 Evolved Universal Terrestial Radio Access (E-UTRA) + * 3GPP TS 36.322 Evolved Universal Terrestrial Radio Access (E-UTRA) * Radio Link Control (RLC) Protocol specification v14.0.0 */ diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index 88b3a2e7f2..4f89d5b044 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -8832,7 +8832,7 @@ dissect_rnsap_L3_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx switch (pdata->ProcedureCode) { case RNSAP_ID_DOWNLINKSIGNALLINGTRANSFER: - /* TODO: seperate into Iur and Iur-g cases: */ + /* TODO: separate into Iur and Iur-g cases: */ /* For the Iur-g interface, L3 message is a GERAN-RRC message for which a dissector does not currently exist */ /* For the Iur interface, L3 message is a UMTS RRC DL-CCCH message */ parameter_handle = rrc_dl_ccch_handle; diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index c559e90231..d12b9e9d2f 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -52,7 +52,7 @@ * RFC 5531, "Appendix C: Current Number Assignments" defines AUTH_RSA. * AUTH_RSA is not implemented for any known RPC-protocols. The Gluster * protocols (ab)use AUTH_RSA for their own AUTH-flavor. AUTH_RSA is - * therefore dissected as the inofficial AUTH_GLUSTER. + * therefore dissected as the unofficial AUTH_GLUSTER. */ void proto_register_rpc(void); void proto_reg_handoff_rpc(void); diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index f0e2f6713e..c52b75f810 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -646,7 +646,7 @@ static int rsvp_tap; /* * All RSVP packets belonging to a particular flow belong to the same - * conversation. The following structure definitions are for auxillary + * conversation. The following structure definitions are for auxiliary * structures which have all the relevant flow information to make up the * RSVP five-tuple. Note that the values of the five-tuple are determined * from the session object and sender template/filter spec for PATH/RESV diff --git a/epan/dissectors/packet-rtacser.c b/epan/dissectors/packet-rtacser.c index 367de82578..3e6d100e39 100644 --- a/epan/dissectors/packet-rtacser.c +++ b/epan/dissectors/packet-rtacser.c @@ -32,7 +32,7 @@ * and the TCP/IP header(s) maintained from the original conversation. The application data from the * message will follow as per a standard Wireshark packet. * - * Serial-based pcap capture files were orignally stored using "User 0" DLT type 147 to specify a + * Serial-based pcap capture files were originally stored using "User 0" DLT type 147 to specify a * user-defined dissector for pcap data but this format was later modified to specify a custom DLT type * known as LINKTYPE_RTAC_SERIAL (DLT 250). The pcap file data portion contains a standard 12-byte serial * header followed by the application payload data from actual rx/tx activity on the line. Some useful diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index 07bb50ac94..6fc7b1f993 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -2064,7 +2064,7 @@ dissect_rtmpt_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_ } if (!tf) { - /* No preceeding data, get header data starting at current position */ + /* No preceding data, get header data starting at current position */ id = tvb_get_guint8(tvb, offset); if (id == RTMPT_MAGIC && seq+offset == RTMPT_HANDSHAKE_OFFSET_1) { diff --git a/epan/dissectors/packet-rtp-ed137.c b/epan/dissectors/packet-rtp-ed137.c index 3ca0140a3e..441e52f18a 100644 --- a/epan/dissectors/packet-rtp-ed137.c +++ b/epan/dissectors/packet-rtp-ed137.c @@ -1199,7 +1199,7 @@ dissect_rtp_hdr_ext_ed137a(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (RTP_ED137A_extended_information(ext_value)) { /* Loop over all additional feature blocks */ - /* The shortest header lenght is 2, anything shorter is padding */ + /* The shortest header length is 2, anything shorter is padding */ while ( hdr_extension_len >= 2 ) { proto_item *ti3; proto_tree *rtp_hext_tree3; @@ -1227,7 +1227,7 @@ dissect_rtp_hdr_ext_ed137a(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvbuff_t *newtvb; guint32 ft_table_key; - /* join 4 bit type and 4 bit lenght to 8 bit key */ + /* join 4 bit type and 4 bit length to 8 bit key */ ft_table_key = MAKE_KEY( ft_type, ft_len ); /* pass interpretation of header extension to a registered subdissector */ diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 382ce19548..5f674b5827 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1161,7 +1161,7 @@ rtp_add_setup_info_if_no_duplicate(sdp_setup_info_t *setup_info, wmem_array_t *s for (i = 0; i < wmem_array_get_count(sdp_conv_info_list); i++) { stored_setup_info = (sdp_setup_info_t *)wmem_array_index(sdp_conv_info_list, i); - /* Check if we have the call id allready */ + /* Check if we have the call id already */ if ((stored_setup_info->hf_type == SDP_TRACE_ID_HF_TYPE_STR) && (setup_info->hf_type == SDP_TRACE_ID_HF_TYPE_STR)) { if (strcmp(stored_setup_info->trace_id.str, setup_info->trace_id.str) == 0) { return; /* Do not store the call id */ diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index f9176490cd..69bbd5a504 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -3373,7 +3373,7 @@ static gint dissect_user_defined(proto_tree *tree, tvbuff_t * tvb, gint offset, offset = dissect_user_defined(tree, tvb, offset, encoding, encoding_version, NULL, result->member_type_id, result->member_name, EXTENSIBILITY_INVALID, offset, 0, 0, show); } else { - /* the hashmap uses the type_id to index the objects. substracting -2 here to lookup the discriminator + /* the hashmap uses the type_id to index the objects. subtracting -2 here to lookup the discriminator related to the type_id that identifies an union */ key = type_id + HASHMAP_DISCRIMINATOR_CONSTANT; result = (union_member_mapping *)wmem_map_lookup(union_member_mappings, &(key)); @@ -6610,7 +6610,7 @@ static const char* rtps_util_add_topic_info(proto_tree *tree, packet_info* pinfo * * @param[in] tree a chunk of data in the tvb and return a new tvb with the uncompressed data * @param[in] tvb - * @param[in] offset offset at the begining of the compressed data. + * @param[in] offset offset at the beginning of the compressed data. * @param[in] size in bytes from the initial offset to the end of the serialized data * @param[in] compressed_size size in bytes of the compressed chunk in the tvb. * @param[out] True if it tries to uncompress the data. In environment where Zlib is not available this will be false. This is used for @@ -6654,7 +6654,7 @@ tvbuff_t *rtps_util_get_uncompressed_tvb_zlib( * @param[in] tree * @param[in] packet info. * @param[in] tvb -* @param[in] offset at the begining of the encapsulation options. +* @param[in] offset at the beginning of the encapsulation options. * @param[out] encapsulation_options_out If not null it will contain the encapsulation options * @param[out] compression_option_out If not null it will contain the compression option * @param[out] padding_bytes_out If not null it will contain the padding bytes @@ -9666,7 +9666,7 @@ static void dissect_parametrized_serialized_data(proto_tree *tree, tvbuff_t *tvb * @param[in] tree * @param[in] packet info. * @param[in] tvb - * @param[in] offset offset at the begining of the encapsulation id. + * @param[in] offset offset at the beginning of the encapsulation id. * @param[in] size in bytes from the initial offset to the end of the serialized data * @param[in] uncompress_if_compressed true for uncompressing if the data should be uncompressed. * @param[out] encapsulation_id_out If not null it will contain the encapsultaion_id @@ -9675,7 +9675,7 @@ static void dissect_parametrized_serialized_data(proto_tree *tree, tvbuff_t *tvb * @param[out] extended_compression_options_out If not null it will contain the extended compression options * @param[out] extended_header_bits_out If not null it will contain the extended header bits * @param[out] is_compressed_out If not null it will indicate if the serielized data is compressed - * @param[out] uncompressed_ok_out If not null it will indicate if the serizlized data has been succesfully uncompressed + * @param[out] uncompressed_ok_out If not null it will indicate if the serizlized data has been successfully uncompressed * @param[out] uncompressed_tvb_out If not null it will contain the uncompressed tvb pointer. If the seriaized data is not uncompressed it will return NULL. * @param[out] compressed_data_tree_out If not null it will contain the subtree of the uncompressed data. * @@ -13636,7 +13636,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree if ((majorRev != 1) && (majorRev != 2)) return FALSE; - /* Save the begining of the RTPS message */ + /* Save the beginning of the RTPS message */ rtps_root.tvb = tvb; rtps_root.tvb_offset = offset; rtps_root.tvb_len = tvb_reported_length_remaining(tvb, offset); diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c index 64c1f39e7f..c1559ab603 100644 --- a/epan/dissectors/packet-s7comm.c +++ b/epan/dissectors/packet-s7comm.c @@ -512,7 +512,7 @@ const value_string s7comm_item_return_valuenames[] = { { 0, NULL } }; /************************************************************************** - * Block Types, used when blocktype is transfered as string + * Block Types, used when blocktype is transferred as string */ #define S7COMM_BLOCKTYPE_OB 0x3038 /* '08' */ #define S7COMM_BLOCKTYPE_CMOD 0x3039 /* '09' */ @@ -6503,7 +6503,7 @@ s7comm_decode_ud_data(tvbuff_t *tvb, gchar str_fragadd[32]; /* The first 4 bytes of the data part of a userdata telegram are the same for all types. - * This is also the minumum length of the data part. + * This is also the minimum length of the data part. */ if (dlength >= 4) { item = proto_tree_add_item(tree, hf_s7comm_data, tvb, offset, dlength, ENC_NA); diff --git a/epan/dissectors/packet-saphdb.c b/epan/dissectors/packet-saphdb.c index 02f42a1ba1..42e1555ddd 100644 --- a/epan/dissectors/packet-saphdb.c +++ b/epan/dissectors/packet-saphdb.c @@ -370,7 +370,7 @@ static const option_part_definition saphdb_part_fetch_options_vals[] = { static const option_part_definition saphdb_part_transaction_flags_vals[] = { { 0, "Rolled Back", 28 }, - { 1, "Commited", 28 }, + { 1, "Committed", 28 }, { 2, "New Isolation Level", 3 }, { 3, "DDL Commit Mode Changed", 28 }, { 4, "Write Transaction Started", 28 }, diff --git a/epan/dissectors/packet-sapigs.c b/epan/dissectors/packet-sapigs.c index 174e6dd5e2..5d89930702 100755 --- a/epan/dissectors/packet-sapigs.c +++ b/epan/dissectors/packet-sapigs.c @@ -63,10 +63,10 @@ static const value_string sapigs_function_lst[] = { { 30, "ZIPPER"}, /* ZIP provide file(s) */ { 31, "IMGCONV"}, /* Image converter */ { 32, "RSPOCONNECTOR"}, /* Remote Spool Connector */ - { 33, "XMLCHART"}, /* Chart generator throught xml input */ - { 34, "CHART"}, /* Chart generator throught ABAP Table input */ + { 33, "XMLCHART"}, /* Chart generator through xml input */ + { 34, "CHART"}, /* Chart generator through ABAP Table input */ { 35, "BWGIS"}, /* BW Geographic Information System */ - { 36, "SAPGISXML"}, /* old SAP GIS throught xml input */ + { 36, "SAPGISXML"}, /* old SAP GIS through xml input */ /* NULL */ { 0, NULL} }; @@ -231,7 +231,7 @@ dissect_sapigs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ data_offset += offset; /* Definition tables */ is_table = (gchar *)tvb_get_string_enc(pinfo->pool, tvb, offset, 4, ENC_ASCII); - /* if the 4 next char is VERS, we are at the begining of one definition table */ + /* if the 4 next char is VERS, we are at the beginning of one definition table */ while(strncmp("VERS", is_table, 4) == 0){ /* Build a tree for Tables */ sapigs_tables = proto_tree_add_item(sapigs_tree, hf_sapigs_tables, tvb, offset, 336, ENC_NA); diff --git a/epan/dissectors/packet-sapms.c b/epan/dissectors/packet-sapms.c index 42ca140bce..0782a13d80 100644 --- a/epan/dissectors/packet-sapms.c +++ b/epan/dissectors/packet-sapms.c @@ -1455,7 +1455,7 @@ proto_register_sapms(void) { &hf_sapms_diagport, { "Diag Port", "sapms.diag_port", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - /* MS_DP_ADM fiels */ + /* MS_DP_ADM fields */ { &hf_sapms_dp_adm_dp_version, { "Dispatcher Version", "sapms.dp_adm.version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index 48fca5c132..7749d234e8 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -345,7 +345,7 @@ dissect_sasp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data { expert_add_info_format(pinfo, hti, &ei_msg_type_invalid, "Invalid SASP Header Type [0x%04x]", hdr_type); - /* XXX: The folowing should actually happen automatically ? */ + /* XXX: The following should actually happen automatically ? */ col_set_str(pinfo->cinfo, COL_INFO, "[Malformed: Invalid SASP Header Type]"); return tvb_reported_length(tvb); } diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index 0d3225936d..5549358405 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -622,7 +622,7 @@ is_sbus_pdu(tvbuff_t *tvb) if ( tvb_get_guint8(tvb, 5) > 0x01 ) { return (FALSE); } - /* Seventh and eigth byte indicates the packet sequence number and can + /* Seventh and eighth bytes indicate the packet sequence number and can be 0 to 65565 (--> check does not make sense)*/ /* Ninth byte the "attributes character" and must be either 0, 1 or 2 (request, response or ACK/NAK)*/ diff --git a/epan/dissectors/packet-sctp.h b/epan/dissectors/packet-sctp.h index 161ace9a8f..b9673c41f7 100644 --- a/epan/dissectors/packet-sctp.h +++ b/epan/dissectors/packet-sctp.h @@ -1,6 +1,6 @@ /* packet-sctp.h * - * Defintion of SCTP specific structures used by tap listeners. + * Definition of SCTP specific structures used by tap listeners. * * Copyright 2004 Michael Tuexen <tuexen [AT] fh-muenster.de> * diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index cccfe0b730..97f4da9dd7 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -1757,7 +1757,7 @@ dissect_sdp_media_attribute_fmtp(proto_tree *tree, packet_info *pinfo, tvbuff_t decode_sdp_fmtp(fmtp_tree, tvb, pinfo, offset, tokenlen, media_format, transport_info, rtp_dyn_payload); - /* Move offset past "; " and onto firts char */ + /* Move offset past "; " and onto first char */ offset = next_offset + 1; } } diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index d736ed6fab..8e65fc90ec 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -7720,7 +7720,7 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree } /* OS - * Eventhough this field should honour the unicode flag + * Even though this field should honour the unicode flag * some ms clients gets this wrong. * At least XP SP1 sends this in ASCII * even when the unicode flag is on. @@ -7746,7 +7746,7 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree * suspect that, in practice, nobody ever looks at that field * because the bug didn't appear to get fixed until NT 5.0.... * - * Eventhough this field should honour the unicode flag + * Even though this field should honour the unicode flag * some ms clients gets this wrong. * At least XP SP1 sends this in ASCII * even when the unicode flag is on. diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index ff1bf5b1e3..2115d8a56b 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -4234,7 +4234,7 @@ dissect_smb2_session_setup_response(tvbuff_t *tvb, packet_info *pinfo, proto_tre */ if (si->status != 0) { /* - * Not sucessful means either more req/rsp + * Not successful means either more req/rsp * processing is required or we reached an * error, so update hash. */ @@ -6911,7 +6911,7 @@ dissect_smb2_write_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, out: if (have_tap_listener(smb2_eo_tap) && (data_tvb_len == length)) { - if (si->saved && si->eo_file_info) { /* without this data we don't know wich file this belongs to */ + if (si->saved && si->eo_file_info) { /* without this data we don't know which file this belongs to */ feed_eo_smb2(tvb,pinfo,si,dataoffset,length,off); } } @@ -8562,7 +8562,7 @@ dissect_smb2_read_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += MIN(olb.len, data_tvb_len); if (have_tap_listener(smb2_eo_tap) && (data_tvb_len == olb.len)) { - if (si->saved && si->eo_file_info) { /* without this data we don't know wich file this belongs to */ + if (si->saved && si->eo_file_info) { /* without this data we don't know which file this belongs to */ feed_eo_smb2(tvb,pinfo,si,olb.off,olb.len,si->saved->file_offset); } } diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index 5d995d4e28..384bd59452 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -270,7 +270,7 @@ typedef enum { DECODE_AS_GSM7 = 241, /* One of many GSM DCS values that means GSM7 */ } SMPP_DCS_Type; -/* ENC_NA is the same as ENC_ASCII, so use an artifical value to mean +/* ENC_NA is the same as ENC_ASCII, so use an artificial value to mean * "treat this as 8-bit binary / FT_BYTES, not a string." */ #define DO_NOT_DECODE G_MAXUINT diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index b97d68569f..a57be7838b 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -155,7 +155,7 @@ typedef enum { SMTP_AUTH_STATE_PLAIN_REQ, /* Received AUTH PLAIN request from server */ SMTP_AUTH_STATE_PLAIN_RSP, /* Received AUTH PLAIN response from client */ SMTP_AUTH_STATE_NTLM_REQ, /* Received ntlm negotiate request from client */ - SMTP_AUTH_STATE_NTLM_CHALLANGE, /* Received ntlm challange request from server */ + SMTP_AUTH_STATE_NTLM_CHALLANGE, /* Received ntlm challenge request from server */ SMTP_AUTH_STATE_NTLM_RSP, /* Received ntlm auth request from client */ SMTP_AUTH_STATE_SUCCESS, /* Password received, authentication successful, start decoding */ SMTP_AUTH_STATE_FAILED /* authentication failed, no decoding */ @@ -187,7 +187,7 @@ struct smtp_session_state { guint32 user_pass_cmd_frame; /* AUTH command contains username and password */ guint32 user_pass_frame; /* Frame contains username and password */ guint32 ntlm_req_frame; /* Frame containing NTLM request */ - guint32 ntlm_cha_frame; /* Frame containing NTLM challange. */ + guint32 ntlm_cha_frame; /* Frame containing NTLM challenge. */ guint32 ntlm_rsp_frame; /* Frame containing NTLM response. */ }; diff --git a/epan/dissectors/packet-socketcan.h b/epan/dissectors/packet-socketcan.h index f053dfa259..f82fa5e20b 100644 --- a/epan/dissectors/packet-socketcan.h +++ b/epan/dissectors/packet-socketcan.h @@ -20,7 +20,7 @@ * * CANFD_FDF is in that field. and always set, as well as being present * but *never* set in what's at the location corresponding to that field - * in a CAN classic frame, so we can distingish between CAN classic and + * in a CAN classic frame, so we can distinguish between CAN classic and * CAN FD frames by testing that bit. */ #define CANFD_BRS 0x01 /* Bit Rate Switch (second bitrate for payload data) */ diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 0f41bd0076..76b6674039 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -4566,7 +4566,7 @@ ssh_dissect_connection_specific(tvbuff_t *packet_tvb, packet_info *pinfo, }else if(msg_code==SSH_MSG_CHANNEL_WINDOW_ADJUST){ proto_tree_add_item(msg_type_tree, hf_ssh_connection_recipient_channel, packet_tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(msg_type_tree, hf_ssh_channel_window_adjust, packet_tvb, offset, 4, ENC_BIG_ENDIAN); // TODO: maintain count of transfered bytes and window size + proto_tree_add_item(msg_type_tree, hf_ssh_channel_window_adjust, packet_tvb, offset, 4, ENC_BIG_ENDIAN); // TODO: maintain count of transferred bytes and window size offset += 4; }else if(msg_code==SSH_MSG_CHANNEL_DATA){ proto_item *ti = proto_tree_add_item_ret_uint(msg_type_tree, hf_ssh_connection_recipient_channel, packet_tvb, offset, 4, ENC_BIG_ENDIAN, &recipient_channel); diff --git a/epan/dissectors/packet-stcsig.c b/epan/dissectors/packet-stcsig.c index 7c51b558c6..3e6afad7bd 100644 --- a/epan/dissectors/packet-stcsig.c +++ b/epan/dissectors/packet-stcsig.c @@ -236,7 +236,7 @@ dissect_stcsig(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ proto_tree_add_item(stcsig_tree, hf_stcsig_iv, stcsig_tvb, 0, 1, ENC_NA); ti = proto_tree_add_item(stcsig_tree, hf_stcsig_streamid, stcsig_tvb, 1, 4, ENC_BIG_ENDIAN); stcsig_streamid_tree = proto_item_add_subtree(ti, ett_stcsig_streamid); - /* This subtree is mostly an optical hierachy, auto expand it */ + /* This subtree is mostly an optical hierarchy, auto expand it */ tree_expanded_set(ett_stcsig_streamid, TRUE); proto_tree_add_item(stcsig_streamid_tree, hf_stcsig_csp, stcsig_tvb, 1, 2, ENC_BIG_ENDIAN); proto_tree_add_item(stcsig_streamid_tree, hf_stcsig_streamtype, stcsig_tvb, 3, 1, ENC_NA); diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 5ac455bdf6..bfdc0cc891 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -469,7 +469,7 @@ static const value_string data_statb03to00names[] = { { 0, NULL } }; -/* strings to decode the commands (CMD Field) acording Table 15, p.26 +/* strings to decode the commands (CMD Field) according Table 15, p.26 * 0000 0000 0000 0001 - Turn off transmission of data frames * 0000 0000 0000 0010 - Turn on transmission of data frames * 0000 0000 0000 0011 - Send HDR frame diff --git a/epan/dissectors/packet-sysex.c b/epan/dissectors/packet-sysex.c index b15b8f4c02..b2c7a67b27 100644 --- a/epan/dissectors/packet-sysex.c +++ b/epan/dissectors/packet-sysex.c @@ -460,7 +460,7 @@ static const value_string sysex_extended_manufacturer_id_vals[] = { {0x002019, "MA Lighting Technology"}, {0x00201A, "Fatar SRL c/o Music Industries"}, {0x00201B, "QSC Audio Products Inc."}, - {0x00201C, "Artisan Clasic Organ Inc."}, + {0x00201C, "Artisan Classic Organ Inc."}, {0x00201D, "Orla Spa"}, {0x00201E, "Pinnacle Audio (Klark Teknik PLC)"}, {0x00201F, "TC Electronics"}, diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 6e1db94639..65edc16bbb 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -1731,7 +1731,7 @@ mptcp_convert_dsn(guint64 dsn, mptcp_meta_flow_t *meta, enum mptcp_dsn_conversio *result = dsn; /* if relative is set then we need the 64 bits version anyway - * we assume no wrapping was done on the 32 lsb so this may be wrong for elphant flows + * we assume no wrapping was done on the 32 lsb so this may be wrong for elephant flows */ if(conv == DSN_CONV_32_TO_64 || relative) { diff --git a/epan/dissectors/packet-tcp.h b/epan/dissectors/packet-tcp.h index 5220505133..071d5c7709 100644 --- a/epan/dissectors/packet-tcp.h +++ b/epan/dissectors/packet-tcp.h @@ -400,7 +400,7 @@ struct mptcp_analysis { mptcp_meta_flow_t meta_flow[2]; guint32 stream; /* Keep track of unique mptcp stream (per MP_CAPABLE handshake) */ - guint8 hmac_algo; /* hmac decided after negociation */ + guint8 hmac_algo; /* hmac decided after negotiation */ wmem_list_t* subflows; /* List of subflows (tcp_analysis) */ /* identifier of the tcp stream that saw the initial 3WHS with MP_CAPABLE option */ diff --git a/epan/dissectors/packet-tdmop.c b/epan/dissectors/packet-tdmop.c index 9ffc8323fc..c1d4884f13 100644 --- a/epan/dissectors/packet-tdmop.c +++ b/epan/dissectors/packet-tdmop.c @@ -16,7 +16,7 @@ #include <epan/conversation.h> #include <epan/prefs.h> -/*Using of ethertype 0x0808(assigned to Frame Realy ARP) was implemented in hardware, when ethertype was not assigned*/ +/*Using of ethertype 0x0808(assigned to Frame Relay ARP) was implemented in hardware, when ethertype was not assigned*/ #define ETHERTYPE_TDMOP 0 #define MAX_DCHANNEL_LEN 128 diff --git a/epan/dissectors/packet-thread.c b/epan/dissectors/packet-thread.c index 823afc1b5b..0aaf1f84e9 100644 --- a/epan/dissectors/packet-thread.c +++ b/epan/dissectors/packet-thread.c @@ -1472,7 +1472,7 @@ dissect_thread_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void offset += tlv_len; } else { - //Need to only take 16 bytes for the IPv6 adress + //Need to only take 16 bytes for the IPv6 address for (int i = 0; i < (tlv_len / 16); i++) { proto_tree_add_item(tlv_tree, hf_thread_mc_tlv_ipv6_addr, tvb, offset, 16, ENC_NA); @@ -1696,7 +1696,7 @@ dissect_thread_nm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat offset += tlv_len; } else { - //Need to only take 16 bytes for the IPv6 adress + //Need to only take 16 bytes for the IPv6 address for (int i = 0; i < (tlv_len / 16); i++) { proto_tree_add_item(tlv_tree, hf_thread_mc_tlv_ipv6_addr, tvb, offset, 16, ENC_NA); diff --git a/epan/dissectors/packet-tibia.c b/epan/dissectors/packet-tibia.c index e03915a53a..f523fc80d7 100644 --- a/epan/dissectors/packet-tibia.c +++ b/epan/dissectors/packet-tibia.c @@ -727,7 +727,7 @@ enum gameserv_cmd { S_CREATURE_HEALTH = 0x8C, S_CREATURELIGHT = 0x8d, /* Long creatureid Byte ? Byte ? */ S_SETOUTFIT = 0x8e, /* Long creatureid Byte lookType Byte headType Byte bodyType Byte legsType Byte feetType // can extended look go here too? */ - S_CREATURESPEED = 0x8f, /* YIKES! I didnt handle this! */ + S_CREATURESPEED = 0x8f, /* YIKES! I didn't handle this! */ S_TEXTWINDOW = 0x96, /* Long windowId Byte icon Byte maxlength String message */ S_STATUSMSG = 0xA0, /* Status status */ S_SKILLS = 0xA1, /* Skills skills */ @@ -1139,7 +1139,7 @@ dissect_gameserv_packet(struct tibia_convo *convo, tvbuff_t *tvb, int offset, in case S_CHANNELSDIALOG: /* 0xAB,Byte channelCount (Int channelId String channelName) */ case S_STATUSMSG: /* 0xA0,Status status */ case S_SKILLS: /* 0xA1,Skills skills */ - case S_CREATURESPEED: /* 0x8f,YIKES! I didnt handle this! */ + case S_CREATURESPEED: /* 0x8f,YIKES! I didn't handle this! */ case S_GO_NORTH: /* 0x65,MapDescription (18,1) */ case S_GO_EAST: /* 0x66,MapDescription (1,14) */ case S_GO_SOUTH: /* 0x67,MapDescription (18,1) */ diff --git a/epan/dissectors/packet-tls-utils.c b/epan/dissectors/packet-tls-utils.c index 1245763dbb..9c5383da98 100644 --- a/epan/dissectors/packet-tls-utils.c +++ b/epan/dissectors/packet-tls-utils.c @@ -8605,7 +8605,7 @@ ssl_dissect_hnd_hello_common(ssl_common_dissect_t *hf, tvbuff_t *tvb, offset++; if (ssl) { - /* save the authorative SID for later use in ChangeCipherSpec. + /* save the authoritative SID for later use in ChangeCipherSpec. * (D)TLS restricts the SID to 32 chars, it does not make sense to * save more, so ignore larger ones. */ if (from_server && sessid_length <= 32) { diff --git a/epan/dissectors/packet-tls-utils.h b/epan/dissectors/packet-tls-utils.h index 01f4d0b53f..36d5627511 100644 --- a/epan/dissectors/packet-tls-utils.h +++ b/epan/dissectors/packet-tls-utils.h @@ -491,7 +491,7 @@ typedef struct _SslSession { gboolean client_cid_len_present; guint8 server_cid_len; gboolean server_cid_len_present; - gboolean deprecated_cid; /* Set when handshake is using the deprecated CID extention type */ + gboolean deprecated_cid; /* Set when handshake is using the deprecated CID extension type */ } SslSession; /* RFC 5246, section 8.1 says that the master secret is always 48 bytes */ diff --git a/epan/dissectors/packet-tls.c b/epan/dissectors/packet-tls.c index a27f485932..29dfb295f5 100644 --- a/epan/dissectors/packet-tls.c +++ b/epan/dissectors/packet-tls.c @@ -2087,7 +2087,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 the conversation - * structure and print the column version. If the message is not authorative + * structure and print the column version. If the message is not authoritative * (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). */ diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index 64d16c176f..f2e126b06b 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -16,7 +16,7 @@ * networks, contact kiltedtaco@xxxxxxxxx */ /* 2008-08-05 : Added support for aggregate frames. - * AP mode, NWID and sat mode fiels identification were + * AP mode, NWID and sat mode fields identification were * taken from http://aphopper.sourceforge.net/turbocell.html * everything else is based on (educated) guesses. */ diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c index ee815287ab..ff4d4fa4ef 100644 --- a/epan/dissectors/packet-turnchannel.c +++ b/epan/dissectors/packet-turnchannel.c @@ -1,5 +1,5 @@ /* packet-turnchannel.c - * Routines for TURN channel dissection (TURN negociation is handled + * Routines for TURN channel dissection (TURN negotiation is handled * in the STUN2 dissector * Copyright 2008, 8x8 Inc. <petithug@8x8.com> * diff --git a/epan/dissectors/packet-ubx.c b/epan/dissectors/packet-ubx.c index 5462c66817..251e70fd44 100644 --- a/epan/dissectors/packet-ubx.c +++ b/epan/dissectors/packet-ubx.c @@ -334,7 +334,7 @@ static const value_string UBX_SBAS_TESTBED[] = { /* UTC standard identifier */ static const value_string UBX_UTC_STD_ID[] = { {0, "Information not available"}, - {1, "Communications Research Labratory (CRL), Tokyo, Japan"}, + {1, "Communications Research Laboratory (CRL), Tokyo, Japan"}, {2, "National Institute of Standards and Technology (NIST)"}, {3, "U.S. Naval Observatory (USNO)"}, {4, "International Bureau of Weights and Measures (BIPM)"}, diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index 5359e48d6e..c93b3fa1b7 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -804,7 +804,7 @@ ucp_mktime(const gint len, const char *datestr) /*! * Scanning routines to add standard types (byte, int, string, data) - * to the protocol-tree. Each field is seperated with a slash ('/'). + * to the protocol-tree. Each field is separated with a slash ('/'). * * \param tree The protocol tree to add to * \param tvb Buffer containing the data diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index b8d8d2f2be..193c363e0e 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -5228,7 +5228,7 @@ heur_dissect_fp_edch_type_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* This method can frame UDP streams containing FP packets but dissection of those packets will */ /* fail since the FP conversation info is never attached */ -/* Usefull for DCH streams containing CS data and don't have their own heuristic method */ +/* Useful for DCH streams containing CS data and don't have their own heuristic method */ static gboolean heur_dissect_fp_unknown_format(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { diff --git a/epan/dissectors/packet-umts_fp.h b/epan/dissectors/packet-umts_fp.h index 7a36a615ad..48509e093a 100644 --- a/epan/dissectors/packet-umts_fp.h +++ b/epan/dissectors/packet-umts_fp.h @@ -247,7 +247,7 @@ typedef struct fp_info gboolean hsdhsch_macfdlow_is_mux[MAX_NUM_HSDHSCH_MACDFLOW]; enum fp_rlc_mode hsdsch_rlc_mode; enum fp_link_type link_type; - guint urnti; /*Used for tracking a "sequence" over diffrent transport channels*/ + guint urnti; /*Used for tracking a "sequence" over different transport channels*/ gboolean reset_frag; /*Used to indicate that a stream has been reconfigured, hence we need to reset the fragtable*/ } fp_info; diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c index ba57202fd3..af82735b7f 100644 --- a/epan/dissectors/packet-usb-ccid.c +++ b/epan/dissectors/packet-usb-ccid.c @@ -212,7 +212,7 @@ static int * const bStatus_fields[] = { #define RDR_PC_ESCAPE 0x83 #define RDR_PC_DATA_CLOCK 0x84 -/* Standardised Interupt IN message types */ +/* Standardised Interrupt IN message types */ #define RDR_PC_NOTIF_SLOT_CHNG 0x50 #define RDR_PC_HWERROR 0x51 @@ -250,7 +250,7 @@ static const value_string ccid_opcode_vals[] = { {RDR_PC_ESCAPE , "RDR_to_PC_Escape"}, {RDR_PC_DATA_CLOCK , "RDR_to_PC_DataRateAndClockFrequency"}, - /* Standardised Interupt IN message types */ + /* Standardised Interrupt IN message types */ {RDR_PC_NOTIF_SLOT_CHNG , "RDR_to_PC_NotifySlotChange"}, {RDR_PC_HWERROR , "RDR_to_PC_HardwareError"}, @@ -282,7 +282,7 @@ static const value_string ccid_messagetypes_vals[] = { {RDR_PC_ESCAPE , "Reader to PC: Escape"}, {RDR_PC_DATA_CLOCK , "Reader to PC: Data Rate and Clock Frequency"}, - /* Standardised Interupt IN message types */ + /* Standardised Interrupt IN message types */ {RDR_PC_NOTIF_SLOT_CHNG , "Reader to PC: Notify Slot Change"}, {RDR_PC_HWERROR , "Reader to PC: Hardware Error"}, @@ -685,7 +685,7 @@ dissect_ccid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } break; - /*Interupt IN*/ + /*Interrupt IN*/ case RDR_PC_NOTIF_SLOT_CHNG: proto_tree_add_bitmask(ccid_tree, tvb, 1, hf_ccid_bmSlotICCState, ett_ccid_slot_change, bmSlotICCStateb0_fields, diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index eeacbd6166..93b85e9fd8 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -3074,7 +3074,7 @@ static const value_string usb_hid_battery_system_usage_page_vals[] = { {0x88, "iDevicename"}, {0x89, "iDeviceChemistery"}, {0x8A, "ManufacturerData"}, - {0x8B, "Rechargable"}, + {0x8B, "Rechargeable"}, {0x8C, "WarningCapacityLimit"}, {0x8D, "CapacityGranularity1"}, {0x8E, "CapacityGranularity2"}, diff --git a/epan/dissectors/packet-usbll.c b/epan/dissectors/packet-usbll.c index 2721f76b0b..5e59e5c03c 100644 --- a/epan/dissectors/packet-usbll.c +++ b/epan/dissectors/packet-usbll.c @@ -1858,7 +1858,7 @@ dissect_usbll_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offs transfer->first_packet = pinfo->num; transfer->offset = 0; transfer->type = USBLL_EP_CONTROL; - transfer->from_host = TRUE; /* SETUP is always from host to sevice */ + transfer->from_host = TRUE; /* SETUP is always from host to service */ if (requested_length > 0) { diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c index 995a491eef..b5a1e8e075 100644 --- a/epan/dissectors/packet-uts.c +++ b/epan/dissectors/packet-uts.c @@ -289,7 +289,7 @@ dissect_uts(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree, void* data length = tvb_captured_length_remaining(tvb, stx_start+1); /* find out how much message remains */ if (etx_start) length = (etx_start - stx_start - 1); /* and the data part is the rest... */ - /* whatever preceeds the ETX if it exists */ + /* whatever precedes the ETX if it exists */ data_ptr = tvb_get_string_enc(pinfo->pool, tvb, stx_start+1, length, ENC_ASCII); /* copy the string for dissecting */ proto_tree_add_string_format(uts_tree, hf_data, tvb, stx_start + 1, length, data_ptr, "Text (%d byte%s)", length, plurality(length, "", "s")); diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index 629b922707..3155b204d4 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -7248,7 +7248,7 @@ parse_wbxml_attribute_list_defined (proto_tree *tree, tvbuff_t *tvb, packet_info /* Move to end of buffer */ off = tvb_len; break; - } else { /* Known atribute token */ + } else { /* Known attribute token */ const char* s; if (peek & 0x80) { /* attrValue */ if (map != NULL) { diff --git a/epan/dissectors/packet-wireguard.c b/epan/dissectors/packet-wireguard.c index b226520237..22255773ea 100644 --- a/epan/dissectors/packet-wireguard.c +++ b/epan/dissectors/packet-wireguard.c @@ -1062,7 +1062,7 @@ wg_session_update_address(wg_session_t *session, packet_info *pinfo, gboolean se /* Finds an initiation message based on the given Receiver ID that was not * previously associated with a responder message. Returns the session if a - * matching initation message can be found or NULL otherwise. + * matching initiation message can be found or NULL otherwise. */ static wg_session_t * wg_sessions_lookup_initiation(packet_info *pinfo, guint32 receiver_id) diff --git a/epan/dissectors/packet-woww.c b/epan/dissectors/packet-woww.c index ebb7c5b7e2..f8ff8d19aa 100644 --- a/epan/dissectors/packet-woww.c +++ b/epan/dissectors/packet-woww.c @@ -2631,7 +2631,7 @@ static const value_string e_area_strings[] = { { AREA_LIGHTHOUSE, "Lighthouse" }, { AREA_WESTERN_PLAGUELANDS, "Western Plaguelands" }, { AREA_NINE, "Nine" }, - { AREA_THE_CEMETARY, "The Cemetary" }, + { AREA_THE_CEMETARY, "The Cemetery" }, { AREA_STRANGLETHORN_VALE, "Stranglethorn Vale" }, { AREA_ECHO_RIDGE_MINE, "Echo Ridge Mine" }, { AREA_BOOTY_BAY, "Booty Bay" }, @@ -4144,7 +4144,7 @@ static const value_string e_faction_strings[] = { { FACTION_TROGG, "Trogg" }, { FACTION_TROLL_FROSTMANE, "Troll Frostmane" }, { FACTION_ORC_BLACKROCK, "Orc Blackrock" }, - { FACTION_VILLIAN, "Villian" }, + { FACTION_VILLIAN, "Villain" }, { FACTION_VICTIM, "Victim" }, { FACTION_BEAST_BEAR, "Beast Bear" }, { FACTION_OGRE, "Ogre" }, @@ -5005,7 +5005,7 @@ static const value_string e_skill_strings[] = { { SKILL_RIDING_WOLF, "Riding Wolf" }, { SKILL_RIDING_TIGER, "Riding Tiger" }, { SKILL_RIDING_RAM, "Riding Ram" }, - { SKILL_SWIMING, "Swiming" }, + { SKILL_SWIMING, "Swimming" }, { SKILL_TWO_HANDED_MACES, "Two Handed Maces" }, { SKILL_UNARMED, "Unarmed" }, { SKILL_MARKSMANSHIP, "Marksmanship" }, @@ -7338,7 +7338,7 @@ static const value_string e_inventory_result_strings[] = { { INVENTORY_RESULT_OK, "Ok" }, { INVENTORY_RESULT_CANT_EQUIP_LEVEL_I, "Cant Equip Level I" }, { INVENTORY_RESULT_CANT_EQUIP_SKILL, "Cant Equip Skill" }, - { INVENTORY_RESULT_ITEM_DOESNT_GO_TO_SLOT, "Item Doesnt Go To Slot" }, + { INVENTORY_RESULT_ITEM_DOESNT_GO_TO_SLOT, "Item Doesn't Go To Slot" }, { INVENTORY_RESULT_BAG_FULL, "Bag Full" }, { INVENTORY_RESULT_NONEMPTY_BAG_OVER_OTHER_BAG, "Nonempty Bag Over Other Bag" }, { INVENTORY_RESULT_CANT_TRADE_EQUIP_BAGS, "Cant Trade Equip Bags" }, @@ -7350,8 +7350,8 @@ static const value_string e_inventory_result_strings[] = { { INVENTORY_RESULT_NO_EQUIPMENT_SLOT_AVAILABLE2, "No Equipment Slot Available2" }, { INVENTORY_RESULT_CANT_EQUIP_WITH_TWOHANDED, "Cant Equip With Twohanded" }, { INVENTORY_RESULT_CANT_DUAL_WIELD, "Cant Dual Wield" }, - { INVENTORY_RESULT_ITEM_DOESNT_GO_INTO_BAG, "Item Doesnt Go Into Bag" }, - { INVENTORY_RESULT_ITEM_DOESNT_GO_INTO_BAG2, "Item Doesnt Go Into Bag2" }, + { INVENTORY_RESULT_ITEM_DOESNT_GO_INTO_BAG, "Item Doesn't Go Into Bag" }, + { INVENTORY_RESULT_ITEM_DOESNT_GO_INTO_BAG2, "Item Doesn't Go Into Bag2" }, { INVENTORY_RESULT_CANT_CARRY_MORE_OF_THIS, "Cant Carry More Of This" }, { INVENTORY_RESULT_NO_EQUIPMENT_SLOT_AVAILABLE3, "No Equipment Slot Available3" }, { INVENTORY_RESULT_ITEM_CANT_STACK, "Item Cant Stack" }, @@ -7611,7 +7611,7 @@ static const value_string e_battleground_bracket_strings[] = { { BATTLEGROUND_BRACKET_TENS, "Tens" }, { BATTLEGROUND_BRACKET_TWENTIES, "Twenties" }, { BATTLEGROUND_BRACKET_THIRTIES, "Thirties" }, - { BATTLEGROUND_BRACKET_FOURTIES, "Fourties" }, + { BATTLEGROUND_BRACKET_FOURTIES, "Forties" }, { BATTLEGROUND_BRACKET_FIFTIES, "Fifties" }, { BATTLEGROUND_BRACKET_SIXTY, "Sixty" }, { 0, NULL } @@ -9031,7 +9031,7 @@ typedef enum { LOOT_METHOD_ERROR_NOT_WHILE_SHAPESHIFTED = 0x10, } e_loot_method_error; static const value_string e_loot_method_error_strings[] = { - { LOOT_METHOD_ERROR_DIDNT_KILL, "Didnt Kill" }, + { LOOT_METHOD_ERROR_DIDNT_KILL, "Didn't Kill" }, { LOOT_METHOD_ERROR_TOO_FAR, "Too Far" }, { LOOT_METHOD_ERROR_BAD_FACING, "Bad Facing" }, { LOOT_METHOD_ERROR_LOCKED, "Locked" }, diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c index 80efba0fda..b228c4460b 100644 --- a/epan/dissectors/packet-wtp.c +++ b/epan/dissectors/packet-wtp.c @@ -637,7 +637,7 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * for packets other than the last packet?) * * Try calling a subdissector only if: - * - The WTP payload is ressembled in this very packet, + * - The WTP payload is resembled in this very packet, * - The WTP payload is not fragmented across packets. */ dataOffset = offCur + cbHeader + vHeader; diff --git a/epan/dissectors/packet-x11-keysymdef.h b/epan/dissectors/packet-x11-keysymdef.h index fa414a23d7..68202b6912 100644 --- a/epan/dissectors/packet-x11-keysymdef.h +++ b/epan/dissectors/packet-x11-keysymdef.h @@ -189,7 +189,7 @@ SOFTWARE. /* - * Auxilliary Functions; note the duplicate definitions for left and right + * Auxiliary Functions; note the duplicate definitions for left and right * function keys; Sun keyboards and a few other manufactures have such * function key groups on the left and/or right sides of the keyboard. * We've not found a keyboard with more than 35 function keys total. diff --git a/epan/dissectors/packet-zbee-direct.c b/epan/dissectors/packet-zbee-direct.c index 23552965e8..6c4b9bec75 100644 --- a/epan/dissectors/packet-zbee-direct.c +++ b/epan/dissectors/packet-zbee-direct.c @@ -1280,7 +1280,7 @@ static int dissect_zb_direct_formation(tvbuff_t *tvb, } /** - * Dissector for Commisioning Status. + * Dissector for Commissioning Status. * * @param tvb pointer to buffer containing raw packet * @param pinfo pointer to packet information fields diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h index 29ad9f13ac..86a0037d31 100644 --- a/epan/dissectors/x11-register-info.h +++ b/epan/dissectors/x11-register-info.h @@ -4127,7 +4127,7 @@ { &hf_x11_xf86vidmode_SetViewPort_x, { "x", "x11.xf86vidmode.SetViewPort.x", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_SetViewPort_y, { "y", "x11.xf86vidmode.SetViewPort.y", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetDotClocks_screen, { "screen", "x11.xf86vidmode.GetDotClocks.screen", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xf86vidmode_GetDotClocks_reply_flags_mask_Programable, { "Programable", "x11.xf86vidmode.GetDotClocks.reply.flags.Programable", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetDotClocks_reply_flags_mask_Programable, { "Programmable", "x11.xf86vidmode.GetDotClocks.reply.flags.Programmable", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetDotClocks_reply_flags, { "flags", "x11.xf86vidmode.GetDotClocks.reply.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetDotClocks_reply_clocks, { "clocks", "x11.xf86vidmode.GetDotClocks.reply.clocks", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetDotClocks_reply_maxclocks, { "maxclocks", "x11.xf86vidmode.GetDotClocks.reply.maxclocks", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, diff --git a/epan/etypes.h b/epan/etypes.h index abfefdd8e4..cb306e2198 100644 --- a/epan/etypes.h +++ b/epan/etypes.h @@ -72,7 +72,7 @@ extern "C" { #endif #ifndef ETHERTYPE_WOL -#define ETHERTYPE_WOL 0x0842 /* Wake on LAN. Not offically registered. */ +#define ETHERTYPE_WOL 0x0842 /* Wake on LAN. Not officially registered. */ #endif #ifndef ETHERTYPE_WMX_M2M diff --git a/epan/exceptions.h b/epan/exceptions.h index 8841e4541d..f7a01efe85 100644 --- a/epan/exceptions.h +++ b/epan/exceptions.h @@ -407,7 +407,7 @@ ws_assert(except_state == EXCEPT_CAUGHT); \ /* we can't use except_rethrow here, as that pops a catch block \ * off the stack, and we don't want to do that, because we want to \ - * excecute the FINALLY {} block first. \ + * execute the FINALLY {} block first. \ * except_throw doesn't provide an interface to rethrow an existing \ * exception; however, longjmping back to except_try_push() has the \ * desired effect. \ diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c index 1a57c9afc1..cf50a988b7 100644 --- a/epan/ftypes/ftypes.c +++ b/epan/ftypes/ftypes.c @@ -127,7 +127,7 @@ same_ftype(const enum ftenum ftype) case FT_REL_OID: return FT_OID; - /* XXX: the folowing are unique for now */ + /* XXX: the following are unique for now */ case FT_IPv4: case FT_IPv6: diff --git a/epan/packet.c b/epan/packet.c index dc360e1154..322b4f491d 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -342,7 +342,7 @@ init_dissection(void) { /* * Reinitialize resolution information. Don't leak host entries from - * one file to another (e.g. embarassing-host-name.example.com from + * one file to another (e.g. embarrassing-host-name.example.com from * file1.pcapng into a name resolution block in file2.pcapng). */ host_name_lookup_reset(); @@ -916,7 +916,7 @@ call_dissector_work(dissector_handle_t handle, tvbuff_t *tvb, packet_info *pinfo /* * can_desegment is set to 2 by anyone which offers the * desegmentation api/service. - * Then everytime a subdissector is called it is decremented + * Then every time a subdissector is called it is decremented * by one. * Thus only the subdissector immediately on top of whoever * offers this service can use it. @@ -2972,7 +2972,7 @@ dissector_try_heuristic(heur_dissector_list_t sub_dissectors, tvbuff_t *tvb, guint saved_tree_count = tree ? tree->tree_data->count : 0; /* can_desegment is set to 2 by anyone which offers this api/service. - then everytime a subdissector is called it is decremented by one. + then every time a subdissector is called it is decremented by one. thus only the subdissector immediately ontop of whoever offers this service can use it. We save the current value of "can_desegment" for the @@ -3572,7 +3572,7 @@ void call_heur_dissector_direct(heur_dtbl_entry_t *heur_dtbl_entry, tvbuff_t *tv DISSECTOR_ASSERT(heur_dtbl_entry); /* can_desegment is set to 2 by anyone which offers this api/service. - then everytime a subdissector is called it is decremented by one. + then every time a subdissector is called it is decremented by one. thus only the subdissector immediately ontop of whoever offers this service can use it. We save the current value of "can_desegment" for the diff --git a/epan/prefs.c b/epan/prefs.c index 9faeddec00..009faab3fc 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -6400,7 +6400,7 @@ set_pref(gchar *pref_name, const gchar *value, void *private_data, break; case PREF_PASSWORD: - /* Read value is everytime empty */ + /* Read value is every time empty */ containing_module->prefs_changed_flags |= prefs_set_string_value(pref, "", pref_current); break; diff --git a/epan/proto.c b/epan/proto.c index 3dc7e8dec1..f9c05202b5 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -7106,7 +7106,7 @@ proto_item_fill_display_label(field_info *finfo, gchar *display_label_str, const str = fvalue_get_string(finfo->value); label_len = (int)ws_label_strcpy(display_label_str, label_str_size, 0, str, label_strcat_flags(hfinfo)); if (label_len >= label_str_size) { - /* Truncation occured. Get the real length + /* Truncation occurred. Get the real length * copied (not including '\0') */ label_len = label_str_size ? label_str_size - 1 : 0; } diff --git a/epan/protobuf-helper.c b/epan/protobuf-helper.c index 2c03d6ae99..5b60ecab1a 100644 --- a/epan/protobuf-helper.c +++ b/epan/protobuf-helper.c @@ -16,9 +16,9 @@ * - The data type of FIELD which assuring the value of protobuf field of packet can be dissected correctly. * * At present, we use C Protocol Buffers Language Parser which generated by protobuf_lang_parser.lemon and protobuf_lang_scanner.l. - * Because wireshark is mainly implemented in plain ANSI C but the offical protobuf library is implemented in C++ language. + * Because wireshark is mainly implemented in plain ANSI C but the official protobuf library is implemented in C++ language. * - * One day, if C++ library is allowd, we can create a protobuf-helper.cpp file, that invoking offical protobuf C++ library directly, + * One day, if C++ library is allowd, we can create a protobuf-helper.cpp file, that invoking official protobuf C++ library directly, * to replace protobuf-helper.c. The packet-protobuf.c can keep unchanged. */ diff --git a/epan/protobuf-helper.h b/epan/protobuf-helper.h index 623a980d06..707c592951 100644 --- a/epan/protobuf-helper.h +++ b/epan/protobuf-helper.h @@ -16,9 +16,9 @@ * - The data type of FIELD which assuring the value of protobuf field of packet can be dissected correctly. * * At present, we use C Protocol Buffers Language Parser which generated by protobuf_lang_parser.lemon and protobuf_lang_scanner.l. - * Because wireshark is mainly implemented in plain ANSI C but the offical protobuf library is implemented in C++ language. + * Because wireshark is mainly implemented in plain ANSI C but the official protobuf library is implemented in C++ language. * - * One day, if C++ library is allowd, we can create a protobuf-helper.cpp file, that invoking offical protobuf C++ library directly, + * One day, if C++ library is allowd, we can create a protobuf-helper.cpp file, that invoking official protobuf C++ library directly, * to replace protobuf-helper.c. The packet-protobuf.c can keep unchanged. */ diff --git a/epan/protobuf_lang_parser.lemon b/epan/protobuf_lang_parser.lemon index 60544585c4..72bbe915ef 100644 --- a/epan/protobuf_lang_parser.lemon +++ b/epan/protobuf_lang_parser.lemon @@ -14,7 +14,7 @@ * 2) Protocol Buffers Version 2 Language Specification: * https://developers.google.com/protocol-buffers/docs/reference/proto2-spec * There are some errors about 'proto', 'option' (value) and 'reserved' (fieldName) definitions on that sites. - * This parser is created because Wireshark is mainly implemented in plain ANSI C but the offical + * This parser is created because Wireshark is mainly implemented in plain ANSI C but the official * Protocol Buffers Language parser is implemented in C++. */ #include "config.h" @@ -139,7 +139,7 @@ extensions reserved ranges range quoteFieldNames emptyStatement %start_symbol proto /* v2/v3: proto = syntax { import | package | option | topLevelDef | emptyStatement } */ -/* Offical PBL bugfix: proto = { syntax } { import | package | option | topLevelDef | emptyStatement } +/* Official PBL bugfix: proto = { syntax } { import | package | option | topLevelDef | emptyStatement } The default syntax version is "proto2". */ proto ::= wholeProtoBody. proto ::= syntax wholeProtoBody. @@ -195,12 +195,12 @@ package ::= PT_PACKAGE exIdent(B) PT_SEMICOLON. } /* v2/v3: option = "option" optionName "=" constant ";" */ -/* Offical PBL bugfix: option = "option" optionName "=" ( constant | customOptionValue ) ";" */ +/* Official PBL bugfix: option = "option" optionName "=" ( constant | customOptionValue ) ";" */ option ::= PT_OPTION optionName PT_ASSIGN constant PT_SEMICOLON. option ::= PT_OPTION optionName PT_ASSIGN customOptionValue PT_SEMICOLON. /* v2/v3: optionName = ( ident | "(" fullIdent ")" ) { "." ident } */ -/* Offical PBL bugfix: optionName = ( ident | "(" fullIdent ")" ) { "." ( ident | "(" fullIdent ")" ) } */ +/* Official PBL bugfix: optionName = ( ident | "(" fullIdent ")" ) { "." ( ident | "(" fullIdent ")" ) } */ extIdentInParentheses(A) ::= PT_LPAREN exIdent(B) PT_RPAREN. { A = B; A->v = pbl_store_string_token(state, g_strconcat("(", B->v, ")", NULL)); } optionName ::= exIdent. @@ -212,7 +212,7 @@ optionName(A) ::= optionName(B) PT_DOT extIdentInParentheses(C). optionName(A) ::= optionName(B) extIdentInParentheses(C). { A = B; A->v = pbl_store_string_token(state, g_strconcat(B->v, ".", C->v, NULL)); } -/* Allow format which not defined in offical PBL specification like: +/* Allow format which not defined in official PBL specification like: option (google.api.http) = { post: "/v3alpha/kv/put" body: "*" }; option (google.api.http) = { post: "/v3alpha/kv/put", body: "*" }; option (google.api.http) = { post: "/v3alpha/kv/put" { any format } body: "*" }; @@ -312,7 +312,7 @@ enum(A) ::= PT_ENUM enumName(B) PT_LCURLY enumBody(C) PT_RCURLY. { A = C; pbl_set_node_name(A, B->ln, B->v); } /* v2/v3: enumBody = "{" { option | enumField | emptyStatement } "}" */ -/* Offical PBL bugfix: enumBody = "{" { reserved | option | enumField | emptyStatement } "}" */ +/* Official PBL bugfix: enumBody = "{" { reserved | option | enumField | emptyStatement } "}" */ enumBody(A) ::= . { A = pbl_create_node(state->file, CUR_LINENO, PBL_ENUM, NAME_TO_BE_SET); } enumBody ::= enumBody reserved. enumBody ::= enumBody option. @@ -335,7 +335,7 @@ enumValueOptions ::= enumValueOption. enumValueOptions ::= enumValueOptions PT_COMMA enumValueOption. /* v2/v3: enumValueOption = optionName "=" constant */ -/* Offical PBL bugfix: enumValueOption = optionName "=" ( constant | customOptionValue ) ";" */ +/* Official PBL bugfix: enumValueOption = optionName "=" ( constant | customOptionValue ) ";" */ enumValueOption ::= optionName PT_ASSIGN constant. enumValueOption ::= optionName PT_ASSIGN customOptionValue. @@ -414,14 +414,14 @@ fieldOptions(A) ::= fieldOptions(B) PT_COMMA fieldOption(C). { A = B; pbl_add_child(A, C); } /* v2/v3: fieldOption = optionName "=" constant */ -/* Offical PBL bugfix: fieldOption = optionName "=" ( constant | customOptionValue ) ";" */ +/* Official PBL bugfix: fieldOption = optionName "=" ( constant | customOptionValue ) ";" */ fieldOption(A) ::= optionName(B) PT_ASSIGN constant(C). { A = pbl_create_option_node(state->file, B->ln, B->v, C); } fieldOption(A) ::= optionName(B) PT_ASSIGN customOptionValue. { A = pbl_create_option_node(state->file, B->ln, B->v, pbl_store_string_token(state, g_strdup("{ ... }"))); } /* v2 only: group = label "group" groupName "=" fieldNumber messageBody */ -/* Offical PBL bugfix: there is no label if the 'group' is a member of oneof body */ +/* Official PBL bugfix: there is no label if the 'group' is a member of oneof body */ group(A) ::= PT_GROUP groupName(B) PT_ASSIGN fieldNumber PT_LCURLY messageBody(C) PT_RCURLY. { A = C; pbl_set_node_name(A, B->ln, B->v); } group(A) ::= label PT_GROUP groupName(B) PT_ASSIGN fieldNumber PT_LCURLY messageBody(C) PT_RCURLY. @@ -430,7 +430,7 @@ group(A) ::= label PT_GROUP groupName(B) PT_ASSIGN fieldNumber PT_LCURLY message groupName ::= exIdent. /* v2/v3: oneof = "oneof" oneofName "{" { oneofField | emptyStatement } "}" */ -/* Offical PBL bugfix: oneof = "oneof" oneofName "{" { oneofField | option | group | emptyStatement } "}" */ +/* Official PBL bugfix: oneof = "oneof" oneofName "{" { oneofField | option | group | emptyStatement } "}" */ oneof(A) ::= PT_ONEOF oneofName(B) PT_LCURLY oneofBody(C) PT_RCURLY. { A = C; pbl_set_node_name(A, B->ln, B->v); } diff --git a/epan/reassemble.c b/epan/reassemble.c index 035128973f..543d091f67 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -918,7 +918,7 @@ fragment_truncate(reassembly_table *table, const packet_info *pinfo, fragment_item *fd_i, *prev_fd = NULL; for (fd_i = fd_head->next; fd_i && (fd_i->offset < tot_len); fd_i = fd_i->next) { fd_i->flags &= ~(FD_TOOLONGFRAGMENT|FD_MULTIPLETAILS); - /* Check for the split point occuring in the middle of the + /* Check for the split point occurring in the middle of the * fragment. */ if (fd_i->offset + fd_i->len > tot_len) { fd_i->len = tot_len - fd_i->offset; diff --git a/epan/reassemble.h b/epan/reassemble.h index 1400578fff..44699608a0 100644 --- a/epan/reassemble.h +++ b/epan/reassemble.h @@ -366,7 +366,7 @@ fragment_add_seq_802_11(reassembly_table *table, tvbuff_t *tvb, * * @note Out of order fragments will not be reassembled correctly. * Dissectors atop a reliable protocol like TCP may rely on the lower - * level dissector reordering out or order segments (if the appropraite + * level dissector reordering out or order segments (if the appropriate * out of order reassembly preference is enabled), but other dissectors * will have to handle out of order fragments themselves, if possible. */ diff --git a/epan/reedsolomon.c b/epan/reedsolomon.c index 5c810aa154..67eda403f5 100644 --- a/epan/reedsolomon.c +++ b/epan/reedsolomon.c @@ -243,7 +243,7 @@ gen_ldec(void) of the integer "alpha_to[i]" with a(0) being the LSB and a(m-1) the MSB. Thus for example the polynomial representation of @^5 would be given by the binary representation of the integer "alpha_to[5]". - Similarily, index_of[] can be used as follows: + Similarly, index_of[] can be used as follows: As above, let @ represent the primitive element of GF(2^m) that is the root of the primitive polynomial p(x). In order to find the power of @ (alpha) that has the polynomial representation @@ -255,7 +255,7 @@ gen_ldec(void) NOTE: The element alpha_to[2^m-1] = 0 always signifying that the representation of "@^infinity" = 0 is (0,0,0,...,0). - Similarily, the element index_of[0] = A0 always signifying + Similarly, the element index_of[0] = A0 always signifying that the power of alpha which has the polynomial representation (0,0,...,0) is "infinity". diff --git a/epan/tap.c b/epan/tap.c index 571a2dc113..79d306f2fb 100644 --- a/epan/tap.c +++ b/epan/tap.c @@ -180,7 +180,7 @@ register_tap(const char *name) int i=0; if(tap_dissector_list){ - /* Check if we allready have the name registered, if it is return the tap_id of that tap. + /* Check if we already have the name registered, if it is return the tap_id of that tap. * After the for loop tdl_prev will point to the last element of the list, add the new one there. */ for (i = 1, tdl = tap_dissector_list; tdl; i++, tdl_prev = tdl, tdl = tdl->next) { @@ -205,7 +205,7 @@ register_tap(const char *name) } -/* Everytime the dissector has finished dissecting a packet (and all +/* Every time the dissector has finished dissecting a packet (and all subdissectors have returned) and if the dissector has been made "tappable" it will push some data to everyone tapping this layer by a call to tap_queue_packet(). diff --git a/epan/tap.h b/epan/tap.h index 89ec220ceb..45168692a4 100644 --- a/epan/tap.h +++ b/epan/tap.h @@ -100,7 +100,7 @@ WS_DLL_PUBLIC GList* get_tap_names(void); */ WS_DLL_PUBLIC int find_tap_id(const char *name); -/** Everytime the dissector has finished dissecting a packet (and all +/** Every time the dissector has finished dissecting a packet (and all * subdissectors have returned) and if the dissector has been made "tappable" * it will push some data to everyone tapping this layer by a call * to tap_queue_packet(). diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 8a1973d93a..f75a38212c 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -2159,7 +2159,7 @@ static const guint8 bit_mask8[] = { }; -/* Get a variable ammount of bits +/* Get a variable amount of bits * * Return a byte array with bit limited data. * When encoding is ENC_BIG_ENDIAN, the data is aligned to the left. diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c index 844c10bd20..e986a25ecb 100644 --- a/epan/wslua/init_wslua.c +++ b/epan/wslua/init_wslua.c @@ -819,7 +819,7 @@ static int lua_load_plugins(const char *dirname, register_cb cb, gpointer client continue; } - /* skip files starting wih . */ + /* skip files starting with . */ if (name[0] == '.') { g_free(filename); continue; diff --git a/epan/wslua/wslua_listener.c b/epan/wslua/wslua_listener.c index 669a64f919..676d9384f5 100644 --- a/epan/wslua/wslua_listener.c +++ b/epan/wslua/wslua_listener.c @@ -354,7 +354,7 @@ WSLUA_ATTRIBUTE_FUNC_SETTER(Listener,packet); /* WSLUA_ATTRIBUTE Listener_draw WO A function that will be called once every few seconds to redraw the GUI objects; - in TShark this funtion is called only at the very end of the capture file. + in TShark this function is called only at the very end of the capture file. When later called by Wireshark, the `draw` function will not be given any arguments. diff --git a/extcap/ciscodump.c b/extcap/ciscodump.c index dcd538c3a8..2331a05a55 100644 --- a/extcap/ciscodump.c +++ b/extcap/ciscodump.c @@ -222,7 +222,7 @@ static int read_output_bytes(ssh_channel channel, int bytes, char* outbuf) /* Reads input to buffer and parses EOL * If line is NULL, just received count of characters in len is calculated * It returns: - * READ_LINE_ERROR - any ssh error occured + * READ_LINE_ERROR - any ssh error occurred * READ_LINE_EOLN - EOLN found, line/len contains \0 terminated string * READ_LINE_TIMEOUT - reading ended with timeout, line/len contains \0 terminate prompt * READ_LINE_TOO_LONG - buffer is full with no EOLN nor PROMPT found, line is filled with NOT \0 terminated data @@ -264,7 +264,7 @@ static int ssh_channel_read_line_timeout(ssh_channel channel, char *line, int *l /* Reads input to buffer and parses EOL or prompt_str PROMPT * It returns: - * READ_PROMPT_ERROR - any ssh error occured + * READ_PROMPT_ERROR - any ssh error occurred * READ_PROMPT_EOLN - EOLN found, line/len contains \0 terminated string * READ_PROMPT_PROMPT - reading ended and it ends with PROMPT, line/len contains \0 terminate prompt * READ_PROMPT_TOO_LONG - buffer is full with no EOLN nor PROMPT found, line is filled with NOT \0 terminated data diff --git a/include/wireshark.h b/include/wireshark.h index f7c19c23ff..3ffa955763 100644 --- a/include/wireshark.h +++ b/include/wireshark.h @@ -21,7 +21,7 @@ * Other public headers provided here should be minimal, with stable interfaces * and have only global declarations. * - * Everytime this header changes everything must be rebuilt so consider carefully + * Every time this header changes everything must be rebuilt so consider carefully * if the other project headers included here should really have global scope. * * See README.developer for a more in-depth guide. diff --git a/plugins/epan/gryphon/packet-gryphon.h b/plugins/epan/gryphon/packet-gryphon.h index 477f897c33..182146269d 100644 --- a/plugins/epan/gryphon/packet-gryphon.h +++ b/plugins/epan/gryphon/packet-gryphon.h @@ -66,7 +66,7 @@ #define CMD_SET_TIME 0x0b /* set time */ /* SD-type specific commands: should start at 0x40, global uniqueness */ -/* is prefered, but not mandatory. */ +/* is preferred, but not mandatory. */ /* SD_CARD command types: */ diff --git a/plugins/epan/mate/mate.h b/plugins/epan/mate/mate.h index 79f46af826..c4a5adc954 100644 --- a/plugins/epan/mate/mate.h +++ b/plugins/epan/mate/mate.h @@ -267,7 +267,7 @@ struct _mate_pdu { AVPL* avpl; - guint32 frame; /* wich frame I belog to? */ + guint32 frame; /* which frame I belong to? */ mate_pdu* next_in_frame; /* points to the next pdu in this frame */ float rel_time; /* time since start of capture */ diff --git a/plugins/epan/mate/mate_setup.c b/plugins/epan/mate/mate_setup.c index eef9764389..680a8fa92c 100644 --- a/plugins/epan/mate/mate_setup.c +++ b/plugins/epan/mate/mate_setup.c @@ -177,7 +177,7 @@ extern gboolean add_hfid(mate_config* mc, header_field_info* hfi, gchar* how, G #if 0 /* - * XXX - where is this suposed to be used? + * XXX - where is this supposed to be used? */ extern gchar* add_ranges(mate_config* mc, gchar* range,GPtrArray* range_ptr_arr) { gchar** ranges; diff --git a/plugins/epan/mate/mate_util.c b/plugins/epan/mate/mate_util.c index a50b7ac03e..4fa7e653e4 100644 --- a/plugins/epan/mate/mate_util.c +++ b/plugins/epan/mate/mate_util.c @@ -883,7 +883,7 @@ extern AVPL* new_avpl_from_avpl(const gchar* name, AVPL* avpl, gboolean copy_avp /** * match_avp: - * @param src an src to be compared agains an "op" avp + * @param src an src to be compared against an "op" avp * @param op the "op" avp that will be matched against the src avp * * Checks whether or not two avp's match. @@ -1117,7 +1117,7 @@ extern AVPL* new_avpl_pairs_match(const gchar* name, AVPL* src, AVPL* op, gboole * new_avpl_from_match: * @param mode The matching method, one of AVPL_STRICT, AVPL_LOOSE, AVPL_EVERY. * @param name the name of the resulting avpl - * @param src the data AVPL to be matched agains a condition AVPL + * @param src the data AVPL to be matched against a condition AVPL * @param op the conditions AVPL that will be matched against the data AVPL * * Matches the conditions AVPL against the original AVPL according to the mode. diff --git a/plugins/epan/profinet/packet-dcerpc-pn-io.c b/plugins/epan/profinet/packet-dcerpc-pn-io.c index 74ab50a223..6ce81e760e 100644 --- a/plugins/epan/profinet/packet-dcerpc-pn-io.c +++ b/plugins/epan/profinet/packet-dcerpc-pn-io.c @@ -10471,7 +10471,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset, hf_pn_io_number_of_io_data_objects, &u16NumberOfIODataObjectsInAPI); /* Set global Variant for Number of IO Data Objects */ - /* Notice: Handle Input & Output seperate!!! */ + /* Notice: Handle Input & Output separate!!! */ if (!PINFO_FD_VISITED(pinfo)) { /* Get current conversation endpoints using MAC addresses */ conversation = find_conversation(pinfo->num, &pinfo->dl_src, &pinfo->dl_dst, CONVERSATION_NONE, 0, 0, 0); diff --git a/plugins/epan/profinet/packet-pn-dcp.c b/plugins/epan/profinet/packet-pn-dcp.c index 23d0383a60..6de2b19c23 100644 --- a/plugins/epan/profinet/packet-pn-dcp.c +++ b/plugins/epan/profinet/packet-pn-dcp.c @@ -16,7 +16,7 @@ * * Added new functions to packet-pn-dcp.c. The profinet plug-in will now save * the information (Stationname, -type, -id) of "Ident OK" frames. Those - * informations will later be used for detailled dissection of cyclic PNIO RTC1 + * informations will later be used for detailed dissection of cyclic PNIO RTC1 * dataframes. * * The declaration of the new added structures are within packet-pn.h to diff --git a/plugins/epan/profinet/packet-pn.h b/plugins/epan/profinet/packet-pn.h index f2c0743d6f..6053fc3780 100644 --- a/plugins/epan/profinet/packet-pn.h +++ b/plugins/epan/profinet/packet-pn.h @@ -13,7 +13,7 @@ * * Added new structures to packet-pn.h to transfer the gained data of * packet-pn-dcp.c and packet-dcerpc-pn-io.c to packet-pn-rtc-one.c for - * detailled dissection of cyclic PNIO RTC1 dataframes. + * detailed dissection of cyclic PNIO RTC1 dataframes. * */ diff --git a/plugins/epan/unistim/packet-unistim.c b/plugins/epan/unistim/packet-unistim.c index b4b62c14ab..58b01eccd0 100644 --- a/plugins/epan/unistim/packet-unistim.c +++ b/plugins/epan/unistim/packet-unistim.c @@ -292,7 +292,7 @@ dissect_payload(proto_tree *overall_unistim_tree,tvbuff_t *tvb, gint offset, pac break; } - /* Handle UFTP seperately because it is significantly different + /* Handle UFTP separately because it is significantly different than standard UNISTIM */ while (tvb_reported_length_remaining(tvb, offset) > 0) offset = dissect_unistim_message(unistim_tree,pinfo,tvb,offset); diff --git a/resources/protocols/diameter/Starent.xml b/resources/protocols/diameter/Starent.xml index 0e2ed2c100..686e7cb352 100644 --- a/resources/protocols/diameter/Starent.xml +++ b/resources/protocols/diameter/Starent.xml @@ -912,7 +912,7 @@ <enum name="intra-ggsn-handoff" code="510"/> <enum name="WSG-Auth-failed" code="511"/> <enum name="Gtp-non-existent-pdp-context" code="512"/> - <enum name="sgsn-cancel-loc-inital-attach" code="513"/> + <enum name="sgsn-cancel-loc-initial-attach" code="513"/> <enum name="Local-fallback-timeout" code="514"/> <enum name="sgsn-nrspca-actv-rej-by-sgsn" code="515"/> <enum name="sgsn-nrspca-actv-rej-by-ms" code="516"/> @@ -1965,7 +1965,7 @@ <avp name="SN-Subscriber-Acct-Mode" code="192" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must"> <type type-name="Unsigned32"/> - <enum name="flow-based-auxilliary" code="0"/> + <enum name="flow-based-auxiliary" code="0"/> <enum name="flow-based-all" code="1"/> <enum name="flow-based-none" code="2"/> <enum name="session-based" code="3"/> diff --git a/resources/protocols/radius/dictionary.cablelabs b/resources/protocols/radius/dictionary.cablelabs index 21fa03a64b..31879614cd 100644 --- a/resources/protocols/radius/dictionary.cablelabs +++ b/resources/protocols/radius/dictionary.cablelabs @@ -123,7 +123,7 @@ ATTRIBUTE Related_ICID 98 string # # Commented out because they cannot be used. -# [wireshark: The following values are actualy handled by +# [wireshark: The following values are actually handled by # packet-radius_packetcable.c] # #VALUE CableLabs-Event-Message Reserved 0 diff --git a/resources/protocols/radius/dictionary.starent b/resources/protocols/radius/dictionary.starent index 12f6405e10..7b4706b03b 100644 --- a/resources/protocols/radius/dictionary.starent +++ b/resources/protocols/radius/dictionary.starent @@ -1267,7 +1267,7 @@ VALUE SN-Subscriber-Accounting GTPP 2 VALUE SN-Subscriber-Acct-Interim Normal 0 VALUE SN-Subscriber-Acct-Interim Suppress 1 -VALUE SN-Subscriber-Acct-Mode flow-based-auxilliary 0 +VALUE SN-Subscriber-Acct-Mode flow-based-auxiliary 0 VALUE SN-Subscriber-Acct-Mode flow-based-all 1 VALUE SN-Subscriber-Acct-Mode flow-based-none 2 VALUE SN-Subscriber-Acct-Mode session-based 3 diff --git a/resources/protocols/radius/dictionary.starent.vsa1 b/resources/protocols/radius/dictionary.starent.vsa1 index e8c9ccced8..1e9eb8bbf4 100644 --- a/resources/protocols/radius/dictionary.starent.vsa1 +++ b/resources/protocols/radius/dictionary.starent.vsa1 @@ -1116,7 +1116,7 @@ VALUE SN1-Subscriber-Accounting GTPP 2 VALUE SN1-Subscriber-Acct-Interim Normal 0 VALUE SN1-Subscriber-Acct-Interim Suppress 1 -VALUE SN1-Subscriber-Acct-Mode flow-based-auxilliary 0 +VALUE SN1-Subscriber-Acct-Mode flow-based-auxiliary 0 VALUE SN1-Subscriber-Acct-Mode flow-based-all 1 VALUE SN1-Subscriber-Acct-Mode flow-based-none 2 VALUE SN1-Subscriber-Acct-Mode session-based 3 diff --git a/resources/protocols/radius/dictionary.versanet b/resources/protocols/radius/dictionary.versanet index 1060a35520..5ca69d57ac 100644 --- a/resources/protocols/radius/dictionary.versanet +++ b/resources/protocols/radius/dictionary.versanet @@ -1,7 +1,7 @@ # -*- text -*- # Copyright (C) 2015 The FreeRADIUS Server project and contributors # -# dictionary.versanet Vendor specfic attributes for versanet +# dictionary.versanet Vendor specific attributes for versanet # # # VersaNet Communications, Inc. diff --git a/test/lua/pcap_file.lua b/test/lua/pcap_file.lua index b949a38717..c99aaa3a6a 100644 --- a/test/lua/pcap_file.lua +++ b/test/lua/pcap_file.lua @@ -145,7 +145,7 @@ local function read(file, capture, frame) local position = file:seek() if not read_common("read", file, capture, frame) then - -- this isnt' actually an error, because it might just mean we reached end-of-file + -- this isn't' actually an error, because it might just mean we reached end-of-file -- so let's test for that (read(0) is a special case in Lua, see Lua docs) if file:read(0) ~= nil then dprint("read: failed to call read_common") diff --git a/test/suite_dissection.py b/test/suite_dissection.py index 2a99f81560..f6bd4e74e5 100644 --- a/test/suite_dissection.py +++ b/test/suite_dissection.py @@ -823,7 +823,7 @@ class TestDissectQuic: # multiple packets, fragmented in multiple out of order packets, # retried, retried with overlap from the original packets, and retried # with one of the original packets missing (but all data there.) - # Include -zexpert just to be sure that nothing Warn or higher occured. + # Include -zexpert just to be sure that nothing Warn or higher occurred. # Note level expert infos may be expected with the overlaps and # retransmissions. stdout = subprocess.check_output([cmd_tshark, diff --git a/tools/Get-HardenFlags.ps1 b/tools/Get-HardenFlags.ps1 index c078565900..eb73b40f37 100644 --- a/tools/Get-HardenFlags.ps1 +++ b/tools/Get-HardenFlags.ps1 @@ -16,7 +16,7 @@ # on all the binaries in the distribution, and then filters # for the NXCOMPAT and DYNAMICBASE flags. -# This script will probably fail for the forseeable future. +# This script will probably fail for the foreseeable future. # # Many of our third-party libraries are compiled using MinGW-w64. Its version # of `ld` doesn't enable the dynamicbase, nxcompat, or high-entropy-va flags diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py index 0411299892..7790068e47 100755 --- a/tools/asn2wrs.py +++ b/tools/asn2wrs.py @@ -5978,7 +5978,7 @@ def p_Reference_1 (t): def p_Reference_2 (t): '''Reference : LCASE_IDENT_ASSIGNED - | identifier ''' # instead of valuereference wich causes reduce/reduce conflict + | identifier ''' # instead of valuereference which causes reduce/reduce conflict t[0] = Value_Ref(val=t[1]) def p_AssignmentList_1 (t): @@ -6019,7 +6019,7 @@ def p_DefinedValue_1(t): t[0] = t[1] def p_DefinedValue_2(t): - '''DefinedValue : identifier ''' # instead of valuereference wich causes reduce/reduce conflict + '''DefinedValue : identifier ''' # instead of valuereference which causes reduce/reduce conflict t[0] = Value_Ref(val=t[1]) # 13.6 @@ -6045,7 +6045,7 @@ def p_ValueAssignment (t): 'ValueAssignment : LCASE_IDENT ValueType ASSIGNMENT Value' t[0] = ValueAssignment(ident = t[1], typ = t[2], val = t[4]) -# only "simple" types are supported to simplify grammer +# only "simple" types are supported to simplify grammar def p_ValueType (t): '''ValueType : type_ref | BooleanType diff --git a/tools/check_spelling.py b/tools/check_spelling.py index d3a46d7e27..bcc7af1686 100755 --- a/tools/check_spelling.py +++ b/tools/check_spelling.py @@ -53,6 +53,9 @@ from spellchecker import SpellChecker spell = SpellChecker() spell.word_frequency.load_text_file('./tools/wireshark_words.txt') +# TODO: this should include the full list from Wikipedia page as used by Darius's script +spell.word_frequency.remove_words([ 'futher', 'extention']) + # Track words that were not found. missing_words = [] @@ -233,6 +236,8 @@ class File: if self.numberPlusUnits(word): continue + if word == "extension": + print('checking', word) if len(word) > 4 and spell.unknown([word]) and not self.checkMultiWords(word) and not self.wordBeforeId(word): print(self.file, value_index, '/', num_values, '"' + original + '"', bcolors.FAIL + word + bcolors.ENDC, ' -> ', '?') diff --git a/tools/generate-dissector.py b/tools/generate-dissector.py index 4d8ab37dde..aee1d61558 100755 --- a/tools/generate-dissector.py +++ b/tools/generate-dissector.py @@ -144,7 +144,7 @@ def print_header(): def print_trailer(args): print("") print("The skeleton for the dissector of the " + args.protoshortname + " protocol has been generated.") - print("Please review/extend it to match your specific criterias.") + print("Please review/extend it to match your specific criteria.") print("") diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c index 1a4144b383..c4b4881107 100644 --- a/tools/lemon/lemon.c +++ b/tools/lemon/lemon.c @@ -5848,7 +5848,7 @@ int Configtable_insert(struct config *data) newnp->from = &(array.ht[h]); array.ht[h] = newnp; } - /* free(x4a->tbl); // This code was originall written for 16-bit machines. + /* free(x4a->tbl); // This code was originally written for 16-bit machines. ** on modern machines, don't worry about freeing this trival amount of ** memory. */ *x4a = array; diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh index a80774bd79..21c5033290 100755 --- a/tools/macos-setup.sh +++ b/tools/macos-setup.sh @@ -3656,7 +3656,7 @@ uninstall_all() { } # This script is meant to be run in the source root. The following -# code will attempt to get you there, but is not perfect (particulary +# code will attempt to get you there, but is not perfect (particularly # if someone copies the script). topdir="$( pwd )/$( dirname $0 )/.." diff --git a/tools/make-bluetooth.py b/tools/make-bluetooth.py index 2915071b52..5ae099e42f 100755 --- a/tools/make-bluetooth.py +++ b/tools/make-bluetooth.py @@ -200,7 +200,7 @@ for uuids in uuids_sources: # if not a few exceptional cases (see above) if uuid["uuid"] not in [0x001E, 0x001F, 0x1102, 0x1104, 0x1105, 0x1106, 0x1107, 0x1200, 0x2B8C]: # Parse through the names and look for capital letters; when - # not preceeded by another capital letter or one of break_chars, insert a space + # not preceded by another capital letter or one of break_chars, insert a space break_chars = [" ", "-", "+", "/", "(", ".", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"] was_break = True # fake space at beginning of string was_upper = False diff --git a/tools/ncp2222.py b/tools/ncp2222.py index 1eb7aa3280..2a80b69aea 100755 --- a/tools/ncp2222.py +++ b/tools/ncp2222.py @@ -3,7 +3,7 @@ """ Creates C code from a table of NCP type 0x2222 packet types. (And 0x3333, which are the replies, but the packets are more commonly -refered to as type 0x2222; the 0x3333 replies are understood to be +referred to as type 0x2222; the 0x3333 replies are understood to be part of the 0x2222 "family") The data-munging code was written by Gilbert Ramirez. diff --git a/tools/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/tools/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm index c87d17a5a7..4857585bba 100644 --- a/tools/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm +++ b/tools/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm @@ -62,11 +62,11 @@ sub AllocOutVar($$$$$$$) $l = $nl if ($nl->{TYPE} eq "ARRAY"); } elsif - # we don't support multi-dimentional arrays yet + # we don't support multi-dimensional arrays yet ($l->{TYPE} eq "ARRAY") { my $nl = GetNextLevel($e, $l); if ($nl->{TYPE} eq "ARRAY") { - fatal($e->{ORIGINAL},"multi-dimentional [out] arrays are not supported!"); + fatal($e->{ORIGINAL},"multi-dimensional [out] arrays are not supported!"); } } else { # neither pointer nor array, no need to alloc something. diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py index 4973f0b6da..28842303d1 100755 --- a/tools/wireshark_gen.py +++ b/tools/wireshark_gen.py @@ -1412,7 +1412,7 @@ class wireshark_gen_C: self.getCDR(st, sname + "_" + un.identifier()) - # Depending on what kind of discriminant I come accross (enum,integer,char, + # Depending on what kind of discriminant I come across (enum,integer,char, # short, boolean), make sure I cast the return value of the get_XXX accessor # to an appropriate value. Omniidl idlast.CaseLabel.value() accessor will # return an integer, or an Enumerator object that is then converted to its diff --git a/tools/ws-coding-style.cfg b/tools/ws-coding-style.cfg index aabd05e368..8bdd4efc1b 100644 --- a/tools/ws-coding-style.cfg +++ b/tools/ws-coding-style.cfg @@ -157,7 +157,7 @@ sp_cond_colon = force # ignore/add/remove/force # Add or remove space around the '?' in 'b ? t : f' sp_cond_question = force # ignore/add/remove/force -# Add or remove space before a semicolon of an empty part of a for statment. +# Add or remove space before a semicolon of an empty part of a for statement. sp_before_semi_for_empty = force # ignore/add/remove/force # Space between close brace and else diff --git a/tools/yacc.py b/tools/yacc.py index ef843ba7d2..3466fbb534 100644 --- a/tools/yacc.py +++ b/tools/yacc.py @@ -1459,7 +1459,7 @@ class Grammar(object): self.Precedence = {} # Precedence rules for each terminal. Contains tuples of the # form ('right',level) or ('nonassoc', level) or ('left',level) - self.UsedPrecedence = set() # Precedence rules that were actually used by the grammer. + self.UsedPrecedence = set() # Precedence rules that were actually used by the grammar. # This is only used to provide error checking and to generate # a warning about unused precedence rules. diff --git a/ui/logray/logray_main_window.cpp b/ui/logray/logray_main_window.cpp index 992bcc65c1..60ff831ab7 100644 --- a/ui/logray/logray_main_window.cpp +++ b/ui/logray/logray_main_window.cpp @@ -1117,7 +1117,7 @@ void LograyMainWindow::saveWindowGeometry() // Our event loop becomes nested whenever we call update_progress_dlg, which // includes several places in file.c. The GTK+ UI stays out of trouble by // showing a modal progress dialog. We attempt to do the equivalent below by -// disabling parts of the main window. At a minumum the ProgressFrame in the +// disabling parts of the main window. At a minimum the ProgressFrame in the // main status bar must remain accessible. // // We might want to do this any time the main status bar progress frame is diff --git a/ui/qt/coloring_rules_dialog.cpp b/ui/qt/coloring_rules_dialog.cpp index 20eb72b2ee..181105dc85 100644 --- a/ui/qt/coloring_rules_dialog.cpp +++ b/ui/qt/coloring_rules_dialog.cpp @@ -229,7 +229,7 @@ void ColoringRulesDialog::updateHint(QModelIndex idx) if (errors_.count() > 0) { //take the list of QModelIndexes and sort them so first color rule error is displayed - //This isn't the most efficent algorithm, but the list shouldn't be large to matter + //This isn't the most efficient algorithm, but the list shouldn't be large to matter QList<QModelIndex> keys = errors_.keys(); //list is not guaranteed to be sorted, so force it diff --git a/ui/qt/interface_frame.cpp b/ui/qt/interface_frame.cpp index 43c9a1a5b0..d8d0601361 100644 --- a/ui/qt/interface_frame.cpp +++ b/ui/qt/interface_frame.cpp @@ -439,7 +439,7 @@ void InterfaceFrame::on_interfaceTree_doubleClicked(const QModelIndex &index) interfaces << device_name; /* We trust the string here. If this interface is really extcap, the string is - * being checked immediatly before the dialog is being generated */ + * being checked immediately before the dialog is being generated */ if (extcap_string.length() > 0) { /* this checks if configuration is required and not yet provided or saved via prefs */ @@ -471,7 +471,7 @@ void InterfaceFrame::on_interfaceTree_clicked(const QModelIndex &index) QString extcap_string = source_model_.getColumnContent(realIndex.row(), IFTREE_COL_EXTCAP_PATH).toString(); /* We trust the string here. If this interface is really extcap, the string is - * being checked immediatly before the dialog is being generated */ + * being checked immediately before the dialog is being generated */ if (extcap_string.length() > 0) { /* this checks if configuration is required and not yet provided or saved via prefs */ diff --git a/ui/qt/models/atap_data_model.cpp b/ui/qt/models/atap_data_model.cpp index 639f389d98..9e8b281750 100644 --- a/ui/qt/models/atap_data_model.cpp +++ b/ui/qt/models/atap_data_model.cpp @@ -724,7 +724,7 @@ QVariant ConversationDataModel::data(const QModelIndex &idx, int role) const /* Qt guarantees that this roundtrip conversion compares equally, * so filtering with equality will work as expected. * XXX: Perhaps the UNFORMATTED_DISPLAYDATA role shoud be split - * into one used for raw data export and comparisions with each + * into one used for raw data export and comparisons with each * other, and another for comparing with filters? */ return role == Qt::DisplayRole ? rounded + "%" : QVariant(rounded.toDouble()); diff --git a/ui/qt/models/pref_models.cpp b/ui/qt/models/pref_models.cpp index d6b6143e0b..a2797fd577 100644 --- a/ui/qt/models/pref_models.cpp +++ b/ui/qt/models/pref_models.cpp @@ -544,7 +544,7 @@ Qt::ItemFlags AdvancedPrefsModel::flags(const QModelIndex &index) const Qt::ItemFlags flags = QAbstractItemModel::flags(index); if (item->getPref() == NULL) { - /* Base modules aren't changable */ + /* Base modules aren't changeable */ flags &= ~(Qt::ItemIsEnabled | Qt::ItemIsSelectable); } else { flags |= Qt::ItemIsEditable; diff --git a/ui/qt/profile_dialog.h b/ui/qt/profile_dialog.h index d42594f0ff..96d1f7fa9b 100644 --- a/ui/qt/profile_dialog.h +++ b/ui/qt/profile_dialog.h @@ -40,8 +40,8 @@ public: /** * @brief Select the profile with the given name. * - * If the profile name is empty, the currently selected profile will be choosen instead. - * If the choosen profile is invalid, the first row will be choosen. + * If the profile name is empty, the currently selected profile will be chosen instead. + * If the chosen profile is invalid, the first row will be chosen. * * @param profile the name of the profile to be selected */ diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp index 5ceb809fc7..150c455be8 100644 --- a/ui/qt/rtp_audio_stream.cpp +++ b/ui/qt/rtp_audio_stream.cpp @@ -843,7 +843,7 @@ void RtpAudioStream::stopPlaying() if (audio_output_) { if (audio_output_->state() == QAudio::StoppedState) { // Looks like "delayed" QTBUG-6548 - // It may happen that stream is stopped, but no signal emited + // It may happen that stream is stopped, but no signal emitted // Probably triggered by some issue in sound system which is not // handled by Qt correctly outputStateChanged(QAudio::StoppedState); diff --git a/ui/qt/utils/rtp_audio_file.cpp b/ui/qt/utils/rtp_audio_file.cpp index 591a63bbf3..46e7a3659e 100644 --- a/ui/qt/utils/rtp_audio_file.cpp +++ b/ui/qt/utils/rtp_audio_file.cpp @@ -14,7 +14,7 @@ * File uses Frame as piece of information. One Frame match audio of one * decoded packet or audio silence in between them. Frame holds information * about frame type (audio/silence), its length and realtime position and - * sample possition (where decoded audio is really stored, with gaps omitted). + * sample position (where decoded audio is really stored, with gaps omitted). * * There are three stages of the object use * - writing data by frames during decoding of the stream diff --git a/ui/qt/wireshark_main_window.cpp b/ui/qt/wireshark_main_window.cpp index b58d4fd6b9..ad7a84e58a 100644 --- a/ui/qt/wireshark_main_window.cpp +++ b/ui/qt/wireshark_main_window.cpp @@ -1184,7 +1184,7 @@ void WiresharkMainWindow::saveWindowGeometry() // Our event loop becomes nested whenever we call update_progress_dlg, which // includes several places in file.c. The GTK+ UI stays out of trouble by // showing a modal progress dialog. We attempt to do the equivalent below by -// disabling parts of the main window. At a minumum the ProgressFrame in the +// disabling parts of the main window. At a minimum the ProgressFrame in the // main status bar must remain accessible. // // We might want to do this any time the main status bar progress frame is diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 3911dc0206..47fd9b702f 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -1719,7 +1719,7 @@ pcapng_read_if_descr_block(wtap *wth, FILE_T fh, pcapng_block_header_t *bh, * * Dealing with base-2 time stamps is a bit of a mess, * thanks to humans counting with their fingers rather - * than their hands, and it applies to mroe files than + * than their hands, and it applies to more files than * pcapng files, e.g. ERF files.) */ if (time_units_per_second >= 1000000000) @@ -4500,7 +4500,7 @@ compute_options_size(wtap_block_t block, compute_option_size_func compute_option /* * Compute the total size of all the options in the block. - * This always suceeds, so we don't check the return value. + * This always succeeds, so we don't check the return value. */ compute_options_size.size = 0; compute_options_size.compute_option_size = compute_option_size; diff --git a/wsutil/exported_pdu_tlvs.h b/wsutil/exported_pdu_tlvs.h index 4850be8e66..1caff3ee5e 100644 --- a/wsutil/exported_pdu_tlvs.h +++ b/wsutil/exported_pdu_tlvs.h @@ -175,7 +175,7 @@ #define EXP_PDU_TAG_P2P_DIRECTION 35 /**< The packet direction (P2P_DIR_SENT, P2P_DIR_RECV). */ -#define EXP_PDU_TAG_COL_INFO_TEXT 36 /**< UTF-8 text string to put in COL_INFO, useful when puting meta data into the packet list. +#define EXP_PDU_TAG_COL_INFO_TEXT 36 /**< UTF-8 text string to put in COL_INFO, useful when putting meta data into the packet list. */ #define EXP_PDU_TAG_USER_DATA_PDU 37 /**< Raw user data PDU which can be dissected as any protocol. */ diff --git a/wsutil/os_version_info.c b/wsutil/os_version_info.c index 69a80c8fb7..7e9daa0568 100644 --- a/wsutil/os_version_info.c +++ b/wsutil/os_version_info.c @@ -565,7 +565,7 @@ DIAG_ON(cast-function-type) * trusted at all? * * As for the Windows Server 2022 entry, - * is that just becuase that script doesn't + * is that just because that script doesn't * bother checking for "workstation" vs. * "server"? */ @@ -760,7 +760,7 @@ DIAG_ON(cast-function-type) * The first line parser reads the first line of the file. * If a string is passed to it, it constructs a distribution * name string by concatenating the parameter, a space, - * and the contents of that line (iwth the newline removed), + * and the contents of that line (with the newline removed), * otherwise it constructs it from the contents of the line. * * Fall back on just "Linux" if nothing works. diff --git a/wsutil/pint.h b/wsutil/pint.h index 97b6da2355..48dc2af6a1 100644 --- a/wsutil/pint.h +++ b/wsutil/pint.h @@ -52,7 +52,7 @@ */ #if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__INTEL_LLVM_COMPILER) && !defined(__clang__) /* Intel and clang-cl both define _MSC_VER when compiling on Windows for - * greater compatiblity (just as they define __GNUC__ on other platforms). + * greater compatibility (just as they define __GNUC__ on other platforms). * However, at least on some versions, while including the MSVC <stdlib.h> * provides access to the _byteswap_ intrinsics, they are not actually * optimized into a single x86 BSWAP function, unlike the gcc-style intrinsics diff --git a/wsutil/to_str.c b/wsutil/to_str.c index 5e61aec7a7..9b4dfe2580 100644 --- a/wsutil/to_str.c +++ b/wsutil/to_str.c @@ -412,7 +412,7 @@ uint_to_str_back_len(char *ptr, uint32_t value, int len) new_ptr = uint_to_str_back(ptr, value); - /* substract from len number of generated characters */ + /* subtract from len number of generated characters */ len -= (int)(ptr - new_ptr); /* pad remaining with '0' */ @@ -432,7 +432,7 @@ uint64_to_str_back_len(char *ptr, uint64_t value, int len) new_ptr = uint64_to_str_back(ptr, value); - /* substract from len number of generated characters */ + /* subtract from len number of generated characters */ len -= (int)(ptr - new_ptr); /* pad remaining with '0' */ diff --git a/wsutil/wmem/wmem_allocator_block.c b/wsutil/wmem/wmem_allocator_block.c index d399f379e5..4723f0f368 100644 --- a/wsutil/wmem/wmem_allocator_block.c +++ b/wsutil/wmem/wmem_allocator_block.c @@ -18,7 +18,7 @@ #include "wmem_allocator.h" #include "wmem_allocator_block.h" -/* This has turned into a very interesting excercise in algorithms and data +/* This has turned into a very interesting exercise in algorithms and data * structures. * * HISTORY |