More spelling fixes.

epan/dissectors/asn1/snmp/packet-snmp-template.c

@@ -2487,7 +2487,7 @@ void proto_register_snmp(void) {
 		{ &ei_snmp_index_suboid_len0, { "snmp.ndex_suboid_len0", PI_MALFORMED, PI_WARN, "an index sub-oid OID cannot be 0 bytes long!", EXPFILL }},
 		{ &ei_snmp_index_suboid_too_long, { "snmp.index_suboid_too_long", PI_MALFORMED, PI_WARN, "index sub-oid should not be longer than remaining oid size", EXPFILL }},
 		{ &ei_snmp_index_string_too_long, { "snmp.index_string_too_long", PI_MALFORMED, PI_WARN, "index string should not be longer than remaining oid size", EXPFILL }},
-		{ &ei_snmp_column_parent_not_row, { "snmp.column_parent_not_row", PI_MALFORMED, PI_ERROR, "COLUMS's parent is not a ROW", EXPFILL }},
+		{ &ei_snmp_column_parent_not_row, { "snmp.column_parent_not_row", PI_MALFORMED, PI_ERROR, "COLUMNS's parent is not a ROW", EXPFILL }},
 		{ &ei_snmp_uint_too_large, { "snmp.uint_too_large", PI_UNDECODED, PI_NOTE, "Unsigned integer value > 2^64 - 1", EXPFILL }},
 		{ &ei_snmp_int_too_large, { "snmp.int_too_large", PI_UNDECODED, PI_NOTE, "Signed integer value > 2^63 - 1 or <= -2^63", EXPFILL }},
 		{ &ei_snmp_integral_value0, { "snmp.integral_value0", PI_UNDECODED, PI_NOTE, "Integral value is zero-length", EXPFILL }},

epan/dissectors/packet-hartip.c

@@ -2099,7 +2099,7 @@ proto_register_hartip(void)
         NULL, HFILL }
     },
     { &hf_hartip_pt_rsp_embedded_cmd_delimiter,
-      { "Embedded Command Delimiter",  "hart_ip.pt.rsp.embedded_command_delimter",
+      { "Embedded Command Delimiter",  "hart_ip.pt.rsp.embedded_command_delimiter",
         FT_UINT8, BASE_HEX, NULL, 0x0,
         NULL, HFILL }
     },

epan/dissectors/packet-lustre.c

@@ -8177,7 +8177,7 @@ proto_register_lustre(void)
         { &hf_lustre_obj_update_params_count,
           { "Ou Param Count", "lustre.obj_update.params_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
         { &hf_lustre_obj_update_result_size,
-          { "Ou Reult Sz", "lustre.obj_update.result_size", FT_UINT32, BASE_DEC_HEX, NULL, 0, NULL, HFILL }},
+          { "Ou Result Sz", "lustre.obj_update.result_size", FT_UINT32, BASE_DEC_HEX, NULL, 0, NULL, HFILL }},
         { &hf_lustre_obj_update_flags,
           { "Ou Flags", "lustre.obj_update.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
         { &hf_lustre_obj_update_padding,

epan/dissectors/packet-mq.c

@@ -4122,7 +4122,7 @@ void proto_register_mq(void)
 
         {&hf_mq_id_cf3_CanMsgPrp, {"Msg Property Cap", "mq.id.ief3.msgpropertycap", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_CF3_MSG_PROP_CAPABLE, "ID ICF3 Message PropertyCapable", HFILL}},
         {&hf_mq_id_cf3_CanMulticast, {"Multicast Cap", "mq.id.ief3.multicastcap", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_CF3_MULTICAST_CAPABLE, "ID ICF3 Mutlicast Capabilities", HFILL}},
-        {&hf_mq_id_cf3_PropIntSep, {"Prop Int Separate", "mq.id.ief3.propintseparate", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_CF3_MSG_PROP_INT_SEPARATE, "ID ICF3 Properety Int Separate", HFILL}},
+        {&hf_mq_id_cf3_PropIntSep, {"Prop Int Separate", "mq.id.ief3.propintseparate", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_CF3_MSG_PROP_INT_SEPARATE, "ID ICF3 Property Int Separate", HFILL}},
         {&hf_mq_id_cf3_MPlxSyGet, {"Multiplex_synchget", "mq.id.ief3.multiplexsynchget", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_CF3_MULTIPLEX_SYNCGET, "ID ICF3 MULTIPLEX_SYNCGET", HFILL}},
         {&hf_mq_id_cf3_ProtAlgorit, {"Prot Algorithms", "mq.id.ief3.protalgorithms", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_CF3_PROT_ALGORITHMS, "ID ICF3 Prot Algorithms", HFILL}},
         {&hf_mq_id_cf3_CanGenConnTag, {"Gen ConnTag Cap", "mq.id.ief3.genconntagcap", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_CF3_GEN_CONNTAG_CAP, "ID ICF3 Generate ConnTag Capable", HFILL}},

epan/dissectors/packet-nfapi.c

@@ -2197,7 +2197,7 @@ static void dissect_prach_root_sequence_index_value(ptvcursor_t * ptvc, packet_i
 
 	if (test_value > 837)
 	{
-		expert_add_info_format(pinfo, item, &ei_invalid_range, "Invalid prach root sequency Index [0..837]");
+		expert_add_info_format(pinfo, item, &ei_invalid_range, "Invalid prach root sequence Index [0..837]");
 	}
 }
 static void dissect_prach_zero_correlation_zone_configuration_value(ptvcursor_t * ptvc, packet_info* pinfo)

epan/dissectors/packet-pfcp.c

@@ -12384,7 +12384,7 @@ proto_register_pfcp(void)
             NULL, HFILL }
         },
         { &hf_pfcp_data_status_flags_b1_buff,
-        { "BUFF (First DL packet is reveived and buffered by UP function)", "pfcp.data_status.flags.buff",
+        { "BUFF (First DL packet is received and buffered by UP function)", "pfcp.data_status.flags.buff",
             FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x02,
             NULL, HFILL }
         },

epan/dissectors/packet-snmp.c

@@ -4016,7 +4016,7 @@ void proto_register_snmp(void) {
 		{ &ei_snmp_index_suboid_len0, { "snmp.ndex_suboid_len0", PI_MALFORMED, PI_WARN, "an index sub-oid OID cannot be 0 bytes long!", EXPFILL }},
 		{ &ei_snmp_index_suboid_too_long, { "snmp.index_suboid_too_long", PI_MALFORMED, PI_WARN, "index sub-oid should not be longer than remaining oid size", EXPFILL }},
 		{ &ei_snmp_index_string_too_long, { "snmp.index_string_too_long", PI_MALFORMED, PI_WARN, "index string should not be longer than remaining oid size", EXPFILL }},
-		{ &ei_snmp_column_parent_not_row, { "snmp.column_parent_not_row", PI_MALFORMED, PI_ERROR, "COLUMS's parent is not a ROW", EXPFILL }},
+		{ &ei_snmp_column_parent_not_row, { "snmp.column_parent_not_row", PI_MALFORMED, PI_ERROR, "COLUMNS's parent is not a ROW", EXPFILL }},
 		{ &ei_snmp_uint_too_large, { "snmp.uint_too_large", PI_UNDECODED, PI_NOTE, "Unsigned integer value > 2^64 - 1", EXPFILL }},
 		{ &ei_snmp_int_too_large, { "snmp.int_too_large", PI_UNDECODED, PI_NOTE, "Signed integer value > 2^63 - 1 or <= -2^63", EXPFILL }},
 		{ &ei_snmp_integral_value0, { "snmp.integral_value0", PI_UNDECODED, PI_NOTE, "Integral value is zero-length", EXPFILL }},

epan/dissectors/packet-stanag4607.c

@@ -264,7 +264,7 @@ static const value_string stanag4607_target_vals[] = {
 	{   3, "Rotary Wing Aircraft, Live Target" },
 	{   4, "Fixed Wing Aircraft, Live Target" },
 	{   5, "Stationary Rotator, Live Target" },
-	{   6, "Maritme, Live Target" },
+	{   6, "Maritime, Live Target" },
 	{   7, "Beacon, Live Target" },
 	{   8, "Amphibious, Live Target" },
 	{   9, "Person, Live Target" },

epan/dissectors/packet-tpncp.c

@@ -611,7 +611,7 @@ init_tpncp_data_fields_info(tpncp_data_field_info *data_fields_info, FILE *file)
             &hf_tpncp_length_ext,
             {
                 "Length Extension",
-                "tpncp.lengthextention",
+                "tpncp.lengthextension",
                 FT_UINT8,
                 BASE_DEC,
                 NULL,

epan/dissectors/packet-wassp.c

@@ -1256,7 +1256,7 @@ static const value_string wassp_tlv_types[] =
 	{ EID_MU_ASSOC_TIME, "MU Associated Time"},
 	{ EID_MU_ACTIVE_TIME, "MU Active Time"},
 	{ EID_REPORT_REQ, "Report Request"},
-	{ EID_MU_URL, "MU Capive Portal Url"},
+	{ EID_MU_URL, "MU Captive Portal Url"},
 	{ EID_MU_SESSION_LIFETIME, "MU Session Life Time"},
 	{ EID_MU_REAUTH_TIMER, "MU Re-Authentication Timer"},
 	{ EID_MU_ACCT_SESSION_ID_STRING, "MU Acct Session ID String"},
@@ -1495,7 +1495,7 @@ const TLV_PARSER_ENTRY tlvMainTable[]  =
 	{ EID_SIAPP_PACKET_RETRIES, "SIAPP Packet Retries", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_SIAPP_ASSOC_IN_WLAN, "SIAPP MU Association With In Same WLAN", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_SIAPP_ASSOC_IN_CLUSTER, "SIAPP MU Association With In Same Cluster", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ EID_SIAPP_REASSOC_IN_CLUSTER, "SIAPP MU Ressociation With In Same Cluster", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ EID_SIAPP_REASSOC_IN_CLUSTER, "SIAPP MU Reassociation With In Same Cluster", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_SIAPP_THIN_BLOCK, "SIAPP Thin Access Points Block", TLV_TYPE_BLOCK_TLV, TAB_SIAPP_THIN_BLOCK, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_SIAPP_NEWAP_BSSID, "SIAPP New Access Points BSSID", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_SIAPP_OLDAP_BSSID, "SIAPP Old Access Points BSSID", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -2118,7 +2118,7 @@ const TLV_PARSER_ENTRY tlvGlobalConfigTable[]  =
 	{ EID_IOT_BLE_SCAN_WINDOW, "IOT BLE Scan Window In Milliseconds", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_IOT_BLE_SCAN_MIN_RSSI, "IOT BLE Scan Min RSSI", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_LISENSE_SERVER, "License Server", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ EID_LISENSE_MIN_RSSI, "Lisense Min RSSI", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0},
+	{ EID_LISENSE_MIN_RSSI, "License Min RSSI", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_LISENSE_REP_FREQ, "License Report Frequency", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_DPI_SIG_HASH, "Deep Packet Inspection Signature Hash", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_ANT_MODELS_IOT, "Antanna Type for IOT Radio", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -3665,7 +3665,7 @@ const TLV_PARSER_ENTRY tlvHS2_blockTable[]  =
 	{ EID_HS2_WIDTH, "HS2 Width", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_HS2_DOWLINK_LOAD, "HS2 Downlink Load", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ EID_HS2_DOWLINK_SPEED, "HS2 Downlink Speed", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0},
-	{ EID_HS2_HIGHT, "HS2 Hight", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}
+	{ EID_HS2_HIGHT, "HS2 Height", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}
 
 
 };
@@ -6596,7 +6596,7 @@ void proto_register_wassp(void)
 			&hf_wassp_tlv_value_string,
 			{
 				"Value", "wassp.tlv.valuestr", FT_STRING, BASE_NONE, NULL,
-				0x00, "Wassp TLV Value in string formst", HFILL
+				0x00, "Wassp TLV Value in string format", HFILL
 			}
 		},
 		{

tools/check_spelling.py

@@ -203,13 +203,18 @@ def removeWhitespaceControl(code_string):
     code_string = code_string.replace('\\t', ' ')
     return code_string
 
+# Remove any contractions from the given string.
 def removeContractions(code_string):
-    contractions = [ "Wireshark’s", "don’t", "let’s", "isn’t", "won’t", "User’s", "user’s", "hasn’t", "you’re", "o’clock", "you’ll",
-                     "you’d", "Developer’s", "doesn’t", "what’s", "Don’t", "Let’s", "haven’t", "can’t", "you’ve",
-                     "shouldn’t", "didn’t", "wouldn’t", "aren’t", "there’s", "packet’s", "couldn’t" ]
+    contractions = [ "wireshark’s", "don’t", "let’s", "isn’t", "won’t", "user’s", "hasn’t", "you’re", "o’clock", "you’ll",
+                     "you’d", "developer’s", "doesn’t", "what’s", "let’s", "haven’t", "can’t", "you’ve",
+                     "shouldn’t", "didn’t", "wouldn’t", "aren’t", "there’s", "packet’s", "couldn’t", "world’s",
+                     "needn’t", "graph’s", "table’s", "parent’s", "entity’s", "server’s", "node’s",
+                     "querier’s", "sender’s", "receiver’s"]
     for c in contractions:
         code_string = code_string.replace(c, "")
+        code_string = code_string.replace(c.capitalize(), "")
         code_string = code_string.replace(c.replace('’', "'"), "")
+        code_string = code_string.replace(c.capitalize().replace('’', "'"), "")
     return code_string
 
 def removeComments(code_string):
@@ -281,7 +286,8 @@ def isGeneratedFile(filename):
             line.find('is autogenerated') != -1 or
             line.find('automatically generated by Pidl') != -1 or
             line.find('Created by: The Qt Meta Object Compiler') != -1 or
-            line.find('This file was generated') != -1):
+            line.find('This file was generated') != -1 or
+            line.find('This filter was automatically generated') != -1):
 
             f_read.close()
             return True

tools/wireshark_words.txt

@@ -16,6 +16,7 @@ acp133
 activations
 actuator
 additionsr
+administrable
 adwin
 aes128
 aes256
@@ -38,7 +39,10 @@ annexc
 anonsvn
 appdata
 appid
+arbitrated
+arduino
 arfcn
+asciidoc
 asn1cnf
 asn2wrs
 assymetric
@@ -54,6 +58,7 @@ authenticator
 authenticators
 authn
 authntransitioning
+authorizer
 authtoken
 authtype
 autoconfiguration
@@ -111,6 +116,7 @@ canonicalize
 canonicalized
 capinfos
 capsa
+captioning
 capwap
 carrierfreq
 carrierid
@@ -123,8 +129,10 @@ celcius
 cellid
 cellidentity
 centiseconds
+centrino
 chan1
 chan2
+changelog
 channelisation
 channelized
 charset
@@ -159,6 +167,7 @@ colorizing
 combiner
 combiners
 communication
+computable
 concatenate
 concatenated
 concatenates
@@ -221,6 +230,7 @@ defragmented
 defragmenting
 dehumidification
 deinterleaved
+delimited
 delimiters
 demodulator
 demultiplexer
@@ -228,6 +238,9 @@ demultiplexers
 deobfuscated
 deprecated
 dequeued
+dereference
+dereferenced
+dereferencing
 dereg
 deregister
 deregistered
@@ -342,6 +355,7 @@ gboolean
 gchar
 gcrypt
 gendc
+gentoo
 geoip
 geonw
 geran
@@ -407,6 +421,7 @@ infos
 initialise
 initialising
 initialization
+initializations
 initialize
 initialized
 initializer
@@ -438,6 +453,8 @@ jetds
 kademlia
 keepalive
 kerberos
+keydes
+keygen
 keylen
 keylog
 keypress
@@ -453,6 +470,7 @@ libgcrypt
 libpcap
 linkaddr
 linkinfo
+linksys
 linux
 list1
 lithionics
@@ -472,8 +490,10 @@ mailto
 malloc
 manuf
 mappable
+maybefcs
 mcast
 measurements
+megabit
 megaco
 mellanox
 memcache
@@ -547,6 +567,7 @@ nettl
 newpw
 nexthop
 nfs4err
+nghttp
 ngsniffer
 niagra
 noauth
@@ -562,6 +583,7 @@ notused
 npcap
 nprach
 nsapi
+nssai
 nstime
 nstrace
 ntlmssp
@@ -583,8 +605,10 @@ onoff
 ontime
 opcode
 opcodes
+openssl
 openstreetmap
 openvpn
+oplock
 opnum
 optimizations
 optimizer
@@ -593,6 +617,7 @@ outhdr
 packetcable
 packetization
 packetized
+parallelization
 param
 parameterization
 parameterized
@@ -669,6 +694,7 @@ randpkt
 reachability
 readme
 realloc
+realtek
 realtime
 reassembles
 reassigning
@@ -689,6 +715,7 @@ recalculate
 recalculating
 recalibrate
 recognizer
+recompiling
 recomputed
 reconf
 reconfig
@@ -769,6 +796,7 @@ roamer
 routable
 rpcap
 rtpmidi
+rtpmux
 sanitize
 satisfiable
 scaler
@@ -815,6 +843,7 @@ spare7
 spare8
 spare9
 spcell
+spectrograph
 speex
 spnego
 spoofing
@@ -867,6 +896,7 @@ subtrees
 switchinfo
 synchronizing
 synphasor
+syntaxes
 sysdig
 sysex
 sysframe
@@ -891,9 +921,11 @@ toggling
 toolongfragment
 tooltip
 touchlink
+touchpad
 traceroute
 transcoder
 transitioning
+traveler
 truncatable
 truncate
 truncates
@@ -956,8 +988,10 @@ unignore
 unimplemented
 uninitialized
 uninstall
+uninstallation
 uninstalled
 uninstaller
+uninterruptable
 unjoin
 unjoined
 unjoining
@@ -966,8 +1000,10 @@ unlink
 unlinked
 unmappable
 unmarshal
+unmerged
 unoptimized
 unparsable
+unparseable
 unparsed
 unprocessable
 unpunctuated