osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

More fussing with items and calls.

This commit is contained in:
Martin Mathieson 2023-01-31 13:34:04 +00:00 committed by Martin Mathieson
parent 858f759fa2
commit ed8ee831fd
32 changed files with 302 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-ansi_map.c
View File

@ -16593,7 +16593,7 @@ void proto_register_ansi_map(void) {
NULL, HFILL }}, NULL, HFILL }},
{&hf_ansi_map_cdmachanneldata_nominal_pwr, {&hf_ansi_map_cdmachanneldata_nominal_pwr,
{ "Nominal Power", "ansi_map.cdmachanneldata.nominal_pwr", { "Nominal Power", "ansi_map.cdmachanneldata.nominal_pwr",
FT_UINT8, BASE_DEC, NULL, 0x71, FT_UINT8, BASE_DEC, NULL, 0x78,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ansi_map_cdmachanneldata_nr_preamble, {&hf_ansi_map_cdmachanneldata_nr_preamble,
{ "Number Preamble", "ansi_map.cdmachanneldata.nr_preamble", { "Number Preamble", "ansi_map.cdmachanneldata.nr_preamble",

2
epan/dissectors/packet-brcm-tag.c
View File

@ -137,7 +137,7 @@ proto_register_brcm_tag(void)
}, },
{ &hf_brcm_tag_frame_octet_cnt, { &hf_brcm_tag_frame_octet_cnt,
{ "Frame octet count", "brcm_tag.frame_octet_cnt", { "Frame octet count", "brcm_tag.frame_octet_cnt",
FT_UINT16, BASE_DEC, NULL, 0xFFF, NULL, HFILL } FT_UINT16, BASE_DEC, NULL, 0x0FFF, NULL, HFILL }
}, },
{ &hf_brcm_tag_dest_dev_id, { &hf_brcm_tag_dest_dev_id,
{ "Destination device ID", "brcm_tag.dest_dev_id", { "Destination device ID", "brcm_tag.dest_dev_id",

2
epan/dissectors/packet-brdwlk.c
View File

@ -339,7 +339,7 @@ proto_register_brdwlk(void)
{"Packet Dropped", "brdwlk.drop", FT_BOOLEAN, BASE_NONE, NULL, 0x0, {"Packet Dropped", "brdwlk.drop", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL}}, NULL, HFILL}},
{ &hf_brdwlk_vsan, { &hf_brdwlk_vsan,
{"VSAN", "brdwlk.vsan", FT_UINT16, BASE_DEC, NULL, 0xFFF, NULL, {"VSAN", "brdwlk.vsan", FT_UINT16, BASE_DEC, NULL, 0x0FFF, NULL,
HFILL}}, HFILL}},
{ &hf_brdwlk_plen, { &hf_brdwlk_plen,
{"Original Packet Length", "brdwlk.plen", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, {"Original Packet Length", "brdwlk.plen", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,

8
epan/dissectors/packet-btmesh.c
View File

@ -8841,7 +8841,7 @@ proto_register_btmesh(void)
}, },
{ &hf_btmesh_config_appkey_add_netkeyindexandappkeyindex_net, { &hf_btmesh_config_appkey_add_netkeyindexandappkeyindex_net,
{ "NetKeyIndex", "btmesh.model.config_appkey_add.netkeyindexandappkeyindex.net", { "NetKeyIndex", "btmesh.model.config_appkey_add.netkeyindexandappkeyindex.net",
FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0xFFF, FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0x000FFF,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_btmesh_config_appkey_add_netkeyindexandappkeyindex_app, { &hf_btmesh_config_appkey_add_netkeyindexandappkeyindex_app,
@ -8861,7 +8861,7 @@ proto_register_btmesh(void)
}, },
{ &hf_btmesh_config_appkey_update_netkeyindexandappkeyindex_net, { &hf_btmesh_config_appkey_update_netkeyindexandappkeyindex_net,
{ "NetKeyIndex", "btmesh.model.config_appkey_update.netkeyindexandappkeyindex.net", { "NetKeyIndex", "btmesh.model.config_appkey_update.netkeyindexandappkeyindex.net",
FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0xFFF, FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0x000FFF,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_btmesh_config_appkey_update_netkeyindexandappkeyindex_app, { &hf_btmesh_config_appkey_update_netkeyindexandappkeyindex_app,
@ -9136,7 +9136,7 @@ proto_register_btmesh(void)
}, },
{ &hf_btmesh_config_appkey_delete_netkeyindexandappkeyindex_net, { &hf_btmesh_config_appkey_delete_netkeyindexandappkeyindex_net,
{ "NetKeyIndex", "btmesh.model.config_appkey_delete.netkeyindexandappkeyindex.net", { "NetKeyIndex", "btmesh.model.config_appkey_delete.netkeyindexandappkeyindex.net",
FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0xFFF, FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0x000FFF,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_btmesh_config_appkey_delete_netkeyindexandappkeyindex_app, { &hf_btmesh_config_appkey_delete_netkeyindexandappkeyindex_app,
@ -9201,7 +9201,7 @@ proto_register_btmesh(void)
}, },
{ &hf_btmesh_config_appkey_status_netkeyindexandappkeyindex_net, { &hf_btmesh_config_appkey_status_netkeyindexandappkeyindex_net,
{ "NetKeyIndex", "btmesh.model.config_appkey_status.netkeyindexandappkeyindex.net", { "NetKeyIndex", "btmesh.model.config_appkey_status.netkeyindexandappkeyindex.net",
FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0xFFF, FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0x000FFF,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_btmesh_config_appkey_status_netkeyindexandappkeyindex_app, { &hf_btmesh_config_appkey_status_netkeyindexandappkeyindex_app,

2
epan/dissectors/packet-canopen.c
View File

@ -1426,7 +1426,7 @@ proto_register_canopen(void)
}, },
{ &hf_canopen_function_code, { &hf_canopen_function_code,
{ "Function code", "canopen.function_code", { "Function code", "canopen.function_code",
FT_UINT32, BASE_HEX, NULL, 0x780, FT_UINT32, BASE_HEX, NULL, 0x00000780,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_canopen_node_id, { &hf_canopen_node_id,

4
epan/dissectors/packet-dsi.c
View File

@ -434,11 +434,11 @@ proto_register_dsi(void)
"Attention flag, don't reconnect bit", HFILL }}, "Attention flag, don't reconnect bit", HFILL }},
{ &hf_dsi_attn_flag_time, { &hf_dsi_attn_flag_time,
{ "Minutes", "dsi.attn_flag.time", { "Minutes", "dsi.attn_flag.time",
FT_UINT16, BASE_DEC, NULL, 0xfff, FT_UINT16, BASE_DEC, NULL, 0x0fff,
"Number of minutes", HFILL }}, "Number of minutes", HFILL }},
{ &hf_dsi_attn_flag_bitmap, { &hf_dsi_attn_flag_bitmap,
{ "Bitmap", "dsi.attn_flag.bitmap", { "Bitmap", "dsi.attn_flag.bitmap",
FT_UINT16, BASE_HEX, NULL, 0xfff, FT_UINT16, BASE_HEX, NULL, 0x0fff,
"Attention extended bitmap", HFILL }}, "Attention extended bitmap", HFILL }},
}; };

6
epan/dissectors/packet-dvbci.c
View File

@ -6150,15 +6150,15 @@ proto_register_dvbci(void)
}, },
{ &hf_dvbci_dlv_sys_hint_t, { &hf_dvbci_dlv_sys_hint_t,
{ "terrestrial network (DVB-T/T2)", "dvb-ci.opp.dlv_sys_hint.t", { "terrestrial network (DVB-T/T2)", "dvb-ci.opp.dlv_sys_hint.t",
FT_BOOLEAN, 4, TFS(&tfs_set_notset), 0x04, NULL, HFILL } FT_BOOLEAN, 4, TFS(&tfs_set_notset), 0x4, NULL, HFILL }
}, },
{ &hf_dvbci_dlv_sys_hint_s, { &hf_dvbci_dlv_sys_hint_s,
{ "satellite network (DVB-S/S2)", "dvb-ci.opp.dlv_sys_hint.s", { "satellite network (DVB-S/S2)", "dvb-ci.opp.dlv_sys_hint.s",
FT_BOOLEAN, 4, TFS(&tfs_set_notset), 0x02, NULL, HFILL } FT_BOOLEAN, 4, TFS(&tfs_set_notset), 0x2, NULL, HFILL }
}, },
{ &hf_dvbci_dlv_sys_hint_c, { &hf_dvbci_dlv_sys_hint_c,
{ "cable network (DVB-C/C2)", "dvb-ci.opp.dlv_sys_hint.c", { "cable network (DVB-C/C2)", "dvb-ci.opp.dlv_sys_hint.c",
FT_BOOLEAN, 4, TFS(&tfs_set_notset), 0x01, NULL, HFILL } FT_BOOLEAN, 4, TFS(&tfs_set_notset), 0x1, NULL, HFILL }
}, },
{ &hf_dvbci_refr_req_date, { &hf_dvbci_refr_req_date,
{ "Refresh request date", "dvb-ci.opp.refresh_req_date", { "Refresh request date", "dvb-ci.opp.refresh_req_date",

4
epan/dissectors/packet-ecp.c
View File

@ -497,10 +497,10 @@ proto_register_vdp(void)
NULL, 0x0, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_vdp_vidstr_ps, { &hf_vdp_vidstr_ps,
{ "VIDSTR PS", "vdp21.vidstr.ps", FT_UINT16, BASE_HEX, { "VIDSTR PS", "vdp21.vidstr.ps", FT_UINT16, BASE_HEX,
NULL, 0x800, NULL, HFILL }}, NULL, 0x0800, NULL, HFILL }},
{ &hf_vdp_vidstr_pcp, { &hf_vdp_vidstr_pcp,
{ "VIDSTR PCP", "vdp21.vidstr.pcp", FT_UINT16, BASE_HEX, { "VIDSTR PCP", "vdp21.vidstr.pcp", FT_UINT16, BASE_HEX,
NULL, 0x700, NULL, HFILL }}, NULL, 0x0700, NULL, HFILL }},
{ &hf_vdp_vidstr_vid, { &hf_vdp_vidstr_vid,
{ "VIDSTR VID", "vdp21.vidstr.vid", FT_UINT16, BASE_HEX, { "VIDSTR VID", "vdp21.vidstr.vid", FT_UINT16, BASE_HEX,
NULL, 0x0FFF, NULL, HFILL }}, NULL, 0x0FFF, NULL, HFILL }},

8
epan/dissectors/packet-enip.c
View File

@ -4214,22 +4214,22 @@ proto_register_enip(void)
{ &hf_elink_icapability_capability_bits_manual, { &hf_elink_icapability_capability_bits_manual,
{ "Manual Setting Requires Reset", "cip.elink.icapability.capability_bits.manual", { "Manual Setting Requires Reset", "cip.elink.icapability.capability_bits.manual",
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x0001, FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x00000001,
NULL, HFILL }}, NULL, HFILL }},
{ &hf_elink_icapability_capability_bits_auto_neg, { &hf_elink_icapability_capability_bits_auto_neg,
{ "Auto-negotiate", "cip.elink.icapability.capability_bits.auto_neg", { "Auto-negotiate", "cip.elink.icapability.capability_bits.auto_neg",
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x0002, FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x00000002,
NULL, HFILL }}, NULL, HFILL }},
{ &hf_elink_icapability_capability_bits_auto_mdix, { &hf_elink_icapability_capability_bits_auto_mdix,
{ "Auto-MDIX", "cip.elink.icapability.capability_bits.auto_mdix", { "Auto-MDIX", "cip.elink.icapability.capability_bits.auto_mdix",
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x0004, FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x00000004,
NULL, HFILL } }, NULL, HFILL } },
{ &hf_elink_icapability_capability_bits_manual_speed, { &hf_elink_icapability_capability_bits_manual_speed,
{ "Manual Speed/Duplex", "cip.elink.icapability.capability_bits.manual_speed", { "Manual Speed/Duplex", "cip.elink.icapability.capability_bits.manual_speed",
FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x0008, FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x00000008,
NULL, HFILL } }, NULL, HFILL } },
{ &hf_elink_icapability_capability_speed_duplex_array_count, { &hf_elink_icapability_capability_speed_duplex_array_count,

42
epan/dissectors/packet-epl.c
View File

@ -5611,87 +5611,87 @@ proto_register_epl(void)
}, },
{ &hf_epl_asnd_identresponse_feat_bit0, { &hf_epl_asnd_identresponse_feat_bit0,
{ "Isochronous", "epl.asnd.ires.features.bit0", { "Isochronous", "epl.asnd.ires.features.bit0",
FT_BOOLEAN, 32, NULL, 0x0001, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit1, { &hf_epl_asnd_identresponse_feat_bit1,
{ "SDO by UDP/IP", "epl.asnd.ires.features.bit1", { "SDO by UDP/IP", "epl.asnd.ires.features.bit1",
FT_BOOLEAN, 32, NULL, 0x0002, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit2, { &hf_epl_asnd_identresponse_feat_bit2,
{ "SDO by ASnd", "epl.asnd.ires.features.bit2", { "SDO by ASnd", "epl.asnd.ires.features.bit2",
FT_BOOLEAN, 32, NULL, 0x0004, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00000004, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit3, { &hf_epl_asnd_identresponse_feat_bit3,
{ "SDO by PDO", "epl.asnd.ires.features.bit3", { "SDO by PDO", "epl.asnd.ires.features.bit3",
FT_BOOLEAN, 32, NULL, 0x0008, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00000008, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit4, { &hf_epl_asnd_identresponse_feat_bit4,
{ "NMT Info Services", "epl.asnd.ires.features.bit4", { "NMT Info Services", "epl.asnd.ires.features.bit4",
FT_BOOLEAN, 32, NULL, 0x0010, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00000010, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit5, { &hf_epl_asnd_identresponse_feat_bit5,
{ "Ext. NMT State Commands", "epl.asnd.ires.features.bit5", { "Ext. NMT State Commands", "epl.asnd.ires.features.bit5",
FT_BOOLEAN, 32, NULL, 0x0020, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00000020, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit6, { &hf_epl_asnd_identresponse_feat_bit6,
{ "Dynamic PDO Mapping", "epl.asnd.ires.features.bit6", { "Dynamic PDO Mapping", "epl.asnd.ires.features.bit6",
FT_BOOLEAN, 32, NULL, 0x0040, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00000040, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit7, { &hf_epl_asnd_identresponse_feat_bit7,
{ "NMT Service by UDP/IP", "epl.asnd.ires.features.bit7", { "NMT Service by UDP/IP", "epl.asnd.ires.features.bit7",
FT_BOOLEAN, 32, NULL, 0x0080, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00000080, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit8, { &hf_epl_asnd_identresponse_feat_bit8,
{ "Configuration Manager", "epl.asnd.ires.features.bit8", { "Configuration Manager", "epl.asnd.ires.features.bit8",
FT_BOOLEAN, 32, NULL, 0x0100, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00000100, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit9, { &hf_epl_asnd_identresponse_feat_bit9,
{ "Multiplexed Access", "epl.asnd.ires.features.bit9", { "Multiplexed Access", "epl.asnd.ires.features.bit9",
FT_BOOLEAN, 32, NULL, 0x0200, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00000200, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bitA, { &hf_epl_asnd_identresponse_feat_bitA,
{ "NodeID setup by SW", "epl.asnd.ires.features.bitA", { "NodeID setup by SW", "epl.asnd.ires.features.bitA",
FT_BOOLEAN, 32, NULL, 0x0400, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00000400, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bitB, { &hf_epl_asnd_identresponse_feat_bitB,
{ "MN Basic Ethernet Mode", "epl.asnd.ires.features.bitB", { "MN Basic Ethernet Mode", "epl.asnd.ires.features.bitB",
FT_BOOLEAN, 32, NULL, 0x0800, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00000800, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bitC, { &hf_epl_asnd_identresponse_feat_bitC,
{ "Routing Type 1 Support", "epl.asnd.ires.features.bitC", { "Routing Type 1 Support", "epl.asnd.ires.features.bitC",
FT_BOOLEAN, 32, NULL, 0x1000, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00001000, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bitD, { &hf_epl_asnd_identresponse_feat_bitD,
{ "Routing Type 2 Support", "epl.asnd.ires.features.bitD", { "Routing Type 2 Support", "epl.asnd.ires.features.bitD",
FT_BOOLEAN, 32, NULL, 0x2000, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00002000, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bitE, { &hf_epl_asnd_identresponse_feat_bitE,
{ "SDO Read/Write All", "epl.asnd.ires.features.bitE", { "SDO Read/Write All", "epl.asnd.ires.features.bitE",
FT_BOOLEAN, 32, NULL, 0x4000, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00004000, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bitF, { &hf_epl_asnd_identresponse_feat_bitF,
{ "SDO Read/Write Multiple", "epl.asnd.ires.features.bitF", { "SDO Read/Write Multiple", "epl.asnd.ires.features.bitF",
FT_BOOLEAN, 32, NULL, 0x8000, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00008000, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit10, { &hf_epl_asnd_identresponse_feat_bit10,
{ "Multiple-ASend Support", "epl.asnd.ires.features.bit10", { "Multiple-ASend Support", "epl.asnd.ires.features.bit10",
FT_BOOLEAN, 32, NULL, 0x010000, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00010000, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit11, { &hf_epl_asnd_identresponse_feat_bit11,
{ "Ring Redundancy", "epl.asnd.ires.features.bit11", { "Ring Redundancy", "epl.asnd.ires.features.bit11",
FT_BOOLEAN, 32, NULL, 0x020000, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00020000, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit12, { &hf_epl_asnd_identresponse_feat_bit12,
{ "PResChaining", "epl.asnd.ires.features.bit12", { "PResChaining", "epl.asnd.ires.features.bit12",
FT_BOOLEAN, 32, NULL, 0x040000, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00040000, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit13, { &hf_epl_asnd_identresponse_feat_bit13,
{ "Multiple PReq/PRes", "epl.asnd.ires.features.bit13", { "Multiple PReq/PRes", "epl.asnd.ires.features.bit13",
FT_BOOLEAN, 32, NULL, 0x080000, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00080000, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit14, { &hf_epl_asnd_identresponse_feat_bit14,
{ "Dynamic Node Allocation", "epl.asnd.ires.features.bit14", { "Dynamic Node Allocation", "epl.asnd.ires.features.bit14",
FT_BOOLEAN, 32, NULL, 0x100000, NULL, HFILL } FT_BOOLEAN, 32, NULL, 0x00100000, NULL, HFILL }
}, },
{ &hf_epl_asnd_identresponse_feat_bit21, { &hf_epl_asnd_identresponse_feat_bit21,
{ "Modular Device", "epl.asnd.ires.features.bit21", { "Modular Device", "epl.asnd.ires.features.bit21",

2
epan/dissectors/packet-icmp.c
View File

@ -2096,7 +2096,7 @@ void proto_register_icmp(void)
NULL, HFILL}}, NULL, HFILL}},
{&hf_icmp_mpls_s, {&hf_icmp_mpls_s,
{"Stack bit", "icmp.mpls.s", FT_BOOLEAN, 24, {"Stack bit", "icmp.mpls.s", FT_BOOLEAN, 8,
TFS(&tfs_set_notset), 0x01, TFS(&tfs_set_notset), 0x01,
NULL, HFILL}}, NULL, HFILL}},

48
epan/dissectors/packet-ieee80211.c
View File

@ -37182,7 +37182,7 @@ proto_register_ieee80211(void)
{&hf_ieee80211_block_ack_control_ack_policy, {&hf_ieee80211_block_ack_control_ack_policy,
{"BA Ack Policy", "wlan.ba.control.ackpolicy", {"BA Ack Policy", "wlan.ba.control.ackpolicy",
FT_BOOLEAN, 16, TFS(&ieee80211_block_ack_control_ack_policy_flag), 0x01, FT_BOOLEAN, 16, TFS(&ieee80211_block_ack_control_ack_policy_flag), 0x0001,
"Block Ack Request (BAR) Ack Policy", HFILL }}, "Block Ack Request (BAR) Ack Policy", HFILL }},
{&hf_ieee80211_block_ack_control_type, {&hf_ieee80211_block_ack_control_type,
@ -40142,7 +40142,7 @@ proto_register_ieee80211(void)
{&hf_ieee80211_ftm_rsta_partial_tsf_timer1, {&hf_ieee80211_ftm_rsta_partial_tsf_timer1,
{"Partial TSF Timer", "wlan.ranging.rsta.partial_tsf_timer", {"Partial TSF Timer", "wlan.ranging.rsta.partial_tsf_timer",
FT_UINT32, BASE_CUSTOM, CF_FUNC(partial_tsf_custom), 0xffff, NULL, HFILL }}, FT_UINT32, BASE_CUSTOM, CF_FUNC(partial_tsf_custom), 0x0000ffff, NULL, HFILL }},
{&hf_ieee80211_ftm_rsta_duration1, {&hf_ieee80211_ftm_rsta_duration1,
{"Duration", "wlan.ranging.rsta.duration", {"Duration", "wlan.ranging.rsta.duration",
@ -40150,7 +40150,7 @@ proto_register_ieee80211(void)
{&hf_ieee80211_ftm_rsta_passive_tb_ranging_reserved1, {&hf_ieee80211_ftm_rsta_passive_tb_ranging_reserved1,
{"Reserved", "wlan.ranging.rsta.reserved1", {"Reserved", "wlan.ranging.rsta.reserved1",
FT_BOOLEAN, 32, NULL, 0x800000, NULL, HFILL }}, FT_BOOLEAN, 32, NULL, 0x00800000, NULL, HFILL }},
{&hf_ieee80211_ftm_rsta_periodicity1, {&hf_ieee80211_ftm_rsta_periodicity1,
{"Periodicity", "wlan.ranging.rsta.periodicity1", {"Periodicity", "wlan.ranging.rsta.periodicity1",
@ -40166,11 +40166,11 @@ proto_register_ieee80211(void)
{&hf_ieee80211_ftm_rsta_passive_tb_ranging_reserved, {&hf_ieee80211_ftm_rsta_passive_tb_ranging_reserved,
{"Reserved", "wlan.ranging.rsta.reserved", {"Reserved", "wlan.ranging.rsta.reserved",
FT_BOOLEAN, 40, NULL, 0x800000, NULL, HFILL }}, FT_BOOLEAN, 40, NULL, 0x0000800000, NULL, HFILL }},
{&hf_ieee80211_ftm_rsta_periodicity, {&hf_ieee80211_ftm_rsta_periodicity,
{"Periodicity", "wlan.ranging.rsta.periodicity", {"Periodicity", "wlan.ranging.rsta.periodicity",
FT_UINT40, BASE_DEC, NULL, 0xff000000, NULL, HFILL }}, FT_UINT40, BASE_DEC, NULL, 0x00ff000000, NULL, HFILL }},
{&hf_ieee80211_ftm_rsta_format_and_bandwidth, {&hf_ieee80211_ftm_rsta_format_and_bandwidth,
{"Format and Bandwidth", "wlan.ftm.rsta.format_and_bandwidth", {"Format and Bandwidth", "wlan.ftm.rsta.format_and_bandwidth",
@ -46685,37 +46685,37 @@ proto_register_ieee80211(void)
{&hf_ieee80211_tag_extended_capabilities_b56_2, {&hf_ieee80211_tag_extended_capabilities_b56_2,
{"Alternate EDCA", "wlan.extcap.b56", {"Alternate EDCA", "wlan.extcap.b56",
FT_BOOLEAN, 16, NULL, 0x01, FT_BOOLEAN, 16, NULL, 0x0001,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b57_2, {&hf_ieee80211_tag_extended_capabilities_b57_2,
{"Unprotected TXOP Negotiation", "wlan.extcap.b57", {"Unprotected TXOP Negotiation", "wlan.extcap.b57",
FT_BOOLEAN, 16, NULL, 0x02, FT_BOOLEAN, 16, NULL, 0x0002,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b58_2, {&hf_ieee80211_tag_extended_capabilities_b58_2,
{"Protected TXOP Negotiation", "wlan.extcap.b58", {"Protected TXOP Negotiation", "wlan.extcap.b58",
FT_BOOLEAN, 16, NULL, 0x04, FT_BOOLEAN, 16, NULL, 0x0004,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b59_2, {&hf_ieee80211_tag_extended_capabilities_b59_2,
{"Reserved", "wlan.extcap.b59", {"Reserved", "wlan.extcap.b59",
FT_UINT16, BASE_HEX, NULL, 0x08, FT_UINT16, BASE_HEX, NULL, 0x0008,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b60_2, {&hf_ieee80211_tag_extended_capabilities_b60_2,
{"Protected QLoad Report", "wlan.extcap.b60", {"Protected QLoad Report", "wlan.extcap.b60",
FT_BOOLEAN, 16, NULL, 0x10, FT_BOOLEAN, 16, NULL, 0x0010,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b61_2, {&hf_ieee80211_tag_extended_capabilities_b61_2,
{"TDLS Wider Bandwidth", "wlan.extcap.b61", {"TDLS Wider Bandwidth", "wlan.extcap.b61",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x20, FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0020,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b62_2, {&hf_ieee80211_tag_extended_capabilities_b62_2,
{"Operating Mode Notification", "wlan.extcap.b62", {"Operating Mode Notification", "wlan.extcap.b62",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x40, FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0040,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_max_num_msdus, {&hf_ieee80211_tag_extended_capabilities_max_num_msdus,
@ -48674,35 +48674,35 @@ proto_register_ieee80211(void)
{&hf_ieee80211_he_cci_ac_constraint, {&hf_ieee80211_he_cci_ac_constraint,
{"AC Constraint", "wlan.htc.he.a_control.cci.ac_constraint", {"AC Constraint", "wlan.htc.he.a_control.cci.ac_constraint",
FT_BOOLEAN, 32, NULL, 0x01, NULL, HFILL }}, FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }},
{&hf_ieee80211_he_cci_rdg_more_ppdu, {&hf_ieee80211_he_cci_rdg_more_ppdu,
{"RDG/More PPDU", "wlan.htc.he.a_control.cci.rdg_more_ppdu", {"RDG/More PPDU", "wlan.htc.he.a_control.cci.rdg_more_ppdu",
FT_BOOLEAN, 32, NULL, 0x02, NULL, HFILL }}, FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL }},
{&hf_ieee80211_he_cci_sr_ppdu_indic, {&hf_ieee80211_he_cci_sr_ppdu_indic,
{"PSRT PPDU", "wlan.htc.he.a_control.cci.sr_ppdu_indic", {"PSRT PPDU", "wlan.htc.he.a_control.cci.sr_ppdu_indic",
FT_BOOLEAN, 32, NULL, 0x04, NULL, HFILL }}, FT_BOOLEAN, 32, NULL, 0x00000004, NULL, HFILL }},
{&hf_ieee80211_he_cci_reserved, {&hf_ieee80211_he_cci_reserved,
{"Reserved", "wlan.htc.he.a_control.cci.reserved", {"Reserved", "wlan.htc.he.a_control.cci.reserved",
FT_UINT32, BASE_HEX, NULL, 0xF8, NULL, HFILL }}, FT_UINT32, BASE_HEX, NULL, 0x000000F8, NULL, HFILL }},
{&hf_ieee80211_he_eht_om_rx_nss_ext, {&hf_ieee80211_he_eht_om_rx_nss_ext,
{"Rx NSS Extension", "wlan.htc.he.a_control.eht_om.rx_nss_ext", {"Rx NSS Extension", "wlan.htc.he.a_control.eht_om.rx_nss_ext",
FT_BOOLEAN, 32, NULL, 0x01, NULL, HFILL }}, FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }},
{&hf_ieee80211_he_eht_om_chan_w_ext, {&hf_ieee80211_he_eht_om_chan_w_ext,
{"Channel Width Extension", "wlan.htc.he.a_control.eht_om.chan_w_ext", {"Channel Width Extension", "wlan.htc.he.a_control.eht_om.chan_w_ext",
FT_BOOLEAN, 32, NULL, 0x02, NULL, HFILL }}, FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL }},
{&hf_ieee80211_he_eht_om_tx_nsts_ext, {&hf_ieee80211_he_eht_om_tx_nsts_ext,
{"Tx NSTS Extension", "wlan.htc.he.a_control.eht_om.tx_nsts_ext", {"Tx NSTS Extension", "wlan.htc.he.a_control.eht_om.tx_nsts_ext",
FT_BOOLEAN, 32, NULL, 0x04, NULL, HFILL }}, FT_BOOLEAN, 32, NULL, 0x00000004, NULL, HFILL }},
{&hf_ieee80211_he_eht_om_reserved, {&hf_ieee80211_he_eht_om_reserved,
{"Reserved", "wlan.htc.he.a_control.eht_om.reserved", {"Reserved", "wlan.htc.he.a_control.eht_om.reserved",
FT_UINT32, BASE_HEX, NULL, 0x38, NULL, HFILL }}, FT_UINT32, BASE_HEX, NULL, 0x00000038, NULL, HFILL }},
{&hf_ieee80211_he_srs_ppdu_resp_dur, {&hf_ieee80211_he_srs_ppdu_resp_dur,
{"PPDU Response Duration", "wlan.htc.he.a_control.srs.ppdu_resp_dur", {"PPDU Response Duration", "wlan.htc.he.a_control.srs.ppdu_resp_dur",
@ -49670,7 +49670,7 @@ proto_register_ieee80211(void)
{&hf_ieee80211_osen_rsn_cap_peerkey, {&hf_ieee80211_osen_rsn_cap_peerkey,
{"PeerKey Enabled", "wlan.osen.rsn.capabilities.peerkey", {"PeerKey Enabled", "wlan.osen.rsn.capabilities.peerkey",
FT_BOOLEAN, 16, TFS(&tfs_enabled_disabled), 0x200, NULL, HFILL }}, FT_BOOLEAN, 16, TFS(&tfs_enabled_disabled), 0x0200, NULL, HFILL }},
{&hf_ieee80211_osen_rsn_cap_flags, {&hf_ieee80211_osen_rsn_cap_flags,
{"RSN Capability Flags", "wlan.osen.rsn.capabilities.flags", {"RSN Capability Flags", "wlan.osen.rsn.capabilities.flags",
@ -50595,7 +50595,7 @@ proto_register_ieee80211(void)
{&hf_ieee80211_he_trs_support, {&hf_ieee80211_he_trs_support,
{"TRS Support", "wlan.ext_tag.he_mac_cap.Trs_support", {"TRS Support", "wlan.ext_tag.he_mac_cap.Trs_support",
FT_BOOLEAN, 48, TFS(&tfs_supported_not_supported), 0x0000040000, FT_BOOLEAN, 48, TFS(&tfs_supported_not_supported), 0x000000040000,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_he_bsr_support, {&hf_ieee80211_he_bsr_support,
@ -50675,7 +50675,7 @@ proto_register_ieee80211(void)
{&hf_ieee80211_he_psr_responder, {&hf_ieee80211_he_psr_responder,
{"PSR Responder", "wlan.ext_tag.he_mac_cap.psr_responder", {"PSR Responder", "wlan.ext_tag.he_mac_cap.psr_responder",
FT_BOOLEAN, 48, TFS(&tfs_supported_not_supported), 0x0800000000, FT_BOOLEAN, 48, TFS(&tfs_supported_not_supported), 0x000800000000,
NULL, HFILL }}, NULL, HFILL }},
{&hf_ieee80211_he_ndp_feedback_report_support, {&hf_ieee80211_he_ndp_feedback_report_support,
@ -50705,7 +50705,7 @@ proto_register_ieee80211(void)
{&hf_ieee80211_he_2_996_tone_ru_support, {&hf_ieee80211_he_2_996_tone_ru_support,
{"UL 2x996-tone RU Support", "wlan.ext_tag.he_mac_cap.ul_2_996_tone_ru_support", {"UL 2x996-tone RU Support", "wlan.ext_tag.he_mac_cap.ul_2_996_tone_ru_support",
FT_BOOLEAN, 48, TFS(&tfs_supported_not_supported), FT_BOOLEAN, 48, TFS(&tfs_supported_not_supported),
0x80000000000, NULL, HFILL }}, 0x080000000000, NULL, HFILL }},
{&hf_ieee80211_he_om_control_ul_mu_data_disable_rx_support, {&hf_ieee80211_he_om_control_ul_mu_data_disable_rx_support,
{"OM Control UL MU Data Disable RX Support", "wlan.ext_tag.he_mac_cap.om_cntl_ul_mu_data_disable_rx_support", {"OM Control UL MU Data Disable RX Support", "wlan.ext_tag.he_mac_cap.om_cntl_ul_mu_data_disable_rx_support",

4
epan/dissectors/packet-ieee802154.c
View File

@ -7086,11 +7086,11 @@ void proto_register_ieee802154(void)
"New Mode Modulation Scheme", HFILL }}, "New Mode Modulation Scheme", HFILL }},
{ &hf_ieee802154_tap_phr_fsk_ms_mode_mode, { &hf_ieee802154_tap_phr_fsk_ms_mode_mode,
{ "Mode", "wpan-tap.phr.fsk_ms.page", FT_UINT16, BASE_HEX, VALS(ieee802154_phr_fsk_ms_mode), IEEE802154_TAP_PHR_FSK_MS_MODE_MODE, { "Mode", "wpan-tap.phr.fsk_ms.mode", FT_UINT16, BASE_HEX, VALS(ieee802154_phr_fsk_ms_mode), IEEE802154_TAP_PHR_FSK_MS_MODE_MODE,
"New Mode Mode", HFILL }}, "New Mode Mode", HFILL }},
{ &hf_ieee802154_tap_phr_fsk_ms_mode_addl_mode, { &hf_ieee802154_tap_phr_fsk_ms_mode_addl_mode,
{ "Additional Mode", "wpan-tap.phr.fsk_ms.page", FT_UINT16, BASE_HEX, VALS(ieee802154_phr_fsk_ms_additional_modes), IEEE802154_TAP_PHR_FSK_MS_MODE_MODE, { "Additional Mode", "wpan-tap.phr.fsk_ms.mode", FT_UINT16, BASE_HEX, VALS(ieee802154_phr_fsk_ms_additional_modes), IEEE802154_TAP_PHR_FSK_MS_MODE_MODE,
"New Mode Additional Mode", HFILL }}, "New Mode Additional Mode", HFILL }},
{ &hf_ieee802154_tap_phr_wisun_fsk_ms_reserved, { &hf_ieee802154_tap_phr_wisun_fsk_ms_reserved,

22
epan/dissectors/packet-ipv6.c
View File

@ -4527,57 +4527,57 @@ proto_register_ipv6(void)
}, },
{ &hf_ipv6_opt_ioam_trace_type_bit4, { &hf_ipv6_opt_ioam_trace_type_bit4,
{ "Transit delay", "ipv6.opt.ioam.trace.type.bit4", { "Transit delay", "ipv6.opt.ioam.trace.type.bit4",
FT_BOOLEAN, 24, NULL, 0x80000, FT_BOOLEAN, 24, NULL, 0x080000,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_ipv6_opt_ioam_trace_type_bit5, { &hf_ipv6_opt_ioam_trace_type_bit5,
{ "IOAM-Namespace specific data (short)", "ipv6.opt.ioam.trace.type.bit5", { "IOAM-Namespace specific data (short)", "ipv6.opt.ioam.trace.type.bit5",
FT_BOOLEAN, 24, NULL, 0x40000, FT_BOOLEAN, 24, NULL, 0x040000,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_ipv6_opt_ioam_trace_type_bit6, { &hf_ipv6_opt_ioam_trace_type_bit6,
{ "Queue depth", "ipv6.opt.ioam.trace.type.bit6", { "Queue depth", "ipv6.opt.ioam.trace.type.bit6",
FT_BOOLEAN, 24, NULL, 0x20000, FT_BOOLEAN, 24, NULL, 0x020000,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_ipv6_opt_ioam_trace_type_bit7, { &hf_ipv6_opt_ioam_trace_type_bit7,
{ "Checksum complement", "ipv6.opt.ioam.trace.type.bit7", { "Checksum complement", "ipv6.opt.ioam.trace.type.bit7",
FT_BOOLEAN, 24, NULL, 0x10000, FT_BOOLEAN, 24, NULL, 0x010000,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_ipv6_opt_ioam_trace_type_bit8, { &hf_ipv6_opt_ioam_trace_type_bit8,
{ "Hop_Lim and Node ID (wide)", "ipv6.opt.ioam.trace.type.bit8", { "Hop_Lim and Node ID (wide)", "ipv6.opt.ioam.trace.type.bit8",
FT_BOOLEAN, 24, NULL, 0x8000, FT_BOOLEAN, 24, NULL, 0x008000,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_ipv6_opt_ioam_trace_type_bit9, { &hf_ipv6_opt_ioam_trace_type_bit9,
{ "Ingress and Egress IDs (wide)", "ipv6.opt.ioam.trace.type.bit9", { "Ingress and Egress IDs (wide)", "ipv6.opt.ioam.trace.type.bit9",
FT_BOOLEAN, 24, NULL, 0x4000, FT_BOOLEAN, 24, NULL, 0x004000,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_ipv6_opt_ioam_trace_type_bit10, { &hf_ipv6_opt_ioam_trace_type_bit10,
{ "IOAM-Namespace specific data (wide)", "ipv6.opt.ioam.trace.type.bit10", { "IOAM-Namespace specific data (wide)", "ipv6.opt.ioam.trace.type.bit10",
FT_BOOLEAN, 24, NULL, 0x2000, FT_BOOLEAN, 24, NULL, 0x002000,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_ipv6_opt_ioam_trace_type_bit11, { &hf_ipv6_opt_ioam_trace_type_bit11,
{ "Buffer occupancy", "ipv6.opt.ioam.trace.type.bit11", { "Buffer occupancy", "ipv6.opt.ioam.trace.type.bit11",
FT_BOOLEAN, 24, NULL, 0x1000, FT_BOOLEAN, 24, NULL, 0x001000,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_ipv6_opt_ioam_trace_type_undef, { &hf_ipv6_opt_ioam_trace_type_undef,
{ "Undefined", "ipv6.opt.ioam.trace.type.undef", { "Undefined", "ipv6.opt.ioam.trace.type.undef",
FT_BOOLEAN, 24, NULL, 0xffc, FT_BOOLEAN, 24, NULL, 0x000ffc,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_ipv6_opt_ioam_trace_type_bit22, { &hf_ipv6_opt_ioam_trace_type_bit22,
{ "Opaque State Snapshot", "ipv6.opt.ioam.trace.type.bit22", { "Opaque State Snapshot", "ipv6.opt.ioam.trace.type.bit22",
FT_BOOLEAN, 24, NULL, 0x2, FT_BOOLEAN, 24, NULL, 0x000002,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_ipv6_opt_ioam_trace_type_rsv, { &hf_ipv6_opt_ioam_trace_type_rsv,
{ "Reserved", "ipv6.opt.ioam.trace.type.rsv", { "Reserved", "ipv6.opt.ioam.trace.type.rsv",
FT_BOOLEAN, 24, NULL, 0x1, FT_BOOLEAN, 24, NULL, 0x000001,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_ipv6_opt_ioam_trace_rsv, { &hf_ipv6_opt_ioam_trace_rsv,

18
epan/dissectors/packet-l2tp.c
View File

@ -3237,7 +3237,7 @@ proto_register_l2tp(void)
NULL, HFILL }}, NULL, HFILL }},
{ &hf_l2tp_avp_vendor_id, { &hf_l2tp_avp_vendor_id,
{ "Vendor ID", "l2tp.avp.vendor_id", FT_UINT16, BASE_ENTERPRISES, STRINGS_ENTERPRISES, 0, { "Vendor ID", "l2tp.avp.vendor_id", FT_UINT32, BASE_ENTERPRISES, STRINGS_ENTERPRISES, 0,
"AVP Vendor ID", HFILL }}, "AVP Vendor ID", HFILL }},
{ &hf_l2tp_avp_type, { &hf_l2tp_avp_type,
@ -3616,10 +3616,10 @@ proto_register_l2tp(void)
{ &hf_l2tp_avp_error_message, { "Error Message", "l2tp.avp.error_message", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_error_message, { "Error Message", "l2tp.avp.error_message", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_l2tp_avp_protocol_version, { "Version", "l2tp.avp.protocol_version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_protocol_version, { "Version", "l2tp.avp.protocol_version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_l2tp_avp_protocol_revision, { "Revision", "l2tp.avp.protocol_revision", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_protocol_revision, { "Revision", "l2tp.avp.protocol_revision", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_l2tp_avp_async_framing_supported, { "Async Framing Supported", "l2tp.avp.async_framing_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0002, NULL, HFILL }}, { &hf_l2tp_avp_async_framing_supported, { "Async Framing Supported", "l2tp.avp.async_framing_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, NULL, HFILL }},
{ &hf_l2tp_avp_sync_framing_supported, { "Sync Framing Supported", "l2tp.avp.sync_framing_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0001, NULL, HFILL }}, { &hf_l2tp_avp_sync_framing_supported, { "Sync Framing Supported", "l2tp.avp.sync_framing_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }},
{ &hf_l2tp_avp_analog_access_supported, { "Analog Access Supported", "l2tp.avp.analog_access_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0002, NULL, HFILL }}, { &hf_l2tp_avp_analog_access_supported, { "Analog Access Supported", "l2tp.avp.analog_access_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, NULL, HFILL }},
{ &hf_l2tp_avp_digital_access_supported, { "Digital Access Supported", "l2tp.avp.digital_access_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0001, NULL, HFILL }}, { &hf_l2tp_avp_digital_access_supported, { "Digital Access Supported", "l2tp.avp.digital_access_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }},
{ &hf_l2tp_avp_firmware_revision, { "Firmware Revision", "l2tp.avp.firmware_revision", FT_UINT16, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_firmware_revision, { "Firmware Revision", "l2tp.avp.firmware_revision", FT_UINT16, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_l2tp_avp_host_name, { "Host Name", "l2tp.avp.host_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_host_name, { "Host Name", "l2tp.avp.host_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_l2tp_avp_vendor_name, { "Vendor Name", "l2tp.avp.vendor_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_vendor_name, { "Vendor Name", "l2tp.avp.vendor_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@ -3632,10 +3632,10 @@ proto_register_l2tp(void)
{ &hf_l2tp_avp_call_serial_number, { "Call Serial Number", "l2tp.avp.call_serial_number", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_call_serial_number, { "Call Serial Number", "l2tp.avp.call_serial_number", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_l2tp_avp_minimum_bps, { "Minimum BPS", "l2tp.avp.minimum_bps", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_minimum_bps, { "Minimum BPS", "l2tp.avp.minimum_bps", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_l2tp_avp_maximum_bps, { "Maximum BPS", "l2tp.avp.maximum_bps", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_maximum_bps, { "Maximum BPS", "l2tp.avp.maximum_bps", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_l2tp_avp_analog_bearer_type, { "Analog Bearer Type", "l2tp.avp.analog_bearer_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0002, NULL, HFILL }}, { &hf_l2tp_avp_analog_bearer_type, { "Analog Bearer Type", "l2tp.avp.analog_bearer_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, NULL, HFILL }},
{ &hf_l2tp_avp_digital_bearer_type, { "Digital Bearer Type", "l2tp.avp.digital_bearer_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0001, NULL, HFILL }}, { &hf_l2tp_avp_digital_bearer_type, { "Digital Bearer Type", "l2tp.avp.digital_bearer_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }},
{ &hf_l2tp_avp_async_framing_type, { "Async Framing Type", "l2tp.avp.async_framing_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0002, NULL, HFILL }}, { &hf_l2tp_avp_async_framing_type, { "Async Framing Type", "l2tp.avp.async_framing_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, NULL, HFILL }},
{ &hf_l2tp_avp_sync_framing_type, { "Sync Framing Type", "l2tp.avp.sync_framing_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0001, NULL, HFILL }}, { &hf_l2tp_avp_sync_framing_type, { "Sync Framing Type", "l2tp.avp.sync_framing_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }},
{ &hf_l2tp_avp_sub_address, { "Sub-Address", "l2tp.avp.sub_address", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_sub_address, { "Sub-Address", "l2tp.avp.sub_address", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_l2tp_avp_connect_speed, { "Connect Speed", "l2tp.avp.connect_speed", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_connect_speed, { "Connect Speed", "l2tp.avp.connect_speed", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_l2tp_avp_physical_channel, { "Physical Channel", "l2tp.avp.physical_channel", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_physical_channel, { "Physical Channel", "l2tp.avp.physical_channel", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},

6
epan/dissectors/packet-link16.c
View File

@ -252,13 +252,13 @@ void proto_register_link16(void)
{ {
static hf_register_info hf[] = { static hf_register_info hf[] = {
{ &hf_link16_wordformat, { &hf_link16_wordformat,
{ "Word Format", "link16.wordformat", FT_UINT16, BASE_DEC, VALS(WordFormat_Strings), 0x3, { "Word Format", "link16.wordformat", FT_UINT16, BASE_DEC, VALS(WordFormat_Strings), 0x0003,
NULL, HFILL }}, NULL, HFILL }},
{ &hf_link16_label, { &hf_link16_label,
{ "Label", "link16.label", FT_UINT16, BASE_DEC, VALS(Link16_Label_Strings), 0x7C, { "Label", "link16.label", FT_UINT16, BASE_DEC, VALS(Link16_Label_Strings), 0x007C,
NULL, HFILL }}, NULL, HFILL }},
{ &hf_link16_sublabel, { &hf_link16_sublabel,
{ "Sublabel", "link16.sublabel", FT_UINT16, BASE_DEC, NULL, 0x380, { "Sublabel", "link16.sublabel", FT_UINT16, BASE_DEC, NULL, 0x0380,
NULL, HFILL }}, NULL, HFILL }},
{ &hf_link16_mli, { &hf_link16_mli,
{ "Message Length Indicator", "link16.mli", FT_UINT16, BASE_DEC, NULL, 0x1C00, { "Message Length Indicator", "link16.mli", FT_UINT16, BASE_DEC, NULL, 0x1C00,

2
epan/dissectors/packet-llt.c
View File

@ -89,7 +89,7 @@ proto_register_llt(void)
static hf_register_info hf[] = { static hf_register_info hf[] = {
{ &hf_llt_cluster_num, { "Cluster number", "llt.cluster_num", { &hf_llt_cluster_num, { "Cluster number", "llt.cluster_num",
FT_UINT8, BASE_DEC, NULL, 0, FT_UINT16, BASE_DEC, NULL, 0,
"Cluster number that this node belongs to", HFILL } }, "Cluster number that this node belongs to", HFILL } },
{ &hf_llt_message_type, { "Message type", "llt.message_type", { &hf_llt_message_type, { "Message type", "llt.message_type",

46
epan/dissectors/packet-maccontrol.c
View File

@ -263,95 +263,95 @@ proto_register_macctrl(void)
{ &hf_macctrl_cbfc_enbv_c0, { &hf_macctrl_cbfc_enbv_c0,
{ "C0", "macc.cbfc.enbv.c0", FT_BOOLEAN, 16, { "C0", "macc.cbfc.enbv.c0", FT_BOOLEAN, 16,
NULL, 0x01, NULL, HFILL }}, NULL, 0x0001, NULL, HFILL }},
{ &hf_macctrl_cbfc_enbv_c1, { &hf_macctrl_cbfc_enbv_c1,
{ "C1", "macc.cbfc.enbv.c1", FT_BOOLEAN, 16, { "C1", "macc.cbfc.enbv.c1", FT_BOOLEAN, 16,
NULL, 0x02, NULL, HFILL }}, NULL, 0x0002, NULL, HFILL }},
{ &hf_macctrl_cbfc_enbv_c2, { &hf_macctrl_cbfc_enbv_c2,
{ "C2", "macc.cbfc.enbv.c2", FT_BOOLEAN, 16, { "C2", "macc.cbfc.enbv.c2", FT_BOOLEAN, 16,
NULL, 0x04, NULL, HFILL }}, NULL, 0x0004, NULL, HFILL }},
{ &hf_macctrl_cbfc_enbv_c3, { &hf_macctrl_cbfc_enbv_c3,
{ "C3", "macc.cbfc.enbv.c3", FT_BOOLEAN, 16, { "C3", "macc.cbfc.enbv.c3", FT_BOOLEAN, 16,
NULL, 0x08, NULL, HFILL }}, NULL, 0x0008, NULL, HFILL }},
{ &hf_macctrl_cbfc_enbv_c4, { &hf_macctrl_cbfc_enbv_c4,
{ "C4", "macc.cbfc.enbv.c4", FT_BOOLEAN, 16, { "C4", "macc.cbfc.enbv.c4", FT_BOOLEAN, 16,
NULL, 0x10, NULL, HFILL }}, NULL, 0x0010, NULL, HFILL }},
{ &hf_macctrl_cbfc_enbv_c5, { &hf_macctrl_cbfc_enbv_c5,
{ "C5", "macc.cbfc.enbv.c5", FT_BOOLEAN, 16, { "C5", "macc.cbfc.enbv.c5", FT_BOOLEAN, 16,
NULL, 0x20, NULL, HFILL }}, NULL, 0x0020, NULL, HFILL }},
{ &hf_macctrl_cbfc_enbv_c6, { &hf_macctrl_cbfc_enbv_c6,
{ "C6", "macc.cbfc.enbv.c6", FT_BOOLEAN, 16, { "C6", "macc.cbfc.enbv.c6", FT_BOOLEAN, 16,
NULL, 0x40, NULL, HFILL }}, NULL, 0x0040, NULL, HFILL }},
{ &hf_macctrl_cbfc_enbv_c7, { &hf_macctrl_cbfc_enbv_c7,
{ "C7", "macc.cbfc.enbv.c7", FT_BOOLEAN, 16, { "C7", "macc.cbfc.enbv.c7", FT_BOOLEAN, 16,
NULL, 0x80, NULL, HFILL }}, NULL, 0x0080, NULL, HFILL }},
{ &hf_macctrl_cbfc_pause_time_c0, { &hf_macctrl_cbfc_pause_time_c0,
{ "C0", "macc.cbfc.pause_time.c0", FT_UINT16, BASE_DEC, { "C0", "macc.cbfc.pause_time.c0", FT_UINT16, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_macctrl_cbfc_pause_time_c1, { &hf_macctrl_cbfc_pause_time_c1,
{ "C1", "macc.cbfc.pause_time.c1", FT_UINT16, BASE_DEC, { "C1", "macc.cbfc.pause_time.c1", FT_UINT16, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_macctrl_cbfc_pause_time_c2, { &hf_macctrl_cbfc_pause_time_c2,
{ "C2", "macc.cbfc.pause_time.c2", FT_UINT16, BASE_DEC, { "C2", "macc.cbfc.pause_time.c2", FT_UINT16, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_macctrl_cbfc_pause_time_c3, { &hf_macctrl_cbfc_pause_time_c3,
{ "C3", "macc.cbfc.pause_time.c3", FT_UINT16, BASE_DEC, { "C3", "macc.cbfc.pause_time.c3", FT_UINT16, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_macctrl_cbfc_pause_time_c4, { &hf_macctrl_cbfc_pause_time_c4,
{ "C4", "macc.cbfc.pause_time.c4", FT_UINT16, BASE_DEC, { "C4", "macc.cbfc.pause_time.c4", FT_UINT16, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_macctrl_cbfc_pause_time_c5, { &hf_macctrl_cbfc_pause_time_c5,
{ "C5", "macc.cbfc.pause_time.c5", FT_UINT16, BASE_DEC, { "C5", "macc.cbfc.pause_time.c5", FT_UINT16, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_macctrl_cbfc_pause_time_c6, { &hf_macctrl_cbfc_pause_time_c6,
{ "C6", "macc.cbfc.pause_time.c6", FT_UINT16, BASE_DEC, { "C6", "macc.cbfc.pause_time.c6", FT_UINT16, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_macctrl_cbfc_pause_time_c7, { &hf_macctrl_cbfc_pause_time_c7,
{ "C7", "macc.cbfc.pause_time.c7", FT_UINT16, BASE_DEC, { "C7", "macc.cbfc.pause_time.c7", FT_UINT16, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_reg_flags, { &hf_reg_flags,
{ "Flags", "macc.reg.flags", FT_UINT8, BASE_HEX, { "Flags", "macc.reg.flags", FT_UINT8, BASE_HEX,
VALS(reg_flags_vals), 0x00, NULL, HFILL }}, VALS(reg_flags_vals), 0x0, NULL, HFILL }},
{ &hf_reg_req_grants, { &hf_reg_req_grants,
{ "Pending Grants", "macc.regreq.grants", FT_UINT8, BASE_DEC, { "Pending Grants", "macc.regreq.grants", FT_UINT8, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_reg_grants, { &hf_reg_grants,
{ "Echoed Pending Grants", "macc.reg.grants", FT_UINT8, BASE_DEC, { "Echoed Pending Grants", "macc.reg.grants", FT_UINT8, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_reg_port, { &hf_reg_port,
{ "Assigned Port (LLID)", "macc.reg.assignedport", FT_UINT16, BASE_DEC, { "Assigned Port (LLID)", "macc.reg.assignedport", FT_UINT16, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_reg_ack_port, { &hf_reg_ack_port,
{ "Echoed Assigned Port (LLID)", "macc.regack.assignedport", FT_UINT16, BASE_DEC, { "Echoed Assigned Port (LLID)", "macc.regack.assignedport", FT_UINT16, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_reg_time, { &hf_reg_time,
{ "Sync Time", "macc.reg.synctime", FT_UINT16, BASE_DEC, { "Sync Time", "macc.reg.synctime", FT_UINT16, BASE_DEC,
NULL, 0x00, NULL, HFILL }}, NULL, 0x0, NULL, HFILL }},
{ &hf_reg_ack_time, { &hf_reg_ack_time,
{ "Echoed Sync Time", "macc.regack.synctime", FT_UINT16, BASE_DEC, { "Echoed Sync Time", "macc.regack.synctime", FT_UINT16, BASE_DEC,
NULL, 0x00, NULL, HFILL }} NULL, 0x0, NULL, HFILL }}
}; };
static gint *ett[] = { static gint *ett[] = {

46
epan/dissectors/packet-mih.c
View File

@ -2557,7 +2557,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0001, 0x00000001,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2569,7 +2569,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0002, 0x00000002,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2581,7 +2581,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0004, 0x00000004,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2605,7 +2605,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0001, 0x00000001,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2617,7 +2617,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0002, 0x00000002,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2629,7 +2629,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0004, 0x00000004,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2653,7 +2653,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0001, 0x00000001,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2665,7 +2665,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0002, 0x00000002,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2677,7 +2677,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0004, 0x00000004,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2689,7 +2689,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0008, 0x00000008,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2701,7 +2701,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0010, 0x00000010,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2725,7 +2725,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0001, 0x00000001,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2737,7 +2737,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0002, 0x00000002,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2749,7 +2749,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0004, 0x00000004,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2761,7 +2761,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0008, 0x00000008,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2773,7 +2773,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0010, 0x00000010,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2785,7 +2785,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0020, 0x00000020,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2809,7 +2809,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0001, 0x00000001,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2821,7 +2821,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0002, 0x00000002,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2833,7 +2833,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0004, 0x00000004,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2845,7 +2845,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0008, 0x00000008,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2869,7 +2869,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0001, 0x00000001,
NULL, HFILL NULL, HFILL
} }
}, },
@ -2881,7 +2881,7 @@ void proto_register_mih(void)
FT_BOOLEAN, FT_BOOLEAN,
32, 32,
NULL, NULL,
0x0002, 0x00000002,
NULL, HFILL NULL, HFILL
} }
}, },

2
epan/dissectors/packet-mpls.c
View File

@ -581,7 +581,7 @@ proto_register_mpls(void)
{&hf_mpls_ttl, {&hf_mpls_ttl,
{"MPLS TTL", "mpls.ttl", {"MPLS TTL", "mpls.ttl",
FT_UINT32, BASE_DEC, NULL, 0x0000000FF, FT_UINT32, BASE_DEC, NULL, 0x000000FF,
NULL, HFILL } NULL, HFILL }
}, },

2
epan/dissectors/packet-nas_5gs.c
View File

@ -13447,7 +13447,7 @@ proto_register_nas_5gs(void)
}, },
{ &hf_nas_5gs_mm_relay_key_req_params_relay_service_code, { &hf_nas_5gs_mm_relay_key_req_params_relay_service_code,
{ "Relay service code", "nas_5gs.mm.relay_key_req_params.relay_service_code", { "Relay service code", "nas_5gs.mm.relay_key_req_params.relay_service_code",
FT_UINT8, BASE_DEC, NULL, 0, FT_UINT24, BASE_DEC, NULL, 0,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_nas_5gs_mm_relay_key_req_params_nonce_1, { &hf_nas_5gs_mm_relay_key_req_params_nonce_1,

2
epan/dissectors/packet-nas_eps.c
View File

@ -8303,7 +8303,7 @@ proto_register_nas_eps(void)
}, },
{ &hf_nas_eps_esm_qci, { &hf_nas_eps_esm_qci,
{ "Quality of Service Class Identifier (QCI)","nas_eps.esm.qci", { "Quality of Service Class Identifier (QCI)","nas_eps.esm.qci",
FT_UINT8,(BASE_DEC|BASE_RANGE_STRING), RVALS(nas_eps_qci_vals), 0x0, FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(nas_eps_qci_vals), 0x0,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_nas_eps_esm_mbr_ul, { &hf_nas_eps_esm_mbr_ul,

2
epan/dissectors/packet-ndps.c
View File

@ -8648,7 +8648,7 @@ proto_register_ndps(void)
{ &hf_ndps_len, { &hf_ndps_len,
{ "Length", "ndps.len", { "Length", "ndps.len",
FT_UINT16, BASE_DEC, NULL, 0x0, FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }}, NULL, HFILL }},
{ &hf_ndps_limit_enc, { &hf_ndps_limit_enc,

10
epan/dissectors/packet-nvme-mi.c
View File

@ -405,27 +405,27 @@ proto_register_nvme_mi(void)
}, },
{ &hf_nvme_mi_mctp_ic, { &hf_nvme_mi_mctp_ic,
{ "MCTP IC", "nvme-mi.mctp-ic", { "MCTP IC", "nvme-mi.mctp-ic",
FT_BOOLEAN, 32, NULL, 0x80, FT_BOOLEAN, 32, NULL, 0x00000080,
NULL, HFILL }, NULL, HFILL },
}, },
{ &hf_nvme_mi_csi, { &hf_nvme_mi_csi,
{ "CSI", "nvme-mi.csi", { "CSI", "nvme-mi.csi",
FT_UINT32, BASE_DEC, NULL, 0x0100, FT_UINT32, BASE_DEC, NULL, 0x00000100,
NULL, HFILL }, NULL, HFILL },
}, },
{ &hf_nvme_mi_type, { &hf_nvme_mi_type,
{ "Type", "nvme-mi.type", { "Type", "nvme-mi.type",
FT_UINT32, BASE_HEX, VALS(mi_type_vals), 0x7800, FT_UINT32, BASE_HEX, VALS(mi_type_vals), 0x00007800,
NULL, HFILL }, NULL, HFILL },
}, },
{ &hf_nvme_mi_ror, { &hf_nvme_mi_ror,
{ "ROR", "nvme-mi.ror", { "ROR", "nvme-mi.ror",
FT_BOOLEAN, 32, TFS(&tfs_response_request), 0x8000, FT_BOOLEAN, 32, TFS(&tfs_response_request), 0x00008000,
NULL, HFILL }, NULL, HFILL },
}, },
{ &hf_nvme_mi_meb, { &hf_nvme_mi_meb,
{ "MEB", "nvme-mi.meb", { "MEB", "nvme-mi.meb",
FT_BOOLEAN, 32, TFS(&tfs_meb), 0x10000, FT_BOOLEAN, 32, TFS(&tfs_meb), 0x00010000,
NULL, HFILL }, NULL, HFILL },
}, },
{ &hf_nvme_mi_mic, { &hf_nvme_mi_mic,

16
epan/dissectors/packet-oampdu.c
View File

@ -2954,42 +2954,42 @@ proto_register_oampdu(void)
{ &hf_oam_dpoe_s1_autoneg_hd, { &hf_oam_dpoe_s1_autoneg_hd,
{ "Half Duplex", "oampdu.s1.autoneg.hd", { "Half Duplex", "oampdu.s1.autoneg.hd",
FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x01, FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0001,
NULL, HFILL } }, NULL, HFILL } },
{ &hf_oam_dpoe_s1_autoneg_fd, { &hf_oam_dpoe_s1_autoneg_fd,
{ "Full Duplex", "oampdu.s1.autoneg.fd", { "Full Duplex", "oampdu.s1.autoneg.fd",
FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x02, FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0002,
NULL, HFILL } }, NULL, HFILL } },
{ &hf_oam_dpoe_s1_autoneg_10, { &hf_oam_dpoe_s1_autoneg_10,
{ "10 Mbps", "oampdu.s1.autoneg.10", { "10 Mbps", "oampdu.s1.autoneg.10",
FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x04, FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0004,
NULL, HFILL } }, NULL, HFILL } },
{ &hf_oam_dpoe_s1_autoneg_100, { &hf_oam_dpoe_s1_autoneg_100,
{ "100 Mbps", "oampdu.s1.autoneg.100", { "100 Mbps", "oampdu.s1.autoneg.100",
FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x08, FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0008,
NULL, HFILL } }, NULL, HFILL } },
{ &hf_oam_dpoe_s1_autoneg_1000, { &hf_oam_dpoe_s1_autoneg_1000,
{ "1000 Mbps", "oampdu.s1.autoneg.1000", { "1000 Mbps", "oampdu.s1.autoneg.1000",
FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x10, FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0010,
NULL, HFILL } }, NULL, HFILL } },
{ &hf_oam_dpoe_s1_autoneg_10000, { &hf_oam_dpoe_s1_autoneg_10000,
{ "10Gbps", "oampdu.s1.autoneg.10000", { "10Gbps", "oampdu.s1.autoneg.10000",
FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x20, FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0020,
NULL, HFILL } }, NULL, HFILL } },
{ &hf_oam_dpoe_s1_autoneg_fc, { &hf_oam_dpoe_s1_autoneg_fc,
{ "Flow Control", "oampdu.s1.autoneg.fc", { "Flow Control", "oampdu.s1.autoneg.fc",
FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x40, FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0040,
NULL, HFILL } }, NULL, HFILL } },
{ &hf_oam_dpoe_s1_autoneg_mdi, { &hf_oam_dpoe_s1_autoneg_mdi,
{ "Auto MDI/MDI-X", "oampdu.s1.autoneg.mdi", { "Auto MDI/MDI-X", "oampdu.s1.autoneg.mdi",
FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x80, FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0080,
NULL, HFILL } }, NULL, HFILL } },
{ &hf_oam_dpoe_user_port_object, { &hf_oam_dpoe_user_port_object,

2
epan/dissectors/packet-tetra.c
View File

@ -9222,7 +9222,7 @@ void proto_register_tetra (void)
{ "Channel 3", "tetra.rxchannel3", FT_UINT8, BASE_DEC, VALS(recvchanneltypenames), 0x0, { "Channel 3", "tetra.rxchannel3", FT_UINT8, BASE_DEC, VALS(recvchanneltypenames), 0x0,
"Logical channels type", HFILL }}, "Logical channels type", HFILL }},
{ &hf_tetra_timer, { &hf_tetra_timer,
{ "Timer", "tetra.timer", FT_UINT16, BASE_HEX, NULL, 0x0, { "Timer", "tetra.timer", FT_UINT32, BASE_HEX, NULL, 0x0,
"Timer Register", HFILL }}, "Timer Register", HFILL }},
{ &hf_tetra_crc, { &hf_tetra_crc,
{ "CRC", "tetra.crc", FT_BOOLEAN, BASE_NONE, NULL, 0x0, { "CRC", "tetra.crc", FT_BOOLEAN, BASE_NONE, NULL, 0x0,

4
epan/dissectors/packet-tn3270.c
View File

@ -5930,7 +5930,7 @@ proto_register_tn3270(void)
{ &hf_tn3270_bsc, { &hf_tn3270_bsc,
{ "SNA BSC", { "SNA BSC",
"tn3270.bsc", "tn3270.bsc",
FT_UINT8, BASE_HEX, NULL, 0x0, FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL } NULL, HFILL }
}, },
/* END - 5.16 - Outbound 3270DS */ /* END - 5.16 - Outbound 3270DS */
@ -6002,7 +6002,7 @@ proto_register_tn3270(void)
{ &hf_tn3270_interval, { &hf_tn3270_interval,
{ "Checkpoint interval", { "Checkpoint interval",
"tn3270.interval", "tn3270.interval",
FT_UINT8, BASE_HEX, NULL, 0x0, FT_UINT16, BASE_HEX, NULL, 0x0,
"Specifies the number of pages in the interval between terminal checkpoints", HFILL } "Specifies the number of pages in the interval between terminal checkpoints", HFILL }
}, },
/* End - 5.26 - Set Checkpoint Interval */ /* End - 5.26 - Set Checkpoint Interval */

4
epan/dissectors/packet-usbip.c
View File

@ -993,12 +993,12 @@ proto_register_usbip(void)
{&hf_usbip_direction, {&hf_usbip_direction,
{"Direction", "usbip.endpoint_number.direction", {"Direction", "usbip.endpoint_number.direction",
FT_UINT8, BASE_HEX, VALS(usb_endpoint_direction_vals), 0x1, FT_UINT32, BASE_HEX, VALS(usb_endpoint_direction_vals), 0x00000001,
"USB endpoint direction", HFILL}}, "USB endpoint direction", HFILL}},
{&hf_usbip_ep, {&hf_usbip_ep,
{"Endpoint", "usbip.endpoint_number", {"Endpoint", "usbip.endpoint_number",
FT_UINT8, BASE_HEX, NULL, 0xf, FT_UINT32, BASE_HEX, NULL, 0x0000000f,
"USB endpoint number", HFILL}}, "USB endpoint number", HFILL}},
{&hf_usbip_transfer_flags, {&hf_usbip_transfer_flags,

2
epan/dissectors/packet-vsip.c
View File

@ -929,7 +929,7 @@ static guint32 vsip_PingResp(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t
proto_tree_add_item(tree, hf_vsip_PingResp_ProductType, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_vsip_PingResp_ProductType, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2; offset += 2;
proto_tree_add_item(tree, hf_vsip_PingResp_Status, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_vsip_PingResp_Status, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1; offset += 1;
len = tvb_get_ntohs(tvb, offset); len = tvb_get_ntohs(tvb, offset);

238
epan/dissectors/packet-wassp.c
View File

@ -6030,28 +6030,28 @@ void proto_register_wassp(void)
&hf_aeroscout_header, &hf_aeroscout_header,
{ {
"Location Base Service Header", "wassp.aeroscout.header", FT_BYTES, BASE_NONE, NULL, "Location Base Service Header", "wassp.aeroscout.header", FT_BYTES, BASE_NONE, NULL,
0x00, "Aeroscout header", HFILL 0x0, "Aeroscout header", HFILL
} }
}, },
{ {
&hf_aeroscout_header_magic_number, &hf_aeroscout_header_magic_number,
{ {
"Header Magic Number", "wassp.aeroscout.header_magic", FT_UINT16, BASE_HEX, NULL, "Header Magic Number", "wassp.aeroscout.header_magic", FT_UINT16, BASE_HEX, NULL,
0x00, "Aeroscout header magic number", HFILL 0x0, "Aeroscout header magic number", HFILL
} }
}, },
{ {
&hf_aeroscout_request_id, &hf_aeroscout_request_id,
{ {
"Request ID", "wassp.aeroscout.request_id", FT_UINT16, BASE_DEC, NULL, "Request ID", "wassp.aeroscout.request_id", FT_UINT16, BASE_DEC, NULL,
0x00, "Aeroscout Request ID", HFILL 0x0, "Aeroscout Request ID", HFILL
} }
}, },
{ {
&hf_aeroscout_code, &hf_aeroscout_code,
{ {
"Operation Code", "wassp.aeroscout.code", FT_UINT8, BASE_DEC, NULL, "Operation Code", "wassp.aeroscout.code", FT_UINT8, BASE_DEC, NULL,
0x00, "Aeroscout Operation Code", HFILL 0x0, "Aeroscout Operation Code", HFILL
} }
}, },
@ -6059,49 +6059,49 @@ void proto_register_wassp(void)
&hf_aeroscout_sub_code, &hf_aeroscout_sub_code,
{ {
"Operation Sub Code", "wassp.aeroscout.sub_code", FT_UINT8, BASE_DEC, NULL, "Operation Sub Code", "wassp.aeroscout.sub_code", FT_UINT8, BASE_DEC, NULL,
0x00, "Aeroscout Operation Sub Code", HFILL 0x0, "Aeroscout Operation Sub Code", HFILL
} }
}, },
{ {
&hf_aeroscout_datalength, &hf_aeroscout_datalength,
{ {
"Length of Data Payload", "wassp.aeroscout.datalength", FT_UINT16, BASE_DEC, NULL, "Length of Data Payload", "wassp.aeroscout.datalength", FT_UINT16, BASE_DEC, NULL,
0x00, "Aeroscout Length of Data Payload", HFILL 0x0, "Aeroscout Length of Data Payload", HFILL
} }
}, },
{ {
&hf_lbs_vendor_id, &hf_lbs_vendor_id,
{ {
"Location Base Service Vendor ID", "wassp.lbs.vendor_id", FT_UINT16, BASE_DEC, NULL, "Location Base Service Vendor ID", "wassp.lbs.vendor_id", FT_UINT16, BASE_DEC, NULL,
0x00, "LBS TAG Vendor ID", HFILL 0x0, "LBS TAG Vendor ID", HFILL
} }
}, },
{ {
&hf_lbs_rsvd1, &hf_lbs_rsvd1,
{ {
"LBS Rsvd", "wassp.lbs.rsvd1", FT_UINT16, BASE_HEX, NULL, "LBS Rsvd", "wassp.lbs.rsvd1", FT_UINT16, BASE_HEX, NULL,
0x00, "LBS TAG rsvd", HFILL 0x0, "LBS TAG rsvd", HFILL
} }
}, },
{ {
&hf_lbs_ap_bssid, &hf_lbs_ap_bssid,
{ {
"Location Base Service AccessPoint BSSID", "wassp.lbs.ap_bssid", FT_BYTES, BASE_NONE, NULL, "Location Base Service AccessPoint BSSID", "wassp.lbs.ap_bssid", FT_BYTES, BASE_NONE, NULL,
0x00, "LBS TAG ap bssid", HFILL 0x0, "LBS TAG ap bssid", HFILL
} }
}, },
{ {
&hf_lbs_rsvd2, &hf_lbs_rsvd2,
{ {
"LBS Rsvd", "wassp.lbs.rsvd2", FT_UINT8, BASE_HEX, NULL, "LBS Rsvd", "wassp.lbs.rsvd2", FT_UINT8, BASE_HEX, NULL,
0x00, "LBS TAG rsvd2", HFILL 0x0, "LBS TAG rsvd2", HFILL
} }
}, },
{ {
&hf_lbs_rxchan, &hf_lbs_rxchan,
{ {
"LBS rxchan", "wassp.lbs.rxchan", FT_UINT8, BASE_DEC, NULL, "LBS rxchan", "wassp.lbs.rxchan", FT_UINT8, BASE_DEC, NULL,
0x00, "LBS TAG rxchan", HFILL 0x0, "LBS TAG rxchan", HFILL
} }
}, },
@ -6109,105 +6109,105 @@ void proto_register_wassp(void)
&hf_lsb_tstamp, &hf_lsb_tstamp,
{ {
"Location Base Service Time Stamp", "wassp.lbs.tstamp", FT_UINT32, BASE_DEC, NULL, "Location Base Service Time Stamp", "wassp.lbs.tstamp", FT_UINT32, BASE_DEC, NULL,
0x00, "LBS TAG tstamp", HFILL 0x0, "LBS TAG tstamp", HFILL
} }
}, },
{ {
&hf_hf_lsb_rsvd3, &hf_hf_lsb_rsvd3,
{ {
"LBS Rsvd", "wassp.lbs.rsvd3", FT_UINT16, BASE_HEX, NULL, "LBS Rsvd", "wassp.lbs.rsvd3", FT_UINT16, BASE_HEX, NULL,
0x00, "LBS TAG rsvd3", HFILL 0x0, "LBS TAG rsvd3", HFILL
} }
}, },
{ {
&hf_lsb_rssi, &hf_lsb_rssi,
{ {
"Location Base Service RSSI", "wassp.lbs.rssi", FT_INT8, BASE_DEC, NULL, "Location Base Service RSSI", "wassp.lbs.rssi", FT_INT8, BASE_DEC, NULL,
0x00, "LBS TAG rssi", HFILL 0x0, "LBS TAG rssi", HFILL
} }
}, },
{ {
&hf_lsb_rsvd, &hf_lsb_rsvd,
{ {
"LBS Rsvd", "wassp.lbs.rsvd", FT_UINT8, BASE_HEX, NULL, "LBS Rsvd", "wassp.lbs.rsvd", FT_UINT8, BASE_HEX, NULL,
0x00, "LBS TAG rsvd4", HFILL 0x0, "LBS TAG rsvd4", HFILL
} }
}, },
{ {
&hf_lsb_noise_floor, &hf_lsb_noise_floor,
{ {
"LBS Noise Floor", "wassp.lsb.noise_floor", FT_INT8, BASE_DEC, NULL, "LBS Noise Floor", "wassp.lsb.noise_floor", FT_INT8, BASE_DEC, NULL,
0x00, "LBS TAG noise floor", HFILL 0x0, "LBS TAG noise floor", HFILL
} }
}, },
{ {
&hf_lsb_rsvd4, &hf_lsb_rsvd4,
{ {
"LBS Rsvd", "wassp.lsb.rsvd4", FT_UINT8, BASE_HEX, NULL, "LBS Rsvd", "wassp.lsb.rsvd4", FT_UINT24, BASE_HEX, NULL,
0x00, "LBS TAG rsvd5", HFILL 0x0, "LBS TAG rsvd5", HFILL
} }
}, },
{ {
&hf_lsb_chan_rate, &hf_lsb_chan_rate,
{ {
"LBS channel Rate", "wassp.lsb.chan_rate", FT_UINT8, BASE_DEC, NULL, "LBS channel Rate", "wassp.lsb.chan_rate", FT_UINT8, BASE_DEC, NULL,
0x00, "LBS TAG channel rate", HFILL 0x0, "LBS TAG channel rate", HFILL
} }
}, },
{ {
&hf_lsb_rsvd5, &hf_lsb_rsvd5,
{ {
"LBS Rsvd", "wassp.lsb.rsvd5", FT_UINT8, BASE_HEX, NULL, "LBS Rsvd", "wassp.lsb.rsvd5", FT_UINT8, BASE_HEX, NULL,
0x00, "LBS TAG rsvd6", HFILL 0x0, "LBS TAG rsvd6", HFILL
} }
}, },
{ {
&hf_lsb_wh_fc, &hf_lsb_wh_fc,
{ {
"LBS Wireless Header Frame Control", "wassp.lsb.wh_fc", FT_UINT16, BASE_HEX, NULL, "LBS Wireless Header Frame Control", "wassp.lsb.wh_fc", FT_UINT16, BASE_HEX, NULL,
0x00, "LBS TAG Frame Control", HFILL 0x0, "LBS TAG Frame Control", HFILL
} }
}, },
{ {
&hf_lsb_wh_seq, &hf_lsb_wh_seq,
{ {
"LBS Wireless Header Sequence Number", "wassp.hf_lsb_wh_seq", FT_UINT16, BASE_HEX, NULL, "LBS Wireless Header Sequence Number", "wassp.hf_lsb_wh_seq", FT_UINT16, BASE_HEX, NULL,
0x00, "LBS TAG Sequence Number", HFILL 0x0, "LBS TAG Sequence Number", HFILL
} }
}, },
{ {
&hf_lsb_rsvd6, &hf_lsb_rsvd6,
{ {
"LBS Rsvd", "wassp.lsb.rsvd6", FT_UINT16, BASE_HEX, NULL, "LBS Rsvd", "wassp.lsb.rsvd6", FT_UINT16, BASE_HEX, NULL,
0x00, "LBS TAG rsvd7", HFILL 0x0, "LBS TAG rsvd7", HFILL
} }
}, },
{ {
&hf_lsb_wh_addr2, &hf_lsb_wh_addr2,
{ {
"MAC address2", "wassp.data.mu_mac", FT_ETHER, BASE_NONE, NULL, "MAC address2", "wassp.data.mu_mac", FT_ETHER, BASE_NONE, NULL,
0x00, "Mobile Unit Ethernet address", HFILL 0x0, "Mobile Unit Ethernet address", HFILL
} }
}, },
{ {
&hf_lsb_wh_addr3, &hf_lsb_wh_addr3,
{ {
"MAC address3", "wassp.data.mu_mac", FT_ETHER, BASE_NONE, NULL, "MAC address3", "wassp.data.mu_mac", FT_ETHER, BASE_NONE, NULL,
0x00, "Mobile Unit Ethernet address", HFILL 0x0, "Mobile Unit Ethernet address", HFILL
} }
}, },
{ {
&hf_lsb_wh_addr4, &hf_lsb_wh_addr4,
{ {
"MAC address4", "wassp.data.mu_mac", FT_ETHER, BASE_NONE, NULL, "MAC address4", "wassp.data.mu_mac", FT_ETHER, BASE_NONE, NULL,
0x00, "Mobile Unit Ethernet address", HFILL 0x0, "Mobile Unit Ethernet address", HFILL
} }
}, },
{ {
&hf_wassp_version, &hf_wassp_version,
{ {
"Version", "wassp.version", FT_UINT8, BASE_DEC, NULL, "Version", "wassp.version", FT_UINT8, BASE_DEC, NULL,
0x00, "Wassp Protocol Version", HFILL 0x0, "Wassp Protocol Version", HFILL
} }
}, },
/* ru discover header */ /* ru discover header */
@ -6215,63 +6215,63 @@ void proto_register_wassp(void)
&hf_ru_rad_num, &hf_ru_rad_num,
{ {
"RU Random Number", "wassp.ru_xid", FT_UINT16, BASE_DEC, NULL, "RU Random Number", "wassp.ru_xid", FT_UINT16, BASE_DEC, NULL,
0x00, "random number for checking the session", HFILL 0x0, "random number for checking the session", HFILL
} }
}, },
{ {
&hf_ru_checksum, &hf_ru_checksum,
{ {
"RU Messages Checksum", "wassp.ru_checksum", FT_UINT16, BASE_DEC, NULL, "RU Messages Checksum", "wassp.ru_checksum", FT_UINT16, BASE_DEC, NULL,
0x00, "AccessPoint messages checksum", HFILL 0x0, "AccessPoint messages checksum", HFILL
} }
}, },
{ {
&hf_ru_ac_op, &hf_ru_ac_op,
{ {
"Controller Operation", "wassp.ru_ac_op", FT_UINT16, BASE_DEC, NULL, "Controller Operation", "wassp.ru_ac_op", FT_UINT16, BASE_DEC, NULL,
0x00, NULL, HFILL 0x0, NULL, HFILL
} }
}, },
{ {
&hf_ru_ac_mode, &hf_ru_ac_mode,
{ {
"Controller Operation Mode", "wassp.ru_ac_mode", FT_UINT16, BASE_DEC, NULL, "Controller Operation Mode", "wassp.ru_ac_mode", FT_UINT16, BASE_DEC, NULL,
0x00, NULL, HFILL 0x0, NULL, HFILL
} }
}, },
{ {
&hf_ru_mac, &hf_ru_mac,
{ {
"AP MAC address", "wassp.ru_mac", FT_ETHER, BASE_NONE, NULL, "AP MAC address", "wassp.ru_mac", FT_ETHER, BASE_NONE, NULL,
0x00, "AP Ethernet address", HFILL 0x0, "AP Ethernet address", HFILL
} }
}, },
{ {
&hf_ru_discover_header, &hf_ru_discover_header,
{ {
"RU Discover Header", "wassp.ru.header", FT_BYTES, BASE_NONE, NULL , "RU Discover Header", "wassp.ru.header", FT_BYTES, BASE_NONE, NULL ,
0x00, "AccessPoint Discover Header", HFILL 0x0, "AccessPoint Discover Header", HFILL
} }
}, },
{ {
&hf_wassp_header, &hf_wassp_header,
{ {
"Wassp Header", "wassp.header", FT_BYTES, BASE_NONE, NULL , "Wassp Header", "wassp.header", FT_BYTES, BASE_NONE, NULL ,
0x00, "Wassp Message Header", HFILL 0x0, "Wassp Message Header", HFILL
} }
}, },
{ {
&hf_wassp_type, &hf_wassp_type,
{ {
"WASSP Type", "wassp.type", FT_UINT8, BASE_DEC, "WASSP Type", "wassp.type", FT_UINT8, BASE_DEC,
VALS(wassp_header_types), 0x00, "Wassp message type", HFILL VALS(wassp_header_types), 0x0, "Wassp message type", HFILL
} }
}, },
{ {
&hf_wassp_seq_num_flag, &hf_wassp_seq_num_flag,
{ {
"Sequence Number & Flag", "wassp.seq_num_flag", FT_UINT16, BASE_DEC, NULL, "Sequence Number & Flag", "wassp.seq_num_flag", FT_UINT16, BASE_DEC, NULL,
0x00, "Sequence number and flag for multi-message", HFILL 0x0, "Sequence number and flag for multi-message", HFILL
} }
}, },
{ {
@ -6313,14 +6313,14 @@ void proto_register_wassp(void)
&hf_wassp_sessionid, &hf_wassp_sessionid,
{ {
"Session ID", "wassp.session_id", FT_UINT16, BASE_DEC, NULL, "Session ID", "wassp.session_id", FT_UINT16, BASE_DEC, NULL,
0x00, "Concentrator Session ID", HFILL 0x0, "Concentrator Session ID", HFILL
} }
}, },
{ {
&hf_wassp_length, &hf_wassp_length,
{ {
"Length", "wassp.length", FT_UINT16, BASE_DEC, NULL, "Length", "wassp.length", FT_UINT16, BASE_DEC, NULL,
0x00, "Length of Payload", HFILL 0x0, "Length of Payload", HFILL
} }
}, },
/* wassp MU data --- start */ /* wassp MU data --- start */
@ -6336,28 +6336,28 @@ void proto_register_wassp(void)
&hf_wassp_mu_data_header, &hf_wassp_mu_data_header,
{ {
"Wassp MU Data Header", "wassp.mu_data_header", FT_BYTES, BASE_NONE, NULL, "Wassp MU Data Header", "wassp.mu_data_header", FT_BYTES, BASE_NONE, NULL,
0x00, "MU Data Header", HFILL 0x0, "MU Data Header", HFILL
} }
}, },
{ {
&hf_wassp_mu_type, &hf_wassp_mu_type,
{ {
"Type", "wassp.data.mu_type", FT_UINT8, BASE_DEC, NULL, "Type", "wassp.data.mu_type", FT_UINT8, BASE_DEC, NULL,
0x00, "Wassp MU message type", HFILL 0x0, "Wassp MU message type", HFILL
} }
}, },
{ {
&hf_wassp_mu_qos, &hf_wassp_mu_qos,
{ {
"QOS", "wassp.data.mu_qos", FT_UINT8, BASE_DEC, NULL, "QOS", "wassp.data.mu_qos", FT_UINT8, BASE_DEC, NULL,
0x00, "Quality of Service identifier", HFILL 0x0, "Quality of Service identifier", HFILL
} }
}, },
{ {
&hf_wassp_mu_action_ssid, &hf_wassp_mu_action_ssid,
{ {
"Action & SSID/Vlan ID", "wassp.data.mu_action_ssid", FT_UINT16, BASE_DEC, NULL, "Action & SSID/Vlan ID", "wassp.data.mu_action_ssid", FT_UINT16, BASE_DEC, NULL,
0x00, "Action and where device is currently registered", HFILL 0x0, "Action and where device is currently registered", HFILL
} }
}, },
{ {
@ -6379,28 +6379,28 @@ void proto_register_wassp(void)
&hf_wassp_mu_resv0, &hf_wassp_mu_resv0,
{ {
"Reserved0", "wassp.data.mu_resv0", FT_UINT16, BASE_HEX, VALS(mu_resv0_strings), "Reserved0", "wassp.data.mu_resv0", FT_UINT16, BASE_HEX, VALS(mu_resv0_strings),
0x00, "MU data Reserved0 or Flag", HFILL 0x0, "MU data Reserved0 or Flag", HFILL
} }
}, },
{ {
&hf_wassp_mu_resv1, &hf_wassp_mu_resv1,
{ {
"Reserved1", "wassp.data.mu_resv1", FT_UINT16, BASE_DEC, NULL, "Reserved1", "wassp.data.mu_resv1", FT_UINT16, BASE_DEC, NULL,
0x00, "MU data Reserved 1", HFILL 0x0, "MU data Reserved 1", HFILL
} }
}, },
{ {
&hf_wassp_mu_assoc_status, &hf_wassp_mu_assoc_status,
{ {
"Association Status", "wassp.data.mu_assoc_status", FT_UINT8, BASE_CUSTOM, CF_FUNC(mu_association_status), "Association Status", "wassp.data.mu_assoc_status", FT_UINT8, BASE_CUSTOM, CF_FUNC(mu_association_status),
0x00, "MU Association Status", HFILL 0x0, "MU Association Status", HFILL
} }
}, },
{ {
&hf_wassp_mu_mac, &hf_wassp_mu_mac,
{ {
"MAC address", "wassp.data.mu_mac", FT_ETHER, BASE_NONE, NULL, "MAC address", "wassp.data.mu_mac", FT_ETHER, BASE_NONE, NULL,
0x00, "Mobile Unit Ethernet address", HFILL 0x0, "Mobile Unit Ethernet address", HFILL
} }
}, },
/* netflow */ /* netflow */
@ -6408,147 +6408,147 @@ void proto_register_wassp(void)
&hf_wassp_mu_netflow_tree, &hf_wassp_mu_netflow_tree,
{ {
"WASSP MU Data NetFlow Tree", "wassp.mu.data.netflow.subtree", FT_NONE, BASE_NONE, NULL, "WASSP MU Data NetFlow Tree", "wassp.mu.data.netflow.subtree", FT_NONE, BASE_NONE, NULL,
0x00, NULL, HFILL 0x0, NULL, HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_header, &hf_wassp_mu_netflow_header,
{ {
"Wassp MU Data NetFlow Header", "wassp.mu_data_netflow_header", FT_BYTES, BASE_NONE, NULL, "Wassp MU Data NetFlow Header", "wassp.mu_data_netflow_header", FT_BYTES, BASE_NONE, NULL,
0x00, "MU Data NetFlow Header", HFILL 0x0, "MU Data NetFlow Header", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_version, &hf_wassp_mu_netflow_version,
{ {
"Version", "wassp.data.mu_netflow_version", FT_UINT16, BASE_DEC, NULL, "Version", "wassp.data.mu_netflow_version", FT_UINT16, BASE_DEC, NULL,
0x00, "MU NetFlow Version", HFILL 0x0, "MU NetFlow Version", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_length, &hf_wassp_mu_netflow_length,
{ {
"Length", "wassp.data.mu_netflow_length", FT_UINT16, BASE_DEC, NULL, "Length", "wassp.data.mu_netflow_length", FT_UINT16, BASE_DEC, NULL,
0x00, "MU NetFlow Length", HFILL 0x0, "MU NetFlow Length", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_flags, &hf_wassp_mu_netflow_flags,
{ {
"Flag", "wassp.data.mu_netflow_flag", FT_UINT16, BASE_HEX, NULL, "Flag", "wassp.data.mu_netflow_flag", FT_UINT16, BASE_HEX, NULL,
0x00, "MU NetFlow Flag", HFILL 0x0, "MU NetFlow Flag", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_uptime, &hf_wassp_mu_netflow_uptime,
{ {
"UpTime", "wassp.data.mu_netflow_uptime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, "UpTime", "wassp.data.mu_netflow_uptime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL,
0x00, "MU NetFlow Up Time", HFILL 0x0, "MU NetFlow Up Time", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_record, &hf_wassp_mu_netflow_record,
{ {
"Record", "wassp.data.mu_netflow_record", FT_BYTES, BASE_NONE, NULL, "Record", "wassp.data.mu_netflow_record", FT_BYTES, BASE_NONE, NULL,
0x00, "MU NetFlow Record", HFILL 0x0, "MU NetFlow Record", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_in_bytes, &hf_wassp_mu_netflow_in_bytes,
{ {
"InBytes", "wassp.data.mu_netflow_inbytes", FT_UINT32, BASE_DEC, NULL, "InBytes", "wassp.data.mu_netflow_inbytes", FT_UINT32, BASE_DEC, NULL,
0x00, "MU NetFlow In Bytes", HFILL 0x0, "MU NetFlow In Bytes", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_in_packets, &hf_wassp_mu_netflow_in_packets,
{ {
"InPackets", "wassp.data.mu_netflow_inpackets", FT_UINT32, BASE_DEC, NULL, "InPackets", "wassp.data.mu_netflow_inpackets", FT_UINT32, BASE_DEC, NULL,
0x00, "MU NetFlow In Packets", HFILL 0x0, "MU NetFlow In Packets", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_ip_protocol_number, &hf_wassp_mu_netflow_ip_protocol_number,
{ {
"Protocol", "wassp.data.mu_netflow_protocol", FT_UINT8, BASE_DEC, NULL, "Protocol", "wassp.data.mu_netflow_protocol", FT_UINT8, BASE_DEC, NULL,
0x00, "MU NetFlow IP Protocol", HFILL 0x0, "MU NetFlow IP Protocol", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_source_tos, &hf_wassp_mu_netflow_source_tos,
{ {
"Source TOS", "wassp.data.mu_netflow_tos", FT_UINT8, BASE_HEX, NULL, "Source TOS", "wassp.data.mu_netflow_tos", FT_UINT8, BASE_HEX, NULL,
0x00, "MU NetFlow Source TOS", HFILL 0x0, "MU NetFlow Source TOS", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_source_port, &hf_wassp_mu_netflow_source_port,
{ {
"Source Port", "wassp.data.mu_netflow_source_port", FT_INT16, BASE_DEC, NULL, "Source Port", "wassp.data.mu_netflow_source_port", FT_INT16, BASE_DEC, NULL,
0x00, "MU NetFlow Source Port", HFILL 0x0, "MU NetFlow Source Port", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_source_ip, &hf_wassp_mu_netflow_source_ip,
{ {
"IP", "wassp.data.mu_netflow_source_ip", FT_IPv4, BASE_NONE, NULL, "IP", "wassp.data.mu_netflow_source_ip", FT_IPv4, BASE_NONE, NULL,
0x00, "MU NetFlow Source IP", HFILL 0x0, "MU NetFlow Source IP", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_input_snmp, &hf_wassp_mu_netflow_input_snmp,
{ {
"In SNMP", "wassp.data.mu_netflow_in_snmp", FT_UINT16, BASE_DEC, NULL, "In SNMP", "wassp.data.mu_netflow_in_snmp", FT_UINT16, BASE_DEC, NULL,
0x00, "MU NetFlow In Snmp", HFILL 0x0, "MU NetFlow In Snmp", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_dest_port, &hf_wassp_mu_netflow_dest_port,
{ {
"Dest Port", "wassp.data.mu_netflow_dest_port", FT_INT16, BASE_DEC, NULL, "Dest Port", "wassp.data.mu_netflow_dest_port", FT_INT16, BASE_DEC, NULL,
0x00, "MU NetFlow Dest Port", HFILL 0x0, "MU NetFlow Dest Port", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_dest_ip, &hf_wassp_mu_netflow_dest_ip,
{ {
"Dest IP", "wassp.data.mu_netflow_dest_ip", FT_IPv4, BASE_NONE, NULL, "Dest IP", "wassp.data.mu_netflow_dest_ip", FT_IPv4, BASE_NONE, NULL,
0x00, "MU NetFlow Dest IP", HFILL 0x0, "MU NetFlow Dest IP", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_output_snmp, &hf_wassp_mu_netflow_output_snmp,
{ {
"Out SNMP", "wassp.data.mu_netflow_out_snmp", FT_UINT16, BASE_DEC, NULL, "Out SNMP", "wassp.data.mu_netflow_out_snmp", FT_UINT16, BASE_DEC, NULL,
0x00, "MU NetFlow Out Snmp", HFILL 0x0, "MU NetFlow Out Snmp", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_last_time, &hf_wassp_mu_netflow_last_time,
{ {
"Last Time", "wassp.data.mu_netflow_last_time", FT_UINT32, BASE_DEC, NULL, "Last Time", "wassp.data.mu_netflow_last_time", FT_UINT32, BASE_DEC, NULL,
0x00, "MU NetFlow Last Time", HFILL 0x0, "MU NetFlow Last Time", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_first_time, &hf_wassp_mu_netflow_first_time,
{ {
"First Time", "wassp.data.mu_netflow_first_time", FT_UINT32, BASE_DEC, NULL, "First Time", "wassp.data.mu_netflow_first_time", FT_UINT32, BASE_DEC, NULL,
0x00, "MU NetFlow First Time", HFILL 0x0, "MU NetFlow First Time", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_in_source_mac, &hf_wassp_mu_netflow_in_source_mac,
{ {
"Source Mac", "wassp.data.mu_netflow_source_mac", FT_ETHER, BASE_NONE, NULL, "Source Mac", "wassp.data.mu_netflow_source_mac", FT_ETHER, BASE_NONE, NULL,
0x00, "MU NetFlow Source MAC Address", HFILL 0x0, "MU NetFlow Source MAC Address", HFILL
} }
}, },
{ {
&hf_wassp_mu_netflow_in_dest_mac, &hf_wassp_mu_netflow_in_dest_mac,
{ {
"Dest Mac", "wassp.data.mu_netflow_dest_mac", FT_ETHER, BASE_NONE, NULL, "Dest Mac", "wassp.data.mu_netflow_dest_mac", FT_ETHER, BASE_NONE, NULL,
0x00, "MU NetFlow Dest MAC Address", HFILL 0x0, "MU NetFlow Dest MAC Address", HFILL
} }
}, },
/* wassp TLV */ /* wassp TLV */
@ -6556,84 +6556,84 @@ void proto_register_wassp(void)
&hf_wassp_tlv_value, &hf_wassp_tlv_value,
{ {
"Wassp TLV", "wassp.tlv.value", FT_NONE, BASE_NONE, NULL, "Wassp TLV", "wassp.tlv.value", FT_NONE, BASE_NONE, NULL,
0x00, "Wassp TLV in hexadecimal", HFILL 0x0, "Wassp TLV in hexadecimal", HFILL
} }
}, },
{ {
&hf_wassp_tlv_type_main, &hf_wassp_tlv_type_main,
{ {
"Type", "wassp.tlv.type", FT_UINT16, BASE_DEC, VALS(wassp_tlv_types), "Type", "wassp.tlv.type", FT_UINT16, BASE_DEC, VALS(wassp_tlv_types),
0x00, "Wassp TLV type", HFILL 0x0, "Wassp TLV type", HFILL
} }
}, },
{ {
&hf_wassp_tlv_type_sub, &hf_wassp_tlv_type_sub,
{ {
"Type", "wassp.tlv.type", FT_NONE, BASE_NONE, NULL, "Type", "wassp.tlv.type", FT_NONE, BASE_NONE, NULL,
0x00, "Wassp TLV type", HFILL 0x0, "Wassp TLV type", HFILL
} }
}, },
{ {
&hf_wassp_tlv_length, &hf_wassp_tlv_length,
{ {
"Length", "wassp.tlv.length", FT_UINT16, BASE_DEC, NULL, "Length", "wassp.tlv.length", FT_UINT16, BASE_DEC, NULL,
0x00, "Wassp TLV length", HFILL 0x0, "Wassp TLV length", HFILL
} }
}, },
{ {
&hf_wassp_tlv_value_octext, &hf_wassp_tlv_value_octext,
{ {
"value", "wassp.tlv.value_octext", FT_BYTES, BASE_NONE, NULL, "value", "wassp.tlv.value_octext", FT_BYTES, BASE_NONE, NULL,
0x00, "Wassp TLV Value in hexadecimal", HFILL 0x0, "Wassp TLV Value in hexadecimal", HFILL
} }
}, },
{ {
&hf_wassp_tlv_value_string, &hf_wassp_tlv_value_string,
{ {
"Value", "wassp.tlv.valuestr", FT_STRING, BASE_NONE, NULL, "Value", "wassp.tlv.valuestr", FT_STRING, BASE_NONE, NULL,
0x00, "Wassp TLV Value in string format", HFILL 0x0, "Wassp TLV Value in string format", HFILL
} }
}, },
{ {
&hf_wassp_tlv_value_ip, &hf_wassp_tlv_value_ip,
{ {
"Value", "wassp.tlv.valueip", FT_IPv4, BASE_NONE, NULL, "Value", "wassp.tlv.valueip", FT_IPv4, BASE_NONE, NULL,
0x00, "Wassp TLV Value in IP format", HFILL 0x0, "Wassp TLV Value in IP format", HFILL
} }
}, },
{ {
&hf_wassp_tlv_value_int, &hf_wassp_tlv_value_int,
{ {
"Value", "wassp.tlv.valueint", FT_UINT8, BASE_DEC, NULL, "Value", "wassp.tlv.valueint", FT_UINT8, BASE_DEC, NULL,
0x00, "Wassp TLV Value in an integer", HFILL 0x0, "Wassp TLV Value in an integer", HFILL
} }
}, },
{ {
&hf_wassp_tlv_eid_status, &hf_wassp_tlv_eid_status,
{ {
"Status", "wassp.tlv.eid.status", FT_UINT32, BASE_DEC, VALS(wassp_eid_status_types), "Status", "wassp.tlv.eid.status", FT_UINT32, BASE_DEC, VALS(wassp_eid_status_types),
0x00, "Explicit indication of request's status", HFILL 0x0, "Explicit indication of request's status", HFILL
} }
}, },
{ {
&hf_wassp_tlv_eid_action, &hf_wassp_tlv_eid_action,
{ {
"action", "wassp.tlv.eid.action", FT_UINT32, BASE_DEC, VALS(wassp_eid_action_types), "action", "wassp.tlv.eid.action", FT_UINT32, BASE_DEC, VALS(wassp_eid_action_types),
0x00, "upgrade action request", HFILL 0x0, "upgrade action request", HFILL
} }
}, },
{ {
&hf_wassp_tlv_eid_rustate, &hf_wassp_tlv_eid_rustate,
{ {
"RU State", "wassp.tlv.eid.rustate", FT_BOOLEAN, FT_UINT8, TFS(&wassp_eid_rustate_types), "RU State", "wassp.tlv.eid.rustate", FT_BOOLEAN, FT_UINT8, TFS(&wassp_eid_rustate_types),
0x00, "Remote Unit State", HFILL 0x0, "Remote Unit State", HFILL
} }
}, },
{ {
&hf_wassp_ipaddress, &hf_wassp_ipaddress,
{ {
"IPv4 address", "wassp.ipaddress", FT_IPv4, BASE_NONE, NULL, "IPv4 address", "wassp.ipaddress", FT_IPv4, BASE_NONE, NULL,
0x00, "IPv4 IP address", HFILL 0x0, "IPv4 IP address", HFILL
} }
}, },
/* fragmentation */ /* fragmentation */
@ -6648,14 +6648,14 @@ void proto_register_wassp(void)
&hf_wassp_fragment_overlap_conflict, &hf_wassp_fragment_overlap_conflict,
{ {
"Conflicting data in fragment overlap", "wassp.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, "Conflicting data in fragment overlap", "wassp.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL,
0x00, "Overlapping fragments contained conflicting data", HFILL 0x0, "Overlapping fragments contained conflicting data", HFILL
} }
}, },
{ {
&hf_wassp_fragment_multiple_tails, &hf_wassp_fragment_multiple_tails,
{ {
"Multiple tail fragments found", "wassp.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, "Multiple tail fragments found", "wassp.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL,
0x00, "Several tails were found when defragmenting the packet", HFILL 0x0, "Several tails were found when defragmenting the packet", HFILL
} }
}, },
{ {
@ -6669,112 +6669,112 @@ void proto_register_wassp(void)
&hf_wassp_fragment_error, &hf_wassp_fragment_error,
{ {
"Defragmentation error", "wassp.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, "Defragmentation error", "wassp.fragment.error", FT_FRAMENUM, BASE_NONE, NULL,
0x00, "Defragmentation error due to illegal fragments", HFILL 0x0, "Defragmentation error due to illegal fragments", HFILL
} }
}, },
{ {
&hf_wassp_fragment, &hf_wassp_fragment,
{ {
"WASSP Fragment", "wassp.fragment", FT_FRAMENUM, BASE_NONE, NULL, "WASSP Fragment", "wassp.fragment", FT_FRAMENUM, BASE_NONE, NULL,
0x00, "wassp Fragmented", HFILL 0x0, "wassp Fragmented", HFILL
} }
}, },
{ {
&hf_wassp_fragments, &hf_wassp_fragments,
{ {
"WASSP Fragments", "wassp.fragments", FT_NONE, BASE_NONE, NULL, "WASSP Fragments", "wassp.fragments", FT_NONE, BASE_NONE, NULL,
0x00, "wassp more Fragments", HFILL 0x0, "wassp more Fragments", HFILL
} }
}, },
{ {
&hf_wassp_fragment_count, &hf_wassp_fragment_count,
{ {
"WASSP Fragment count", "wassp.fragment.count", FT_UINT32, BASE_DEC, NULL, "WASSP Fragment count", "wassp.fragment.count", FT_UINT32, BASE_DEC, NULL,
0x00, "Fragment Count", HFILL 0x0, "Fragment Count", HFILL
} }
}, },
{ {
&hf_wassp_reassembled_in, &hf_wassp_reassembled_in,
{ {
"Reassembled WASSP in frame", "wassp.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, "Reassembled WASSP in frame", "wassp.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL,
0x00, "This WASSP frame is reassembled in this frame", HFILL 0x0, "This WASSP frame is reassembled in this frame", HFILL
} }
}, },
{ {
&hf_wassp_reassembled_length, &hf_wassp_reassembled_length,
{ {
"Reassembled WASSP length", "wassp.reassembled.length", FT_UINT32, BASE_DEC, NULL, "Reassembled WASSP length", "wassp.reassembled.length", FT_UINT32, BASE_DEC, NULL,
0x00, "The total length of the reassembled payload", HFILL 0x0, "The total length of the reassembled payload", HFILL
} }
}, },
{ {
&hf_wassp_sub_tree, &hf_wassp_sub_tree,
{ {
"WASSP Sub TLV Block", "wassp.subtree", FT_NONE, BASE_NONE, NULL, "WASSP Sub TLV Block", "wassp.subtree", FT_NONE, BASE_NONE, NULL,
0x00, "WASSP sub tree", HFILL 0x0, "WASSP sub tree", HFILL
} }
}, },
{ {
&hf_wassp_tlv_unknown, &hf_wassp_tlv_unknown,
{ {
"WASSP unknown tlv", "wassp.tlv.unknown", FT_UINT32, BASE_DEC, NULL, "WASSP unknown tlv", "wassp.tlv.unknown", FT_UINT32, BASE_DEC, NULL,
0x00, "Unknown tlv", HFILL 0x0, "Unknown tlv", HFILL
} }
}, },
{ {
&hf_wassp_tlv_invalid, &hf_wassp_tlv_invalid,
{ {
"WASSP invalid tlv", "wassp.tlv.invalid", FT_UINT32, BASE_DEC, NULL, "WASSP invalid tlv", "wassp.tlv.invalid", FT_UINT32, BASE_DEC, NULL,
0x00, "Invalid tlv", HFILL 0x0, "Invalid tlv", HFILL
} }
}, },
{ {
&hf_wassp_topologykey, &hf_wassp_topologykey,
{ {
"Topology Key", "wassp.topology_key", FT_UINT16, BASE_DEC, NULL, "Topology Key", "wassp.topology_key", FT_UINT16, BASE_DEC, NULL,
0x00, "Topology ID", HFILL 0x0, "Topology ID", HFILL
} }
}, },
{ {
&hf_wassp_vlanid, &hf_wassp_vlanid,
{ {
"Vlan ID", "wassp.vlan_id", FT_UINT16, BASE_DEC, NULL, "Vlan ID", "wassp.vlan_id", FT_UINT16, BASE_DEC, NULL,
0x00, "Vlan Number", HFILL 0x0, "Vlan Number", HFILL
} }
}, },
{ {
&hf_wassp_topology_mode, &hf_wassp_topology_mode,
{ {
"Topology Mode", "wassp.topology_mode", FT_UINT16,BASE_CUSTOM, CF_FUNC(topology_moder_print), "Topology Mode", "wassp.topology_mode", FT_UINT16,BASE_CUSTOM, CF_FUNC(topology_moder_print),
0x00, "Wassp Topology Mode", HFILL 0x0, "Wassp Topology Mode", HFILL
} }
}, },
{ {
&hf_wassp_in_cir, &hf_wassp_in_cir,
{ {
"Committed Information Rate(In direction)", "wassp.in_cir", FT_UINT16, BASE_DEC, NULL, "Committed Information Rate(In direction)", "wassp.in_cir", FT_UINT16, BASE_DEC, NULL,
0x00, "Committed Information Rate", HFILL 0x0, "Committed Information Rate", HFILL
} }
}, },
{ {
&hf_wassp_out_cir, &hf_wassp_out_cir,
{ {
"Committed Information Rate(out direction)", "wassp.out_cir", FT_UINT16, BASE_DEC, NULL, "Committed Information Rate(out direction)", "wassp.out_cir", FT_UINT16, BASE_DEC, NULL,
0x00, "Committed Information Rate", HFILL 0x0, "Committed Information Rate", HFILL
} }
}, },
{ {
&hf_wassp_flag_1b, &hf_wassp_flag_1b,
{ {
"Flag (1 byte)", "wassp.flag.1b", FT_UINT8, BASE_HEX, NULL, "Flag (1 byte)", "wassp.flag.1b", FT_UINT8, BASE_HEX, NULL,
0x00, "Flag", HFILL 0x0, "Flag", HFILL
} }
}, },
{ {
&hf_wassp_tos, &hf_wassp_tos,
{ {
"Type of Service", "wassp.tos", FT_UINT8, BASE_HEX, NULL, "Type of Service", "wassp.tos", FT_UINT8, BASE_HEX, NULL,
0x00, "Tos", HFILL 0x0, "Tos", HFILL
} }
}, },
{ {
@ -6788,14 +6788,14 @@ void proto_register_wassp(void)
&hf_wassp_tos_mask, &hf_wassp_tos_mask,
{ {
"Type of Service Mask", "wassp.tos.mask", FT_UINT8, BASE_HEX, NULL, "Type of Service Mask", "wassp.tos.mask", FT_UINT8, BASE_HEX, NULL,
0x00, "ToS Mask", HFILL 0x0, "ToS Mask", HFILL
} }
}, },
{ {
&hf_cos_tos_mask, &hf_cos_tos_mask,
{ {
"Class of Service ToS Mask", "wassp.cos_tos.mask", FT_UINT8, BASE_HEX, NULL, "Class of Service ToS Mask", "wassp.cos_tos.mask", FT_UINT8, BASE_HEX, NULL,
0x00, "Cos Tos Mask", HFILL 0x0, "Cos Tos Mask", HFILL
} }
}, },
{ {
@ -6830,140 +6830,140 @@ void proto_register_wassp(void)
&hf_wassp_filter_rule, &hf_wassp_filter_rule,
{ {
"WASSP Filter Rule", "wassp.filter.rule", FT_BYTES, BASE_NONE, NULL, "WASSP Filter Rule", "wassp.filter.rule", FT_BYTES, BASE_NONE, NULL,
0x00, "Filter Rule", HFILL 0x0, "Filter Rule", HFILL
} }
}, },
{ {
&hf_wassp_filter_flag, &hf_wassp_filter_flag,
{ {
"WASSP Filter Flag", "wassp.filter.flag", FT_UINT32, BASE_HEX, NULL, "WASSP Filter Flag", "wassp.filter.flag", FT_UINT32, BASE_HEX, NULL,
0x00, "Filter Flag", HFILL 0x0, "Filter Flag", HFILL
} }
}, },
{ {
&hf_filter_rule_port_range, &hf_filter_rule_port_range,
{ {
"TCP/UDP Port range", "wassp.port", FT_UINT32, BASE_CUSTOM, CF_FUNC(port_range_print), "TCP/UDP Port range", "wassp.port", FT_UINT32, BASE_CUSTOM, CF_FUNC(port_range_print),
0x00, "WASSP TCP/UDP Port", HFILL 0x0, "WASSP TCP/UDP Port", HFILL
} }
}, },
{ {
&hf_wassp_ipprotocol, &hf_wassp_ipprotocol,
{ {
"IP Protocol", "wassp.ip_protocol", FT_UINT8, BASE_DEC, NULL, "IP Protocol", "wassp.ip_protocol", FT_UINT8, BASE_DEC, NULL,
0x00, "WASSP IP Protocol", HFILL 0x0, "WASSP IP Protocol", HFILL
} }
}, },
{ {
&hf_wassp_netmasklength, &hf_wassp_netmasklength,
{ {
"Netmask Length Bit", "wassp.netmask_length", FT_UINT8, BASE_DEC, NULL, "Netmask Length Bit", "wassp.netmask_length", FT_UINT8, BASE_DEC, NULL,
0x00, "WASSP Netmask Length Bit", HFILL 0x0, "WASSP Netmask Length Bit", HFILL
} }
}, },
{ {
&hf_wassp_macaddr, &hf_wassp_macaddr,
{ {
"MAC address", "wassp.mac_address", FT_ETHER, BASE_NONE, NULL, "MAC address", "wassp.mac_address", FT_ETHER, BASE_NONE, NULL,
0x00, "WASSP MAC address", HFILL 0x0, "WASSP MAC address", HFILL
} }
}, },
{ {
&hf_wassp_macaddr_mask, &hf_wassp_macaddr_mask,
{ {
"MAC address mask", "wassp.mac_address.mask", FT_ETHER, BASE_NONE, NULL, "MAC address mask", "wassp.mac_address.mask", FT_ETHER, BASE_NONE, NULL,
0x00, "MAC mask", HFILL 0x0, "MAC mask", HFILL
} }
}, },
{ {
&hf_wassp_ethernet_type, &hf_wassp_ethernet_type,
{ {
"Ethernet Type", "wassp.ethernet_type", FT_UINT16, BASE_HEX, NULL, "Ethernet Type", "wassp.ethernet_type", FT_UINT16, BASE_HEX, NULL,
0x00, "Ethernet Type Field", HFILL 0x0, "Ethernet Type Field", HFILL
} }
}, },
{ {
&hf_wassp_reserve, &hf_wassp_reserve,
{ {
"Reserve", "wassp.reserve", FT_UINT16, BASE_DEC, NULL, "Reserve", "wassp.reserve", FT_UINT16, BASE_DEC, NULL,
0x00, "Reserve value", HFILL 0x0, "Reserve value", HFILL
} }
}, },
{ {
&hf_wassp_freq, &hf_wassp_freq,
{ {
"Freq in MHz", "wassp.freq", FT_UINT16, BASE_DEC, NULL, "Freq in MHz", "wassp.freq", FT_UINT16, BASE_DEC, NULL,
0x00, "WASSP Freq", HFILL 0x0, "WASSP Freq", HFILL
} }
}, },
{ {
&hf_wassp_rss, &hf_wassp_rss,
{ {
"RSS", "wassp.rss", FT_UINT16, BASE_DEC, NULL, "RSS", "wassp.rss", FT_UINT16, BASE_DEC, NULL,
0x00, "WASSP RSS", HFILL 0x0, "WASSP RSS", HFILL
} }
}, },
{ {
&hf_wassp_rssi, &hf_wassp_rssi,
{ {
"RSSI", "wassp.rssi", FT_UINT16, BASE_DEC, NULL, "RSSI", "wassp.rssi", FT_UINT16, BASE_DEC, NULL,
0x00, "WASSP RSSI", HFILL 0x0, "WASSP RSSI", HFILL
} }
}, },
{ {
&hf_wassp_threatstate, &hf_wassp_threatstate,
{ {
"WASSP Threat State", "wassp.threat_state", FT_UINT8, BASE_HEX, VALS(threat_state_strings), "WASSP Threat State", "wassp.threat_state", FT_UINT8, BASE_HEX, VALS(threat_state_strings),
0x00, "WASSP Threat State (NA/Active/Inactive)", HFILL 0x0, "WASSP Threat State (NA/Active/Inactive)", HFILL
} }
}, },
{ {
&hf_wassp_radioparams, &hf_wassp_radioparams,
{ {
"Radio Params QOS", "wassp.radio_params", FT_UINT8, BASE_HEX, VALS(radio_params_strings), "Radio Params QOS", "wassp.radio_params", FT_UINT8, BASE_HEX, VALS(radio_params_strings),
0x00, "WASSP Radio Params QOS", HFILL 0x0, "WASSP Radio Params QOS", HFILL
} }
}, },
{ {
&hf_wassp_channelfreq, &hf_wassp_channelfreq,
{ {
"Channel Frequency", "wassp.channel_freq", FT_UINT16, BASE_DEC, NULL, "Channel Frequency", "wassp.channel_freq", FT_UINT16, BASE_DEC, NULL,
0x00, "WASSP Channel Frequency", HFILL 0x0, "WASSP Channel Frequency", HFILL
} }
}, },
{ {
&hf_wassp_mu, &hf_wassp_mu,
{ {
"Total Mu", "wassp.mu", FT_UINT32, BASE_DEC, NULL, "Total Mu", "wassp.mu", FT_UINT32, BASE_DEC, NULL,
0x00, "WASSP Total Mu", HFILL 0x0, "WASSP Total Mu", HFILL
} }
}, },
{ {
&hf_wassp_apprules, &hf_wassp_apprules,
{ {
"Number of Application Rules", "wassp.num_apprules", FT_UINT16, BASE_DEC, NULL, "Number of Application Rules", "wassp.num_apprules", FT_UINT16, BASE_DEC, NULL,
0x00, "WASSP number of app rules", HFILL 0x0, "WASSP number of app rules", HFILL
} }
}, },
{ {
&hf_wassp_displayid, &hf_wassp_displayid,
{ {
"Display ID", "wassp.display_id", FT_UINT16, BASE_DEC, NULL, "Display ID", "wassp.display_id", FT_UINT16, BASE_DEC, NULL,
0x00, "WASSP display ID", HFILL 0x0, "WASSP display ID", HFILL
} }
}, },
{ {
&hf_wassp_txbytes, &hf_wassp_txbytes,
{ {
"Tx Bytes", "wassp.tx_bytes", FT_UINT32, BASE_DEC, NULL, "Tx Bytes", "wassp.tx_bytes", FT_UINT32, BASE_DEC, NULL,
0x00, "WASSP Tx Bytes", HFILL 0x0, "WASSP Tx Bytes", HFILL
} }
}, },
{ {
&hf_wassp_rxbytes, &hf_wassp_rxbytes,
{ {
"Rx Bytes", "wassp.rx_bytes", FT_UINT32, BASE_DEC, NULL, "Rx Bytes", "wassp.rx_bytes", FT_UINT32, BASE_DEC, NULL,
0x00, "WASSP Rx Bytes", HFILL 0x0, "WASSP Rx Bytes", HFILL
} }
}, },
}; };

18
plugins/epan/wimaxmacphy/packet-wimaxmacphy.c
View File

@ -3208,8 +3208,7 @@ proto_register_wimaxmacphy(void)
"wimaxmacphy.prim_fast_feedback_sub_type", "wimaxmacphy.prim_fast_feedback_sub_type",
FT_UINT16, FT_UINT16,
BASE_DEC, BASE_DEC,
VALS( VALS(wimaxmacphy_prim_fast_feedback_sub_type_vals),
wimaxmacphy_prim_fast_feedback_sub_type_vals),
0x7000, 0x7000,
NULL, NULL,
HFILL HFILL
@ -3547,8 +3546,7 @@ proto_register_wimaxmacphy(void)
"wimaxmacphy.zone_disable_pusc_subchannel_rotation", "wimaxmacphy.zone_disable_pusc_subchannel_rotation",
FT_UINT8, FT_UINT8,
BASE_DEC, BASE_DEC,
VALS( VALS(wimaxmacphy_ul_zone_disable_pusc_subchannel_rotation_vals),
wimaxmacphy_ul_zone_disable_pusc_subchannel_rotation_vals),
0x0f, 0x0f,
NULL, NULL,
HFILL HFILL
@ -4423,8 +4421,7 @@ proto_register_wimaxmacphy(void)
"wimaxmacphy.burst_sounding_max_cyclic_shift_indx", "wimaxmacphy.burst_sounding_max_cyclic_shift_indx",
FT_UINT8, FT_UINT8,
BASE_DEC, BASE_DEC,
VALS( VALS(wimaxmacphy_ul_burst_sounding_max_cyclic_shift_indx_vals),
wimaxmacphy_ul_burst_sounding_max_cyclic_shift_indx_vals),
0x0, 0x0,
NULL, NULL,
HFILL HFILL
@ -4450,8 +4447,7 @@ proto_register_wimaxmacphy(void)
"wimaxmacphy.burst_sounding_decimation_offset_rand", "wimaxmacphy.burst_sounding_decimation_offset_rand",
FT_UINT8, FT_UINT8,
BASE_DEC, BASE_DEC,
VALS( VALS(wimaxmacphy_ul_burst_sounding_decimation_offset_rand_vals),
wimaxmacphy_ul_burst_sounding_decimation_offset_rand_vals),
0x0, 0x0,
NULL, NULL,
HFILL HFILL
@ -5231,8 +5227,7 @@ proto_register_wimaxmacphy(void)
"wimaxmacphy.sub_burst_sounding_power_assignment_method", "wimaxmacphy.sub_burst_sounding_power_assignment_method",
FT_UINT8, FT_UINT8,
BASE_HEX, BASE_HEX,
VALS( VALS(wimaxmacphy_ul_sub_burst_sounding_power_assignment_vals),
wimaxmacphy_ul_sub_burst_sounding_power_assignment_vals),
0x0, 0x0,
NULL, NULL,
HFILL HFILL
@ -5258,8 +5253,7 @@ proto_register_wimaxmacphy(void)
"wimaxmacphy.sub_burst_sounding_allocation_mode", "wimaxmacphy.sub_burst_sounding_allocation_mode",
FT_UINT8, FT_UINT8,
BASE_DEC, BASE_DEC,
VALS( VALS(wimaxmacphy_ul_sub_burst_sounding_allocation_mode_vals),
wimaxmacphy_ul_sub_burst_sounding_allocation_mode_vals),
0x0, 0x0,
NULL, NULL,
HFILL HFILL

19
tools/check_typed_item_calls.py
View File

@ -359,7 +359,19 @@ def is_ignored_consecutive_filter(filter):
re.compile(r'^opa.mad.attributemodifier.p'), re.compile(r'^opa.mad.attributemodifier.p'),
re.compile(r'^v5ua.efa'), re.compile(r'^v5ua.efa'),
re.compile(r'^zbncp.data.tx_power'), re.compile(r'^zbncp.data.tx_power'),
re.compile(r'^zbncp.data.nwk_addr') re.compile(r'^zbncp.data.nwk_addr'),
re.compile(r'^zbee_zcl_hvac.pump_config_control.attr.ctrl_mode'),
re.compile(r'^nat-pmp.external_port'),
re.compile(r'^zbee_zcl.attr.float'),
re.compile(r'^wpan-tap.phr.fsk_ms.mode'),
re.compile(r'^mysql.exec_flags'),
re.compile(r'^pim.metric_pref'),
re.compile(r'^modbus.regval_float'),
re.compile(r'^alcap.cau.value'),
re.compile(r'^bpv7.crc_field'),
re.compile(r'^at.chld.mode'),
re.compile(r'^btl2cap.psm'),
re.compile(r'^srvloc.srvtypereq.nameauthlistlen')
] ]
for patt in ignore_patterns: for patt in ignore_patterns:
@ -725,6 +737,8 @@ apiChecks.append(ProtoTreeAddItemCheck(True)) # for ptvcursor_add()
def removeComments(code_string): def removeComments(code_string):
code_string = re.sub(re.compile(r"/\*.*?\*/",re.DOTALL ) ,"" , code_string) # C-style comment code_string = re.sub(re.compile(r"/\*.*?\*/",re.DOTALL ) ,"" , code_string) # C-style comment
code_string = re.sub(re.compile(r"//.*?\n" ) ,"" , code_string) # C++-style comment code_string = re.sub(re.compile(r"//.*?\n" ) ,"" , code_string) # C++-style comment
code_string = re.sub(re.compile(r"#if 0.*?#endif",re.DOTALL ) ,"" , code_string) # Ignored region
return code_string return code_string
# Test for whether the given file was automatically generated. # Test for whether the given file was automatically generated.
@ -766,10 +780,11 @@ def find_items(filename, check_mask=False, mask_exact_width=False, check_label=F
contents = removeComments(contents) contents = removeComments(contents)
# N.B. re extends all the way to HFILL to avoid greedy matching # N.B. re extends all the way to HFILL to avoid greedy matching
matches = re.finditer( r'.*\{\s*\&(hf_[a-z_A-Z0-9]*)\s*,\s*{\s*\"(.*?)\"\s*,\s*\"(.*?)\"\s*,\s*(.*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*,\s*([a-zA-Z0-9\W\s_]*?)\s*,\s*HFILL', contents) matches = re.finditer( r'.*\{\s*\&(hf_[a-z_A-Z0-9]*)\s*,\s*{\s*\"(.*?)\"\s*,\s*\"(.*?)\"\s*,\s*(.*?)\s*,\s*([0-9A-Z_\|\s]*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*,\s*([a-zA-Z0-9\W\s_\u00f6\u00e4]*?)\s*,\s*HFILL', contents)
for m in matches: for m in matches:
# Store this item. # Store this item.
hf = m.group(1) hf = m.group(1)
#print(hf)
items[hf] = Item(filename, hf, filter=m.group(3), label=m.group(2), item_type=m.group(4), mask=m.group(7), items[hf] = Item(filename, hf, filter=m.group(3), label=m.group(2), item_type=m.group(4), mask=m.group(7),
type_modifier=m.group(5), type_modifier=m.group(5),
check_mask=check_mask, check_mask=check_mask,