forked from osmocom/wireshark
From Kovarththanan Rajaratnam:
More FT_XXX cleanup. svn path=/trunk/; revision=28970
This commit is contained in:
parent
fd9d18bbe9
commit
7881d1ccd7
|
@ -414,7 +414,7 @@ proto_register_docsis_bpkmattr (void)
|
|||
},
|
||||
{&hf_docsis_bpkmattr_mac_addr,
|
||||
{"3 Mac Address", "docsis_bpkmattr.macaddr",
|
||||
FT_ETHER, BASE_HEX, NULL, 0x0,
|
||||
FT_ETHER, BASE_NONE, NULL, 0x0,
|
||||
"Mac Address", HFILL}
|
||||
},
|
||||
{&hf_docsis_bpkmattr_rsa_pub_key,
|
||||
|
|
|
@ -559,7 +559,7 @@ proto_register_docsis_dccreq (void)
|
|||
{
|
||||
"CMTS Mac Address",
|
||||
"docsis_dccreq.cmts_mac_addr",
|
||||
FT_ETHER, BASE_DEC, NULL, 0x0,
|
||||
FT_ETHER, BASE_NONE, NULL, 0x0,
|
||||
NULL,
|
||||
HFILL
|
||||
}
|
||||
|
|
|
@ -721,7 +721,7 @@ proto_register_docsis_dcd (void)
|
|||
{
|
||||
"DSG Rule Client ID Known MAC Address",
|
||||
"docsis_dcd.clid_known_mac_addr",
|
||||
FT_ETHER, BASE_DEC, NULL, 0x0,
|
||||
FT_ETHER, BASE_NONE, NULL, 0x0,
|
||||
NULL,
|
||||
HFILL
|
||||
}
|
||||
|
@ -748,7 +748,7 @@ proto_register_docsis_dcd (void)
|
|||
{
|
||||
"DSG Rule Tunnel MAC Address",
|
||||
"docsis_dcd.rule_tunl_addr",
|
||||
FT_ETHER, BASE_DEC, NULL, 0x0,
|
||||
FT_ETHER, BASE_NONE, NULL, 0x0,
|
||||
NULL,
|
||||
HFILL
|
||||
}
|
||||
|
|
|
@ -209,12 +209,12 @@ proto_register_docsis_mgmt (void)
|
|||
},
|
||||
{&hf_docsis_mgt_dst_addr,
|
||||
{"Destination Address", "docsis_mgmt.dst",
|
||||
FT_ETHER, BASE_HEX, NULL, 0x0,
|
||||
FT_ETHER, BASE_NONE, NULL, 0x0,
|
||||
NULL, HFILL}
|
||||
},
|
||||
{&hf_docsis_mgt_src_addr,
|
||||
{"Source Address", "docsis_mgmt.src",
|
||||
FT_ETHER, BASE_HEX, NULL, 0x0,
|
||||
FT_ETHER, BASE_NONE, NULL, 0x0,
|
||||
NULL, HFILL}
|
||||
},
|
||||
{&hf_docsis_mgt_msg_len,
|
||||
|
|
|
@ -2292,7 +2292,7 @@ proto_register_docsis_tlv (void)
|
|||
},
|
||||
{&hf_docsis_tlv_cpe_ethernet,
|
||||
{"14 CPE Ethernet Addr", "docsis_tlv.cpe_ether",
|
||||
FT_ETHER, BASE_DEC, NULL, 0x0,
|
||||
FT_ETHER, BASE_NONE, NULL, 0x0,
|
||||
"CPE Ethernet Addr", HFILL}
|
||||
},
|
||||
{&hf_docsis_tlv_bpi,
|
||||
|
@ -2447,12 +2447,12 @@ proto_register_docsis_tlv (void)
|
|||
},
|
||||
{&hf_docsis_tlv_ethclsfr_dmac,
|
||||
{"..1 Dest Mac Address", "docsis_tlv.clsfr.eth.dmac",
|
||||
FT_ETHER, BASE_DEC, NULL, 0x0,
|
||||
FT_ETHER, BASE_NONE, NULL, 0x0,
|
||||
"Destination Mac Address", HFILL}
|
||||
},
|
||||
{&hf_docsis_tlv_ethclsfr_smac,
|
||||
{"..2 Source Mac Address", "docsis_tlv.clsfr.eth.smac",
|
||||
FT_ETHER, BASE_DEC, NULL, 0x0,
|
||||
FT_ETHER, BASE_NONE, NULL, 0x0,
|
||||
"Source Mac Address", HFILL}
|
||||
},
|
||||
{&hf_docsis_tlv_ethclsfr_ethertype,
|
||||
|
|
|
@ -6980,7 +6980,7 @@ proto_register_pn_io (void)
|
|||
{ &hf_pn_io_ar_type,
|
||||
{ "ARType", "pn_io.ar_type", FT_UINT16, BASE_HEX, VALS(pn_io_ar_type), 0x0, NULL, HFILL }},
|
||||
{ &hf_pn_io_cminitiator_macadd,
|
||||
{ "CMInitiatorMacAdd", "pn_io.cminitiator_mac_add", FT_ETHER, BASE_HEX, 0x0, 0x0, NULL, HFILL }},
|
||||
{ "CMInitiatorMacAdd", "pn_io.cminitiator_mac_add", FT_ETHER, BASE_NONE, 0x0, 0x0, NULL, HFILL }},
|
||||
{ &hf_pn_io_cminitiator_objectuuid,
|
||||
{ "CMInitiatorObjectUUID", "pn_io.cminitiator_uuid", FT_GUID, BASE_NONE, 0x0, 0x0, NULL, HFILL }},
|
||||
{ &hf_pn_io_parameter_server_objectuuid,
|
||||
|
@ -7020,7 +7020,7 @@ proto_register_pn_io (void)
|
|||
{ "ParameterServerStationName", "pn_io.parameter_server_station_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
|
||||
|
||||
{ &hf_pn_io_cmresponder_macadd,
|
||||
{ "CMResponderMacAdd", "pn_io.cmresponder_macadd", FT_ETHER, BASE_HEX, 0x0, 0x0, NULL, HFILL }},
|
||||
{ "CMResponderMacAdd", "pn_io.cmresponder_macadd", FT_ETHER, BASE_NONE, 0x0, 0x0, NULL, HFILL }},
|
||||
{ &hf_pn_io_cmresponder_udprtport,
|
||||
{ "CMResponderUDPRTPort", "pn_io.cmresponder_udprtport", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, /* XXX - special values */
|
||||
|
||||
|
@ -7081,7 +7081,7 @@ proto_register_pn_io (void)
|
|||
{ &hf_pn_io_iocr_tag_header,
|
||||
{ "IOCRTagHeader", "pn_io.iocr_tag_header", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
|
||||
{ &hf_pn_io_iocr_multicast_mac_add,
|
||||
{ "IOCRMulticastMACAdd", "pn_io.iocr_multicast_mac_add", FT_ETHER, BASE_HEX, NULL, 0x0, NULL, HFILL }},
|
||||
{ "IOCRMulticastMACAdd", "pn_io.iocr_multicast_mac_add", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
|
||||
{ &hf_pn_io_number_of_apis,
|
||||
{ "NumberOfAPIs", "pn_io.number_of_apis", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
|
||||
{ &hf_pn_io_number_of_io_data_objects,
|
||||
|
|
|
@ -422,7 +422,7 @@ proto_register_pn_mrp (void)
|
|||
{ &hf_pn_mrp_sequence_id,
|
||||
{ "SequenceID", "pn_mrp.sequence_id", FT_UINT16, BASE_HEX, NULL, 0x0, "Unique sequence number to each outstanding service request", HFILL }},
|
||||
{ &hf_pn_mrp_sa,
|
||||
{ "SA", "pn_mrp.sa", FT_ETHER, BASE_HEX, 0x0, 0x0, NULL, HFILL }},
|
||||
{ "SA", "pn_mrp.sa", FT_ETHER, BASE_NONE, 0x0, 0x0, NULL, HFILL }},
|
||||
{ &hf_pn_mrp_prio,
|
||||
{ "Prio", "pn_mrp.prio", FT_UINT16, BASE_HEX, VALS(pn_mrp_prio_vals), 0x0, NULL, HFILL }},
|
||||
{ &hf_pn_mrp_port_role,
|
||||
|
|
|
@ -221,7 +221,7 @@ proto_register_pn_mrrt (void)
|
|||
{ &hf_pn_mrrt_sequence_id,
|
||||
{ "SequenceID", "pn_mrrt.sequence_id", FT_UINT16, BASE_HEX, NULL, 0x0, "Unique sequence number to each outstanding service request", HFILL }},
|
||||
{ &hf_pn_mrrt_sa,
|
||||
{ "SA", "pn_mrrt.sa", FT_ETHER, BASE_HEX, 0x0, 0x0, NULL, HFILL }},
|
||||
{ "SA", "pn_mrrt.sa", FT_ETHER, BASE_NONE, 0x0, 0x0, NULL, HFILL }},
|
||||
{ &hf_pn_mrrt_domain_uuid,
|
||||
{ "DomainUUID", "pn_mrrt.domain_uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
|
||||
};
|
||||
|
|
|
@ -877,12 +877,12 @@ proto_register_pn_ptcp (void)
|
|||
{ "TypeLength.Type", "pn_ptcp.tl_type", FT_UINT16, BASE_DEC, 0x0, 0xFE00, NULL, HFILL }},
|
||||
|
||||
{ &hf_pn_ptcp_master_source_address,
|
||||
{ "MasterSourceAddress", "pn_ptcp.master_source_address", FT_ETHER, BASE_HEX, 0x0, 0x0, NULL, HFILL }},
|
||||
{ "MasterSourceAddress", "pn_ptcp.master_source_address", FT_ETHER, BASE_NONE, 0x0, 0x0, NULL, HFILL }},
|
||||
{ &hf_pn_ptcp_subdomain_uuid,
|
||||
{ "SubdomainUUID", "pn_ptcp.subdomain_uuid", FT_GUID, BASE_NONE, 0x0, 0x0, NULL, HFILL }},
|
||||
|
||||
{ &hf_pn_ptcp_port_mac_address,
|
||||
{ "PortMACAddress", "pn_ptcp.port_mac_address", FT_ETHER, BASE_HEX, 0x0, 0x0, NULL, HFILL }},
|
||||
{ "PortMACAddress", "pn_ptcp.port_mac_address", FT_ETHER, BASE_NONE, 0x0, 0x0, NULL, HFILL }},
|
||||
|
||||
{ &hf_pn_ptcp_t2portrxdelay,
|
||||
{ "T2PortRxDelay (ns)", "pn_ptcp.t2portrxdelay", FT_UINT32, BASE_DEC, 0x0, 0x0, NULL, HFILL }},
|
||||
|
|
|
@ -975,7 +975,7 @@ proto_register_unistim(void){
|
|||
},
|
||||
{ &hf_basic_ether_address,
|
||||
{"Phone Ethernet Address","unistim.phone.ether",FT_ETHER,
|
||||
BASE_HEX,NULL,0x00,NULL,HFILL}
|
||||
BASE_NONE,NULL,0x00,NULL,HFILL}
|
||||
},
|
||||
{ &hf_audio_rtcp_bucket_id,
|
||||
{"RTCP Bucket ID","unistim.audio.rtcp.bucket.id",FT_UINT8,
|
||||
|
|
|
@ -386,7 +386,7 @@ void proto_register_mac_mgmt_msg_dcd(void)
|
|||
&hf_dcd_bs_id,
|
||||
{
|
||||
"Base Station ID", "wmx.dcd.bs_id",
|
||||
FT_ETHER, BASE_HEX, NULL, 0x00, NULL, HFILL
|
||||
FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
|
@ -407,14 +407,14 @@ void proto_register_mac_mgmt_msg_dcd(void)
|
|||
&hf_dcd_burst_diuc_entry_threshold,
|
||||
{
|
||||
"DIUC Minimum Entry Threshold (in 0.25 dB units)", "wmx.dcd.burst.diuc_entry_threshold",
|
||||
FT_FLOAT, BASE_DEC, NULL, 0x00, NULL, HFILL
|
||||
FT_FLOAT, BASE_NONE, NULL, 0x00, NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
&hf_dcd_burst_diuc_exit_threshold,
|
||||
{
|
||||
"DIUC Mandatory Exit Threshold (in 0.25 dB units)", "wmx.dcd.burst.diuc_exit_threshold",
|
||||
FT_FLOAT, BASE_DEC, NULL, 0x00, NULL, HFILL
|
||||
FT_FLOAT, BASE_NONE, NULL, 0x00, NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
@ -219,7 +219,7 @@ void proto_register_mac_mgmt_msg_dreg_req(void)
|
|||
&hf_paging_controller_id,
|
||||
{
|
||||
"Paging Controller ID", "wmx.dreg.paging_controller_id",
|
||||
FT_ETHER, BASE_DEC, NULL, 0x0, NULL, HFILL
|
||||
FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
@ -102,7 +102,7 @@ void proto_register_mac_mgmt_msg_fpc(void)
|
|||
&hf_fpc_power_adjust,
|
||||
{
|
||||
"Power Adjust. Signed change in power level (incr of 0.25dB) that the SS shall apply to its current power setting", "wmx.fpc.power_adjust",
|
||||
FT_FLOAT, BASE_DEC, NULL, 0x0, NULL, HFILL
|
||||
FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
@ -153,14 +153,14 @@ void proto_register_mac_mgmt_msg_pmc_req(void)
|
|||
&hf_pmc_rsp_offset_BS_per_MS,
|
||||
{
|
||||
"Offset_BS per MS. Signed change in power level (incr of 0.25 dB) that the MS shall apply to the open loop power control formula in 8.4.10.3.2", "wmx.pmc_rsp.offset_BS_per_MS",
|
||||
FT_FLOAT, BASE_DEC, NULL, 0x0, NULL, HFILL
|
||||
FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
&hf_pmc_rsp_power_adjust,
|
||||
{
|
||||
"Power adjust. Signed change in power level (incr of 0.25 dB) the MS shall apply to its current transmission power. When subchannelization is employed, the SS shall interpret as a required change to the Tx power density", "wmx.pmc_rsp.power_adjust",
|
||||
FT_FLOAT, BASE_DEC, NULL, 0x0, NULL, HFILL
|
||||
FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
@ -943,7 +943,7 @@ void proto_register_mac_mgmt_msg_reg_req(void)
|
|||
&hf_reg_mac_address,
|
||||
{
|
||||
"MAC Address of the SS", "wmx.reg.mac_address",
|
||||
FT_ETHER, BASE_DEC, NULL, 0x0, NULL, HFILL
|
||||
FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
@ -465,14 +465,14 @@ void proto_register_mac_mgmt_msg_rng_req(void)
|
|||
&hf_rng_req_serving_bs_id,
|
||||
{
|
||||
"Former serving BS ID", "wmx.rng_req.serving_bs_id",
|
||||
FT_ETHER, BASE_HEX, NULL, 0x00, NULL, HFILL
|
||||
FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
&hf_rng_req_ss_mac_address,
|
||||
{
|
||||
"SS MAC Address", "wmx.rng_req.ss_mac_address",
|
||||
FT_ETHER, BASE_HEX, NULL, 0x00, NULL, HFILL
|
||||
FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
@ -564,7 +564,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void)
|
|||
&hf_rng_rsp_power_level_adjust,
|
||||
{
|
||||
"Power Level Adjust", "wmx.rng_rsp.power_level_adjust",
|
||||
FT_FLOAT, BASE_DEC, NULL, 0x00, NULL, HFILL
|
||||
FT_FLOAT, BASE_NONE, NULL, 0x00, NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
|
@ -627,7 +627,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void)
|
|||
&hf_rng_rsp_ss_mac_address,
|
||||
{
|
||||
"SS MAC Address", "wmx.rng_rsp.ss_mac_address",
|
||||
FT_ETHER, BASE_HEX, NULL, 0x00, NULL, HFILL
|
||||
FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
|
@ -648,7 +648,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void)
|
|||
&hf_rng_rsp_timing_adjust,
|
||||
{
|
||||
"Timing Adjust", "wmx.rng_rsp.timing_adjust",
|
||||
FT_FLOAT, BASE_DEC, NULL, 0x00, NULL, HFILL
|
||||
FT_FLOAT, BASE_NONE, NULL, 0x00, NULL, HFILL
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
@ -1275,7 +1275,7 @@ void proto_register_wimax_utility_decoders(void)
|
|||
},
|
||||
{
|
||||
&hf_cmac_tuple_bsid,
|
||||
{"BSID", "wmx.cmac_tuple.bsid", FT_ETHER, BASE_HEX, NULL, 0x0, NULL, HFILL}
|
||||
{"BSID", "wmx.cmac_tuple.bsid", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}
|
||||
},
|
||||
{
|
||||
&hf_cmac_tuple_cmac_value,
|
||||
|
@ -1567,7 +1567,7 @@ void proto_register_wimax_utility_decoders(void)
|
|||
},
|
||||
{ /* 11.9.26 - type 39 */
|
||||
&hf_pkm_attr_ms_mac_address,
|
||||
{"MS-MAC Address", "wmx.pkm_msg.pkm_attr.ms_mac_address",FT_ETHER, BASE_HEX, NULL, 0x0, NULL, HFILL}
|
||||
{"MS-MAC Address", "wmx.pkm_msg.pkm_attr.ms_mac_address",FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}
|
||||
},
|
||||
{ /* 11.9.27 - type 40 */
|
||||
&hf_pkm_attr_cmac_digest,
|
||||
|
|
Loading…
Reference in New Issue