diff options
36 files changed, 102 insertions, 107 deletions
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 8c974e95e1..e394dd562a 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -2661,7 +2661,7 @@ dissect_rtcp_app_mcpt(tvbuff_t* tvb, packet_info* pinfo, int offset, proto_tree* if (packet_len >= 4) { guint32 dword = tvb_get_ntohl(tvb, offset); if (dword == 0) { - /* Extra 4 zero bytres */ + /* Extra 4 zero bytes */ proto_tree_add_expert(sub_tree, pinfo, &ei_rtcp_appl_extra_bytes, tvb, offset, 4); packet_len -= 4; offset += 4; @@ -7683,7 +7683,7 @@ proto_register_rtcp(void) { &ei_rtcp_rtpfb_transportcc_bad, { "rtcp.rtpfb.transportcc_bad", PI_MALFORMED, PI_WARN, "Too many packet chunks (more than packet status count)", EXPFILL }}, { &ei_rtcp_mcptt_unknown_fld, { "rtcp.mcptt.unknown_fld", PI_PROTOCOL, PI_WARN, "Unknown field", EXPFILL }}, { &ei_rtcp_mcptt_location_type, { "rtcp.mcptt.location_type_uk", PI_PROTOCOL, PI_WARN, "Unknown location type", EXPFILL }}, - { &ei_rtcp_appl_extra_bytes, { "rtcp.appl.extra_bytres", PI_PROTOCOL, PI_ERROR, "Extra bytes detected", EXPFILL }}, + { &ei_rtcp_appl_extra_bytes, { "rtcp.appl.extra_bytes", PI_PROTOCOL, PI_ERROR, "Extra bytes detected", EXPFILL }}, { &ei_rtcp_appl_not_ascii, { "rtcp.appl.not_ascii", PI_PROTOCOL, PI_ERROR, "Application name is not a string", EXPFILL }}, { &ei_rtcp_appl_non_conformant, { "rtcp.appl.non_conformant", PI_PROTOCOL, PI_ERROR, "Data not according to standards", EXPFILL }}, }; diff --git a/epan/dissectors/packet-rtls.c b/epan/dissectors/packet-rtls.c index d366e3762a..fee74a72ce 100644 --- a/epan/dissectors/packet-rtls.c +++ b/epan/dissectors/packet-rtls.c @@ -659,7 +659,7 @@ proto_register_rtls(void) "Average calculation duration", HFILL } }, { &hf_rtls_ser_num_packets, - { "Num Packets", "rtls.ser.num_packes", + { "Num Packets", "rtls.ser.num_packets", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of packets used in average RSSI calculation", HFILL } }, @@ -710,7 +710,7 @@ proto_register_rtls(void) "Average calculation duration", HFILL } }, { &hf_rtls_aer_num_packets, - { "Num Packets", "rtls.aer.num_packes", + { "Num Packets", "rtls.aer.num_packets", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of packets used in average RSSI calculation", HFILL } }, diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c index 1f08c81297..f08e9c6e16 100644 --- a/epan/dissectors/packet-rtpproxy.c +++ b/epan/dissectors/packet-rtpproxy.c @@ -1132,7 +1132,7 @@ proto_register_rtpproxy(void) { &hf_rtpproxy_command_parameter_proto, { - "RTP tramsission protocol", + "RTP transmsission protocol", "rtpproxy.command_parameter_proto", FT_CHAR, BASE_HEX, diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 78a23b1d99..9db937ce93 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -76,7 +76,7 @@ const value_string rtsp_status_code_vals[] = { { 414, "Request-URI Too Long"}, { 415, "Unsupported Media Type"}, { 451, "Invalid Parameter"}, - { 452, "Illegal Conferenec Identifier"}, + { 452, "Illegal Conference Identifier"}, { 453, "Not Enough Bandwidth"}, { 454, "Session Not Found"}, { 455, "Method Not Valid In This State"}, diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c index 4e27c44dd0..05ff274eea 100644 --- a/epan/dissectors/packet-s7comm.c +++ b/epan/dissectors/packet-s7comm.c @@ -1047,8 +1047,8 @@ static const value_string nck_module_names[] = { { 0x3c, "VSYN - Channel-specific user variables for synchronous actions" }, { 0x3d, "TUS - Tool data: user monitoring data" }, { 0x3e, "TUM - Tool data: user magazine data" }, - { 0x3f, "TUP - Tool data: user magatine place data" }, - { 0x40, "TF - Parametrizing, return parameters of _N_TMGETT, _N_TSEARC" }, + { 0x3f, "TUP - Tool data: user magazine place data" }, + { 0x40, "TF - Parameterizing, return parameters of _N_TMGETT, _N_TSEARC" }, { 0x41, "FB - Channel-specific base frames" }, { 0x42, "SSP2 - State data: Spindle" }, { 0x43, "PUD - programmglobale Benutzerdaten" }, @@ -1063,7 +1063,7 @@ static const value_string nck_module_names[] = { { 0x4c, "FS - System-Frame" }, { 0x4d, "SD - Servo data" }, { 0x4e, "TAD - Application-specific data" }, - { 0x4f, "TAO - Aplication-specific cutting edge data" }, + { 0x4f, "TAO - Application-specific cutting edge data" }, { 0x50, "TAS - Application-specific monitoring data" }, { 0x51, "TAM - Application-specific magazine data" }, { 0x52, "TAP - Application-specific magazine location data" }, @@ -7351,7 +7351,7 @@ proto_register_s7comm (void) { "OB Start info", "s7comm.ob.strt_info", FT_UINT8, BASE_HEX, NULL, 0x0, "OB Start info (OB n has started)", HFILL }}, { &hf_s7comm_ob_flt_id, - { "OB Fault identifcation code", "s7comm.ob.flt_id", FT_UINT8, BASE_HEX, NULL, 0x0, + { "OB Fault identification code", "s7comm.ob.flt_id", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_s7comm_ob_priority, { "OB Priority", "s7comm.ob.priority", FT_UINT8, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-s7comm_szl_ids.c b/epan/dissectors/packet-s7comm_szl_ids.c index 46596d5a38..4fee01eff6 100644 --- a/epan/dissectors/packet-s7comm_szl_ids.c +++ b/epan/dissectors/packet-s7comm_szl_ids.c @@ -405,7 +405,7 @@ static const value_string szl_0119_0174_ledid_index_names[] = { { 0x0012, "IFM1F (interface error interface module 1)" }, { 0x0013, "IFM2F (interface error interface module 2)" }, { 0x0014, "BUS3F (bus fault interface 3)" }, - { 0x0015, "MAINT (meintenance demand)" }, + { 0x0015, "MAINT (maintenance demand)" }, { 0x0016, "DC24V" }, { 0x0080, "IF (init failure)" }, { 0x0081, "UF (user failure)" }, @@ -5541,7 +5541,7 @@ s7comm_szl_xy96_xxxx_register(int proto) { "Offset (Offset in the user data address range of the associated module)", "s7comm.szl.xx96.xxxx.offset", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_s7comm_szl_0096_xxxx_solltyp1, - { "Solltyp1 (Expected Type: Manufacturer no. or profile identificcation)", "s7comm.szl.xx96.xxxx.solltyp1", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Solltyp1 (Expected Type: Manufacturer no. or profile identification)", "s7comm.szl.xx96.xxxx.solltyp1", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_s7comm_szl_0096_xxxx_solltyp2, { "Solltyp2 (Device)", "s7comm.szl.xx96.xxxx.solltyp2", FT_UINT16, BASE_HEX, NULL, 0x0, diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index d86551d576..aeb9bae86f 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -3760,7 +3760,7 @@ proto_register_scsi_osd(void) {"Audit", "scsi_osd.audit", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}}, { &hf_scsi_osd_capability_discriminator, - {"Capability Discriminator", "scsi_osd.capability_descriminator", FT_BYTES, BASE_NONE, + {"Capability Discriminator", "scsi_osd.capability_discriminator", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}}, { &hf_scsi_osd_object_created_time, {"Object Created Time", "scsi_osd.object_created_time", FT_BYTES, BASE_NONE, diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 08b2294b0a..e828f73755 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -7622,14 +7622,14 @@ proto_register_scsi(void) { &hf_scsi_spc_xcopy_head_cscd_desc_type_code, { "Header CSCD description type code", "scsi.extcopy.head_cscd_desc_type_code", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_scsi_spc_xcopy_cscd_desc_type_code, { "CSCD description type code", "scsi.cscd_desc_type_code", FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(desc_type_rval), 0x0, NULL, HFILL}}, { &hf_scsi_spc_xcopy_rel_init_port_id, { "Relative Initiator Port ID", "scsi.extcopy.rel_init_port_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_scsi_spc_xcopy_per_dev_type, { "Peripherial Device Type", "scsi.extcopy.per_dev_type", FT_UINT8, BASE_DEC, VALS(per_dev_type_vals), 0x1F, NULL, HFILL }}, + { &hf_scsi_spc_xcopy_per_dev_type, { "Peripheral Device Type", "scsi.extcopy.per_dev_type", FT_UINT8, BASE_DEC, VALS(per_dev_type_vals), 0x1F, NULL, HFILL }}, { &hf_scsi_spc_xcopy_lu_type, { "LU type", "scsi.extcopy.lu_type", FT_UINT8, BASE_DEC, VALS(lu_type_vals), 0xC0, NULL, HFILL }}, - { &hf_scsi_spc_xcopy_per_dev_type_byte, { "Peripherial Device Type bits", "scsi.extcopy.per_dev_type_byte", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_scsi_spc_xcopy_per_dev_type_byte, { "Peripheral Device Type bits", "scsi.extcopy.per_dev_type_byte", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_scsi_spc_xcopy_disk_block_len, { "Disk block length", "scsi.extcopy.disk_block_len", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_scsi_spc_xcopy_cscd_desc_code_set, { "CSCD descriptor code set", "scsi.extcopy.cscd_code_set", FT_UINT8, BASE_DEC, VALS(scsi_devid_codeset_val), 0x0F, NULL, HFILL }}, { &hf_scsi_spc_xcopy_cscd_desc_assoc, { "CSCD descriptor association", "scsi.extcopy.cscd_assoc", FT_UINT8, BASE_DEC, VALS(scsi_devid_assoc_val), 0x30, NULL, HFILL }}, { &hf_scsi_spc_xcopy_cscd_desc_des_type, { "CSCD descriptor designator type", "scsi.extcopy.cscd_des_type", FT_UINT8, BASE_DEC, VALS(scsi_devid_idtype_val), 0x0F, NULL, HFILL }}, - { &hf_scsi_spc_xcopy_cscd_desc_des_len, { "CSCD descriptor desginator length", "scsi.extcopy.cscd_des_len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_scsi_spc_xcopy_cscd_desc_des_len, { "CSCD descriptor designator length", "scsi.extcopy.cscd_des_len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_scsi_spc_xcopy_seg_desc_type, { "Segment descriptor type code", "scsi.extcopy.seg_desc_type", FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(desc_type_rval), 0x0, NULL, HFILL }}, { &hf_scsi_spc_xcopy_seg_desc_dc, { "Segment descriptor designation count bit", "scsi.extcopy.seg_desc_dc", FT_UINT8, BASE_DEC, NULL, 0x2, NULL, HFILL }}, { &hf_scsi_spc_xcopy_seg_desc_cat, { "Segment descriptor CAT bit", "scsi.extcopy.seg_desc_cat", FT_UINT8, BASE_DEC, NULL, 0x1, NULL, HFILL }}, diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 58ddabd0b5..d0adc4a7ec 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -519,7 +519,7 @@ static const sip_header_t sip_headers[] = { { "Refer-To", "r" }, /* 82 RFC3515 */ #define POS_REFER_TO 82 { "Referred-By", "b" }, /* 83 RFC3892 */ -#define POS_REFERED_BY 83 +#define POS_REFERRED_BY 83 { "Reject-Contact", "j" }, /* 84 RFC3841 */ #define POS_REJECT_CONTACT 84 { "Replaces", NULL }, /* 85 RFC3891 */ @@ -6789,10 +6789,10 @@ void proto_register_sip(void) FT_STRING, BASE_NONE,NULL,0x0, "RFC 3515: Refer-To Header", HFILL } }, - { &hf_header_array[POS_REFERED_BY], - { "Refered By", "sip.Refered-by", + { &hf_header_array[POS_REFERRED_BY], + { "Referred By", "sip.Referred-by", FT_STRING, BASE_NONE,NULL,0x0, - "RFC 3892: Refered-by Header", HFILL } + "RFC 3892: Referred-by Header", HFILL } }, { &hf_header_array[POS_REJECT_CONTACT], { "Reject-Contact", "sip.Reject-Contact", @@ -7512,7 +7512,7 @@ void proto_register_sip(void) prefs_register_bool_preference(sip_module, "hide_generatd_call_id", "Hide the generated Call Id", - "Whether the generated call id should be hiddden(not displayed) in the tree or not.", + "Whether the generated call id should be hidden(not displayed) in the tree or not.", &sip_hide_generatd_call_ids); /* UAT */ diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 7f19233f7d..48c8500709 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -108,7 +108,7 @@ static const value_string message_id[] = { { 0x0021, "MulticastMediaReceptionAck" }, { 0x0022, "OpenReceiveChannelAck" }, { 0x0023, "ConnectionStatisticsRes" }, - { 0x0024, "OffHookWithCalingPartyNumber" }, + { 0x0024, "OffHookWithCallingPartyNumber" }, { 0x0025, "SoftKeySetReq" }, { 0x0026, "SoftKeyEvent" }, { 0x0027, "UnregisterReq" }, @@ -2135,7 +2135,6 @@ static int hf_skinny_stimulusInstance = -1; static int hf_skinny_stimulusStatus = -1; static int hf_skinny_streamPassThroughId = -1; static int hf_skinny_subAppID = -1; -static int hf_skinny_subcriptionFeatureID = -1; static int hf_skinny_subscriptionFeatureID = -1; static int hf_skinny_subscriptionID = -1; static int hf_skinny_systemTime = -1; @@ -2835,7 +2834,7 @@ handle_ConnectionStatisticsResMessage(ptvcursor_t *cursor, packet_info * pinfo _ } /* - * Message: OffHookWithCalingPartyNumberMessage + * Message: OffHookWithCallingPartyNumberMessage * Opcode: 0x0024 * Type: CallControl * Direction: dev2pbx @@ -2843,7 +2842,7 @@ handle_ConnectionStatisticsResMessage(ptvcursor_t *cursor, packet_info * pinfo _ * MsgType: event */ static void -handle_OffHookWithCalingPartyNumberMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) +handle_OffHookWithCallingPartyNumberMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, skinny_conv_info_t * skinny_conv _U_) { guint32 hdr_version = tvb_get_letohl(ptvcursor_tvbuff(cursor), 4); guint32 VariableDirnumSize = (hdr_version >= V18_MSG_TYPE) ? 25 : 24; @@ -4322,7 +4321,7 @@ handle_SubscriptionStatReqMessage(ptvcursor_t *cursor, packet_info * pinfo _U_, guint32 transactionId = 0; transactionId = tvb_get_letohl(ptvcursor_tvbuff(cursor), ptvcursor_current_offset(cursor)); ptvcursor_add(cursor, hf_skinny_transactionId, 4, ENC_LITTLE_ENDIAN); - ptvcursor_add(cursor, hf_skinny_subcriptionFeatureID, 4, ENC_LITTLE_ENDIAN); + ptvcursor_add(cursor, hf_skinny_subscriptionFeatureID, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_timer, 4, ENC_LITTLE_ENDIAN); ptvcursor_add(cursor, hf_skinny_subscriptionID, 64, ENC_ASCII|ENC_NA); skinny_reqrep_add_request(cursor, pinfo, skinny_conv, 0x0048 ^ transactionId); @@ -7844,7 +7843,7 @@ static const skinny_opcode_map_t skinny_opcode_map[] = { {0x0021, handle_MulticastMediaReceptionAckMessage , SKINNY_MSGTYPE_RESPONSE , "MulticastMediaReceptionAckMessage"}, {0x0022, handle_OpenReceiveChannelAckMessage , SKINNY_MSGTYPE_RESPONSE , "OpenReceiveChannelAckMessage"}, {0x0023, handle_ConnectionStatisticsResMessage , SKINNY_MSGTYPE_RESPONSE , "ConnectionStatisticsResMessage"}, - {0x0024, handle_OffHookWithCalingPartyNumberMessage , SKINNY_MSGTYPE_EVENT , "OffHookWithCalingPartyNumberMessage"}, + {0x0024, handle_OffHookWithCallingPartyNumberMessage , SKINNY_MSGTYPE_EVENT , "OffHookWithCallingPartyNumberMessage"}, {0x0025, NULL , SKINNY_MSGTYPE_REQUEST , "SoftKeySetReqMessage"}, {0x0026, handle_SoftKeyEventMessage , SKINNY_MSGTYPE_EVENT , "SoftKeyEventMessage"}, {0x0027, handle_UnregisterReqMessage , SKINNY_MSGTYPE_REQUEST , "UnregisterReqMessage"}, @@ -8347,7 +8346,7 @@ proto_register_skinny(void) NULL, HFILL }}, { &hf_skinny_OrigDialed, { - "Originaly Dialed", "skinny.OrigDialed", FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0001, + "Originally Dialed", "skinny.OrigDialed", FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0001, NULL, HFILL }}, { &hf_skinny_PhoneFeatures_Abbreviated_Dial, { @@ -9925,10 +9924,6 @@ proto_register_skinny(void) { "subAppID", "skinny.subAppID", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - {&hf_skinny_subcriptionFeatureID, - { - "subcriptionFeatureID", "skinny.subcriptionFeatureID", FT_UINT32, BASE_HEX | BASE_EXT_STRING, &SubscriptionFeatureID_ext, 0x0, - NULL, HFILL }}, {&hf_skinny_subscriptionFeatureID, { "subscriptionFeatureID", "skinny.subscriptionFeatureID", FT_UINT32, BASE_HEX | BASE_EXT_STRING, &SubscriptionFeatureID_ext, 0x0, diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 0e57c50d12..374420a536 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -12745,7 +12745,7 @@ proto_register_smb2(void) }, { &hf_smb2_error_redir_res_name, - { "Resourse Name", "smb2.error.share_redirect.res_name", FT_STRING, STR_UNICODE, + { "Resource Name", "smb2.error.share_redirect.res_name", FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } }, @@ -12816,7 +12816,7 @@ proto_register_smb2(void) { &hf_smb2_svhdx_open_device_context_has_initiator_id, { "HasInitiatorId", "smb2.svhdx_open_device_context.initiator_has_id", FT_BOOLEAN, 8, - TFS(&tfs_smb2_svhdx_has_initiator_id), 0, "Whether the host has an intiator", HFILL } + TFS(&tfs_smb2_svhdx_has_initiator_id), 0, "Whether the host has an initiator", HFILL } }, { &hf_smb2_svhdx_open_device_context_reserved, diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 9b4a5bed52..c23d6ccb55 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -1280,7 +1280,7 @@ proto_register_socks( void){ } }, { &hf_socks_subnegotiation_version, - { "Subnegotiation Version", "socks.subnegotation_version", FT_UINT8, BASE_DEC, NULL, + { "Subnegotiation Version", "socks.subnegotiation_version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-someip.c b/epan/dissectors/packet-someip.c index 04c193628a..f94fda6fe0 100644 --- a/epan/dissectors/packet-someip.c +++ b/epan/dissectors/packet-someip.c @@ -2990,7 +2990,7 @@ proto_register_someip(void) { UAT_FLD_DEC(someip_parameter_arrays, lower_limit, "Lower Limit", "Dimension (32bit dec)"), UAT_FLD_DEC(someip_parameter_arrays, upper_limit, "Upper Limit", "Dimension (32bit dec)"), UAT_FLD_DEC(someip_parameter_arrays, length_of_length, "Length of Length Field", "Version of the SOME/IP Service (8bit dec)"), - UAT_FLD_DEC(someip_parameter_arrays, pad_to, "Pad to", "Padding pads to reach allignment (8bit dec)"), + UAT_FLD_DEC(someip_parameter_arrays, pad_to, "Pad to", "Padding pads to reach alignment (8bit dec)"), UAT_END_FIELDS }; @@ -2998,7 +2998,7 @@ proto_register_someip(void) { UAT_FLD_HEX(someip_parameter_structs, id, "ID", "ID of SOME/IP struct (32bit hex without leading 0x)"), UAT_FLD_CSTRING(someip_parameter_structs, struct_name, "Struct Name", "Name of struct"), UAT_FLD_DEC(someip_parameter_structs, length_of_length, "Length of Length Field", "Length of the strcuts length field (8bit dec)"), - UAT_FLD_DEC(someip_parameter_structs, pad_to, "Pad to", "Padding pads to reach allignment (8bit dec)"), + UAT_FLD_DEC(someip_parameter_structs, pad_to, "Pad to", "Padding pads to reach alignment (8bit dec)"), UAT_FLD_DEC(someip_parameter_structs, num_of_items, "Number of Items", "Number of Items (16bit dec)"), @@ -3014,7 +3014,7 @@ proto_register_someip(void) { UAT_FLD_CSTRING(someip_parameter_unions, name, "Union Name", "Name of union"), UAT_FLD_DEC(someip_parameter_unions, length_of_length, "Length of Length Field", "Length of the unions length field (uint8 dec)"), UAT_FLD_DEC(someip_parameter_unions, length_of_type, "Length of Type Field", "Length of the unions type field (8bit dec)"), - UAT_FLD_DEC(someip_parameter_unions, pad_to, "Pad to", "Padding pads to reach allignment (8bit dec)"), + UAT_FLD_DEC(someip_parameter_unions, pad_to, "Pad to", "Padding pads to reach alignment (8bit dec)"), UAT_FLD_DEC(someip_parameter_unions, num_of_items, "Number of Items", "Number of Items (32bit dec)"), @@ -3055,7 +3055,7 @@ proto_register_someip(void) { UAT_FLD_DEC(someip_parameter_strings, max_length, "Max. Length", "Maximum length/Length (uint32 dec)"), UAT_FLD_DEC(someip_parameter_strings, length_of_length, "Length of Len Field", "Length of the length field (uint8 dec)"), UAT_FLD_DEC(someip_parameter_strings, big_endian, "Big Endian", "Encoded Big Endian 0=no 1=yes"), - UAT_FLD_DEC(someip_parameter_strings, pad_to, "Pad to" , "Padding pads to reach allignment (8bit dec)"), + UAT_FLD_DEC(someip_parameter_strings, pad_to, "Pad to" , "Padding pads to reach alignment (8bit dec)"), UAT_END_FIELDS }; diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index 553b08107e..79cd397922 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -1816,7 +1816,7 @@ void proto_register_spdy(void) { &hf_spdy_slot, { "Slot", "spdy.slot", FT_UINT16, BASE_DEC, NULL, 0x00FF, - "Specifying the index in the server's CREDENTIAL vector of the client certificate to be used for this reques", HFILL + "Specifying the index in the server's CREDENTIAL vector of the client certificate to be used for this request", HFILL } }, { &hf_spdy_num_headers, diff --git a/epan/dissectors/packet-sstp.c b/epan/dissectors/packet-sstp.c index cc7bbfad2b..230d8c8be6 100644 --- a/epan/dissectors/packet-sstp.c +++ b/epan/dissectors/packet-sstp.c @@ -470,7 +470,7 @@ proto_register_sstp(void) }, /* Encapsulated Protocol (2 Bytes) */ { &hf_sstp_ecapsulated_protocol, - { "Encapsulated Procotol", "sstp.encapsulatedprotocol", + { "Encapsulated Protocol", "sstp.encapsulatedprotocol", FT_UINT16, BASE_HEX, VALS(encapsulated_protocols), 0x0, NULL, HFILL } diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c index 0c87d558b7..673f4c36d6 100644 --- a/epan/dissectors/packet-stanag4607.c +++ b/epan/dissectors/packet-stanag4607.c @@ -233,12 +233,12 @@ static const value_string stanag4607_radar_mode_vals[] = { static const value_string stanag4607_terrain_vals[] = { { 0, "None Specified" }, - { 1, "DTED0 (Digital Terrain Eelevation Data, Level 0)" }, - { 2, "DTED1 (Digital Terrain Eelevation Data, Level 1)" }, - { 3, "DTED2 (Digital Terrain Eelevation Data, Level 2)" }, - { 4, "DTED3 (Digital Terrain Eelevation Data, Level 3)" }, - { 5, "DTED4 (Digital Terrain Eelevation Data, Level 4)" }, - { 6, "DTED5 (Digital Terrain Eelevation Data, Level 5)" }, + { 1, "DTED0 (Digital Terrain Elevation Data, Level 0)" }, + { 2, "DTED1 (Digital Terrain Elevation Data, Level 1)" }, + { 3, "DTED2 (Digital Terrain Elevation Data, Level 2)" }, + { 4, "DTED3 (Digital Terrain Elevation Data, Level 3)" }, + { 5, "DTED4 (Digital Terrain Elevation Data, Level 4)" }, + { 6, "DTED5 (Digital Terrain Elevation Data, Level 5)" }, { 7, "SRTM1 (Shuttle Radar Topography Mission, Level 1)" }, { 8, "SRTM2 (Shuttle Radar Topography Mission, Level 2)" }, { 9, "DGM50 M745 (Digitales Gelandemodell 1:50 000)" }, diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index d10fc97abe..67fa1fa35b 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -2395,7 +2395,7 @@ proto_register_sua(void) { &hf_sua_network_appearance, { "Network Appearance", "sua.network_appearance", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_sua_correlation_id, { "Correlation ID", "sua.correlation_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_sua_importance_reserved, { "Reserved", "sua.importance_reserved", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_sua_importance, { "Importance", "sua.importance_inportance", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, + { &hf_sua_importance, { "Importance", "sua.importance_importance", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_sua_message_priority_reserved, { "Reserved", "sua.message_priority_reserved", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_sua_message_priority, { "Message Priority", "sua.message_priority_priority", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_sua_protocol_class_reserved, { "Reserved", "sua.protcol_class_reserved", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c index fbce500d21..ea2bcdaa8f 100644 --- a/epan/dissectors/packet-synergy.c +++ b/epan/dissectors/packet-synergy.c @@ -183,7 +183,7 @@ dissect_synergy_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d proto_tree_add_string_format_value(synergy_tree,hf_synergy_packet_type,tvb,offset+4,4,buffer,"Reset Options (%s)",buffer); proto_tree_add_item(synergy_tree,hf_synergy_crop,tvb,offset+8,-1,ENC_NA); } else if(strncmp(buffer,"CIAK",4)==0) { - proto_tree_add_string_format_value(synergy_tree,hf_synergy_packet_type,tvb,offset+4,4,buffer,"Resolution Chagne Acknowledgment (%s)",buffer); + proto_tree_add_string_format_value(synergy_tree,hf_synergy_packet_type,tvb,offset+4,4,buffer,"Resolution Change Acknowledgment (%s)",buffer); proto_tree_add_item(synergy_tree,hf_synergy_ciak,tvb,offset+8,-1,ENC_NA); } else if(strncmp(buffer,"DKDN",4)==0) { proto_tree_add_string_format_value(synergy_tree,hf_synergy_packet_type,tvb,offset+4,4,buffer,"Key Pressed (%s)",buffer); diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 765914bea6..12b388b366 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -382,7 +382,7 @@ static const value_string conf_phasor_type[] = { }; static const true_false_string conf_phasor_type_b03 = { - "Currrent", + "Current", "Voltage" }; diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index ffa3fcc171..58dec70f44 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -6377,7 +6377,7 @@ proto_register_tn3270(void) }, { &hf_tn3270_checkpoint, { "Byte offset from Set Checkpoint Interval structured field to the first" - " character afterhe code point or character that caused an eject to the" + " character after the code point or character that caused an eject to the" " checkpointed page", "tn3270.checkpoint", FT_UINT32, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index b31bdde591..a496643f63 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -6215,11 +6215,11 @@ proto_register_tn5250(void) FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_tn5250_wdsf_deg_ms_horizontal_dimension, - { "Horizontal Dimenstion", "tn5250.wdsf_deg_ms_horizontal_dimension", + { "Horizontal Dimension", "tn5250.wdsf_deg_ms_horizontal_dimension", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_tn5250_wdsf_deg_ms_vertical_dimension, - { "Vertical Dimenstion", "tn5250.wdsf_deg_ms_vertical_dimension", + { "Vertical Dimension", "tn5250.wdsf_deg_ms_vertical_dimension", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_tn5250_wdsf_deg_ms_default_color, diff --git a/epan/dissectors/packet-twamp.c b/epan/dissectors/packet-twamp.c index ac4a62ab40..cd135fa61c 100644 --- a/epan/dissectors/packet-twamp.c +++ b/epan/dissectors/packet-twamp.c @@ -724,7 +724,7 @@ void proto_register_twamp(void) }, {&hf_twamp_control_accept, {"Accept", "twamp.control.accept", FT_UINT8, BASE_DEC, VALS(twamp_control_accept_vals), 0x0, - "Message acceptence by the other side", HFILL} + "Message acceptance by the other side", HFILL} }, {&hf_twamp_control_sender_port, {"Sender Port", "twamp.control.sender_port", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL} diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c index a07f2a1dda..aa2636b2d9 100644 --- a/epan/dissectors/packet-ua3g.c +++ b/epan/dissectors/packet-ua3g.c @@ -1045,7 +1045,7 @@ static const value_string set_param_req_skin_id[] = { static const value_string set_param_req_usb_boost[] = { {0x00 , "Disable"}, {0x01 , "Enable"}, - {0x02 , "Auto-Negociation"}, + {0x02 , "Auto-Negotiation"}, {0, NULL} }; @@ -4909,8 +4909,8 @@ proto_register_ua3g(void) { &hf_ua3g_beep_beep_destination, { "Destination", "ua3g.command.beep.destination", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_beep_beep_destination_handset, { "Handset", "ua3g.command.beep.destination.handset", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_ua3g_beep_beep_destination_headset, { "Headset", "ua3g.command.beep.destination.headset", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, - { &hf_ua3g_beep_beep_destination_loudspeaker, { "Loudspeeker", "ua3g.command.beep.destination.loudspeaker", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, - { &hf_ua3g_beep_beep_destination_announce_loudspeaker, { "Announce Loudspeeker", "ua3g.command.beep.destination.announce_loudspeaker", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, + { &hf_ua3g_beep_beep_destination_loudspeaker, { "Loudspeaker", "ua3g.command.beep.destination.loudspeaker", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, + { &hf_ua3g_beep_beep_destination_announce_loudspeaker, { "Announce Loudspeaker", "ua3g.command.beep.destination.announce_loudspeaker", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, { &hf_ua3g_beep_beep_destination_handsfree, { "Handsfree", "ua3g.command.beep.destination.handsfree", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_ua3g_beep_freq_sample, { "Freq sample", "ua3g.command.beep.note.freq_sample", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_beep_level, { "Level", "ua3g.command.beep.note.level", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-uasip.c b/epan/dissectors/packet-uasip.c index 164706295f..d8f21ae886 100644 --- a/epan/dissectors/packet-uasip.c +++ b/epan/dissectors/packet-uasip.c @@ -518,7 +518,7 @@ void proto_register_uasip(void) expert_register_field_array(expert_uasip, ei, array_length(ei)); uasip_module = prefs_register_protocol(proto_uasip, proto_reg_handoff_uasip); - prefs_register_obsolete_preference(uasip_module, "aplication_octet_stream"); + prefs_register_obsolete_preference(uasip_module, "application_octet_stream"); prefs_register_bool_preference(uasip_module, "noesip", "Try to decode SIP NOE", "NOE SIP Protocol", &noesip_enabled); prefs_register_string_preference(uasip_module, "proxy_ipaddr", "Proxy IP Address", "IPv4 address of the proxy (Invalid values will be ignored)", diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c index c0cca7d13b..c7391f535a 100644 --- a/epan/dissectors/packet-ubertooth.c +++ b/epan/dissectors/packet-ubertooth.c @@ -2127,7 +2127,7 @@ proto_register_ubertooth(void) NULL, HFILL } }, { &hf_chip_status_reserved, - { "Reserved", "ubertooth.status.resered", + { "Reserved", "ubertooth.status.reserved", FT_BOOLEAN, 8, NULL, 0xE0, NULL, HFILL } }, @@ -2668,7 +2668,7 @@ proto_register_ubertooth(void) NULL, HFILL } }, { &hf_cc2400_freqest_rx_freq_offset, - { "Rx Frequence Offset", "ubertooth.register.value.freqest.rx_freq_offset", + { "Rx Frequency Offset", "ubertooth.register.value.freqest.rx_freq_offset", FT_INT16, BASE_DEC, NULL, 0xFF00, NULL, HFILL } }, diff --git a/epan/dissectors/packet-uds.c b/epan/dissectors/packet-uds.c index 539e6faba2..e4e63744b4 100644 --- a/epan/dissectors/packet-uds.c +++ b/epan/dissectors/packet-uds.c @@ -752,7 +752,7 @@ proto_register_uds(void) { &hf_uds_dsc_parameter_record, { - "Parameter Record", "uds.dsc.paramter_record", + "Parameter Record", "uds.dsc.parameter_record", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 0d059ced67..9b85279842 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -755,7 +755,7 @@ static const value_string sample_size_vals[] = { /* MPS, Manual PLMN Selection indicator (octet 3) */ static const value_string mps_vals[] = { { 0, "The MS is in Automatic PLMN selection mode."}, - { 1, "The MS is in Manual PLMN selection mode and request the listof PLMN identities that may provide UMAN service in the current location."}, + { 1, "The MS is in Manual PLMN selection mode and request the list of PLMN identities that may provide UMAN service in the current location."}, { 2, "The MS is in Manual PLMN selection mode and tries to register; no PLMN list is needed."}, { 0, NULL } }; diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index a78c21e85e..9abc068710 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -7048,7 +7048,7 @@ void proto_register_fp(void) { &ei_fp_pch_lost_relevant_pi_frame, { "fp.pch_lost_relevant_pi_frame", PI_SEQUENCE, PI_WARN, "Previous PCH frame containing PI bitmap not captured (common at capture start)", EXPFILL }}, { &ei_fp_hsdsch_entity_not_specified, { "fp.hsdsch_entity_not_specified", PI_MALFORMED, PI_ERROR, "HSDSCH Entity not specified", EXPFILL }}, { &ei_fp_hsdsch_common_experimental_support, { "fp.hsdsch_common.experimental_support", PI_DEBUG, PI_WARN, "HSDSCH COMMON - Experimental support!", EXPFILL }}, - { &ei_fp_hsdsch_common_t3_not_implemented, { "fp.hsdsch_common_t3.not_implemented", PI_DEBUG, PI_ERROR, "HSDSCH COMMON T3 - Not implemeneted!", EXPFILL }}, + { &ei_fp_hsdsch_common_t3_not_implemented, { "fp.hsdsch_common_t3.not_implemented", PI_DEBUG, PI_ERROR, "HSDSCH COMMON T3 - Not implemented!", EXPFILL }}, { &ei_fp_channel_type_unknown, { "fp.channel_type.unknown", PI_MALFORMED, PI_ERROR, "Unknown channel type", EXPFILL }}, { &ei_fp_no_per_frame_info, { "fp.no_per_frame_info", PI_UNDECODED, PI_ERROR, "Can't dissect FP frame because no per-frame info was attached!", EXPFILL }}, { &ei_fp_no_per_conv_channel_info, { "fp.no_per_conv_channel_info", PI_UNDECODED, PI_ERROR, "Can't dissect this FP stream because no per-conversation channel info was attached!", EXPFILL }}, diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c index 6d9bac690b..b0b1f66dd0 100644 --- a/epan/dissectors/packet-usb-audio.c +++ b/epan/dissectors/packet-usb-audio.c @@ -485,7 +485,7 @@ static const value_string ms_ep_subtype_vals[] = { /* Table A-7: Audio Function Category Codes */ static const value_string audio_function_categories_vals[] = { - {0x00, "Undefinied"}, + {0x00, "Undefined"}, {0x01, "Desktop speaker"}, {0x02, "Home theater"}, {0x03, "Microphone"}, @@ -590,7 +590,7 @@ static const value_string terminal_types_vals[] = { {0x0604, "Legacy audio connector"}, {0x0605, "S/PDIF interface"}, {0x0606, "1394 DA stream"}, - {0x0607, "1394 DV stream soudtrack"}, + {0x0607, "1394 DV stream soundtrack"}, /* Embedded Function Terminal Types */ {0x0700, "Embedded Undefined"}, {0x0701, "Level Calibration Noise Source"}, diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c index 9c62e44b42..6464942334 100644 --- a/epan/dissectors/packet-usb-ccid.c +++ b/epan/dissectors/packet-usb-ccid.c @@ -71,7 +71,7 @@ static int hf_ccid_dwFeatures_nadValNot0accept = -1; static int hf_ccid_dwFeatures_autoIfsd = -1; static int hf_ccid_dwFeatures_levelExchangeTDPU = -1; static int hf_ccid_dwFeatures_levelExchangeShortAPDU = -1; -static int hf_ccid_dwFeatures_levelExchangeShortExtentedAPDU = -1; +static int hf_ccid_dwFeatures_levelExchangeShortExtendedAPDU = -1; static int hf_ccid_dwFeatures_UsbWakeUp = -1; static int hf_ccid_dwMaxCCIDMessageLength = -1; static int hf_ccid_bClassGetResponse = -1; @@ -132,7 +132,7 @@ static int * const bFeatures_fields[] = { &hf_ccid_dwFeatures_autoIfsd, &hf_ccid_dwFeatures_levelExchangeTDPU, &hf_ccid_dwFeatures_levelExchangeShortAPDU, - &hf_ccid_dwFeatures_levelExchangeShortExtentedAPDU, + &hf_ccid_dwFeatures_levelExchangeShortExtendedAPDU, &hf_ccid_dwFeatures_UsbWakeUp, NULL }; @@ -798,9 +798,9 @@ proto_register_ccid(void) { "Short APDU level exchange", "usbccid.dwFeatures.levelExchangeShortAPDU", FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x020000, NULL, HFILL }}, - {&hf_ccid_dwFeatures_levelExchangeShortExtentedAPDU, + {&hf_ccid_dwFeatures_levelExchangeShortExtendedAPDU, { "Short and Extended APDU level exchange", - "usbccid.dwFeatures.levelExchangeShortExtentedAPDU", FT_BOOLEAN, 32, + "usbccid.dwFeatures.levelExchangeShortExtendedAPDU", FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x040000, NULL, HFILL }}, {&hf_ccid_dwFeatures_UsbWakeUp, { "USB Wake up signaling supported on card insertion and removal", diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c index 18c4c779cd..16afa4f9c7 100644 --- a/epan/dissectors/packet-uts.c +++ b/epan/dissectors/packet-uts.c @@ -322,13 +322,13 @@ proto_register_uts(void) { "DID", "uts.did", FT_UINT8, BASE_HEX, NULL, 0, "Device Identifier address", HFILL }}, { &hf_retxrequest, - { "ReTxRequst", "uts.retxrequst", + { "ReTxRequest", "uts.retxrequest", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if Re-transmit Request", HFILL }}, { &hf_ack, { "Ack", "uts.ack", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if Ack", HFILL }}, { &hf_replyrequest, - { "ReplyRequst", "uts.replyrequest", + { "ReplyRequest", "uts.replyrequest", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if Reply Request", HFILL }}, { &hf_busy, { "Busy", "uts.busy", diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c index 55213e2e39..78798f9435 100644 --- a/epan/dissectors/packet-v52.c +++ b/epan/dissectors/packet-v52.c @@ -181,7 +181,7 @@ static const value_string msg_type_values [] = { { SIGNAL_ACK, "Signal Ack" }, { DISCONNECT, "Disconnect" }, { DISCONNECT_COMPLETE, "Disconnect Complete" }, - { STATUS_ENQUIRY, "Status Enqury" }, + { STATUS_ENQUIRY, "Status Enquiry" }, { STATUS, "Status" }, { PROTOCOL_PARAMETER, "Protocol Parameter" }, { PORT_CONTROL, "Port Control" }, @@ -2363,7 +2363,7 @@ proto_register_v52(void) FT_UINT8, BASE_HEX, VALS(bcc_protocol_error_cause_type_values), 0x7f, NULL, HFILL } }, {&hf_v52_diagnostic_message, - { "Diagnostic message", "v52.diagnoatic_message", + { "Diagnostic message", "v52.diagnostic_message", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL } }, {&hf_v52_diagnostic_information, diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index 8788507d59..d9723843ff 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -499,8 +499,8 @@ static const value_string wassp_mu_header_types[] = { WASSP_MU_MIRRORN, "MU Mirror N"}, { WASSP_MU_NETFLOW, "MU Netflow"}, { WASSP_MU_Radius_Update, "MU Radius Update"}, - { WASSP_AP2AC_MU_Inform_Req, "AccessPiont To Controller MU Info Request"}, - { WASSP_AP2AC_MU_Inform_Rsp, "AccessPiont To Controller MU Info Response"}, + { WASSP_AP2AC_MU_Inform_Req, "AccessPoint To Controller MU Info Request"}, + { WASSP_AP2AC_MU_Inform_Rsp, "AccessPoint To Controller MU Info Response"}, { WASSP_MU_Eap_Last, "MU Extensible Authentication Protocol Last"}, { WASSP_MU_PMIRROR, "MU P Mirror"}, { WASSP_MU_UNUSED_18, "MU Unused 18"}, @@ -981,7 +981,7 @@ static const value_string wassp_tlv_types[] = { EID_RU_SCAN_TIMES, "AccessPoint Scan Times"}, { EID_RU_SCAN_DELAY, "AccessPoint Scan Delay"}, { EID_RU_SCAN_REQ_ID, "AccessPoint Scan Request ID"}, - { EID_STATIC_CONFIG, "Static Configuation"}, + { EID_STATIC_CONFIG, "Static Configuration"}, { EID_LOCAL_BRIDGING, "Local Bridging"}, { EID_STATIC_BP_IPADDR, "Static AccessPoint IP Address"}, { EID_STATIC_BP_NETMASK, "Static AccessPoint NetMask"}, @@ -1080,7 +1080,7 @@ static const value_string wassp_tlv_types[] = { EID_SIAPP_PACKET_RETRIES, "SIAPP Packet Retries"}, { EID_SIAPP_ASSOC_IN_WLAN, "SIAPP MU Association With In Same WLAN"}, { EID_SIAPP_ASSOC_IN_CLUSTER, "SIAPP MU Association With In Same Cluster"}, - { EID_SIAPP_REASSOC_IN_CLUSTER, "SIAPP MU Ressociation With In Same Cluster"}, + { EID_SIAPP_REASSOC_IN_CLUSTER, "SIAPP MU Reassociation With In Same Cluster"}, { EID_SIAPP_THIN_BLOCK, "SIAPP Thin Access Points Block"}, { EID_SIAPP_NEWAP_BSSID, "SIAPP New Access Points BSSID"}, { EID_SIAPP_OLDAP_BSSID, "SIAPP Old Access Points BSSID"}, @@ -1126,7 +1126,7 @@ static const value_string wassp_tlv_types[] = { EID_MU_LOGIN_LAT_PORT, "MU Login authentication state(0 = Non-auth, 1 = Auth)"}, { EID_MU_IDLE_TIMEOUT, "MU Session Idle Timeout"}, { EID_MU_ACCT_INTERIM_INTERVAL, "Client Acct-Interim-Interval(RADIUS)"}, - { EID_MU_IP_ADDR, "MU IP Addresss"}, + { EID_MU_IP_ADDR, "MU IP Address"}, { EID_MU_TERMINATE_ACTION, "MU Terminate Action"}, { EID_SITE_NAME, "Site Name"}, { EID_PEER_SITE_IP, "Peer Site IP Address"}, @@ -1254,7 +1254,7 @@ static const value_string wassp_tlv_types[] = { EID_MU_RFS_NAME, "MU RFS Name"}, { EID_MU_FLAGS, "MU Flags"}, { EID_MU_ASSOC_TIME, "MU Associated Time"}, - { EID_MU_ACTIVE_TIME, "MU Actived Time"}, + { EID_MU_ACTIVE_TIME, "MU Active Time"}, { EID_REPORT_REQ, "Report Request"}, { EID_MU_URL, "MU Capive Portal Url"}, { EID_MU_SESSION_LIFETIME, "MU Session Life Time"}, @@ -1541,7 +1541,7 @@ const TLV_PARSER_ENTRY tlvMainTable[] = { EID_MU_LOGIN_LAT_PORT, "MU Login authentication state(0 = Non-auth, 1 = Auth)", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_MU_IDLE_TIMEOUT, "MU Session Idle Timeout", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_MU_ACCT_INTERIM_INTERVAL, "Client Acct-Interim-Interval(RADIUS)", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, - { EID_MU_IP_ADDR, "MU IP Addresss", TLV_TYPE_IP_ADDR, 0, 0, 0, 0, 0, 0, 0, 0}, + { EID_MU_IP_ADDR, "MU IP Address", TLV_TYPE_IP_ADDR, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_MU_TERMINATE_ACTION, "MU Terminate Action", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_SITE_NAME, "Site Name", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_PEER_SITE_IP, "Peer Site IP Address", TLV_TYPE_IP_ADDR, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -1933,9 +1933,9 @@ typedef enum EID_IOT_BLE_SCAN_INTERVAL, EID_IOT_BLE_SCAN_WINDOW, EID_IOT_BLE_SCAN_MIN_RSSI, - EID_LSENSE_SERVER, - EID_LSENSE_MIN_RSSI, - EID_LSENSE_REP_FREQ, + EID_LISENSE_SERVER, + EID_LISENSE_MIN_RSSI, + EID_LISENSE_REP_FREQ, EID_DPI_SIG_HASH, EID_ANT_MODELS_IOT, EID_FABRICATTACH_ARRAY, @@ -2004,7 +2004,7 @@ const TLV_PARSER_ENTRY tlvGlobalConfigTable[] = { EID_MCAST_SLP_RETRY_DELAY, "Delay Between Multicast SLP Retries", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_DISC_RETRY_COUNT, "Retry Count for Discovery", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_DISC_RETRY_DELAY, "Delay Between Discovery Retries", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0}, - { EID_LOGGING_ALARM_SEV, "Miminum Severity of Event to Report", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, + { EID_LOGGING_ALARM_SEV, "Minumum Severity of Event to Report", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_BLACKLIST_ADD, "Add Clients to MAC Access List", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_FAILOVER_AC_IP_ADDR, "Array of Controllers IP Addresses for Legacy Failover", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_STATIC_AC_IP_ADDR, "Array of Static Controller IP Addresses", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -2013,7 +2013,7 @@ const TLV_PARSER_ENTRY tlvGlobalConfigTable[] = { EID_STATIC_AP_IP_NETMASK, "Uplink Netmask", TLV_TYPE_IP_ADDR, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_STATIC_AP_DEFAULT_GW, "Uplink Default Gateway", TLV_TYPE_IP_ADDR, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_BLACKLIST_DEL, "Remove Clients from MAC Access List", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0}, - { EID_MACADDR_REQ, "Request to Send Radio BSSIDs in Config Acknowle", TLV_TYPE_BOOL, 0, 0, 0, 0, 0, 0, 0, 0}, + { EID_MACADDR_REQ, "Request to Send Radio BSSIDs in Config Acknowledge", TLV_TYPE_BOOL, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_AVAILABILITY_MODE, "Availability Mode", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_AP_PERSISTENCE, "Keep Client Sessions When Connection to Controller Times Out", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_FOREIGN_AP, "Home AP = 0, Foreign AP = 1", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -2117,9 +2117,9 @@ const TLV_PARSER_ENTRY tlvGlobalConfigTable[] = { EID_IOT_BLE_SCAN_INTERVAL, "IOT BLE Scan Interval In Milliseconds", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { 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_LSENSE_SERVER, "Lsense Server", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0}, - { EID_LSENSE_MIN_RSSI, "Lsense Min RSSI", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0}, - { EID_LSENSE_REP_FREQ, "Lsense Report Frequency", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, + { EID_LISENSE_SERVER, "Lisense 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_REP_FREQ, "Lisense 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}, { EID_FABRICATTACH_ARRAY, "Array Of FabricAttach ID", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -2195,7 +2195,7 @@ typedef enum EID_DOT11_MultipleRetryCount, // 7 EID_DOT11_RTSFailureCount, // 8 EID_DOT11_RTSSuccessCount, // 9 - EID_DOT11_ReceivedFragementCount, // 10 + EID_DOT11_ReceivedFragmentCount, // 10 EID_DOT11_RetryCount, // 11 EID_DOT11_TransmittedFragmentCount, // 12 EID_DOT11_TransmittedFrameCount, // 13 @@ -2376,7 +2376,7 @@ const TLV_PARSER_ENTRY tlvBeastConfigTable[] = { EID_DOT11_MultipleRetryCount, "802.11 Multiple Retry Count", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_DOT11_RTSFailureCount, "802.11 RTS Failure Count", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_DOT11_RTSSuccessCount, "802.11 RTS Success Count", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0}, - { EID_DOT11_ReceivedFragementCount, "802.11 Received Fragement Count", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0}, + { EID_DOT11_ReceivedFragmentCount, "802.11 Received Fragment Count", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_DOT11_RetryCount, "802.11 Retry Count", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_DOT11_TransmittedFragmentCount, "802.11 Transmitted Fragment Count", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_DOT11_TransmittedFrameCount, "802.11 Transmitted Frame Count", TLV_TYPE_INT, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -2983,7 +2983,7 @@ const TLV_PARSER_ENTRY tlvVnsConfigTable[] = { EID_V_APP_IDENTIFICATION_ENABLED, "Enable/Disable Application Identification", TLV_TYPE_BOOL, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_V_PRIVACY, "Privacy", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_V_11U_OSEN, "Enable OSU Server-Only Authenticated L2 Encryption Network", TLV_TYPE_BOOL, 0, 0, 0, 0, 0, 0, 0, 0}, - { EID_V_QOS_IN_USE, "Bitmask Used to Select DHCP Values for QoS Maping", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0}, + { EID_V_QOS_IN_USE, "Bitmask Used to Select DHCP Values for QoS Mapping", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_V_CP_CONFIG_BLOCK, "CP Configuration Block", TLV_TYPE_BLOCK_TLV, TAB_V_CP_CONFIG_BLOCK, 0, 0, 0, 0, 0, 0, 0}, { EID_V_CP_IDENTITY, "User Identity", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_V_CP_PASSPHRASE, "Shared Secret in Encryption Form", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -3415,7 +3415,7 @@ const TLV_PARSER_ENTRY tlvSiteConfigTable[] = { EID_SITE_LOCATION_BASED_LOOKUP_BLOCK, "Location Based Lookup Block", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_SITE_RADIUS_SERVER_BLOCK, "Radius Server Block", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_NAC_KRB_KDCS, "List of Kerberos KDC FQDN", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0}, - { EID_NAC_LDAP_SERVER_INDEX, "LDAP Server for MU Autherization", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, + { EID_NAC_LDAP_SERVER_INDEX, "LDAP Server for MU Authorization", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_NAC_SERVER_CONFIG_ARRAY, "Array of NAC Authentication Server Configurations", TLV_TYPE_BLOCK_TLV, TAB_NAC_SERVER_CONFIG_ARRAY, 0, 0, 0, 0, 0, 0, 0}, { EID_NAC_SERVER_CONFIG_BLOCK, "NAC Authentication Server Block", TLV_TYPE_BLOCK_TLV, TAB_NAC_SERVER_CONFIG_BLOCK, 0, 0, 0, 0, 0, 0, 0}, { EID_NAC_SERVER_FQDN, "Authentication Server FQDN", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -3493,10 +3493,10 @@ typedef enum const TLV_PARSER_ENTRY tlvCosConfigTable[] = { - { EID_COS_UNUSED0, "COS Unsed 0", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, + { EID_COS_UNUSED0, "COS Unused 0", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_COS_KEY, "COS Key", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_COS_DEFINITION, "Binary Encoded COS Definition", TLV_TYPE_OCTETS, 0, 0, 0, 0, 0, 0, 0, 0}, - { EID_COS_IN_RATE_LIMIT, "Intput Rate Limit in Kbps", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, + { EID_COS_IN_RATE_LIMIT, "Input Rate Limit in Kbps", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_COS_OUT_RATE_LIMIT, "Output Rate Limit in Kbps", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0} }; @@ -3550,7 +3550,7 @@ const TLV_PARSER_ENTRY tlv11U_ANQP_blockTable[] = { EID_11U_DOMAIN_NAME, "11U Domain Name", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_11U_EAP_AUTH_PARAM, "11U EAP Authentication Parameter", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_11U_EAP_AUTH_PARAM_ARRAY, "11U EAP Authentication Parameter Array", TLV_TYPE_BLOCK_TLV, TAB_11U_ANQP_BLOCK, 0, 0, 0, 0, 0, 0, 0}, - { EID_11U_EAP_AUTH_PARAM_STRUCT, "11U EAP Authentication Parameter Strcut", TLV_TYPE_BLOCK_TLV, TAB_11U_ANQP_BLOCK, 0, 0, 0, 0, 0, 0, 0}, + { EID_11U_EAP_AUTH_PARAM_STRUCT, "11U EAP Authentication Parameter Struct", TLV_TYPE_BLOCK_TLV, TAB_11U_ANQP_BLOCK, 0, 0, 0, 0, 0, 0, 0}, { EID_11U_EAP_AUTH_TYPE, "11U EAP Authentication Type", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_11U_EAP_METHOD, "11U EAP Authentication Method", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_11U_EAP_METHODS_ARRAY, "11U EAP Authentication Methods Array", TLV_TYPE_BLOCK_TLV, TAB_11U_ANQP_BLOCK, 0, 0, 0, 0, 0, 0, 0}, @@ -3658,8 +3658,8 @@ const TLV_PARSER_ENTRY tlvHS2_blockTable[] = { EID_HS2_OSU_SP_NAI, "HS2 OSU SP NAI", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_HS2_OSU_SP_SERVER_URI, "HS2 OSU SP Server Uri", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_HS2_OSU_SSID, "HS2 OSU SSID", TLV_TYPE_STRING, 0, 0, 0, 0, 0, 0, 0, 0}, - { EID_HS2_RELEASE, "HS2 Relase", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, - { EID_HS2_WAN_METRICS_STRUCT, "HS2 WAN meathod Struct", TLV_TYPE_BLOCK_TLV, TAB_HS2_BLOCK, 0, 0, 0, 0, 0, 0, 0}, + { EID_HS2_RELEASE, "HS2 Release", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, + { EID_HS2_WAN_METRICS_STRUCT, "HS2 WAN method Struct", TLV_TYPE_BLOCK_TLV, TAB_HS2_BLOCK, 0, 0, 0, 0, 0, 0, 0}, { EID_HS2_UPLINK_LOAD, "HS2 Uplink Load", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_HS2_UPLINK_SPEED, "HS2 Uplink Speed", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, { EID_HS2_WIDTH, "HS2 Width", TLV_TYPE_UINT, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -3811,7 +3811,7 @@ static const value_string wassp_eid_status_types[] = { UPGRADE_STATUS_FAIL, "failure" }, { UPGRADE_STATUS_INPROGRESS, "download in progress" }, { UPGRADE_STATUS_DOWNLOAD_FAIL, "image download failed" }, - { UPGRADE_STATUS_WRITE_FAIL, "writing image to falsh failed" }, + { UPGRADE_STATUS_WRITE_FAIL, "writing image to flash failed" }, { UPGRADE_STATUS_CORRUPTED_FILE, "main image file is corrupted/unusable" }, { UPGRADE_STATUS_REBOOTING, "AP is rebooting" }, { UPGRADE_STATUS_INVALID_FILE, "bad header in downloaded image" }, @@ -5906,7 +5906,7 @@ static int dissect_wassp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) RU discover header format: Byte 1 Byte 2 Byte 3 and Byte 4 Byte 5 and Byte 6 Byte 7 and Byte 8 Byte 7 and Byte 8 Byte 9 to Byte 12 if mac, else Byte 9 to Byte 10 for operation - | Version | Type | Random Number | Length of Payload | Check Sum | Conteoller Operation | Mac or Operation + | Version | Type | Random Number | Length of Payload | Check Sum | Controller Operation | Mac or Operation ************************************************************************************************************************************************************/ @@ -6234,14 +6234,14 @@ void proto_register_wassp(void) &hf_ru_ac_op, { "Controller Operation", "wassp.ru_ac_op", FT_UINT16, BASE_DEC, NULL, - 0x00, "Conteoller operation", HFILL + 0x00, NULL, HFILL } }, { &hf_ru_ac_mode, { "Controller Operation Mode", "wassp.ru_ac_mode", FT_UINT16, BASE_DEC, NULL, - 0x00, "Conteoller operation mode", HFILL + 0x00, NULL, HFILL } }, { @@ -6369,7 +6369,7 @@ void proto_register_wassp(void) &hf_wassp_mu_action, { "Action", "wassp.data.mu_action", FT_UINT16, BASE_HEX, VALS(mu_action_field_strings), - 0xf000, "Notify what knind of action", HFILL + 0xf000, "Notify what kind of action", HFILL } }, diff --git a/epan/dissectors/packet-wifi-nan.c b/epan/dissectors/packet-wifi-nan.c index 940f273aa4..a1bab7cb3a 100644 --- a/epan/dissectors/packet-wifi-nan.c +++ b/epan/dissectors/packet-wifi-nan.c @@ -3429,7 +3429,7 @@ proto_register_nan(void) { &hf_nan_attr_ndp_ctrl_sepcific_info_pres, { "NDP Specific Info Present", - "nan.ndp.ctrl.specfic_info_pres", + "nan.ndp.ctrl.specific_info_pres", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL } }, @@ -4024,14 +4024,14 @@ proto_register_nan(void) { &hf_nan_attr_security_context_identifier_len, { "Security Context Identifier Length", - "nan.security_context.identifer_len", + "nan.security_context.identifier_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_nan_attr_security_context_identifier_type, { "Security Context Identifier Type", - "nan.security_context.identifer_type", + "nan.security_context.identifier_type", FT_UINT8, BASE_DEC | BASE_RANGE_STRING, RVALS(security_context_iden_type), 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 47eec82e87..5623c98f32 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -1738,7 +1738,7 @@ proto_register_p2p(void) { "Advertisement ID", "wifi_p2p.advertised_service.advertisement_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_p2p_attr_advertised_service_config_methods, - { "Service Config Methods", "wifi_p2p.avertised_service.config_methods", + { "Service Config Methods", "wifi_p2p.advertised_service.config_methods", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_p2p_attr_advertised_service_service_name_length, { "Service Name Length", "wifi_p2p.advertised_service.service_name_length", diff --git a/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c index cd0e5d698a..d016b29b50 100644 --- a/epan/dissectors/packet-xcsl.c +++ b/epan/dissectors/packet-xcsl.c @@ -39,7 +39,7 @@ static header_field_info hfi_xcsl_protocol_version XCSL_HFI_INIT = }; static header_field_info hfi_xcsl_transaction_id XCSL_HFI_INIT = - { "Transaction ID", "xcsl.transacion_id", + { "Transaction ID", "xcsl.transaction_id", FT_STRING, BASE_NONE,NULL,0x0, NULL, HFILL }; |