diff options
50 files changed, 211 insertions, 211 deletions
diff --git a/epan/dissectors/ncp2222.py b/epan/dissectors/ncp2222.py index 48db633d2b..c0db257ca5 100755 --- a/epan/dissectors/ncp2222.py +++ b/epan/dissectors/ncp2222.py @@ -5322,7 +5322,7 @@ def define_errors(): errors[0x0107] = "Invalid Number of Minutes to Delay" errors[0x0108] = "Invalid Start or Network Number" errors[0x0109] = "Cannot Obtain License" - errors[0x010a] = "No Purgable Files Available" + errors[0x010a] = "No Purgeable Files Available" errors[0x0200] = "One or more clients in the send list are not logged in" errors[0x0201] = "Queue server cannot attach" @@ -5426,7 +5426,7 @@ def define_errors(): errors[0x9f00] = "The request attempted to delete a directory that is in use by another client" errors[0xa000] = "The request attempted to delete a directory that is not empty" - errors[0xa100] = "An unrecoverable error occured on the affected directory" + errors[0xa100] = "An unrecoverable error occurred on the affected directory" errors[0xa200] = "The request attempted to read from a file region that is physically locked" errors[0xa201] = "I/O Lock Error" diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 4c3c5d686c..64698175c7 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -1450,7 +1450,7 @@ chunked_encoding_dissector(tvbuff_t **tvb_ptr, packet_info *pinfo, } else { /* * We didn't create a new tvb, so don't allow sub dissectors - * try to decode the non-existant entity body. + * try to decode the non-existent entity body. */ chunks_decoded = -1; } diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 0fef34ed74..06f3d89454 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -4764,7 +4764,7 @@ proto_register_kerberos(void) VALS(krb5_transited_types), 0, "Transited Type", HFILL }}, { &hf_krb_transitedcontents, { "Contents", "kerberos.transited.contents", FT_BYTES, BASE_HEX, - NULL, 0, "Transitent Contents string", HFILL }}, + NULL, 0, "Transited Contents string", HFILL }}, { &hf_krb_keytype, { "Key type", "kerberos.keytype", FT_UINT32, BASE_DEC, VALS(krb5_encryption_types), 0, "Key Type", HFILL }}, diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 6fd96bc576..6cf64bd5e4 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -720,7 +720,7 @@ static const value_string tlv_status_data[] = { {20, "KeepAlive Timer Expired"}, {21, "Label Request Aborted"}, {22, "Missing Message Parameters"}, - {23, "Unsoported Address Family"}, + {23, "Unsupported Address Family"}, {24, "Session Rejected / Bad KeepAlive Time"}, {25, "Internal Error"}, {26, "No LDP Session"}, diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index 21c86214e0..c46b1f41bb 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -2850,7 +2850,7 @@ static const value_string MEGACO_error_code_vals[] = { {518, "Event buffer full"}, {519, "Out of space to store digit map"}, {520, "Digit Map undefined in the MG"}, - {521, "Termination is ServiceChangeing"}, + {521, "Termination is ServiceChanging"}, {526, "Insufficient bandwidth"}, {529, "Internal hardware failure in MG"}, {530, "Temporary Network failure"}, diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index 367c99e439..e9ed26d90a 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -812,7 +812,7 @@ void proto_register_mip(void) { &hf_mip_rext_i, { "'I' bit Support", "mip.ext.rev.i", FT_BOOLEAN, 16, NULL, 32768, - "Agent surevidpports Inform bit in Revocation", HFILL } + "Agent supports Inform bit in Revocation", HFILL } }, { &hf_mip_rext_reserved, { "Reserved", "mip.ext.rev.reserved", diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index 7ec499fb0b..dfc66f527f 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -138,7 +138,7 @@ static const value_string nmas_errors_enum[] = { { 0xFFFFF993, "(-1645) TIMED OUT NOT RECOVERABLE" }, { 0xFFFFF992, "(-1646) TIMED OUT UNKNOWN" }, { 0xFFFFF991, "(-1647) AUTHORIZATION FAILURE" }, - { 0xFFFFF990, "(-1648) INVALID DISTINGUSHED NAME" }, + { 0xFFFFF990, "(-1648) INVALID DISTINGUISHED NAME" }, { 0xFFFFF98F, "(-1649) CANNOT RESOLVE DISTINGUISHED NAME" }, { 0xFFFFF98E, "(-1650) CANNOT RESOLVE CONNECTION" }, { 0xFFFFF98D, "(-1651) NO CRYPTOGRAPHY" }, diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index 4277e625ea..5a7d153a2d 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.c @@ -141,7 +141,7 @@ static const value_string sss_msgverb_enum[] _U_ = { static const value_string sss_attribute_enum[] _U_ = { { 1, "User Name" }, { 2, "Tree Name" }, - { 4, "Clearence" }, + { 4, "Clearance" }, { 11, "Login Sequence" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 02773f0570..6acabfc7b0 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -1643,9 +1643,9 @@ static const value_string ndps_error_types[] = { { 0xffffff0c, "(-244) No Object Delete Rights" }, { 0xffffff0b, "(-245) No Object Create Rights" }, { 0xffffff0a, "(-246) No Property Delete Rights" }, - { 0xffffff09, "(-247) No Property Create Rigths" }, + { 0xffffff09, "(-247) No Property Create Rights" }, { 0xffffff08, "(-248) No Property Write Rights" }, - { 0xffffff07, "(-249) No Propery Read Rights" }, + { 0xffffff07, "(-249) No Property Read Rights" }, { 0xffffff06, "(-250) Temp Remap" }, { 0xffffff05, "(-251) Unknown Request/No Such Property" }, { 0xffffff04, "(-252) Message Queue Full/Target Already Has Message/No Such Object" }, @@ -1787,7 +1787,7 @@ static const value_string ndps_error_types[] = { { 0xfffffd5f, "(-673) Replica Not On" }, { 0xfffffd5e, "(-674) Invalid Name Service" }, { 0xfffffd5d, "(-675) Invalid Task" }, - { 0xfffffd5c, "(-676) Invalide Connection Handle" }, + { 0xfffffd5c, "(-676) Invalid Connection Handle" }, { 0xfffffd5b, "(-677) Invalid Identity" }, { 0xfffffd5a, "(-678) Duplicate ACL" }, { 0xfffffd59, "(-679) Partition Already Exists" }, @@ -1824,7 +1824,7 @@ static const value_string ndps_error_types[] = { { 0xfffffd3a, "(-710) Database Read Fail" }, { 0xfffffd39, "(-711) Invalid Code Page" }, { 0xfffffd38, "(-712) Invalid Escape Character" }, - { 0xfffffd37, "(-713) Invalide Delimiters" }, + { 0xfffffd37, "(-713) Invalid Delimiters" }, { 0xfffffd36, "(-714) Not Implemented" }, { 0xfffffd35, "(-715) Checksum Failure" }, { 0xfffffd34, "(-716) Checksumming Not Supported" }, @@ -1833,7 +1833,7 @@ static const value_string ndps_error_types[] = { { 0xfffffd31, "(-719) Invalid Value Handle" }, { 0xfffffd30, "(-720) Connection Denied" }, { 0xfffffd2f, "(-721) No Such Federation Link" }, - { 0xfffffd2e, "(-722) Operetational Schema Mismatch" }, + { 0xfffffd2e, "(-722) Operational Schema Mismatch" }, { 0xfffffd2d, "(-723) Stream Not Found" }, { 0xfffffd2c, "(-724) DClient Unavailable" }, { 0xfffffd2b, "(-725) MASV No Access" }, @@ -1927,14 +1927,14 @@ static const value_string ndps_error_types[] = { { 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" }, diff --git a/epan/dissectors/packet-ndps.h b/epan/dissectors/packet-ndps.h index ca8ea38187..89105b3126 100644 --- a/epan/dissectors/packet-ndps.h +++ b/epan/dissectors/packet-ndps.h @@ -85,8 +85,8 @@ static const value_string object_ids_8[] = { /* 0608 (LENGTH 8)*/ { 0x0000064C, "TRANSFER METHOD TYPE" }, { 0x0000064D, "DOCUMENT REFERENCE TYPE" }, { 0x00000650, "DELIVERY METHOD" }, - { 0x00000654, "AUXILARY PACKAGE" }, - { 0x00000655, "AUXILARY SHEET" }, + { 0x00000654, "AUXILIARY PACKAGE" }, + { 0x00000655, "AUXILIARY SHEET" }, { 0x0000065A, "FINISHING" }, { 0x0000065B, "STITCHING" }, { 0x0000065C, "BINDING" }, @@ -155,7 +155,7 @@ static const value_string object_ids_9[] = { /* 060928 (LENGTH 9)*/ { 0x00061301, "REASONS DOCUMENTS NEEDED" }, { 0x00061302, "REASONS JOB HOLD SET" }, { 0x00061303, "REASONS JOB PRINTED AFTER SPECIFIED" }, - { 0x00061304, "REASONS REQESTED RESPONSE NOT READY" }, + { 0x00061304, "REASONS REQUESTED RESPONSE NOT READY" }, { 0x00061305, "REASONS SUCCESSFULLY COMPLETE" }, { 0x00061306, "REASONS COMPLETED WITH WARNING" }, { 0x00061307, "REASONS COMPLETED WITH ERROR" }, @@ -367,38 +367,38 @@ static const value_string object_ids_9[] = { /* 060928 (LENGTH 9)*/ { 0x0006500D, "DELIVERY METHOD DOCUMENT FILE" }, { 0x0006500E, "DELIVERY METHOD FILE ADDRESSED TO" }, { 0x0006500F, "DELIVERY METHOD NONE" }, - { 0x00065400, "AUXILARY PACKAGE JOB SEPARATORS" }, - { 0x00065401, "AUXILARY PACKAGE JOB SET START" }, - { 0x00065402, "AUXILARY PACKAGE JOB SET END" }, - { 0x00065403, "AUXILARY PACKAGE JOB SET WRAP" }, - { 0x00065404, "AUXILARY PACKAGE JOB SET START COPY SEPARATORS" }, - { 0x00065405, "AUXILARY PACKAGE JOB SET END COPY SEPARATORS" }, - { 0x00065406, "AUXILARY PACKAGE JOB SET WRAP COPY SEPARATORS" }, - { 0x00065407, "AUXILARY PACKAGE JOB COPY START" }, - { 0x00065408, "AUXILARY PACKAGE JOB COPY END" }, - { 0x00065409, "AUXILARY PACKAGE JOB COPY WRAP" }, - { 0x00065414, "AUXILARY PACKAGE DOCUMENT SEPARATORS" }, - { 0x00065415, "AUXILARY PACKAGE DOCUMENT SET START" }, - { 0x00065416, "AUXILARY PACKAGE DOCUMENT SET END" }, - { 0x00065417, "AUXILARY PACKAGE DOCUMENT SET WRAP" }, - { 0x00065418, "AUXILARY PACKAGE DOCUMENT SET START COPY SEPARATOR" }, - { 0x00065419, "AUXILARY PACKAGE DOCUMENT SET END COPY SEPARATOR" }, - { 0x0006541A, "AUXILARY PACKAGE DOCUMENT SET WRAP COPY SEPARATOR" }, - { 0x0006541B, "AUXILARY PACKAGE DOCUMENT COPY START" }, - { 0x0006541C, "AUXILARY PACKAGE DOCUMENT COPY END" }, - { 0x0006541D, "AUXILARY PACKAGE DOCUMENT COPY WRAP" }, - { 0x0006550A, "AUXILARY JOB SET START" }, - { 0x0006550B, "AUXILARY JOB SET SEPARATOR" }, - { 0x0006550C, "AUXILARY JOB SET END" }, - { 0x0006550D, "AUXILARY JOB COPY START" }, - { 0x0006550E, "AUXILARY JOB COPY SEPARATOR" }, - { 0x0006550F, "AUXILARY JOB COPY END" }, - { 0x0006551E, "AUXILARY DOCUMENT SET START" }, - { 0x0006551F, "AUXILARY DOCUMENT SET SEPARATOR" }, - { 0x00065520, "AUXILARY DOCUMENT SET END" }, - { 0x00065521, "AUXILARY DOCUMENT COPY START" }, - { 0x00065522, "AUXILARY DOCUMENT COPY SEPARATOR" }, - { 0x00065523, "AUXILARY DOCUMENT COPY END" }, + { 0x00065400, "AUXILIARY PACKAGE JOB SEPARATORS" }, + { 0x00065401, "AUXILIARY PACKAGE JOB SET START" }, + { 0x00065402, "AUXILIARY PACKAGE JOB SET END" }, + { 0x00065403, "AUXILIARY PACKAGE JOB SET WRAP" }, + { 0x00065404, "AUXILIARY PACKAGE JOB SET START COPY SEPARATORS" }, + { 0x00065405, "AUXILIARY PACKAGE JOB SET END COPY SEPARATORS" }, + { 0x00065406, "AUXILIARY PACKAGE JOB SET WRAP COPY SEPARATORS" }, + { 0x00065407, "AUXILIARY PACKAGE JOB COPY START" }, + { 0x00065408, "AUXILIARY PACKAGE JOB COPY END" }, + { 0x00065409, "AUXILIARY PACKAGE JOB COPY WRAP" }, + { 0x00065414, "AUXILIARY PACKAGE DOCUMENT SEPARATORS" }, + { 0x00065415, "AUXILIARY PACKAGE DOCUMENT SET START" }, + { 0x00065416, "AUXILIARY PACKAGE DOCUMENT SET END" }, + { 0x00065417, "AUXILIARY PACKAGE DOCUMENT SET WRAP" }, + { 0x00065418, "AUXILIARY PACKAGE DOCUMENT SET START COPY SEPARATOR" }, + { 0x00065419, "AUXILIARY PACKAGE DOCUMENT SET END COPY SEPARATOR" }, + { 0x0006541A, "AUXILIARY PACKAGE DOCUMENT SET WRAP COPY SEPARATOR" }, + { 0x0006541B, "AUXILIARY PACKAGE DOCUMENT COPY START" }, + { 0x0006541C, "AUXILIARY PACKAGE DOCUMENT COPY END" }, + { 0x0006541D, "AUXILIARY PACKAGE DOCUMENT COPY WRAP" }, + { 0x0006550A, "AUXILIARY JOB SET START" }, + { 0x0006550B, "AUXILIARY JOB SET SEPARATOR" }, + { 0x0006550C, "AUXILIARY JOB SET END" }, + { 0x0006550D, "AUXILIARY JOB COPY START" }, + { 0x0006550E, "AUXILIARY JOB COPY SEPARATOR" }, + { 0x0006550F, "AUXILIARY JOB COPY END" }, + { 0x0006551E, "AUXILIARY DOCUMENT SET START" }, + { 0x0006551F, "AUXILIARY DOCUMENT SET SEPARATOR" }, + { 0x00065520, "AUXILIARY DOCUMENT SET END" }, + { 0x00065521, "AUXILIARY DOCUMENT COPY START" }, + { 0x00065522, "AUXILIARY DOCUMENT COPY SEPARATOR" }, + { 0x00065523, "AUXILIARY DOCUMENT COPY END" }, { 0x00065A00, "FINISHING STAPLE" }, { 0x00065A01, "FINISHING STAPLE TOP LEFT" }, { 0x00065A02, "FINISHING STAPLE BOTTOM LEFT" }, @@ -943,7 +943,7 @@ static const value_string object_ids_13[] = { /* 060D6086 480186 (LENGTH 13)*/ { 0x00020000, "(Novell) Attribute DEFAULT CHARACTER SET" }, { 0x00020001, "(Novell) Attribute DEFAULT CHARACTER MAPPING" }, { 0x00020002, "(Novell) Attribute DEFAULT FONT" }, - { 0x00020003, "(Novell) Attribute DEFAULT CHARACTER REPERTOIR" }, + { 0x00020003, "(Novell) Attribute DEFAULT CHARACTER REPERTOIRE" }, { 0x00020006, "(Novell) Attribute DEFAULT RESOURCES" }, { 0x00020007, "(Novell) Attribute DEFAULT PRINTER RESOLUTION" }, { 0x00020008, "(Novell) Attribute DEFAULT RESOLUTIONS USED" }, @@ -1018,8 +1018,8 @@ static const value_string object_ids_13[] = { /* 060D6086 480186 (LENGTH 13)*/ { 0x00030033, "(Novell) Attribute CHARACTER SETS READY" }, { 0x00030035, "(Novell) Attribute CHARACTER MAPPINGS SUPPORTED" }, { 0x00030036, "(Novell) Attribute CHARACTER MAPPINGS READY" }, - { 0x00030038, "(Novell) Attribute CHARACTER REPRTIOR SUPPORTED" }, - { 0x00030039, "(Novell) Attribute CHARACTER REPRTIOR READY" }, + { 0x00030038, "(Novell) Attribute CHARACTER REPERTOIRE SUPPORTED" }, + { 0x00030039, "(Novell) Attribute CHARACTER REPERTOIRE READY" }, { 0x0003003F, "(Novell) Attribute PAGE SELECT SUPPORTED" }, { 0x00030049, "(Novell) Attribute CONTENT ORIENTS SUPPORTED" }, { 0x0003004E, "(Novell) Attribute SHEET COUNT" }, @@ -1181,7 +1181,7 @@ static const value_string object_ids_13[] = { /* 060D6086 480186 (LENGTH 13)*/ { 0x00110002, "(Novell) Attribute SEPARATOR SHEET OF SET" }, { 0x00110003, "(Novell) Attribute END SHEET OF SET" }, { 0x00110004, "(Novell) Attribute START SHEET OF COPY" }, - { 0x00110005, "(Novell) Attribute SEPERATOR SHEET OF COPY" }, + { 0x00110005, "(Novell) Attribute SEPARATOR SHEET OF COPY" }, { 0x00110006, "(Novell) Attribute END SHEET OF COPY" }, { 0x00120200, "(Novell) Attribute MANAGER NAME" }, { 0x00120201, "(Novell) Attribute MANAGER STATE" }, @@ -1235,7 +1235,7 @@ static const value_string object_ids_13[] = { /* 060D6086 480186 (LENGTH 13)*/ { 0x00170265, "(Novell) Attribute ALERT JOB END WAIT" }, { 0x00170267, "(Novell) Attribute ALERT JOB HELD USER" }, { 0x00170268, "(Novell) Attribute ALERT JOB USER HOLD REMOVE" }, - { 0x00170269, "(Novell) Attribute ALERT JOB HELD OPERATORE" }, + { 0x00170269, "(Novell) Attribute ALERT JOB HELD OPERATOR" }, { 0x0017026A, "(Novell) Attribute ALERT JOB OPERATOR HOLD REMOVE" }, { 0x0017026B, "(Novell) Attribute ALERT JOB CREATED" }, { 0x0017026C, "(Novell) Attribute ALERT JOB REORDERED" }, @@ -1388,7 +1388,7 @@ static const value_string object_ids_14[] = { /* 060E6086 480186F8 (LENGTH 14)*/ { 0x03008170, "(Novell) Attribute JOB SIZE RANGE SUPPORTED" }, { 0x03008171, "(Novell) Attribute JOB SIZE RANGE READY" }, { 0x03008172, "(Novell) Attribute CHECKPOINT FORMATS SUPPORTED" }, - { 0x03008173, "(Novell) Attribute ARE FOREIGN JOBS VISABLE" }, + { 0x03008173, "(Novell) Attribute ARE FOREIGN JOBS VISIBLE" }, { 0x03008174, "(Novell) Attribute PRINTER ENABLED" }, { 0x03030202, "(Novell) Attribute HARDWARE MEMORY SIZE" }, { 0x17028148, "(Novell) Attribute ALERT PA CREATED" }, @@ -1663,11 +1663,11 @@ static const value_string object_ids_15[] = { /* 060F6086 480186F837 (LENGTH 15) /* These values are 0x0104000F+(defined number)*/ { 0x01080201, "(Novell) Attribute PRINTER INPUT INDEX" }, { 0x01080202, "(Novell) Attribute PRINTER INPUT TYPE" }, - { 0x01080203, "(Novell) Attribute PRINTER INPUT DIMINSION UNIT" }, - { 0x01080204, "(Novell) Attribute PRINTER INPUT MEDIA DIMINSION FEED DDEC" }, - { 0x01080205, "(Novell) Attribute PRINTER INPUT MEDIA DIMINSION XFEEDDDEC" }, - { 0x01080206, "(Novell) Attribute PRINTER INPUT MEDIA DIMINSION FEEDDCHO" }, - { 0x01080207, "(Novell) Attribute PRINTER INPUT MEDIA DIMINSION XFEEDDCHO" }, + { 0x01080203, "(Novell) Attribute PRINTER INPUT DIMENSION UNIT" }, + { 0x01080204, "(Novell) Attribute PRINTER INPUT MEDIA DIMENSION FEED DDEC" }, + { 0x01080205, "(Novell) Attribute PRINTER INPUT MEDIA DIMENSION XFEEDDDEC" }, + { 0x01080206, "(Novell) Attribute PRINTER INPUT MEDIA DIMENSION FEEDDCHO" }, + { 0x01080207, "(Novell) Attribute PRINTER INPUT MEDIA DIMENSION XFEEDDCHO" }, { 0x01080208, "(Novell) Attribute PRINTER INPUT CAPACITY UNIT" }, { 0x01080209, "(Novell) Attribute PRINTER INPUT MAXIMUM CAPACITY" }, { 0x0108020A, "(Novell) Attribute PRINTER INPUT CURRENT LEVEL" }, @@ -1694,13 +1694,13 @@ static const value_string object_ids_15[] = { /* 060F6086 480186F837 (LENGTH 15) { 0x0109020B, "(Novell) Attribute PRINTER OUTPUT SERIAL NUMBER" }, { 0x0109020C, "(Novell) Attribute PRINTER OUTPUT DESCRIPTION" }, { 0x0109020D, "(Novell) Attribute PRINTER OUTPUT SECURITY" }, - { 0x0109020E, "(Novell) Attribute PRINTER OUTPUT DIMINSION UNIT" }, - { 0x0109020F, "(Novell) Attribute PRINTER OUTPUT MAXIMUM DIMINSION FEED DIRECTION" }, - { 0x01090210, "(Novell) Attribute PRINTER OUTPUT MAXIMUM DIMINSION TRANSFER FEED DIRECTION" }, - { 0x01090211, "(Novell) Attribute PRINTER OUTPUT MINIMUM DIMINSION FEED DIRECTION" }, - { 0x01090212, "(Novell) Attribute PRINTER OUTPUT MINIMUM DIMINSION TRANSFER FEED DIRECTION" }, + { 0x0109020E, "(Novell) Attribute PRINTER OUTPUT DIMENSION UNIT" }, + { 0x0109020F, "(Novell) Attribute PRINTER OUTPUT MAXIMUM DIMENSION FEED DIRECTION" }, + { 0x01090210, "(Novell) Attribute PRINTER OUTPUT MAXIMUM DIMENSION TRANSFER FEED DIRECTION" }, + { 0x01090211, "(Novell) Attribute PRINTER OUTPUT MINIMUM DIMENSION FEED DIRECTION" }, + { 0x01090212, "(Novell) Attribute PRINTER OUTPUT MINIMUM DIMENSION TRANSFER FEED DIRECTION" }, { 0x01090213, "(Novell) Attribute PRINTER OUTPUT STACK INGORE DER" }, - { 0x01090214, "(Novell) Attribute PRINTER OUTPUT PAGE DELIVORY ENTRY" }, + { 0x01090214, "(Novell) Attribute PRINTER OUTPUT PAGE DELIVERY ENTRY" }, { 0x01090215, "(Novell) Attribute PRINTER OUTPUT BURSTING" }, { 0x01090216, "(Novell) Attribute PRINTER OUTPUT DECOLLATING" }, { 0x01090217, "(Novell) Attribute PRINTER OUTPUT PAGE COLLATED" }, diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 99cabceaaf..79bdaea9dc 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -3950,24 +3950,24 @@ proto_register_netflow(void) "Flow Source Network", HFILL} }, {&hf_cflow_ignore_packets, - {"Ignoreed Packets", "cflow.ignore_packets", + {"Ignored Packets", "cflow.ignore_packets", FT_UINT32, BASE_DEC, NULL, 0x0, - "Count of ignoreed packets", HFILL} + "Count of ignored packets", HFILL} }, {&hf_cflow_ignore_packets64, - {"Ignoreed Packets", "cflow.ignore_packets64", + {"Ignored Packets", "cflow.ignore_packets64", FT_UINT64, BASE_DEC, NULL, 0x0, - "Count of ignoreed packets", HFILL} + "Count of ignored packets", HFILL} }, {&hf_cflow_ignore_octets, - {"Ignoreed Octets", "cflow.ignore_octets", + {"Ignored Octets", "cflow.ignore_octets", FT_UINT32, BASE_DEC, NULL, 0x0, - "Count of ignoreed octets", HFILL} + "Count of ignored octets", HFILL} }, {&hf_cflow_ignore_octets64, - {"Ignoreed Octets", "cflow.ignore_octets64", + {"Ignored Octets", "cflow.ignore_octets64", FT_UINT64, BASE_DEC, NULL, 0x0, - "Count of ignoreed octets", HFILL} + "Count of ignored octets", HFILL} }, {&hf_cflow_notsent_flows, {"Not Sent Flows", "cflow.notsent_flows", diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c index 6da713d2b1..a5edd929b7 100644 --- a/epan/dissectors/packet-netsync.c +++ b/epan/dissectors/packet-netsync.c @@ -75,7 +75,7 @@ static const value_string netsync_role_vals[] = { #define NETSYNC_CMD_SEND_DELTA 9 #define NETSYNC_CMD_DATA 10 #define NETSYNC_CMD_DELTA 11 -#define NETSYNC_CMD_NONEXISTANT 12 +#define NETSYNC_CMD_NONEXISTENT 12 static const value_string netsync_cmd_vals[] = { { NETSYNC_CMD_ERROR, "Error" }, @@ -90,7 +90,7 @@ static const value_string netsync_cmd_vals[] = { { NETSYNC_CMD_SEND_DELTA, "Send Delta" }, { NETSYNC_CMD_DATA, "Data" }, { NETSYNC_CMD_DELTA, "Delta" }, - { NETSYNC_CMD_NONEXISTANT, "Nonexistant" }, + { NETSYNC_CMD_NONEXISTENT, "Nonexistent" }, { 0, NULL } }; @@ -149,8 +149,8 @@ static int hf_netsync_cmd_send_delta_type = -1; static int hf_netsync_cmd_send_delta_base_id = -1; static int hf_netsync_cmd_send_delta_ident_id = -1; -static int hf_netsync_cmd_nonexistant_type = -1; -static int hf_netsync_cmd_nonexistant_id = -1; +static int hf_netsync_cmd_nonexistent_type = -1; +static int hf_netsync_cmd_nonexistent_id = -1; /* Define the tree for netsync */ static int ett_netsync = -1; @@ -425,13 +425,13 @@ static gint dissect_netsync_cmd_delta(tvbuff_t *tvb, gint offset, proto_tree *t } -static gint dissect_netsync_cmd_nonexistant(tvbuff_t *tvb, gint offset, proto_tree *tree, guint size _U_) +static gint dissect_netsync_cmd_nonexistent(tvbuff_t *tvb, gint offset, proto_tree *tree, guint size _U_) { - proto_tree_add_item(tree, hf_netsync_cmd_nonexistant_type, tvb, + proto_tree_add_item(tree, hf_netsync_cmd_nonexistent_type, tvb, offset, 1, FALSE ); offset += 1; - proto_tree_add_item(tree, hf_netsync_cmd_nonexistant_id, tvb, + proto_tree_add_item(tree, hf_netsync_cmd_nonexistent_id, tvb, offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE ); offset += NETSNYC_MERKLE_HASH_LENGTH; @@ -555,8 +555,8 @@ dissect_netsync_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_netsync_cmd_delta( tvb, offset, netsync_tree, size ); break; - case NETSYNC_CMD_NONEXISTANT: - dissect_netsync_cmd_nonexistant( tvb, offset, netsync_tree, size ); + case NETSYNC_CMD_NONEXISTENT: + dissect_netsync_cmd_nonexistent( tvb, offset, netsync_tree, size ); break; default: @@ -728,12 +728,12 @@ proto_register_netsync(void) { "Ident ID", "netsync.cmd.send_delta.ident_id", FT_BYTES, BASE_DEC, NULL, 0x0, "Ident ID", HFILL } }, - { &hf_netsync_cmd_nonexistant_id, - { "ID", "netsync.cmd.nonexistant.id", + { &hf_netsync_cmd_nonexistent_id, + { "ID", "netsync.cmd.nonexistent.id", FT_BYTES, BASE_DEC, NULL, 0x0, "ID", HFILL } }, - { &hf_netsync_cmd_nonexistant_type, - { "Type", "netsync.cmd.nonexistant.type", + { &hf_netsync_cmd_nonexistent_type, + { "Type", "netsync.cmd.nonexistent.type", FT_UINT8, BASE_DEC, NULL, 0x0, "Type", HFILL } }, { &hf_netsync_cmd_done_type, diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c index 3f7df74f2e..6a5ec245c5 100644 --- a/epan/dissectors/packet-nisplus.c +++ b/epan/dissectors/packet-nisplus.c @@ -886,7 +886,7 @@ static const value_string nis_error[] = { #define NIS_NAMEEXISTS 14 { NIS_NAMEEXISTS, "Can't create over another name" }, #define NIS_NOTMASTER 15 - { NIS_NOTMASTER, "I'm justa secondaray, don't ask me" }, + { NIS_NOTMASTER, "I'm just a secondary, don't ask me" }, #define NIS_INVALIDOBJ 16 { NIS_INVALIDOBJ, "Object is broken somehow" }, #define NIS_BADNAME 17 diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c index d5a546bcef..b261c26acd 100644 --- a/epan/dissectors/packet-nsrp.c +++ b/epan/dissectors/packet-nsrp.c @@ -495,7 +495,7 @@ proto_register_nsrp(void) { &hf_nsrp_data, { "Data", "nsrp.data", FT_STRING, 0, NULL, 0, - "PADING", HFILL } + "PADDING", HFILL } } }; diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c index 55beac75cd..12ed991471 100644 --- a/epan/dissectors/packet-oicq.c +++ b/epan/dissectors/packet-oicq.c @@ -103,8 +103,8 @@ static const value_string oicq_command_vals[] = { { 0x0065, "Request extra information" }, { 0x0067, "Signature operation" }, { 0x0080, "Receive system message" }, - { 0x0081, "Get statur of friend" }, - { 0x00b5, "Get friend's statur of group" }, + { 0x0081, "Get status of friend" }, + { 0x00b5, "Get friend's status of group" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index 36a63ed1f2..3d818dfeb2 100755 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -726,7 +726,7 @@ static int ositp_decode_DR(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, case (128+4): str = "Mismatched references"; break; case (128+5): str = "Protocol error"; break; case (128+7): str = "Reference overflow"; break; - case (128+8): str = "Connection requestion refused"; break; + case (128+8): str = "Connection request refused"; break; case (128+10):str = "Header or parameter length invalid"; break; case (0): str = "Reason not specified"; break; case (1): str = "Congestion at TSAP"; break; diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index d11a3fa7f8..7670b9e701 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -429,16 +429,16 @@ static const true_false_string tfs_dbd_r = { "OOBResync bit is NOT set" }; static const true_false_string tfs_lls_ext_options_lr = { - "LSDB Resynchrinization (LR-bit) is SET", - "LSDB Resynchrinization (LR-bit) is NOT set" + "LSDB Resynchronization (LR-bit) is SET", + "LSDB Resynchronization (LR-bit) is NOT set" }; static const true_false_string tfs_lls_ext_options_rs = { "Restart Signal (RS-bit) is SET", "Restart Signal (RS-bit) is NOT set" }; static const true_false_string tfs_v3_lls_ext_options_lr = { - "LSDB Resynchrinization (LR-bit) is SET", - "LSDB Resynchrinization (LR-bit) is NOT set" + "LSDB Resynchronization (LR-bit) is SET", + "LSDB Resynchronization (LR-bit) is NOT set" }; static const true_false_string tfs_v3_lls_ext_options_rs = { "Restart Signal (RS-bit) is SET", diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c index 3c5156644c..d9e681a5ce 100644 --- a/epan/dissectors/packet-pagp.c +++ b/epan/dissectors/packet-pagp.c @@ -433,7 +433,7 @@ proto_register_pagp(void) { &hf_pagp_flags, { "Flags", "pagp.flags", FT_UINT8, BASE_HEX, NULL, 0x0, - "Infomation flags", HFILL }}, + "Information flags", HFILL }}, { &hf_pagp_flags_slow_hello, { "Slow Hello", "pagp.flags.slowhello", diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index a0dc1e08ee..2967145125 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -1882,10 +1882,10 @@ dissect_pcep_balancing_obj(proto_tree *pcep_object_tree, tvbuff_t *tvb, int offs proto_tree_add_text(pcep_object_tree, tvb, offset2+2, 1, "Flags: 0x%02x", flags); max_LSP = tvb_get_guint8(tvb, offset2+3); - proto_tree_add_text(pcep_object_tree, tvb, offset2+3, 1, "Maximun Number of TE LSPs: 0x%02x", max_LSP); + proto_tree_add_text(pcep_object_tree, tvb, offset2+3, 1, "Maximum Number of TE LSPs: 0x%02x", max_LSP); min_bandwidth = tvb_get_ntohl(tvb, offset2+4); - proto_tree_add_text(pcep_object_tree, tvb, offset2+4, 4, "Minimun Bandwidth: 0x%08x", min_bandwidth); + proto_tree_add_text(pcep_object_tree, tvb, offset2+4, 4, "Minimum Bandwidth: 0x%08x", min_bandwidth); } /*------------------------------------------------------------------------------ diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index fdf502ab6d..fb59a7b170 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -2368,7 +2368,7 @@ proto_register_per(void) { "Open Type Length", "per.open_type_length", FT_UINT32, BASE_DEC, NULL, 0, "Length of an open type encoding", HFILL }}, { &hf_per_real_length, - { "Raal Length", "per.real_length", FT_UINT32, BASE_DEC, + { "Real Length", "per.real_length", FT_UINT32, BASE_DEC, NULL, 0, "Length of an real encoding", HFILL }}, { &hf_per_octet_string_length, { "Octet String Length", "per.octet_string_length", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index eb5be8baa4..f5340657aa 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -613,7 +613,7 @@ static const value_string q931_cause_code_vals[] = { { 0x60, "Mandatory information element is missing" }, { 0x61, "Message type non-existent or not implemented" }, { 0x62, "Message not compatible with call state or message type non-existent or not implemented" }, - { 0x63, "Information element nonexistant or not implemented" }, + { 0x63, "Information element non-existent or not implemented" }, { 0x64, "Invalid information element contents" }, { 0x65, "Message not compatible with call state" }, { 0x66, "Recovery on timer expiry" }, diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c index 2cf75e7c28..ae4f05d9d1 100644 --- a/epan/dissectors/packet-q2931.c +++ b/epan/dissectors/packet-q2931.c @@ -1103,7 +1103,7 @@ static const value_string q2931_cause_code_vals[] = { { Q2931_CAUSE_MAND_IE_MISSING, "Mandatory information element is missing" }, { Q2931_CAUSE_MT_NONEX_OR_UNIMPL,"Message type non-existent or not implemented" }, { 0x62, "Message not compatible with call state or message type non-existent or not implemented" }, - { Q2931_CAUSE_IE_NONEX_OR_UNIMPL,"Information element nonexistant or not implemented" }, + { Q2931_CAUSE_IE_NONEX_OR_UNIMPL,"Information element non-existent or not implemented" }, { Q2931_CAUSE_INVALID_IE_CONTENTS,"Invalid information element contents" }, { Q2931_CAUSE_MSG_INCOMPAT_W_CS,"Message not compatible with call state" }, { Q2931_CAUSE_REC_TIMER_EXP, "Recovery on timer expiry" }, @@ -1747,7 +1747,7 @@ static const value_string q2931_shaping_indicator_vals[] = { }; static const value_string q2931_user_net_fault_mgmt_vals[] = { - { 0x00, "No user-originated fault managment indications" }, + { 0x00, "No user-originated fault management indications" }, { 0x01, "User-originated fault management indications, cell rate 1 cell/s" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 5f41e03a5a..b497282c0f 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -1172,7 +1172,7 @@ const value_string q931_cause_code_vals[] = { { Q931_CAUSE_MAND_IE_MISSING, "Mandatory information element is missing" }, { Q931_CAUSE_MT_NONEX_OR_UNIMPL,"Message type non-existent or not implemented" }, { 0x62, "Message not compatible with call state or message type non-existent or not implemented" }, - { Q931_CAUSE_IE_NONEX_OR_UNIMPL,"Information element nonexistant or not implemented" }, + { Q931_CAUSE_IE_NONEX_OR_UNIMPL,"Information element non-existent or not implemented" }, { Q931_CAUSE_INVALID_IE_CONTENTS,"Invalid information element contents" }, { Q931_CAUSE_MSG_INCOMPAT_W_CS, "Message not compatible with call state" }, { Q931_CAUSE_REC_TIMER_EXP, "Recovery on timer expiry" }, diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index ea966b593d..27db4245d8 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -857,7 +857,7 @@ const value_string q933_cause_code_vals[] = { { Q933_CAUSE_MAND_IE_MISSING, "Mandatory information element is missing" }, { Q933_CAUSE_MT_NONEX_OR_UNIMPL,"Message type non-existent or not implemented" }, { 0x62, "Message not compatible with call state or message type non-existent or not implemented" }, - { Q933_CAUSE_IE_NONEX_OR_UNIMPL,"Information element nonexistant or not implemented" }, + { Q933_CAUSE_IE_NONEX_OR_UNIMPL,"Information element non-existent or not implemented" }, { Q933_CAUSE_INVALID_IE_CONTENTS,"Invalid information element contents" }, { Q933_CAUSE_MSG_INCOMPAT_W_CS, "Message not compatible with call state" }, { Q933_CAUSE_REC_TIMER_EXP, "Recovery on timer expiry" }, diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c index 387fc59ac2..a341e73a2f 100644 --- a/epan/dissectors/packet-radius_packetcable.c +++ b/epan/dissectors/packet-radius_packetcable.c @@ -583,7 +583,7 @@ void proto_register_packetcable(void) { "PacketCable QoS Descriptor Attribute Bitmask: Minimum Reserved Traffic Rate", HFILL } }, { &hf_packetcable_qos_desc_flags[9], - { "Minium Packet Size","radius.vendor.pkt.qs.flags.mps", + { "Minimum Packet Size","radius.vendor.pkt.qs.flags.mps", FT_UINT32, BASE_DEC, NULL, PACKETCABLE_MINIMUM_PACKET_SIZE_MASK, "PacketCable QoS Descriptor Attribute Bitmask: Minimum Packet Size", HFILL } }, @@ -663,7 +663,7 @@ void proto_register_packetcable(void) { "PacketCable QoS Descriptor Attribute Minimum Reserved Traffic Rate", HFILL } }, { &hf_packetcable_qos_desc_fields[9], - { "Minium Packet Size","radius.vendor.pkt.qs.mps", + { "Minimum Packet Size","radius.vendor.pkt.qs.mps", FT_UINT32, BASE_DEC, NULL, 0x0, "PacketCable QoS Descriptor Attribute Minimum Packet Size", HFILL } }, diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c index 582ba6a101..4e71200151 100644 --- a/epan/dissectors/packet-rfc2190.c +++ b/epan/dissectors/packet-rfc2190.c @@ -497,7 +497,7 @@ proto_register_rfc2190(void) BASE_DEC, NULL, 0x0, - "Reserved field that houls contain zeroes", HFILL + "Reserved field that should contain zeroes", HFILL } }, { diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index 16c4f0f11b..c57030ebc4 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -3812,12 +3812,12 @@ void proto_register_rsl(void) { &hf_rsl_rel_mode, { "Release Mode", "rsl.rel_mode", FT_UINT8, BASE_DEC, VALS(rel_mode_vals), 0x01, - "Relese Mode", HFILL } + "Release Mode", HFILL } }, { &hf_rsl_interf_band, { "Interf Band", "rsl.interf_band", FT_UINT8, BASE_DEC, NULL, 0xe0, - "Relese Mode", HFILL } + "Interf Band", HFILL } }, { &hf_rsl_meas_res_no, { "Measurement result number", "rsl.meas_res_no", diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 5130c68262..268f80c47d 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -2573,7 +2573,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) */ while ( !srtcp_now_encrypted && tvb_bytes_exist( tvb, offset, 4) ) { /* - * First retreive the packet_type + * First retrieve the packet_type */ packet_type = tvb_get_guint8( tvb, offset + 1 ); @@ -4373,7 +4373,7 @@ proto_register_rtcp(void) { &hf_rtcp_xr_btxnq_jbevents, { - "Number of jitter buffer adaptions to date", + "Number of jitter buffer adaptations to date", "rtcp.xr.btxnq.jbevents", FT_UINT16, BASE_DEC, @@ -4409,7 +4409,7 @@ proto_register_rtcp(void) { &hf_rtcp_xr_btxnq_tdegjit, { - "Time degraded by jitter buffer adaption events", + "Time degraded by jitter buffer adaptation events", "rtcp.xr.btxnq.tdegjit", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 9dcf34a7ad..8d2fa634b2 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -424,7 +424,7 @@ static const struct Flag_definition PAD_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition DATA_FLAGS[] = { @@ -435,7 +435,7 @@ static const struct Flag_definition DATA_FLAGS[] = { { 'H', "Hash key flag" }, /* Bit 3 */ { 'A', "Alive flag" }, /* Bit 2 */ { 'D', "Data present" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition NOKEY_DATA_FLAGS[] = { @@ -446,7 +446,7 @@ static const struct Flag_definition NOKEY_DATA_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { 'Q', "Inline QoS" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition ACKNACK_FLAGS[] = { @@ -457,7 +457,7 @@ static const struct Flag_definition ACKNACK_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { 'F', "Final flag" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition GAP_FLAGS[] = { @@ -468,7 +468,7 @@ static const struct Flag_definition GAP_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition HEARTBEAT_FLAGS[] = { @@ -479,7 +479,7 @@ static const struct Flag_definition HEARTBEAT_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { 'L', "Liveliness flag" }, /* Bit 2 */ { 'F', "Final flag" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition INFO_TS_FLAGS[] = { @@ -489,8 +489,8 @@ static const struct Flag_definition INFO_TS_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 4 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ - { 'T', "Timestampm flag" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'T', "Timestamp flag" }, /* Bit 1 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition INFO_SRC_FLAGS[] = { @@ -501,7 +501,7 @@ static const struct Flag_definition INFO_SRC_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition INFO_REPLY_IP4_FLAGS[] = { @@ -512,7 +512,7 @@ static const struct Flag_definition INFO_REPLY_IP4_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { 'M', "Multicast flag" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition INFO_DST_FLAGS[] = { @@ -523,7 +523,7 @@ static const struct Flag_definition INFO_DST_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition INFO_REPLY_FLAGS[] = { @@ -534,7 +534,7 @@ static const struct Flag_definition INFO_REPLY_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { 'M', "Multicast flag" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c index e660448349..f0fa12c9ec 100644 --- a/epan/dissectors/packet-rtps2.c +++ b/epan/dissectors/packet-rtps2.c @@ -464,7 +464,7 @@ static const struct Flag_definition PAD_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition DATA_FLAGS[] = { @@ -475,7 +475,7 @@ static const struct Flag_definition DATA_FLAGS[] = { { 'H', "Hash key flag" }, /* Bit 3 */ { 'D', "Data present" }, /* Bit 2 */ { 'Q', "Inline QoS" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition NOKEY_DATA_FLAGS[] = { @@ -486,7 +486,7 @@ static const struct Flag_definition NOKEY_DATA_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { 'H', "Key Hash" }, /* Bit 2 */ { 'Q', "Inline QoS" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition ACKNACK_FLAGS[] = { @@ -497,7 +497,7 @@ static const struct Flag_definition ACKNACK_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { 'F', "Final flag" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition GAP_FLAGS[] = { @@ -508,7 +508,7 @@ static const struct Flag_definition GAP_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition HEARTBEAT_FLAGS[] = { @@ -519,7 +519,7 @@ static const struct Flag_definition HEARTBEAT_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { 'L', "Liveliness flag" }, /* Bit 2 */ { 'F', "Final flag" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition HEARTBEAT_BATCH_FLAGS[] = { @@ -530,7 +530,7 @@ static const struct Flag_definition HEARTBEAT_BATCH_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { 'L', "Liveliness flag" }, /* Bit 2 */ { 'F', "Final flag" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition INFO_TS_FLAGS[] = { @@ -541,7 +541,7 @@ static const struct Flag_definition INFO_TS_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { 'I', "Invalidate flag" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition INFO_SRC_FLAGS[] = { @@ -552,7 +552,7 @@ static const struct Flag_definition INFO_SRC_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition INFO_REPLY_IP4_FLAGS[] = { @@ -563,7 +563,7 @@ static const struct Flag_definition INFO_REPLY_IP4_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { 'M', "Multicast flag" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition INFO_DST_FLAGS[] = { @@ -574,7 +574,7 @@ static const struct Flag_definition INFO_DST_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition INFO_REPLY_FLAGS[] = { @@ -585,7 +585,7 @@ static const struct Flag_definition INFO_REPLY_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { 'M', "Multicast flag" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition NOKEY_DATA_FRAG_FLAGS[] = { @@ -596,7 +596,7 @@ static const struct Flag_definition NOKEY_DATA_FRAG_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { 'Q', "Inline QoS" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition HEARTBEAT_FRAG_FLAGS[] = { @@ -607,7 +607,7 @@ static const struct Flag_definition HEARTBEAT_FRAG_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition NACK_FLAGS[] = { @@ -618,7 +618,7 @@ static const struct Flag_definition NACK_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { 'F', "Final flag" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition DATA_FRAG_FLAGS[] = { @@ -629,7 +629,7 @@ static const struct Flag_definition DATA_FRAG_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { 'H', "Hash key flag" }, /* Bit 2 */ { 'Q', "Inline QoS" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition NACK_FRAG_FLAGS[] = { @@ -640,7 +640,7 @@ static const struct Flag_definition NACK_FRAG_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition RTPS_DATA_FLAGS[] = { @@ -651,7 +651,7 @@ static const struct Flag_definition RTPS_DATA_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { 'D', "Data present" }, /* Bit 2 */ { 'Q', "Inline QoS" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition RTPS_DATA_FRAG_FLAGS[] = { @@ -662,7 +662,7 @@ static const struct Flag_definition RTPS_DATA_FRAG_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { 'Q', "Inline QoS" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition RTPS_DATA_BATCH_FLAGS[] = { @@ -673,7 +673,7 @@ static const struct Flag_definition RTPS_DATA_BATCH_FLAGS[] = { { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 3 */ { RESERVEDFLAG_CHAR, RESERVEDFLAG_STRING }, /* Bit 2 */ { 'Q', "Inline QoS" }, /* Bit 1 */ - { 'E', "Endianess bit" } /* Bit 0 */ + { 'E', "Endianness bit" } /* Bit 0 */ }; static const struct Flag_definition RTPS_SAMPLE_INFO_FLAGS16[] = { diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c index f71a0c065f..0784fd1bc7 100644 --- a/epan/dissectors/packet-s5066.c +++ b/epan/dissectors/packet-s5066.c @@ -429,7 +429,7 @@ proto_register_s5066(void) { static hf_register_info hf[] = { { &hf_s5066_sync_word, - { "Sync preample", "s5066.sync", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } + { "Sync preamble", "s5066.sync", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_s5066_version, { "S5066 version", "s5066.version", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index e9dd30464e..411bb5ee3e 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -55,7 +55,7 @@ static int hf_scsi_osd_get_attributes_page = -1; static int hf_scsi_osd_get_attributes_allocation_length = -1; static int hf_scsi_osd_get_attributes_list_length= -1; static int hf_scsi_osd_get_attributes_list_offset= -1; -static int hf_scsi_osd_retreived_attributes_offset = -1; +static int hf_scsi_osd_retrieved_attributes_offset = -1; static int hf_scsi_osd_set_attributes_page = -1; static int hf_scsi_osd_set_attribute_length = -1; static int hf_scsi_osd_set_attribute_number = -1; @@ -180,7 +180,7 @@ typedef struct _scsi_osd_extra_data_t { guint32 get_list_length; guint32 get_list_offset; guint32 get_list_allocation_length; - guint32 retreived_list_offset; + guint32 retrieved_list_offset; guint32 set_list_length; guint32 set_list_offset; } al; @@ -237,9 +237,9 @@ static const value_string attributes_page_vals[] = { static const value_string attributes_list_type_vals[] = { - {0x01, "Retreive attributes for this OSD object"}, - {0x09, "Retreive/Set attributes for this OSD object"}, - {0x0f, "Retreive attributes for a CREATE command"}, + {0x01, "Retrieve attributes for this OSD object"}, + {0x09, "Retrieve/Set attributes for this OSD object"}, + {0x0f, "Retrieve attributes for a CREATE command"}, {0,NULL} }; @@ -321,7 +321,7 @@ dissect_osd_attributes_list(packet_info *pinfo, tvbuff_t *tvb, int offset, proto offset+=8; /* fallthrough to the next case */ - case 0x09: /* retreived/set attributes 7.1.3.3 */ + case 0x09: /* retrieved/set attributes 7.1.3.3 */ /* attributes page */ page=tvb_get_ntohl(tvb, offset); proto_tree_add_item(tree, hf_scsi_osd_attributes_page, tvb, offset, 4, 0); @@ -480,7 +480,7 @@ dissect_osd_attribute_parameters(tvbuff_t *tvb, int offset, proto_tree *parent_t offset+=4; proto_tree_add_item(tree, hf_scsi_osd_get_attributes_allocation_length, tvb, offset, 4, 0); offset+=4; - proto_tree_add_item(tree, hf_scsi_osd_retreived_attributes_offset, tvb, offset, 4, 0); + proto_tree_add_item(tree, hf_scsi_osd_retrieved_attributes_offset, tvb, offset, 4, 0); offset+=4; proto_tree_add_item(tree, hf_scsi_osd_set_attributes_page, tvb, offset, 4, 0); offset+=4; @@ -508,10 +508,10 @@ dissect_osd_attribute_parameters(tvbuff_t *tvb, int offset, proto_tree *parent_t offset+=4; /* 4.12.5 */ - extra_data->u.al.retreived_list_offset=tvb_get_ntohl(tvb, offset); - extra_data->u.al.retreived_list_offset=(extra_data->u.al.retreived_list_offset&0x0fffffff)<<((extra_data->u.al.retreived_list_offset>>28)&0x0f); - extra_data->u.al.retreived_list_offset<<=8; - proto_tree_add_uint(tree, hf_scsi_osd_retreived_attributes_offset, tvb, offset, 4, extra_data->u.al.retreived_list_offset); + extra_data->u.al.retrieved_list_offset=tvb_get_ntohl(tvb, offset); + extra_data->u.al.retrieved_list_offset=(extra_data->u.al.retrieved_list_offset&0x0fffffff)<<((extra_data->u.al.retrieved_list_offset>>28)&0x0f); + extra_data->u.al.retrieved_list_offset<<=8; + proto_tree_add_uint(tree, hf_scsi_osd_retrieved_attributes_offset, tvb, offset, 4, extra_data->u.al.retrieved_list_offset); offset+=4; proto_tree_add_item(tree, hf_scsi_osd_set_attributes_list_length, tvb, offset, 4, 0); @@ -578,7 +578,7 @@ dissect_osd_attribute_data_in(packet_info *pinfo, tvbuff_t *tvb, int offset _U_, break; case 3: /* 5.2.2.3 attribute list */ if(extra_data->u.al.get_list_allocation_length){ - dissect_osd_attributes_list(pinfo, tvb, extra_data->u.al.retreived_list_offset, tree); + dissect_osd_attributes_list(pinfo, tvb, extra_data->u.al.retrieved_list_offset, tree); } break; } @@ -2994,8 +2994,8 @@ proto_register_scsi_osd(void) { &hf_scsi_osd_get_attributes_allocation_length, {"Get Attributes Allocation Length", "scsi.osd.get_attributes_allocation_length", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}}, - { &hf_scsi_osd_retreived_attributes_offset, - {"Retreived Attributes Offset", "scsi.osd.retreived_attributes_offset", FT_UINT32, BASE_HEX, + { &hf_scsi_osd_retrieved_attributes_offset, + {"Retrieved Attributes Offset", "scsi.osd.retrieved_attributes_offset", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}}, { &hf_scsi_osd_set_attributes_page, {"Set Attributes Page", "scsi.osd.set_attributes_page", FT_UINT32, BASE_HEX, diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 918b8dc96a..e87fcac961 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -370,9 +370,9 @@ static const value_string scsi_spc_vals[] = { static const value_string log_flags_tmc_vals[] = { {0, "Every update of the cumulative value"}, - {1, "Cumulative value equal to treshold value"}, - {2, "Cumulative value not equal to treshold value"}, - {3, "Cumulative value greater than treshold value"}, + {1, "Cumulative value equal to threshold value"}, + {2, "Cumulative value not equal to threshold value"}, + {3, "Cumulative value greater than threshold value"}, {0, NULL}, }; @@ -682,7 +682,7 @@ log_parameter_2e_0026(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_tree_add_item(tree, hf_scsi_log_ta_pefa, tvb, 0, 1, 0); } -/* TapeAlert page : diagnostics requiured flag */ +/* TapeAlert page : diagnostics required flag */ static void log_parameter_2e_0027(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { @@ -813,7 +813,7 @@ static const log_page_parameters_t tape_alert_log_parameters[] = { {0x0024, "drive temperature", log_parameter_2e_0024}, {0x0025, "drive voltage", log_parameter_2e_0025}, {0x0026, "periodic failure", log_parameter_2e_0026}, - {0x0027, "diagnostics requiured", log_parameter_2e_0027}, + {0x0027, "diagnostics required", log_parameter_2e_0027}, {0x0032, "lost statistics", log_parameter_2e_0032}, {0x0033, "tape directory invalid at unload", log_parameter_2e_0033}, {0x0034, "tape system area write failure", log_parameter_2e_0034}, @@ -5084,7 +5084,7 @@ proto_register_scsi (void) {"Qualifier", "scsi.inquiry.qualifier", FT_UINT8, BASE_HEX, VALS (scsi_qualifier_val), 0xE0, "", HFILL}}, { &hf_scsi_inq_peripheral, - {"Peripheral", "scsi.inquiry.preipheral", FT_UINT8, BASE_HEX, + {"Peripheral", "scsi.inquiry.peripheral", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL}}, { &hf_scsi_inq_vendor_id, {"Vendor Id", "scsi.inquiry.vendor_id", FT_STRING, BASE_NONE, @@ -5477,7 +5477,7 @@ proto_register_scsi (void) {"periodic failure", "scsi.log.ta.pefa", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}}, { &hf_scsi_log_ta_dire, - {"diagnostics requiured", "scsi.log.ta.dire", FT_BOOLEAN, 8, NULL, 0x01, + {"diagnostics required", "scsi.log.ta.dire", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}}, { &hf_scsi_log_ta_lost, {"lost statistics", "scsi.log.ta.lost", FT_BOOLEAN, 8, NULL, 0x01, diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index ecbdff7cdf..e65b6f26bd 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -1830,7 +1830,7 @@ dissect_udvm_bytecode(tvbuff_t *udvm_tvb, proto_tree *sigcomp_udvm_tree,guint st /* %requested_feedback_location */ if ((msg_length-1) < offset){ item2 = proto_tree_add_text(sigcomp_udvm_tree, udvm_tvb, 0, -1, - "All remaining parameters = 0(Not in the uploaded code as UDVM buffer initalized to Zero"); + "All remaining parameters = 0(Not in the uploaded code as UDVM buffer initialized to Zero"); PROTO_ITEM_SET_GENERATED(item2); return; } @@ -1841,7 +1841,7 @@ dissect_udvm_bytecode(tvbuff_t *udvm_tvb, proto_tree *sigcomp_udvm_tree,guint st /* returned_parameters_location */ if ((msg_length-1) < offset){ item2 = proto_tree_add_text(sigcomp_udvm_tree, udvm_tvb, offset-1, -1, - "All remaining parameters = 0(Not in the uploaded code as UDVM buffer initalized to Zero"); + "All remaining parameters = 0(Not in the uploaded code as UDVM buffer initialized to Zero"); PROTO_ITEM_SET_GENERATED(item2); return; } @@ -1897,14 +1897,14 @@ dissect_udvm_bytecode(tvbuff_t *udvm_tvb, proto_tree *sigcomp_udvm_tree,guint st udvm_tvb, start_offset, len, value); }else{ item2 = proto_tree_add_text(sigcomp_udvm_tree, udvm_tvb, offset, 1, - "state_retention_priority = 0(Not in the uploaded code as UDVM buffer initalized to Zero"); + "state_retention_priority = 0(Not in the uploaded code as UDVM buffer initialized to Zero"); PROTO_ITEM_SET_GENERATED(item2); } if ( tvb_reported_length_remaining(udvm_tvb, offset) != 0 ){ len = tvb_reported_length_remaining(udvm_tvb, offset); UDVM_address = start_address + offset; proto_tree_add_text(sigcomp_udvm_tree, udvm_tvb, offset, len, - "Remaning %u bytes starting at UDVM addr %u (0x%x)- State information ?",len, UDVM_address, UDVM_address); + "Remaining %u bytes starting at UDVM addr %u (0x%x)- State information ?",len, UDVM_address, UDVM_address); } offset = offset + tvb_reported_length_remaining(udvm_tvb, offset); break; diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c index 516422997f..2d2ba13dd5 100644 --- a/epan/dissectors/packet-sita.c +++ b/epan/dissectors/packet-sita.c @@ -111,7 +111,7 @@ dissect_sita(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const gchar *rx_errors1_str[] = {"Framing", "Parity", "Collision", "Long-frame", "Short-frame", "", "", "" }; const gchar *rx_errors2_str[] = {"Non-Aligned", "Abort", "CD-lost", "DPLL", "Overrun", "Length", "CRC", "Break" }; /*const gchar *tx_errors1_str[] = {"", "", "", "", "", "", "", "" }; */ - const gchar *tx_errors2_str[] = {"Underun", "CTS-lost", "UART", "ReTx-limit", "", "", "", "" }; + const gchar *tx_errors2_str[] = {"Underrun", "CTS-lost", "UART", "ReTx-limit", "", "", "", "" }; const gchar *signals_str[] = {"DSR", "DTR", "CTS", "RTS", "DCD", "", "", "" }; const gchar *flags_str[] = {"", "", "", "", "", "", "", "No-buffers" }; @@ -238,7 +238,7 @@ proto_register_sita(void) { &hf_framing, { "Framing", "sita.errors.framing", FT_BOOLEAN, 8, TFS(&tfs_sita_error), SITA_ERROR_RX_FRAMING, "TRUE if Framing Error", HFILL }}, { &hf_parity, { "Parity", "sita.errors.parity", FT_BOOLEAN, 8, TFS(&tfs_sita_error), SITA_ERROR_RX_PARITY, "TRUE if Parity Error", HFILL }}, { &hf_collision, { "Collision", "sita.errors.collision", FT_BOOLEAN, 8, TFS(&tfs_sita_error), SITA_ERROR_RX_COLLISION, "TRUE if Collision", HFILL }}, - { &hf_longframe, { "Long Frame", "sita.errors.longfame", FT_BOOLEAN, 8, TFS(&tfs_sita_error), SITA_ERROR_RX_FRAME_LONG, "TRUE if Long Frame Received", HFILL }}, + { &hf_longframe, { "Long Frame", "sita.errors.longframe", FT_BOOLEAN, 8, TFS(&tfs_sita_error), SITA_ERROR_RX_FRAME_LONG, "TRUE if Long Frame Received", HFILL }}, { &hf_shortframe, { "Short Frame", "sita.errors.shortframe", FT_BOOLEAN, 8, TFS(&tfs_sita_error), SITA_ERROR_RX_FRAME_SHORT, "TRUE if Short Frame", HFILL }}, { &hf_nonaligned, { "NonAligned", "sita.errors.nonaligned", FT_BOOLEAN, 8, TFS(&tfs_sita_error), SITA_ERROR_RX_NONOCTET_ALIGNED, "TRUE if NonAligned Frame", HFILL }}, { &hf_abort, { "Abort", "sita.errors.abort", FT_BOOLEAN, 8, TFS(&tfs_sita_received), SITA_ERROR_RX_ABORT, "TRUE if Abort Received", HFILL }}, diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 978bb0fc24..7b71458092 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -1933,7 +1933,7 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Create the bitfield tree */ bf_item = proto_tree_add_text(tree, tvb, offset, 1, - "Transmision Header Byte 1"); + "Transmission Header Byte 1"); bf_tree = proto_item_add_subtree(bf_item, ett_sna_th_fid); /* Byte 1 */ @@ -1950,7 +1950,7 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Create the bitfield tree */ bf_item = proto_tree_add_text(tree, tvb, offset, 1, - "Transmision Header Byte 2"); + "Transmission Header Byte 2"); bf_tree = proto_item_add_subtree(bf_item, ett_sna_th_fid); /* Byte 2 */ @@ -1971,7 +1971,7 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Create the bitfield tree */ bf_item = proto_tree_add_text(tree, tvb, offset, 1, - "Transmision Header Byte 3"); + "Transmission Header Byte 3"); bf_tree = proto_item_add_subtree(bf_item, ett_sna_th_fid); /* Byte 3 */ @@ -1985,7 +1985,7 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Create the bitfield tree */ bf_item = proto_tree_add_text(tree, tvb, offset, 2, - "Transmision Header Bytes 4-5"); + "Transmission Header Bytes 4-5"); bf_tree = proto_item_add_subtree(bf_item, ett_sna_th_fid); /* Bytes 4-5 */ @@ -2005,7 +2005,7 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Create the bitfield tree */ bf_item = proto_tree_add_text(tree, tvb, offset, 2, - "Transmision Header Bytes 6-7"); + "Transmission Header Bytes 6-7"); bf_tree = proto_item_add_subtree(bf_item, ett_sna_th_fid); /* Bytes 6-7 */ @@ -2039,7 +2039,7 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Create the bitfield tree */ bf_item = proto_tree_add_text(tree, tvb, offset, 2, - "Transmision Header Byte 16"); + "Transmission Header Byte 16"); bf_tree = proto_item_add_subtree(bf_item, ett_sna_th_fid); /* Byte 16 */ @@ -2653,7 +2653,7 @@ proto_register_sna(void) "TH Byte 0", HFILL }}, { &hf_sna_th_fid, - { "Format Identifer", "sna.th.fid", FT_UINT8, BASE_HEX, + { "Format Identifier", "sna.th.fid", FT_UINT8, BASE_HEX, VALS(sna_th_fid_vals), 0xf0, "", HFILL }}, { &hf_sna_th_mpf, diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 1f06edf5a3..e05155e7ba 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -225,7 +225,7 @@ static const value_string reply_table_v5[] = { }; static const value_string cmd_strings[] = { - {0, "Unknow"}, + {0, "Unknown"}, {1, "Connect"}, {2, "Bind"}, {3, "UdpAssociate"}, @@ -300,7 +300,7 @@ static const char *get_command_name( guint Number){ /* return the name of the command as a string */ - if ( Number == 0) return "Unknow"; + if ( Number == 0) return "Unknown"; if ( Number == 1) return "Connect"; if ( Number == 2) return "Bind"; if ( Number == 3) return "UdpAssociate"; @@ -874,7 +874,7 @@ state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, if (!pinfo->fd->flags.visited) new_udp_conversation( hash_info, pinfo); -/*XXX may need else statement to handle unknows and generate error message */ +/*XXX may need else statement to handle unknowns and generate error message */ } } diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index f2a77a7722..3815a5c97a 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -2284,7 +2284,7 @@ ssl_generate_keyring_material(SslDecryptSession*ssl) void ssl_change_cipher(SslDecryptSession *ssl_session, gboolean server) { - ssl_debug_printf("ssl_change_cipher %s: makes no sence without gnutls. ssl %p\n", + ssl_debug_printf("ssl_change_cipher %s: makes no sense without gnutls. ssl %p\n", (server)?"SERVER":"CLIENT", ssl_session); } diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 2a0c5fb491..38d1482d4f 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -1904,7 +1904,7 @@ dissect_ssl3_handshake(tvbuff_t *tvb, packet_info *pinfo, } ssl_save_session(ssl, ssl_session_hash); - ssl_debug_printf("dissect_ssl3_handshake session keys succesfully generated\n"); + ssl_debug_printf("dissect_ssl3_handshake session keys successfully generated\n"); } break; diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index e0e40c8699..a4c4cf1e3b 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -173,7 +173,7 @@ static const value_string message_class_type_values[] = { { MESSAGE_CLASS_CO_MESSAGE * 256 + MESSAGE_TYPE_COERR , "Connection Oriented Error (COERR)" }, { MESSAGE_CLASS_CO_MESSAGE * 256 + MESSAGE_TYPE_COIT , "Inactivity Test (COIT)" }, { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_REG_REQ , "Registration Request (REG_REQ)" }, - { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_REG_RSP , "Registartion Response (REG_RSP)" }, + { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_REG_RSP , "Registration Response (REG_RSP)" }, { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_DEREG_REQ , "Deregistration Request (DEREG_REQ)" }, { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_DEREG_RSP , "Deregistration Response (DEREG_RSP)" }, { 0, NULL } }; @@ -478,7 +478,7 @@ static const value_string v8_error_code_values[] = { { 0x14, "Destination status unknown" }, { 0x15, "Invalid network appearance" }, { 0x16, "Missing parameter" }, - { 0x17, "Routing key change refuesed" }, + { 0x17, "Routing key change refused" }, { 0x18, "Invalid loadsharing label" }, { 0, NULL } }; @@ -793,7 +793,7 @@ dissect_destination_reference_number_parameter(tvbuff_t *parameter_tvb, proto_tr static const value_string cause_type_values[] = { { 0x1, "Return Cause" }, - { 0x2, "Refusual Cause" }, + { 0x2, "Refusal Cause" }, { 0x3, "Release Cause" }, { 0x4, "Reset Cause" }, { 0x5, "Error cause" }, @@ -1160,7 +1160,7 @@ static const value_string nature_of_address_values[] = { { UNKNOWN_NATURE_OF_ADDRESS, "Unknown" }, { SUBSCRIBER_NUMBER_NATURE_OF_ADDRESS, "Subscriber Number" }, { RESERVED_FOR_NATIONAL_USE_NATURE_OF_ADDRESS, "Reserved For National Use" }, - { NATIONAL_SIGNIFICANT_NUMBER_NATURE_OF_ADDRESS, "Natinal Significant Number" }, + { NATIONAL_SIGNIFICANT_NUMBER_NATURE_OF_ADDRESS, "National Significant Number" }, { INTERNATION_NUMBER_NATURE_OF_ADDRESS, "International Number" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 2a3d5b0edd..a8413ce411 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -1105,7 +1105,7 @@ proto_register_tacplus(void) proto_register_subtree_array(ett, array_length(ett)); tacplus_module = prefs_register_protocol (proto_tacplus, tacplus_pref_cb ); - prefs_register_bool_preference(tacplus_module, "desegment", "Reassemble TACACS+ messages spanning multiple TCP segments.", "Whether the TACACS+ dissector should reasssemble messages spanning multiple TCP segments. To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &tacplus_preference_desegment); + prefs_register_bool_preference(tacplus_module, "desegment", "Reassemble TACACS+ messages spanning multiple TCP segments.", "Whether the TACACS+ dissector should reassemble messages spanning multiple TCP segments. To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &tacplus_preference_desegment); prefs_register_string_preference ( tacplus_module, "key", "TACACS+ Encryption Key", "TACACS+ Encryption Key", &tacplus_opt_key ); diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 5551444b59..281627bc2b 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -2414,7 +2414,7 @@ proto_register_tipc(void) { &hf_tipc_org_port, { "Originating port", "tipc.org_port", FT_UINT32, BASE_DEC, NULL, 0xffffffff, - "TIPC Oiginating port", HFILL } + "TIPC Originating port", HFILL } }, { &hf_tipc_dst_port, { "Destination port", "tipc.dst_port", diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index 9b9f905719..753bd041ca 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -582,7 +582,7 @@ static const value_string vals_parm_LUR[] = { }; static const value_string vals_parm_LRR[] = { - { '1', "Leg. code for repitition requested" }, + { '1', "Leg. code for repetition requested" }, { 0, NULL }, }; @@ -620,7 +620,7 @@ static const value_string vals_parm_REQ_OT[] = { static const value_string vals_parm_SSTAT[] = { { '0', "All services" }, - { '1', "All in the moment active servics" }, + { '1', "All in the moment active services" }, { '2', "Call diversion" }, { '3', "Roaming information status" }, { '4', "Call barring status" }, @@ -2119,7 +2119,7 @@ proto_register_ucp(void) { &hf_ucp_parm_LRR, { "LRR", "ucp.parm.LRR", FT_UINT8, BASE_DEC, VALS(vals_parm_LRR), 0x00, - "Leg. code for repitition flag.", + "Leg. code for repetition flag.", HFILL } }, @@ -2217,14 +2217,14 @@ proto_register_ucp(void) { &hf_ucp_parm_RP, { "RP", "ucp.parm.RP", FT_UINT8, BASE_DEC, VALS(vals_parm_RP), 0x00, - "Repitition requested.", + "Repetition requested.", HFILL } }, { &hf_ucp_parm_LRP, { "LRP", "ucp.parm.LRP", FT_STRING, BASE_DEC, NULL, 0x00, - "Legitimisation code for repitition.", + "Legitimisation code for repetition.", HFILL } }, @@ -2679,7 +2679,7 @@ proto_register_ucp(void) { &hf_ucp_parm_MVP, { "MVP", "ucp.parm.MVP", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00, - "Mofified validity period.", + "Modified validity period.", HFILL } }, diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 7a628b63d6..6ebdb3a6fd 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -1923,7 +1923,7 @@ proto_register_uma(void) { &hf_uma_urr_communication_port, { "Communication Port","uma.urr.communication_port", FT_UINT16,BASE_DEC, NULL, 0x0, - "Communication Portt", HFILL } + "Communication Port", HFILL } }, { &hf_uma_urr_L3_Message, { "L3 message contents","uma.urr.l3", diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 932b6674a1..24264dce12 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -3417,7 +3417,7 @@ void proto_register_fp(void) }, { &hf_fp_rach_measurement_result, { "RACH Measurement Result", - "fp.rach-meansurement-result", FT_UINT16, BASE_DEC, 0, 0x0, + "fp.rach-measurement-result", FT_UINT16, BASE_DEC, 0, 0x0, "RACH Measurement Result", HFILL } }, diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index f28f7c29b6..28a50959fc 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -3041,7 +3041,7 @@ proto_register_vnc(void) /* Register our preferences module */ vnc_module = prefs_register_protocol(proto_vnc, proto_reg_handoff_vnc); - prefs_register_bool_preference(vnc_module, "desegment", "Reassemble VNC messages spanning multiple TCP segments.", "Whether the VNC dissector should reasss emble messages spanning multiple TCP segments. To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &vnc_preference_desegment); + prefs_register_bool_preference(vnc_module, "desegment", "Reassemble VNC messages spanning multiple TCP segments.", "Whether the VNC dissector should reassemble messages spanning multiple TCP segments. To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &vnc_preference_desegment); prefs_register_uint_preference(vnc_module, "alternate_port", "Alternate TCP port", "Decode this port's traffic as VNC in addition to the default ports (5500, 5501, 5900, 5901)", 10, &vnc_preference_alternate_port); diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index a93a9bc7d5..6aad238e01 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -5303,7 +5303,7 @@ dissect_x11_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, "errorcode: %d (%s)", errorcode, val_to_str(errorcode, errorcode_vals, - "<Unknown errocode %u>")); + "<Unknown errorcode %u>")); ++offset; proto_item_append_text(ti, ", Error, errorcode: %d (%s)", diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 4392e712fe..67e99109c9 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -544,7 +544,7 @@ static const char *clear_diag(unsigned char code) if (code == 248) return "Connection rejection - incompatible information in user data"; if (code == 249) - return "Connection rejection - unrecognizable protocol indentifier " + return "Connection rejection - unrecognizable protocol identifier " "in user data"; if (code == 250) return "Reset - user resynchronization"; diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c index f6d8c24b01..8c45f1f3f3 100644 --- a/epan/dissectors/packet-xtp.c +++ b/epan/dissectors/packet-xtp.c @@ -107,7 +107,7 @@ static const value_string diag_val_vals[] = { { 10, "Host going down" }, { 11, "Invalid retransmission request" }, { 12, "Context in improper state" }, - { 13, "Joing request denied" }, + { 13, "Join request denied" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index 0c1f653b96..d901f8e5ea 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -531,8 +531,8 @@ proto_register_ymsg(void) ymsg_module = prefs_register_protocol(proto_ymsg, NULL); prefs_register_bool_preference(ymsg_module, "desegment", - "Reasssemble YMSG messages spanning multiple TCP segments", - "Whether the YMSG dissector should reasssemble messages spanning multiple TCP segments. " + "Reassemble YMSG messages spanning multiple TCP segments", + "Whether the YMSG dissector should reassemble messages spanning multiple TCP segments. " "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &ymsg_desegment); } |