diff --git a/README.DECT b/README.DECT index ef67642754..09fd85ff9a 100644 --- a/README.DECT +++ b/README.DECT @@ -20,7 +20,7 @@ To nicely view DECT pcap files in wireshark, set up a custom layout: Edit->Preferences... User Interface - Colums + Columns No. | Number Protocol | Protocol diff --git a/doc/README.dissector b/doc/README.dissector index f69b0f3453..73c7d7af05 100644 --- a/doc/README.dissector +++ b/doc/README.dissector @@ -2503,7 +2503,7 @@ doesn't specify the addresses and ports of both sides. 2.2.1.3 The conversation_new_full function. -This routine will create a new conversation based upon an arbritrary +This routine will create a new conversation based upon an arbitrary lists of elements. Elements can be addresses, strings, unsigned integers, or unsigned 64-bit integers. Unlike conversation_new, element lists are matched strictly; wildcards aren't (yet) supported. diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c index d9cb519d02..45ca5fa311 100644 --- a/epan/dissectors/packet-gsm_rlcmac.c +++ b/epan/dissectors/packet-gsm_rlcmac.c @@ -12337,7 +12337,7 @@ proto_register_gsm_rlcmac(void) } }, { &hf_egprs_timeslotlinkquality_measurements_type2_exist, - { "Exist_EGPRS_TimeslotLinkQualityMeasurements_type2", "gsm_rlcmac.ul.prr_exist_egprs_temeslotquality_meas_type2", + { "Exist_EGPRS_TimeslotLinkQualityMeasurements_type2", "gsm_rlcmac.ul.prr_exist_egprs_timeslotquality_meas_type2", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } diff --git a/plugins/epan/falco_bridge/README.md b/plugins/epan/falco_bridge/README.md index 4fb30fe177..68e350baae 100644 --- a/plugins/epan/falco_bridge/README.md +++ b/plugins/epan/falco_bridge/README.md @@ -36,7 +36,7 @@ They depend on the following libraries: - zlib: zlib Wireshark is released under the GPL version 2 (GPL-2.0-or-later). It and the Apache-2.0 license are compatible via the "any later version" provision in the GPL version 2. -As discussed at https://www.wireshark.org/lists/wireshark-dev/202203/msg00020.html, combining Wireshark and libsinsp+libscap should be OK, but that in effect invokes the GPLv2's "any later version" provision, making the Wireshark portion of the cominbined work GPLv3+. +As discussed at https://www.wireshark.org/lists/wireshark-dev/202203/msg00020.html, combining Wireshark and libsinsp+libscap should be OK, but that in effect invokes the GPLv2's "any later version" provision, making the Wireshark portion of the combined work GPLv3+. Debian would appear to concur: https://lists.debian.org/debian-legal/2014/08/msg00102.html. diff --git a/plugins/epan/profinet/packet-pn.c b/plugins/epan/profinet/packet-pn.c index 86582dbb91..57bea65842 100644 --- a/plugins/epan/profinet/packet-pn.c +++ b/plugins/epan/profinet/packet-pn.c @@ -640,7 +640,7 @@ static const value_string pn_io_error_code2_pnio_253[] = { { 38, "IOCARSR, RDHT expired" }, { 39, "IOCARSR, Pdev, parameterization impossible" }, { 40, "Remote application ready timeout expired" }, - { 41, "IOCARSR, Redundant interface list or access to the peripherals impossibe" }, + { 41, "IOCARSR, Redundant interface list or access to the peripherals impossible" }, { 42, "IOCARSR, MTOT expired" }, { 43, "IOCARSR, AR protocol violation" }, { 44, "PDEV, plug port without CombinedObjectContainer" }, diff --git a/tools/check_spelling.py b/tools/check_spelling.py index 2a2dda0977..acc77a9b04 100755 --- a/tools/check_spelling.py +++ b/tools/check_spelling.py @@ -340,7 +340,9 @@ def isGeneratedFile(filename): def isAppropriateFile(filename): file, extension = os.path.splitext(filename) - return extension in { '.adoc', '.c', '.cpp', '.pod', '.nsi'} or file.endswith('README') + if filename.find('CMake') != -1: + return False + return extension in { '.adoc', '.c', '.cpp', '.pod', '.nsi', '.txt'} or file.endswith('README') def findFilesInFolder(folder, recursive=True): diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt index dd26452aea..3c9b71c7c6 100644 --- a/tools/wireshark_words.txt +++ b/tools/wireshark_words.txt @@ -578,6 +578,7 @@ hfarr hfill, HI2Operations hnbap +homedir homeplug hopcount hostname @@ -655,6 +656,7 @@ iotecha ipaccess ipaddr ipaddress +ipconfig ipfix ipprim ipsec @@ -694,6 +696,7 @@ keylog keymap keypress keyring +keyset keytab knxip l2cap @@ -735,6 +738,7 @@ luminaire luminance macaddr macaddress +macosx macsec mailto malloc @@ -919,6 +923,7 @@ onoff ontime opcode opcodes +opcua openssh openssl openstreetmap @@ -1018,6 +1023,7 @@ privkey procid profidrive profinet +promisc promiscsniff promiscuously propertykey @@ -1190,8 +1196,10 @@ rnsap roamer routable rpcap +rpmbuild rsocket rsrvd +rtitcp rtpmidi rtpmux ruleset @@ -1203,6 +1211,7 @@ sanicap sanitize satisfiable scalability +scaleout scaler scannable scdma @@ -1225,6 +1234,7 @@ sequenceno sercos serialize serialized +servlet sessionid sessionkey setattr @@ -1420,6 +1430,7 @@ tunneled tunneling tuple tuples +tvbparse tvbuff twamp twopc