diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2023-06-22 14:26:21 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2023-06-23 11:07:16 +0000 |
| commit | f72d93ce945faa977f563fd610acc165ac930862 (patch) | |
| tree | 1d4b69777a8c45c577e929f02c2bb52a79a05491 /plugins/epan/wimax | |
| parent | ec28835122b4e1deea226aa7e214977d7d2b904f (diff) | |
wimax: Avoid warnings from fix-encoding-args.pl
Change hf_dcd_h_arq_ack_delay to hf_dcd_h_arq_ack_delay_dl and
hf_dcd_h_arq_ack_delay_ul to show the difference. Removed some
unused and duplicate hf entries to avoid duplicate warning from
the check tool.
Diffstat (limited to 'plugins/epan/wimax')
| -rw-r--r-- | plugins/epan/wimax/msg_dcd.c | 14 | ||||
| -rw-r--r-- | plugins/epan/wimax/wimax_utils.c | 10 |
2 files changed, 10 insertions, 14 deletions
diff --git a/plugins/epan/wimax/msg_dcd.c b/plugins/epan/wimax/msg_dcd.c index 008270e97e..167e074285 100644 --- a/plugins/epan/wimax/msg_dcd.c +++ b/plugins/epan/wimax/msg_dcd.c @@ -59,8 +59,10 @@ static gint hf_dcd_frame_duration_code = -1; static gint hf_dcd_frame_nr = -1; #ifdef WIMAX_16D_2004 static gint hf_dcd_size_cqich_id = -1; +static gint hf_dcd_h_arq_ack_delay_dl = -1; +#else +static gint hf_dcd_h_arq_ack_delay_ul = -1; #endif -static gint hf_dcd_h_arq_ack_delay = -1; static gint hf_dcd_mac_version = -1; static gint hf_dcd_restart_count = -1; @@ -523,7 +525,11 @@ static int dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, p #endif case DCD_H_ARQ_ACK_DELAY: { - add_tlv_subtree(&tlv_info, dcd_tree, hf_dcd_h_arq_ack_delay, tvb, offset-tlv_value_offset, ENC_BIG_ENDIAN); +#ifdef WIMAX_16D_2004 + add_tlv_subtree(&tlv_info, dcd_tree, hf_dcd_h_arq_ack_delay_dl, tvb, offset-tlv_value_offset, ENC_BIG_ENDIAN); +#else + add_tlv_subtree(&tlv_info, dcd_tree, hf_dcd_h_arq_ack_delay_ul, tvb, offset-tlv_value_offset, ENC_BIG_ENDIAN); +#endif break; } case DCD_MAC_VERSION: @@ -970,7 +976,7 @@ void proto_register_mac_mgmt_msg_dcd(void) }, #ifdef WIMAX_16D_2004 { - &hf_dcd_h_arq_ack_delay, + &hf_dcd_h_arq_ack_delay_dl, { "H-ARQ ACK Delay for DL Burst", "wmx.dcd.h_arq_ack_delay_dl_burst", FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_frame_offset, 0x00, "", HFILL @@ -978,7 +984,7 @@ void proto_register_mac_mgmt_msg_dcd(void) }, #else { - &hf_dcd_h_arq_ack_delay, + &hf_dcd_h_arq_ack_delay_ul, { "H-ARQ ACK Delay for UL Burst", "wmx.dcd.h_arq_ack_delay_ul_burst", FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_frame_offset, 0x00, NULL, HFILL diff --git a/plugins/epan/wimax/wimax_utils.c b/plugins/epan/wimax/wimax_utils.c index 405762ca44..226c536a15 100644 --- a/plugins/epan/wimax/wimax_utils.c +++ b/plugins/epan/wimax/wimax_utils.c @@ -1033,10 +1033,6 @@ void wimax_proto_register_wimax_utility_decoders(void) {"Protocol", "wmx.cst.pkt_class_rule.protocol", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, #if 0 /* Removed by the changes of 802.16E 2005 */ - { /* Protocol */ - &hf_cst_pkt_class_rule_protocol, - {"Protocol", "wmx.cst.pkt_class_rule.protocol", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL} - }, { /* Protocol Number */ &hf_cst_pkt_class_rule_protocol_number, {"Protocol Number", "wmx.cst.pkt_class_rule.protocol.number", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL} @@ -1612,12 +1608,6 @@ void wimax_proto_register_wimax_utility_decoders(void) &hf_pkm_attr_sa_service_type, {"SA Service Type", "wmx.pkm_msg.pkm_attr.sa_service_type", FT_UINT8, BASE_DEC, VALS(vs_sa_service_type), 0x0, NULL, HFILL} }, -#if 0 /* same as 11.9.19 */ - { /* 11.9.36 - type 27 */ - &hf_pkm_attr_config_settings, - {"PKMv2 Configuration Settings", "wmx.pkm_msg.pkm_attr.config_settings", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL} - }, -#endif { /* 11.9.37 - type 32 */ &hf_pkm_attr_frame_number, {"Frame Number", "wmx.pkm_msg.pkm_attr.frame_number", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL} |