diff --git a/doc/README.developer b/doc/README.developer index 34e10eeb5b..5e12e2ce39 100644 --- a/doc/README.developer +++ b/doc/README.developer @@ -755,7 +755,7 @@ to avoid warnings at all. The compiler flags in the Makefiles are set to "treat warnings as errors", so your code won't even compile when warnings occur. -7. General observatons about architecture +7. General observations about architecture One day we might conceivably wish to load dissectors on demand and do other more sophisticated kinds of unit test. Plus other scenarios not immediately diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c index fcea800d57..1496efaa41 100644 --- a/epan/dissectors/packet-dlm3.c +++ b/epan/dissectors/packet-dlm3.c @@ -1407,7 +1407,7 @@ proto_register_dlm3(void) FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, { &hf_dlm3_m_flags_user, - { "User space lock realted", "dlm3.m.flags.user", + { "User space lock related", "dlm3.m.flags.user", FT_BOOLEAN, 32, NULL, DLM3_IFL_USER, NULL, HFILL}}, { &hf_dlm3_m_flags_orphan, diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 84dd6b5cc0..b45e7b212f 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -236,9 +236,9 @@ static int hf_gtp_sndcp_number = -1; static int hf_gtp_tear_ind = -1; static int hf_gtp_teid = -1; static int hf_gtp_teid_cp = -1; -static int hf_gtp_ulink_teid_cp = -1; +static int hf_gtp_uplink_teid_cp = -1; static int hf_gtp_teid_data = -1; -static int hf_gtp_ulink_teid_data = -1; +static int hf_gtp_uplink_teid_data = -1; static int hf_gtp_teid_ii = -1; static int hf_gtp_tid = -1; static int hf_gtp_tlli = -1; @@ -5841,8 +5841,8 @@ decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_ offset = offset + 8; break; case 1: - proto_tree_add_item(ext_tree_pdp, hf_gtp_ulink_teid_cp, tvb, offset + 6, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(ext_tree_pdp, hf_gtp_ulink_teid_data, tvb, offset + 10, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ext_tree_pdp, hf_gtp_uplink_teid_cp, tvb, offset + 6, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ext_tree_pdp, hf_gtp_uplink_teid_data, tvb, offset + 10, 4, ENC_BIG_ENDIAN); proto_tree_add_item(ext_tree_pdp, hf_gtp_pdp_context_identifier, tvb, offset + 14, 1, ENC_BIG_ENDIAN); offset = offset + 15; break; @@ -10788,8 +10788,8 @@ proto_register_gtp(void) FT_UINT32, BASE_HEX_DEC, NULL, 0, "Tunnel Endpoint Identifier Control Plane", HFILL} }, - {&hf_gtp_ulink_teid_cp, - { "Uplink TEID Control Plane", "gtp.ulink_teid_cp", + {&hf_gtp_uplink_teid_cp, + { "Uplink TEID Control Plane", "gtp.uplink_teid_cp", FT_UINT32, BASE_HEX_DEC, NULL, 0, "Uplink Tunnel Endpoint Identifier Control Plane", HFILL} }, @@ -10798,8 +10798,8 @@ proto_register_gtp(void) FT_UINT32, BASE_HEX_DEC, NULL, 0, "Tunnel Endpoint Identifier Data I", HFILL} }, - {&hf_gtp_ulink_teid_data, - { "Uplink TEID Data I", "gtp.ulink_teid_data", + {&hf_gtp_uplink_teid_data, + { "Uplink TEID Data I", "gtp.uplink_teid_data", FT_UINT32, BASE_HEX_DEC, NULL, 0, "UplinkTunnel Endpoint Identifier Data I", HFILL} }, diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 099d7c0bb4..f47f12b923 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -9586,7 +9586,7 @@ void proto_register_gtpv2(void) "SGSN", HFILL} }, { &hf_gtpv2_tra_info_ggsn_pdp, - {"PDP Cpntext", "gtpv2.tra_info_ggsn_pdp", + {"PDP Context", "gtpv2.tra_info_ggsn_pdp", FT_UINT8, BASE_DEC, NULL, 0x01, "GGSN", HFILL} }, diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 488fbea59e..fa870fe7ce 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -45738,7 +45738,7 @@ proto_register_ieee80211(void) "", HFILL }}, {&hf_ieee80211_tag_neighbor_report_bssid_info_high_throughput, - {"High Throughput Control (+HTC)", "wlan.nreport.bssid.info.hthoughput", + {"High Throughput Control (+HTC)", "wlan.nreport.bssid.info.hthroughput", FT_BOOLEAN, 32, NULL, 0x00000800, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 4125065be1..6d046198c8 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -4426,7 +4426,7 @@ proto_register_ospf(void) { "Security Association Identifier (SA ID)", "ospf.at.sa_id", FT_UINT16, BASE_HEX, NULL, 0x0, "That maps to the authentication algorithm and the secret key used to create the message digest", HFILL }}, {&hf_ospf_at_crypto_seq_nbr, - { "Cryptographic Sequence Number", "ospf.at.cryto_seq_nbr", FT_UINT64, + { "Cryptographic Sequence Number", "ospf.at.crypto_seq_nbr", FT_UINT64, BASE_DEC, NULL, 0x0, "Increasing sequence number that is used to guard against replay attacks", HFILL }}, {&hf_ospf_at_auth_data, { "Authentication Data", "ospf.at.auth_data", FT_BYTES, diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index 33f5bac632..c07424c23f 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -976,7 +976,7 @@ static const value_string vals_broadcast_content_type_type[] = { {0x0011, "[News Service] General News (Local)"}, {0x0012, "[News Service] General News (Regional)"}, {0x0013, "[News Service] General News (National)"}, - {0x0014, "[News Service] General News (Internationa)"}, + {0x0014, "[News Service] General News (International)"}, {0x0015, "[News Service] Business/Financial News (Local)"}, {0x0016, "[News Service] Business/Financial News (Regional)"}, {0x0017, "[News Service] Business/Financial News (National)"}, diff --git a/plugins/epan/ethercat/packet-ethercat-datagram.c b/plugins/epan/ethercat/packet-ethercat-datagram.c index b708f71f7e..09ae5faa0b 100644 --- a/plugins/epan/ethercat/packet-ethercat-datagram.c +++ b/plugins/epan/ethercat/packet-ethercat-datagram.c @@ -1709,7 +1709,7 @@ void proto_register_ecat(void) }, #if 0 { &hf_ecat_header, - { "eader", "ecat.header", + { "header", "ecat.header", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, #endif diff --git a/plugins/epan/opcua/README b/plugins/epan/opcua/README index beefb801fe..8c4993be10 100644 --- a/plugins/epan/opcua/README +++ b/plugins/epan/opcua/README @@ -30,7 +30,7 @@ Binary (TCP): The fastest and most flexible version (small footprint, no XML and can easily be tunneled (SSH, IPSEC, etc.), redirected, ... SOAP version: Easy to implement with verious tools like .Net, JAVA, gSOAP, etc. Better to communicate through firewalls via HTTP. -SOAP with Binary Attchment: Combines the advantages of both. +SOAP with Binary Attachment: Combines the advantages of both. The messages are encoded as Binary, and transported via SOAP as binary attachment. diff --git a/plugins/epan/unistim/packet-unistim.c b/plugins/epan/unistim/packet-unistim.c index 221cc1bfb9..493f2a481a 100644 --- a/plugins/epan/unistim/packet-unistim.c +++ b/plugins/epan/unistim/packet-unistim.c @@ -3017,7 +3017,7 @@ proto_register_unistim(void){ 8,NULL,DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG,NULL,HFILL} }, { &hf_display_write_address_softkey_id, - {"Soft Key ID","unistim.write.addres.softkey.id",FT_UINT8, + {"Soft Key ID","unistim.write.address.softkey.id",FT_UINT8, BASE_HEX,NULL,DISPLAY_WRITE_ADDRESS_SOFT_KEY_ID,NULL,HFILL} }, { &hf_display_write_address_char_pos, diff --git a/tools/check_spelling.py b/tools/check_spelling.py index 16442d0a5d..b164967bac 100755 --- a/tools/check_spelling.py +++ b/tools/check_spelling.py @@ -392,7 +392,7 @@ elif args.commits: files = [f.decode('utf-8') for f in subprocess.check_output(command).splitlines()] # Filter files - files = list(filter(lambda f : isAppropriateFile(f) and not isGeneratedFile(f), files)) + files = list(filter(lambda f : os.path.exists(f) and isAppropriateFile(f) and not isGeneratedFile(f), files)) elif args.open: # Unstaged changes. command = ['git', 'diff', '--name-only'] diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt index 84ebd96895..f9810e7513 100644 --- a/tools/wireshark_words.txt +++ b/tools/wireshark_words.txt @@ -22,10 +22,13 @@ acknowledgement acp133 activations actuator +acyclic +addba additionsr adjacency adlink administrable +adspec adwin aes128 aes256 @@ -64,6 +67,7 @@ asciidoc asn1 asn1cnf asn2wrs +assignor assoc assymetric async @@ -79,6 +83,7 @@ authen authenticates authenticator authenticators +authgss authn authntransitioning authorizer @@ -91,6 +96,7 @@ autosar available avaya avrcp +bacapp backend backhaul backoff @@ -153,6 +159,7 @@ canonicalize canonicalized capacitive capinfos +caplen capsa captioning capwap @@ -204,6 +211,7 @@ codeset codingrate codute collectd +collimation colocated coloring colorise @@ -215,6 +223,7 @@ colormap combiner combiners communication +compat compilers computable concatenate @@ -231,14 +240,17 @@ const contactless contiguously Coord3D +copycss copyfile corba +corrigendum couchbase coverity cpdlc cpich cppcheck cpuregisters +cqich credential credentials criticalextensions @@ -276,6 +288,7 @@ debian debug decapsulation decca +decentralization dechunk decompressing decompressor @@ -374,6 +387,7 @@ ebcdic ecdhe ecdsa editcap +eeprom egprs egroup eigrp @@ -402,6 +416,7 @@ enumerations enumerator epasv epdcch +epsem equinf ericsson erldp @@ -456,6 +471,7 @@ frametype frontend fsctl ftype +ftypes functionalities funkt fvalue @@ -470,8 +486,10 @@ geoip geonw geran getattr +getentrybyname getnext getter +gidaddr gigabit gigamon gigpod @@ -573,9 +591,11 @@ ipaddress ipfix ipprim ipsec +ipseckey iptables iptrace ipv4addr +irqmask isakmp iscsi iseries @@ -614,6 +634,7 @@ libgcrypt libpcap linearity linkaddr +linkcss linker linkinfo linksys @@ -645,6 +666,7 @@ mathieson maxlen maybefcs mbits +mbsfn mcast mcptt mcsset @@ -680,6 +702,7 @@ modespecificinfo modulo motorola mpeg4 +mplstp mpsse mptcp mrcpv @@ -736,9 +759,11 @@ newpw nexthop nfs4err nghttp +ngran ngsniffer niagra noauth +nodeid nofcs nokia nominals @@ -755,11 +780,13 @@ novell nowait npcap nprach +nrppa nsapi nssai nstime nstrace ntlmssp +nullptr nvmeof obfuscated objectid @@ -822,7 +849,10 @@ pdustatus peeraddr peerkey periodicities +peristency +persistency phaser +phasor phich phonebook physcellid @@ -832,6 +862,7 @@ pixmap plaintext plixer plugin +pluginize plugins pname polestar @@ -964,6 +995,7 @@ reinitialization reinitialize reinitialized reinitializing +reinvoke rekey rekeying relocatable @@ -983,6 +1015,7 @@ reroute rerouted rerouting resampled +resampler rescan resegment resend @@ -1018,6 +1051,7 @@ revertive revocations rfcomm rgoose +ripemd rlcmac rmcap rnsap @@ -1027,6 +1061,7 @@ rpcap rtpmidi rtpmux rxreq +sacch sanicap sanitize satisfiable @@ -1039,9 +1074,11 @@ scrollbar sdusize sectorization sectorized +segmenting segno semiautomatic sendto +separability separators seqno seqnum @@ -1055,6 +1092,7 @@ setcap setuid severities sflow +sftpserver sgdsn sgsap sha256 @@ -1066,6 +1104,7 @@ sidelink signaling signon simulcast +skippable skype slsch smpte @@ -1146,6 +1185,7 @@ suboptions subparam subpdu subpm +subprocesstest subquery subrects subselect @@ -1171,6 +1211,7 @@ tclas tcpdump tcpflags tcpip +tcptrace tcpudp tdd128 tdd384 @@ -1207,10 +1248,12 @@ toshiba touchlink touchpad traceroute +transceive transcoder transifex transitioning transitivity +transversal traveler traversal truncatable @@ -1241,7 +1284,9 @@ uint32 uint8 ulmap ulsch +unack unacked +unadmitted unadvise unaligned unallocated @@ -1256,6 +1301,7 @@ uncalibrated uncategorized unchannelized unciphered +uncompensated uncompress uncompressed uncompressing @@ -1301,6 +1347,7 @@ unjoining unknown1 unlink unlinked +unmanaged unmap unmappable unmark @@ -1404,9 +1451,11 @@ workarounds writable wsbuild wscale +wscbor wslua wsluarm x509sat +xattr xchannel xmlns xsltproc