diff options
Diffstat (limited to '')
55 files changed, 4191 insertions, 4179 deletions
diff --git a/plugins/epan/wimax/README.wimax b/plugins/epan/wimax/README.wimax index 4f7981fc..6dbe2158 100644 --- a/plugins/epan/wimax/README.wimax +++ b/plugins/epan/wimax/README.wimax @@ -70,7 +70,7 @@ Example: call_dissector(mgt_msg_handle, mgt_msg_tvb, pinfo, mgt_msg_tree); Notes -------- -1. All the burst data has to be defraged before passing it to the +1. All the burst data has to be defragged before passing it to the WiMax burst dissectors. 2. The wimax_pdu_burst_handler will automatically call diff --git a/plugins/epan/wimax/crc.c b/plugins/epan/wimax/crc.c index 4bc74a2a..0aacc4d6 100644 --- a/plugins/epan/wimax/crc.c +++ b/plugins/epan/wimax/crc.c @@ -21,10 +21,10 @@ #define CRC16_INITIAL_VALUE 0xFFFF #ifndef STATIC_DATA -static guint8 crc8_table[256]; -static guint32 crc32_table[256]; +static uint8_t crc8_table[256]; +static uint32_t crc32_table[256]; -extern guint16 crc16_table[256]; +extern uint16_t crc16_table[256]; /* void wimax_mac_gen_crc32_table(void) @@ -43,8 +43,8 @@ extern guint16 crc16_table[256]; */ void wimax_mac_gen_crc32_table(void) { - guint32 i, bit; - guint32 crc; + uint32_t i, bit; + uint32_t crc; /* little-endian (reflected) algorithm */ for ( i = 0; i < G_N_ELEMENTS(crc32_table); i++ ) @@ -78,8 +78,8 @@ void wimax_mac_gen_crc32_table(void) */ void wimax_mac_gen_crc8_table(void) { - guint i, bit; - guint8 crc; + unsigned i, bit; + uint8_t crc; for ( i = 0; i < G_N_ELEMENTS(crc8_table); i++ ) { @@ -98,7 +98,7 @@ void wimax_mac_gen_crc8_table(void) /* - guint32 wimax_mac_calc_crc32(guint8 *data, guint data_len) + uint32_t wimax_mac_calc_crc32(uint8_t *data, unsigned data_len) REQUIRES: wimax_mac_gen_crc32_table() must be called before @@ -112,14 +112,14 @@ void wimax_mac_gen_crc8_table(void) SIDE EFFECTS: */ -guint32 wimax_mac_calc_crc32(const guint8 *data, guint data_len) +uint32_t wimax_mac_calc_crc32(const uint8_t *data, unsigned data_len) { - guint32 crc=CRC32_INITIAL_VALUE; - guint i, j; + uint32_t crc=CRC32_INITIAL_VALUE; + unsigned i, j; for ( j = 0; j < data_len; j++ ) { - i = ( (guint8)(crc>>24) ^ data[j] ) & 0xff; + i = ( (uint8_t)(crc>>24) ^ data[j] ) & 0xff; crc = ( crc<<8 ) ^ crc32_table[i]; } return ~crc; @@ -127,7 +127,7 @@ guint32 wimax_mac_calc_crc32(const guint8 *data, guint data_len) /* - guint16 wimax_mac_calc_crc16(guint8 *data, guint data_len) + uint16_t wimax_mac_calc_crc16(uint8_t *data, unsigned data_len) REQUIRES: crc16_table[] in crc_data.c @@ -141,10 +141,10 @@ guint32 wimax_mac_calc_crc32(const guint8 *data, guint data_len) SIDE EFFECTS: */ -guint16 wimax_mac_calc_crc16(const guint8 *data, guint data_len) +uint16_t wimax_mac_calc_crc16(const uint8_t *data, unsigned data_len) { - guint32 crc=CRC16_INITIAL_VALUE; - guint j; + uint32_t crc=CRC16_INITIAL_VALUE; + unsigned j; for ( j = 0; j < data_len; j++ ) { @@ -158,7 +158,7 @@ guint16 wimax_mac_calc_crc16(const guint8 *data, guint data_len) /* - guint8 wimax_mac_calc_crc8(guint8 *data, guint data_len) + uint8_t wimax_mac_calc_crc8(uint8_t *data, unsigned data_len) REQUIRES: wimax_mac_gen_crc8_table() must be called before @@ -172,10 +172,10 @@ guint16 wimax_mac_calc_crc16(const guint8 *data, guint data_len) SIDE EFFECTS: */ -guint8 wimax_mac_calc_crc8(const guint8 *data, guint data_len) +uint8_t wimax_mac_calc_crc8(const uint8_t *data, unsigned data_len) { - guint8 crc=0; - guint i; + uint8_t crc=0; + unsigned i; for(i = 0; i < data_len; i++) { diff --git a/plugins/epan/wimax/crc.h b/plugins/epan/wimax/crc.h index 43c5faf1..eaf2f6f4 100644 --- a/plugins/epan/wimax/crc.h +++ b/plugins/epan/wimax/crc.h @@ -16,18 +16,19 @@ #define CRC_H #include <glib.h> +#include <stdint.h> /* use lookup tables to compute CRC values */ #ifdef STATIC_DATA -extern guint8 crc8_table[]; -extern guint32 crc32_table[]; +extern uint8_t crc8_table[]; +extern uint32_t crc32_table[]; #else void wimax_mac_gen_crc32_table(void); void wimax_mac_gen_crc8_table(void); #endif -guint32 wimax_mac_calc_crc32(const guint8 *data, guint data_len); -guint16 wimax_mac_calc_crc16(const guint8 *data, guint data_len); -guint8 wimax_mac_calc_crc8(const guint8 *data, guint data_len); +uint32_t wimax_mac_calc_crc32(const uint8_t *data, unsigned data_len); +uint16_t wimax_mac_calc_crc16(const uint8_t *data, unsigned data_len); +uint8_t wimax_mac_calc_crc8(const uint8_t *data, unsigned data_len); #endif /* CRC_H */ diff --git a/plugins/epan/wimax/crc_data.c b/plugins/epan/wimax/crc_data.c index 0dcc8b27..b399cf3c 100644 --- a/plugins/epan/wimax/crc_data.c +++ b/plugins/epan/wimax/crc_data.c @@ -16,9 +16,7 @@ #ifdef STATIC_DATA -#include <glib.h> - -guint32 crc32_table[256] = { +uint32_t crc32_table[256] = { 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, @@ -86,7 +84,7 @@ guint32 crc32_table[256] = { }; -guint8 hcs_table[256] = { +uint8_t hcs_table[256] = { 0x00, 0x07, 0x0e, 0x09, 0x1c, 0x1b, 0x12, 0x15, 0x38, 0x3f, 0x36, 0x31, 0x24, 0x23, 0x2a, 0x2d, 0x70, 0x77, 0x7e, 0x79, 0x6c, 0x6b, 0x62, 0x65, @@ -122,7 +120,7 @@ guint8 hcs_table[256] = { }; #endif -guint16 crc16_table[256] = { +uint16_t crc16_table[256] = { 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, diff --git a/plugins/epan/wimax/mac_hd_generic_decoder.c b/plugins/epan/wimax/mac_hd_generic_decoder.c index d083103a..8c69eb77 100644 --- a/plugins/epan/wimax/mac_hd_generic_decoder.c +++ b/plugins/epan/wimax/mac_hd_generic_decoder.c @@ -36,68 +36,68 @@ void proto_reg_handoff_mac_header_generic(void); -extern gint proto_wimax; +extern int proto_wimax; -extern gint seen_a_service_type; -extern gboolean first_gmh; /* defined in wimax_pdu_decoder.c */ +extern int seen_a_service_type; +extern bool first_gmh; /* defined in wimax_pdu_decoder.c */ -extern gint8 arq_enabled; /* declared in packet-wmx.c */ -extern gint scheduling_service_type; /* declared in packet-wmx.c */ +extern int8_t arq_enabled; /* declared in packet-wmx.c */ +extern int scheduling_service_type; /* declared in packet-wmx.c */ extern address bs_address; /* declared in packet-wmx.c */ -extern guint max_logical_bands; /* declared in wimax_compact_dlmap_ie_decoder.c */ +extern unsigned max_logical_bands; /* declared in wimax_compact_dlmap_ie_decoder.c */ -static dissector_handle_t mac_mgmt_msg_decoder_handle = NULL; -static dissector_handle_t mac_ip_handle = NULL; +static dissector_handle_t mac_mgmt_msg_decoder_handle; +static dissector_handle_t mac_ip_handle; /* global variables */ -gboolean include_cor2_changes = FALSE; +bool include_cor2_changes; /* Well-known CIDs */ -guint cid_initial_ranging = 0x0000; -guint global_cid_max_basic = 320; -guint cid_max_primary = 640; -guint cid_aas_ranging = 0xFeFF; -guint cid_normal_multicast = 0xFFFa; -guint cid_sleep_multicast = 0xFFFb; -guint cid_idle_multicast = 0xFFFc; -guint cid_frag_broadcast = 0xFFFd; -guint cid_padding = 0xFFFe; -guint cid_broadcast = 0xFFFF; +unsigned cid_initial_ranging = 0x0000; +unsigned global_cid_max_basic = 320; +unsigned cid_max_primary = 640; +unsigned cid_aas_ranging = 0xFeFF; +unsigned cid_normal_multicast = 0xFFFa; +unsigned cid_sleep_multicast = 0xFFFb; +unsigned cid_idle_multicast = 0xFFFc; +unsigned cid_frag_broadcast = 0xFFFd; +unsigned cid_padding = 0xFFFe; +unsigned cid_broadcast = 0xFFFF; /* Maximum number of CID's */ #define MAX_CID 64 /* forward reference */ -static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *parent_item); +static int extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); +static int arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *parent_item); /* Static variables */ static reassembly_table payload_reassembly_table; -gint proto_mac_header_generic_decoder = -1; -static gint ett_mac_header_generic_decoder = -1; -/* static gint ett_mac_subheader_decoder = -1; */ -static gint ett_mac_mesh_subheader_decoder = -1; -static gint ett_mac_frag_subheader_decoder = -1; -static gint ett_mac_grant_mgmt_subheader_decoder = -1; -static gint ett_mac_pkt_subheader_decoder = -1; -static gint ett_mac_fast_fb_subheader_decoder = -1; -static gint ett_mac_ext_subheader_decoder = -1; -static gint ett_mac_ext_subheader_dl_decoder = -1; -static gint ett_mac_ext_subheader_ul_decoder = -1; -static gint ett_mac_arq_fb_payload_decoder = -1; -static gint ett_mac_data_pdu_decoder = -1; -static gint hf_mac_header_generic_value_bytes = -1; - -static guint frag_type, frag_len; -static guint extended_type, arq_fb_payload, seq_number; - -static guint cid_adjust[MAX_CID]; /* Must not start with 0 */ -static guint cid_vernier[MAX_CID]; -static guint cid_adj_array_size = 0; -static guint *cid_adj_array = NULL; -static guint8 *frag_num_array = NULL; +int proto_mac_header_generic_decoder; +static int ett_mac_header_generic_decoder; +/* static int ett_mac_subheader_decoder; */ +static int ett_mac_mesh_subheader_decoder; +static int ett_mac_frag_subheader_decoder; +static int ett_mac_grant_mgmt_subheader_decoder; +static int ett_mac_pkt_subheader_decoder; +static int ett_mac_fast_fb_subheader_decoder; +static int ett_mac_ext_subheader_decoder; +static int ett_mac_ext_subheader_dl_decoder; +static int ett_mac_ext_subheader_ul_decoder; +static int ett_mac_arq_fb_payload_decoder; +static int ett_mac_data_pdu_decoder; +static int hf_mac_header_generic_value_bytes; + +static unsigned frag_type, frag_len; +static unsigned extended_type, arq_fb_payload, seq_number; + +static unsigned cid_adjust[MAX_CID]; /* Must not start with 0 */ +static unsigned cid_vernier[MAX_CID]; +static unsigned cid_adj_array_size; +static unsigned *cid_adj_array; +static uint8_t *frag_num_array; static address save_src; static address save_dst; @@ -142,23 +142,23 @@ static address save_dst; #define WIMAX_MAC_HEADER_GENERIC_EKS_MASK 0x30 #define WIMAX_MAC_HEADER_GENERIC_LEN_MASK 0x07 -static int hf_mac_header_generic_ht = -1; -static int hf_mac_header_generic_ec = -1; -static int hf_mac_header_generic_type_0 = -1; -static int hf_mac_header_generic_type_1 = -1; -static int hf_mac_header_generic_type_2 = -1; -static int hf_mac_header_generic_type_3 = -1; -static int hf_mac_header_generic_type_4 = -1; -static int hf_mac_header_generic_type_5 = -1; -static int hf_mac_header_generic_esf = -1; -static int hf_mac_header_generic_ci = -1; -static int hf_mac_header_generic_eks = -1; -static int hf_mac_header_generic_rsv = -1; -static int hf_mac_header_generic_len = -1; -static int hf_mac_header_generic_cid = -1; -static int hf_mac_header_generic_hcs = -1; -static int hf_mac_header_generic_crc = -1; -static int hf_mac_header_generic_crc_status = -1; +static int hf_mac_header_generic_ht; +static int hf_mac_header_generic_ec; +static int hf_mac_header_generic_type_0; +static int hf_mac_header_generic_type_1; +static int hf_mac_header_generic_type_2; +static int hf_mac_header_generic_type_3; +static int hf_mac_header_generic_type_4; +static int hf_mac_header_generic_type_5; +static int hf_mac_header_generic_esf; +static int hf_mac_header_generic_ci; +static int hf_mac_header_generic_eks; +static int hf_mac_header_generic_rsv; +static int hf_mac_header_generic_len; +static int hf_mac_header_generic_cid; +static int hf_mac_header_generic_hcs; +static int hf_mac_header_generic_crc; +static int hf_mac_header_generic_crc_status; /* MAC Header types */ static const value_string ht_msgs[] = @@ -369,21 +369,21 @@ static const value_string fb_types[] = }; /* common fields */ -static gint hf_mac_header_generic_ext_subheader_rsv = -1; +static int hf_mac_header_generic_ext_subheader_rsv; /* DL sub-header */ -static gint hf_mac_header_generic_ext_subheader_type_dl = -1; -static gint hf_mac_header_generic_ext_subheader_sdu_sn = -1; -static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_pscid = -1; -static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_op = -1; -static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_fswe = -1; -static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_fswb = -1; -static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_rsv = -1; -static gint hf_mac_header_generic_ext_subheader_fb_req_uiuc = -1; -static gint hf_mac_header_generic_ext_subheader_fb_req_fb_type = -1; -static gint hf_mac_header_generic_ext_subheader_fb_req_ofdma_symbol_offset = -1; -static gint hf_mac_header_generic_ext_subheader_fb_req_subchannel_offset = -1; -static gint hf_mac_header_generic_ext_subheader_fb_req_slots = -1; -static gint hf_mac_header_generic_ext_subheader_fb_req_frame_offset = -1; +static int hf_mac_header_generic_ext_subheader_type_dl; +static int hf_mac_header_generic_ext_subheader_sdu_sn; +static int hf_mac_header_generic_ext_subheader_dl_sleep_control_pscid; +static int hf_mac_header_generic_ext_subheader_dl_sleep_control_op; +static int hf_mac_header_generic_ext_subheader_dl_sleep_control_fswe; +static int hf_mac_header_generic_ext_subheader_dl_sleep_control_fswb; +static int hf_mac_header_generic_ext_subheader_dl_sleep_control_rsv; +static int hf_mac_header_generic_ext_subheader_fb_req_uiuc; +static int hf_mac_header_generic_ext_subheader_fb_req_fb_type; +static int hf_mac_header_generic_ext_subheader_fb_req_ofdma_symbol_offset; +static int hf_mac_header_generic_ext_subheader_fb_req_subchannel_offset; +static int hf_mac_header_generic_ext_subheader_fb_req_slots; +static int hf_mac_header_generic_ext_subheader_fb_req_frame_offset; /* DL Sleep Control Operations */ static const value_string dl_sleep_control_ops[] = @@ -394,24 +394,24 @@ static const value_string dl_sleep_control_ops[] = }; /* UL sub-header */ -static gint hf_mac_header_generic_ext_subheader_type_ul = -1; -static gint hf_mac_header_generic_ext_subheader_mimo_mode_fb_type = -1; -static gint hf_mac_header_generic_ext_subheader_mimo_fb_content = -1; -static gint hf_mac_header_generic_ext_subheader_ul_tx_pwr_rep = -1; -static gint hf_mac_header_generic_ext_subheader_mini_fb_type = -1; -static gint hf_mac_header_generic_ext_subheader_mini_fb_content = -1; +static int hf_mac_header_generic_ext_subheader_type_ul; +static int hf_mac_header_generic_ext_subheader_mimo_mode_fb_type; +static int hf_mac_header_generic_ext_subheader_mimo_fb_content; +static int hf_mac_header_generic_ext_subheader_ul_tx_pwr_rep; +static int hf_mac_header_generic_ext_subheader_mini_fb_type; +static int hf_mac_header_generic_ext_subheader_mini_fb_content; /* common fields */ -static gint hf_mac_header_generic_ext_subheader_pdu_sn_short = -1; -static gint hf_mac_header_generic_ext_subheader_pdu_sn_long = -1; +static int hf_mac_header_generic_ext_subheader_pdu_sn_short; +static int hf_mac_header_generic_ext_subheader_pdu_sn_long; /* SN Request subheader */ #define SN_REQUEST_SUBHEADER_SN_REPORT_INDICATION_1_MASK 0x01 #define SN_REQUEST_SUBHEADER_SN_REPORT_INDICATION_2_MASK 0x02 #define SN_REQUEST_SUBHEADER_RESERVED_MASK 0xFC -static gint hf_mac_header_generic_ext_subheader_sn_req_rep_ind_1 = -1; -static gint hf_mac_header_generic_ext_subheader_sn_req_rep_ind_2 = -1; -static gint hf_mac_header_generic_ext_subheader_sn_req_rsv = -1; +static int hf_mac_header_generic_ext_subheader_sn_req_rep_ind_1; +static int hf_mac_header_generic_ext_subheader_sn_req_rep_ind_2; +static int hf_mac_header_generic_ext_subheader_sn_req_rsv; /* SN Report Indication message */ static const value_string sn_rep_msg[] = { @@ -421,7 +421,7 @@ static const value_string sn_rep_msg[] = }; /* Mesh Subheader */ -static gint hf_mac_header_generic_mesh_subheader = -1; +static int hf_mac_header_generic_mesh_subheader; /* Fragmentation Subheader (table 8) */ #define FRAGMENTATION_SUBHEADER_FC_MASK 0xC000 /*0x0003*/ @@ -438,13 +438,13 @@ static gint hf_mac_header_generic_mesh_subheader = -1; #define FIRST_FRAG 2 #define MIDDLE_FRAG 3 -static gint hf_mac_header_generic_frag_subhd_fc = -1; -static gint hf_mac_header_generic_frag_subhd_fc_ext = -1; -static gint hf_mac_header_generic_frag_subhd_bsn = -1; -static gint hf_mac_header_generic_frag_subhd_fsn = -1; -static gint hf_mac_header_generic_frag_subhd_fsn_ext = -1; -static gint hf_mac_header_generic_frag_subhd_rsv = -1; -static gint hf_mac_header_generic_frag_subhd_rsv_ext = -1; +static int hf_mac_header_generic_frag_subhd_fc; +static int hf_mac_header_generic_frag_subhd_fc_ext; +static int hf_mac_header_generic_frag_subhd_bsn; +static int hf_mac_header_generic_frag_subhd_fsn; +static int hf_mac_header_generic_frag_subhd_fsn_ext; +static int hf_mac_header_generic_frag_subhd_rsv; +static int hf_mac_header_generic_frag_subhd_rsv_ext; /* Fragment Types */ static const value_string frag_types[] = @@ -465,20 +465,20 @@ static const value_string frag_types[] = #define FRAG_LENGTH_MASK 0x0007FF00 -static gint hf_mac_header_generic_packing_subhd_fc = -1; -static gint hf_mac_header_generic_packing_subhd_fc_ext = -1; -static gint hf_mac_header_generic_packing_subhd_bsn = -1; -static gint hf_mac_header_generic_packing_subhd_fsn = -1; -static gint hf_mac_header_generic_packing_subhd_fsn_ext = -1; -static gint hf_mac_header_generic_packing_subhd_len = -1; -static gint hf_mac_header_generic_packing_subhd_len_ext = -1; +static int hf_mac_header_generic_packing_subhd_fc; +static int hf_mac_header_generic_packing_subhd_fc_ext; +static int hf_mac_header_generic_packing_subhd_bsn; +static int hf_mac_header_generic_packing_subhd_fsn; +static int hf_mac_header_generic_packing_subhd_fsn_ext; +static int hf_mac_header_generic_packing_subhd_len; +static int hf_mac_header_generic_packing_subhd_len_ext; /* Fast-feedback Allocation Subheader (table 13) */ #define FAST_FEEDBACK_ALLOCATION_OFFSET_MASK 0xFC /*0x3F*/ #define FAST_FEEDBACK_FEEDBACK_TYPE_MASK 0x03 /*0xC0*/ -static gint hf_mac_header_generic_fast_fb_subhd_alloc_offset = -1; -static gint hf_mac_header_generic_fast_fb_subhd_fb_type = -1; +static int hf_mac_header_generic_fast_fb_subhd_alloc_offset; +static int hf_mac_header_generic_fast_fb_subhd_fb_type; /* Grant Management Subheader (table 9 & 10) */ #define GRANT_MGMT_SUBHEADER_UGS_SI_MASK 0x8000 /*0x0001*/ @@ -501,18 +501,18 @@ typedef enum SCHEDULE_SERVICE_TYPE_UGS } SCHEDULE_SERVICE_TYPE_e; -static gint hf_mac_header_generic_grant_mgmt_ugs_tree = -1; -static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_si = -1; -static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_pm = -1; -static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_fli = -1; -static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_fl = -1; -static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_rsv = -1; -static gint hf_mac_header_generic_grant_mgmt_ext_rtps_tree = -1; -static gint hf_mac_header_generic_grant_mgmt_subhd_ext_pbr = -1; -static gint hf_mac_header_generic_grant_mgmt_subhd_ext_fli = -1; -static gint hf_mac_header_generic_grant_mgmt_subhd_ext_fl = -1; -static gint hf_mac_header_generic_grant_mgmt_ext_pbr_tree = -1; -static gint hf_mac_header_generic_grant_mgmt_subhd_pbr = -1; +static int hf_mac_header_generic_grant_mgmt_ugs_tree; +static int hf_mac_header_generic_grant_mgmt_subhd_ugs_si; +static int hf_mac_header_generic_grant_mgmt_subhd_ugs_pm; +static int hf_mac_header_generic_grant_mgmt_subhd_ugs_fli; +static int hf_mac_header_generic_grant_mgmt_subhd_ugs_fl; +static int hf_mac_header_generic_grant_mgmt_subhd_ugs_rsv; +static int hf_mac_header_generic_grant_mgmt_ext_rtps_tree; +static int hf_mac_header_generic_grant_mgmt_subhd_ext_pbr; +static int hf_mac_header_generic_grant_mgmt_subhd_ext_fli; +static int hf_mac_header_generic_grant_mgmt_subhd_ext_fl; +static int hf_mac_header_generic_grant_mgmt_ext_pbr_tree; +static int hf_mac_header_generic_grant_mgmt_subhd_pbr; /* Slip Indicators */ static const value_string si_msgs[] = @@ -555,27 +555,27 @@ static const value_string fli_msgs[] = #define ARQ_FB_IE_SEQ2_LENGTH_6_MASK 0x007E /*0x7E00*/ #define ARQ_FB_IE_RSV_MASK 0x0001 /*0x8000*/ -static gint hf_mac_header_generic_arq_fb_ie_cid = -1; -static gint hf_mac_header_generic_arq_fb_ie_last = -1; -static gint hf_mac_header_generic_arq_fb_ie_ack_type = -1; -static gint hf_mac_header_generic_arq_fb_ie_bsn = -1; -static gint hf_mac_header_generic_arq_fb_ie_num_maps = -1; -static gint hf_ack_type_reserved = -1; -static gint hf_mac_header_generic_arq_fb_ie_sel_ack_map = -1; -static gint hf_mac_header_generic_arq_fb_ie_seq_format = -1; -static gint hf_mac_header_generic_arq_fb_ie_seq_ack_map = -1; -static gint hf_mac_header_generic_arq_fb_ie_seq1_length = -1; -static gint hf_mac_header_generic_arq_fb_ie_seq2_length = -1; -static gint hf_mac_header_generic_arq_fb_ie_seq3_length = -1; -static gint hf_mac_header_generic_arq_fb_ie_seq_ack_map_2 = -1; -static gint hf_mac_header_generic_arq_fb_ie_seq1_length_6 = -1; -static gint hf_mac_header_generic_arq_fb_ie_seq2_length_6 = -1; -static gint hf_mac_header_generic_arq_fb_ie_rsv = -1; -static gint hf_mac_header_payload_fragment = -1; - -static expert_field ei_mac_crc_malformed = EI_INIT; -static expert_field ei_mac_crc_missing = EI_INIT; -static expert_field ei_mac_header_generic_crc = EI_INIT; +static int hf_mac_header_generic_arq_fb_ie_cid; +static int hf_mac_header_generic_arq_fb_ie_last; +static int hf_mac_header_generic_arq_fb_ie_ack_type; +static int hf_mac_header_generic_arq_fb_ie_bsn; +static int hf_mac_header_generic_arq_fb_ie_num_maps; +static int hf_ack_type_reserved; +static int hf_mac_header_generic_arq_fb_ie_sel_ack_map; +static int hf_mac_header_generic_arq_fb_ie_seq_format; +static int hf_mac_header_generic_arq_fb_ie_seq_ack_map; +static int hf_mac_header_generic_arq_fb_ie_seq1_length; +static int hf_mac_header_generic_arq_fb_ie_seq2_length; +static int hf_mac_header_generic_arq_fb_ie_seq3_length; +static int hf_mac_header_generic_arq_fb_ie_seq_ack_map_2; +static int hf_mac_header_generic_arq_fb_ie_seq1_length_6; +static int hf_mac_header_generic_arq_fb_ie_seq2_length_6; +static int hf_mac_header_generic_arq_fb_ie_rsv; +static int hf_mac_header_payload_fragment; + +static expert_field ei_mac_crc_malformed; +static expert_field ei_mac_crc_missing; +static expert_field ei_mac_header_generic_crc; /* Last IE Indicators */ static const value_string last_ie_msgs[] = @@ -598,7 +598,7 @@ static const value_string plugin_proto_checksum_vals[] = { /* Register Wimax defrag table init routine. */ static void wimax_defragment_init(void) { - gint i; + int i; /* Init fragmentation variables. */ for (i = 0; i < MAX_CID; i++) @@ -627,11 +627,11 @@ static void wimax_defragment_cleanup(void) frag_num_array = NULL; } -static guint decode_packing_subheader(tvbuff_t *payload_tvb, packet_info *pinfo, proto_tree *tree, guint payload_length _U_, guint payload_offset, proto_item *parent_item) +static unsigned decode_packing_subheader(tvbuff_t *payload_tvb, packet_info *pinfo, proto_tree *tree, unsigned payload_length _U_, unsigned payload_offset, proto_item *parent_item) { proto_item *generic_item = NULL; proto_tree *generic_tree = NULL; - guint starting_offset = payload_offset; + unsigned starting_offset = payload_offset; /* update the info column */ col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Packing subhdr"); @@ -643,7 +643,7 @@ static guint decode_packing_subheader(tvbuff_t *payload_tvb, packet_info *pinfo, generic_tree = proto_item_add_subtree(generic_item, ett_mac_pkt_subheader_decoder); /* decode and display the Packing subheader */ /* Get the fragment type */ - frag_type = (tvb_get_guint8(payload_tvb, payload_offset) & FRAGMENT_TYPE_MASK) >> 6; + frag_type = (tvb_get_uint8(payload_tvb, payload_offset) & FRAGMENT_TYPE_MASK) >> 6; /* if ARQ Feedback payload is present */ if (arq_fb_payload) { /* get the frag length */ @@ -675,7 +675,7 @@ static guint decode_packing_subheader(tvbuff_t *payload_tvb, packet_info *pinfo, { /* get the frag length */ frag_len = (tvb_get_ntohs(payload_tvb, payload_offset) & PACKING_SUBHEADER_LENGTH_MASK); /* get the sequence number */ - seq_number = (tvb_get_guint8(payload_tvb, payload_offset) & SEQ_NUMBER_MASK) >> 3; + seq_number = (tvb_get_uint8(payload_tvb, payload_offset) & SEQ_NUMBER_MASK) >> 3; proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_fc, payload_tvb, payload_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_fsn, payload_tvb, payload_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_len, payload_tvb, payload_offset, 2, ENC_BIG_ENDIAN); @@ -685,7 +685,7 @@ static guint decode_packing_subheader(tvbuff_t *payload_tvb, packet_info *pinfo, } } /* Prevent a crash! */ - if ((gint)frag_len < 0) + if ((int)frag_len < 0) frag_len = 0; /* Return the number of bytes decoded. */ return payload_offset - starting_offset; @@ -694,24 +694,24 @@ static guint decode_packing_subheader(tvbuff_t *payload_tvb, packet_info *pinfo, static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint payload_offset; - guint payload_length = 0; + unsigned offset = 0; + unsigned payload_offset; + unsigned payload_length = 0; - static guint8 frag_number[MAX_CID]; - static guint cid_list[MAX_CID]; - static guint cid_base; + static uint8_t frag_number[MAX_CID]; + static unsigned cid_list[MAX_CID]; + static unsigned cid_base; static const char reassem_str[] = "Reassembled Data transport PDU (%u bytes)"; static const char data_str[] = "Data transport PDU (%u bytes)"; const char *str_ptr; - gint length, i, cid_index; - guint tvb_len, ret_length, ubyte, new_tvb_len; - guint new_payload_len = 0; - guint /*mac_ht,*/ mac_ec, mac_esf, mac_ci, /*mac_eks,*/ mac_len, mac_cid, cid; - guint ffb_grant_mgmt_subheader, packing_subheader, fragment_subheader; - guint mesh_subheader; - guint packing_length; - guint32 mac_crc, calculated_crc; + int length, i, cid_index; + unsigned tvb_len, ret_length, ubyte, new_tvb_len; + unsigned new_payload_len = 0; + unsigned /*mac_ht,*/ mac_ec, mac_esf, mac_ci, /*mac_eks,*/ mac_len, mac_cid, cid; + unsigned ffb_grant_mgmt_subheader, packing_subheader, fragment_subheader; + unsigned mesh_subheader; + unsigned packing_length; + uint32_t mac_crc, calculated_crc; proto_item *parent_item = NULL; proto_item *generic_item = NULL; proto_tree *generic_tree = NULL; @@ -720,7 +720,7 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, tvbuff_t *payload_tvb; tvbuff_t *data_pdu_tvb; fragment_head *payload_frag; - gboolean first_arq_fb_payload = TRUE; + bool first_arq_fb_payload = true; proto_mac_header_generic_decoder = proto_wimax; @@ -751,7 +751,7 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, generic_tree = proto_item_add_subtree(generic_item, ett_mac_header_generic_decoder); /* Decode and display the MAC header */ /* Get the first byte */ - ubyte = tvb_get_guint8(tvb, offset); + ubyte = tvb_get_uint8(tvb, offset); /* get the Header Type (HT) */ /*mac_ht = ((ubyte & WIMAX_MAC_HEADER_GENERIC_HT_MASK)?1:0); XX: not used ?? */ /* get the Encryption Control (EC) */ @@ -764,7 +764,7 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, arq_fb_payload = ((ubyte & GENERIC_SUB_TYPE_4)?1:0); mesh_subheader = ((ubyte & GENERIC_SUB_TYPE_5)?1:0); /* Get the 2nd byte */ - ubyte = tvb_get_guint8(tvb, (offset+1)); + ubyte = tvb_get_uint8(tvb, (offset+1)); /* get the Extended subheader field (ESF) */ mac_esf = ((ubyte & WIMAX_MAC_HEADER_GENERIC_ESF_MASK)?1:0); /* get the CRC indicator (CI) */ @@ -814,7 +814,7 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, { if (mac_ci) { - if (length >= (gint)sizeof(mac_crc)) + if (length >= (int)sizeof(mac_crc)) { length -= (int)sizeof(mac_crc); } @@ -932,7 +932,7 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, /* add Fragmentation subheader subtree */ generic_tree = proto_item_add_subtree(generic_item, ett_mac_frag_subheader_decoder); /* Get the fragment type */ - frag_type = (tvb_get_guint8(tvb, offset) & FRAGMENT_TYPE_MASK) >> 6; + frag_type = (tvb_get_uint8(tvb, offset) & FRAGMENT_TYPE_MASK) >> 6; if (arq_fb_payload) { /* get the sequence number */ seq_number = (tvb_get_ntohs(tvb, offset) & SEQ_NUMBER_MASK_11) >> 3; @@ -959,7 +959,7 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, } else { /* get the sequence number */ - seq_number = (tvb_get_guint8(tvb, offset) & SEQ_NUMBER_MASK) >> 3; + seq_number = (tvb_get_uint8(tvb, offset) & SEQ_NUMBER_MASK) >> 3; /* decode and display the header */ proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_fc, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_fsn, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -978,7 +978,7 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, /* Decode the MAC payload if there is any */ if (mac_ci) { - if (length < (gint)sizeof(mac_crc)) + if (length < (int)sizeof(mac_crc)) { /* display error message */ proto_tree_add_protocol_format(tree, proto_mac_header_generic_decoder, tvb, offset, length, "Error - the frame is too short (%u bytes)", length); return tvb_captured_length(tvb); @@ -1026,10 +1026,10 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, while (pinfo->num > cid_adj_array_size) { cid_adj_array_size += 1024; - cid_adj_array = (guint *)g_realloc(cid_adj_array, (int)sizeof(guint) * cid_adj_array_size); - frag_num_array = (guint8 *)g_realloc(frag_num_array, (int)sizeof(guint8) * cid_adj_array_size); + cid_adj_array = (unsigned *)g_realloc(cid_adj_array, (int)sizeof(unsigned) * cid_adj_array_size); + frag_num_array = (uint8_t *)g_realloc(frag_num_array, (int)sizeof(uint8_t) * cid_adj_array_size); /* Clear the added memory */ - memset(&cid_adj_array[cid_adj_array_size - 1024], 0, (int)sizeof(guint) * 1024); + memset(&cid_adj_array[cid_adj_array_size - 1024], 0, (int)sizeof(unsigned) * 1024); } if (first_gmh) { @@ -1062,7 +1062,7 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, } } /* Reset in case we stay in this while() loop to finish the packet. */ - first_gmh = FALSE; + first_gmh = false; cid = cid_base + cid_adjust[cid_index] + cid_vernier[cid_index]; /* Save address pointers. */ copy_address_shallow(&save_src, &pinfo->src); @@ -1124,7 +1124,7 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, /* if ARQ Feedback payload is present, it should be the first SDU */ if (first_arq_fb_payload && arq_fb_payload) { /* decode and display the ARQ feedback payload */ - first_arq_fb_payload = FALSE; + first_arq_fb_payload = false; #ifndef DEBUG arq_feedback_payload_decoder(tvb_new_subset_length(payload_tvb, payload_offset, new_payload_len), pinfo, generic_tree, parent_item); #else @@ -1187,7 +1187,7 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, /* add payload subtree */ generic_tree = proto_item_add_subtree(generic_item, ett_mac_data_pdu_decoder); /* check the data type */ - if (tvb_get_guint8(payload_tvb, payload_offset) == IP_HEADER_BYTE) + if (tvb_get_uint8(payload_tvb, payload_offset) == IP_HEADER_BYTE) { if (mac_ip_handle) call_dissector(mac_ip_handle, tvb_new_subset_length(payload_tvb, payload_offset, new_tvb_len), pinfo, generic_tree); @@ -1235,10 +1235,10 @@ check_crc: return tvb_captured_length(tvb); } -static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - gint offset = 0; - gint length, ext_length, ubyte, i; + int offset = 0; + int length, ext_length, ubyte, i; proto_item *ti = NULL; proto_tree *sub_tree = NULL; proto_tree *ti_tree = NULL; @@ -1255,7 +1255,7 @@ static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ } /* Get the length of the extended subheader group */ - ext_length = tvb_get_guint8(tvb, offset); + ext_length = tvb_get_uint8(tvb, offset); /* display subheader type */ ti = proto_tree_add_protocol_format(tree, proto_mac_header_generic_decoder, tvb, offset, length, "Extended subheader group (%u bytes)", ext_length); /* add extended subheader subtree */ @@ -1263,7 +1263,7 @@ static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ /* decode and display the extended subheaders */ for (i=1; i<ext_length;) { /* Get the extended subheader type */ - ubyte = (tvb_get_guint8(tvb, (offset+i)) & EXTENDED_SUB_HEADER_TYPE_MASK); + ubyte = (tvb_get_uint8(tvb, (offset+i)) & EXTENDED_SUB_HEADER_TYPE_MASK); /* decode and display the extended subheader type (MSB) */ proto_tree_add_item(sub_tree, hf_mac_header_generic_ext_subheader_rsv, tvb, (offset+i), 1, ENC_BIG_ENDIAN); /* for downlink */ @@ -1364,13 +1364,13 @@ static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ return ext_length; } -static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *parent_item) +static int arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *parent_item) { - gint length, i; - gint offset; - gint last_ie = 0; - gint ack_type, num_maps, seq_format; - gint word2, word3; + int length, i; + int offset; + int last_ie = 0; + int ack_type, num_maps, seq_format; + int word2, word3; proto_item *ti = NULL; proto_item *sub_ti = NULL; proto_tree *sub_tree = NULL; @@ -2225,7 +2225,7 @@ void wimax_proto_register_mac_header_generic(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_header_generic_decoder, /* &ett_mac_subheader_decoder, */ diff --git a/plugins/epan/wimax/mac_hd_type1_decoder.c b/plugins/epan/wimax/mac_hd_type1_decoder.c index 6713e920..3b843c0f 100644 --- a/plugins/epan/wimax/mac_hd_type1_decoder.c +++ b/plugins/epan/wimax/mac_hd_type1_decoder.c @@ -28,11 +28,11 @@ #include <epan/packet.h> #include "wimax-int.h" -extern gint proto_mac_header_generic_decoder; +extern int proto_mac_header_generic_decoder; -static gint proto_mac_header_type_1_decoder = -1; -static gint ett_mac_header_type_1_decoder = -1; -static gint hf_mac_header_type_1_value_bytes = -1; +static int proto_mac_header_type_1_decoder; +static int ett_mac_header_type_1_decoder; +static int hf_mac_header_type_1_value_bytes; #define WIMAX_MAC_HEADER_SIZE 6 @@ -64,7 +64,7 @@ static const char *type1_subtype_abbrv[TYPE_I_SUBTYPE_MAX] = #define WIMAX_MAC_HEADER_TYPE_1_SUB_TYPE_MASK 0x38 -/* WIMAX MAC HEADER TYPE I FILEDS */ +/* WIMAX MAC HEADER TYPE I FIELDS */ /* 1st to 3rd bytes */ /* Common Fields */ #define WIMAX_MAC_HEADER_TYPE_1_HT 0x800000 @@ -106,40 +106,40 @@ static const char *type1_subtype_abbrv[TYPE_I_SUBTYPE_MAX] = *#define WIMAX_MAC_HEADER_TYPE_1_HCS 0xFF */ /* Common Fields */ -static int hf_mac_header_type_1_ht = -1; -static int hf_mac_header_type_1_ec = -1; -static int hf_mac_header_type_1_type = -1; +static int hf_mac_header_type_1_ht; +static int hf_mac_header_type_1_ec; +static int hf_mac_header_type_1_type; /* type 0 & type 1 only */ -static int hf_mac_header_type_1_br = -1; +static int hf_mac_header_type_1_br; /* type 3, type 4, & type 5 only */ -static int hf_mac_header_type_1_br_3 = -1; +static int hf_mac_header_type_1_br_3; /* type 2 only */ -static int hf_mac_header_type_1_diuc = -1; -static int hf_mac_header_type_1_ultxpwr = -1; -static int hf_mac_header_type_1_ulhdrm = -1; -static int hf_mac_header_type_1_rsv_2 = -1; +static int hf_mac_header_type_1_diuc; +static int hf_mac_header_type_1_ultxpwr; +static int hf_mac_header_type_1_ulhdrm; +static int hf_mac_header_type_1_rsv_2; /* type 3 only */ -static int hf_mac_header_type_1_ultxpwr_3 = -1; +static int hf_mac_header_type_1_ultxpwr_3; /* type 4 only */ -static int hf_mac_header_type_1_cinr = -1; -static int hf_mac_header_type_1_dci = -1; +static int hf_mac_header_type_1_cinr; +static int hf_mac_header_type_1_dci; /* type 5 only */ -static int hf_mac_header_type_1_pscid = -1; -static int hf_mac_header_type_1_op = -1; -static int hf_mac_header_type_1_rsv_5 = -1; +static int hf_mac_header_type_1_pscid; +static int hf_mac_header_type_1_op; +static int hf_mac_header_type_1_rsv_5; /* type 6 only */ -static int hf_mac_header_type_1_last = -1; -static int hf_mac_header_type_1_sdu_sn1 = -1; -static int hf_mac_header_type_1_sdu_sn2 = -1; -static int hf_mac_header_type_1_sdu_sn3 = -1; +static int hf_mac_header_type_1_last; +static int hf_mac_header_type_1_sdu_sn1; +static int hf_mac_header_type_1_sdu_sn2; +static int hf_mac_header_type_1_sdu_sn3; /* type 7 only */ -static int hf_mac_header_type_1_fb_type = -1; -static int hf_mac_header_type_1_fbssi = -1; -static int hf_mac_header_type_1_period = -1; -static int hf_mac_header_type_1_rsv_7 = -1; +static int hf_mac_header_type_1_fb_type; +static int hf_mac_header_type_1_fbssi; +static int hf_mac_header_type_1_period; +static int hf_mac_header_type_1_rsv_7; /* Common Fields */ -static int hf_mac_header_type_1_cid = -1; -static int hf_mac_header_type_1_hcs = -1; +static int hf_mac_header_type_1_cid; +static int hf_mac_header_type_1_hcs; /* MAC Header Type I Sub-Types */ static const value_string sub_types[] = @@ -195,8 +195,8 @@ static const value_string last_msgs[] = static int dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - gint tvb_len, offset = 0; - guint first_byte, sub_type; + int tvb_len, offset = 0; + unsigned first_byte, sub_type; proto_item *parent_item = NULL; proto_item *ti = NULL; proto_tree *ti_tree = NULL; @@ -226,7 +226,7 @@ static int dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(ti_tree, hf_mac_header_type_1_ec, tvb, offset, 3, ENC_BIG_ENDIAN); proto_tree_add_item(ti_tree, hf_mac_header_type_1_type, tvb, offset, 3, ENC_BIG_ENDIAN); /* Get the first byte */ - first_byte = tvb_get_guint8(tvb, offset); + first_byte = tvb_get_uint8(tvb, offset); /* get the sub Type */ sub_type = ((first_byte & WIMAX_MAC_HEADER_TYPE_1_SUB_TYPE_MASK)>>3); if(sub_type < TYPE_I_SUBTYPE_MAX) @@ -260,7 +260,7 @@ static int dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(ti_tree, hf_mac_header_type_1_ultxpwr, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the UL Headroom */ proto_tree_add_item(ti_tree, hf_mac_header_type_1_ulhdrm, tvb, offset, 3, ENC_BIG_ENDIAN); - /* Decode and display the reserved filed */ + /* Decode and display the reserved field */ proto_tree_add_item(ti_tree, hf_mac_header_type_1_rsv_2, tvb, offset, 3, ENC_BIG_ENDIAN); break; case BR_WITH_UL_TX_POWER_REPORT: @@ -284,7 +284,7 @@ static int dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(ti_tree, hf_mac_header_type_1_pscid, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the Operation */ proto_tree_add_item(ti_tree, hf_mac_header_type_1_op, tvb, offset, 3, ENC_BIG_ENDIAN); - /* Decode and display the reserved filed */ + /* Decode and display the reserved field */ proto_tree_add_item(ti_tree, hf_mac_header_type_1_rsv_5, tvb, offset, 3, ENC_BIG_ENDIAN); break; case SN_REPORT: @@ -302,9 +302,9 @@ static int dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(ti_tree, hf_mac_header_type_1_fb_type, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the FBSSI */ proto_tree_add_item(ti_tree, hf_mac_header_type_1_fbssi, tvb, offset, 3, ENC_BIG_ENDIAN); - /* Decode and display the Prreferred-period */ + /* Decode and display the Preferred-period */ proto_tree_add_item(ti_tree, hf_mac_header_type_1_period, tvb, offset, 3, ENC_BIG_ENDIAN); - /* Decode and display the reserved filed */ + /* Decode and display the reserved field */ proto_tree_add_item(ti_tree, hf_mac_header_type_1_rsv_7, tvb, offset, 3, ENC_BIG_ENDIAN); break; } @@ -533,7 +533,7 @@ void wimax_proto_register_mac_header_type_1(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_header_type_1_decoder, }; diff --git a/plugins/epan/wimax/mac_hd_type2_decoder.c b/plugins/epan/wimax/mac_hd_type2_decoder.c index 466b4b20..551ad369 100644 --- a/plugins/epan/wimax/mac_hd_type2_decoder.c +++ b/plugins/epan/wimax/mac_hd_type2_decoder.c @@ -28,11 +28,11 @@ #include <epan/packet.h> #include "wimax-int.h" -extern gint proto_mac_header_generic_decoder; +extern int proto_mac_header_generic_decoder; -static gint proto_mac_header_type_2_decoder = -1; -static gint ett_mac_header_type_2_decoder = -1; -static gint hf_mac_header_type_2_value_bytes = -1; +static int proto_mac_header_type_2_decoder; +static int ett_mac_header_type_2_decoder; +static int hf_mac_header_type_2_value_bytes; #define WIMAX_MAC_HEADER_SIZE 6 @@ -81,23 +81,23 @@ static const char *type2_fb_type_abbrv[TYPE_II_FB_TYPE_MAX] = #define WIMAX_MAC_HEADER_TYPE_2_TYPE 0x20 #define WIMAX_MAC_HEADER_TYPE_2_CII 0x10 #define WIMAX_MAC_HEADER_TYPE_2_FB_TYPE 0x0F -static int hf_mac_header_type_2_ht = -1; -static int hf_mac_header_type_2_ec = -1; -static int hf_mac_header_type_2_type = -1; -static int hf_mac_header_type_2_cii = -1; -static int hf_mac_header_type_2_fb_type = -1; +static int hf_mac_header_type_2_ht; +static int hf_mac_header_type_2_ec; +static int hf_mac_header_type_2_type; +static int hf_mac_header_type_2_cii; +static int hf_mac_header_type_2_fb_type; /* 2nd to 5th bytes (varies by different fb types) */ -static int hf_mac_header_type_2_cid = -1; -static int hf_mac_header_type_2_no_cid = -1; +static int hf_mac_header_type_2_cid; +static int hf_mac_header_type_2_no_cid; /* CQI and MIMO Feedback */ /* 2nd & 3rd bytes */ #define WIMAX_MAC_HEADER_TYPE_2_CQI_FB_TYPE 0xE000 #define WIMAX_MAC_HEADER_TYPE_2_CQI_PAYLOAD 0x1F80 #define WIMAX_MAC_HEADER_TYPE_2_CQI_RSV 0x007F -static int hf_mac_header_type_2_cqi_fb_type = -1; -static int hf_mac_header_type_2_cqi_payload = -1; -static int hf_mac_header_type_2_cqi_rsv = -1; +static int hf_mac_header_type_2_cqi_fb_type; +static int hf_mac_header_type_2_cqi_payload; +static int hf_mac_header_type_2_cqi_rsv; /* 4th & 5th without CID */ /*#define WIMAX_MAC_HEADER_TYPE_2_NO_CID 0xFFFF*/ @@ -105,8 +105,8 @@ static int hf_mac_header_type_2_cqi_rsv = -1; /* 2nd byte */ #define WIMAX_MAC_HEADER_TYPE_2_DL_AVE_CINR 0xF800 #define WIMAX_MAC_HEADER_TYPE_2_DL_AVE_RSV 0x07FF -static int hf_mac_header_type_2_dl_ave_cinr = -1; -static int hf_mac_header_type_2_dl_ave_rsv = -1; +static int hf_mac_header_type_2_dl_ave_cinr; +static int hf_mac_header_type_2_dl_ave_rsv; /* MIMO Coefficients Feedback */ /* 2nd & 3rd bytes */ @@ -114,26 +114,26 @@ static int hf_mac_header_type_2_dl_ave_rsv = -1; #define WIMAX_MAC_HEADER_TYPE_2_MIMO_COEF_AI 0x3000 #define WIMAX_MAC_HEADER_TYPE_2_MIMO_COEF 0x0F80 #define WIMAX_MAC_HEADER_TYPE_2_MIMO_COEF_RSV 0x007F -static int hf_mac_header_type_2_mimo_coef_ni = -1; -static int hf_mac_header_type_2_mimo_coef_ai = -1; -static int hf_mac_header_type_2_mimo_coef = -1; -static int hf_mac_header_type_2_mimo_coef_rsv = -1; +static int hf_mac_header_type_2_mimo_coef_ni; +static int hf_mac_header_type_2_mimo_coef_ai; +static int hf_mac_header_type_2_mimo_coef; +static int hf_mac_header_type_2_mimo_coef_rsv; /* Preferred DL Channel DIUC Feedback */ /* 2nd byte */ #define WIMAX_MAC_HEADER_TYPE_2_DL_CHAN_DIUC 0xF000 #define WIMAX_MAC_HEADER_TYPE_2_DL_CHAN_DCD 0x0F00 #define WIMAX_MAC_HEADER_TYPE_2_DL_CHAN_RSV 0x00FF -static int hf_mac_header_type_2_dl_chan_diuc = -1; -static int hf_mac_header_type_2_dl_chan_dcd = -1; -static int hf_mac_header_type_2_dl_chan_rsv = -1; +static int hf_mac_header_type_2_dl_chan_diuc; +static int hf_mac_header_type_2_dl_chan_dcd; +static int hf_mac_header_type_2_dl_chan_rsv; /* UL Transmission Power */ /* 2nd byte */ #define WIMAX_MAC_HEADER_TYPE_2_UL_TX_PWR 0xFF00 #define WIMAX_MAC_HEADER_TYPE_2_UL_TX_PWR_RSV 0x00FF -static int hf_mac_header_type_2_ul_tx_pwr = -1; -static int hf_mac_header_type_2_ul_tx_pwr_rsv = -1; +static int hf_mac_header_type_2_ul_tx_pwr; +static int hf_mac_header_type_2_ul_tx_pwr_rsv; /* PHY Channel Feedback */ /* 2nd to 4th bytes */ @@ -141,10 +141,10 @@ static int hf_mac_header_type_2_ul_tx_pwr_rsv = -1; #define WIMAX_MAC_HEADER_TYPE_2_PHY_UL_TX_PWR 0x0FF000 #define WIMAX_MAC_HEADER_TYPE_2_PHY_UL_HDRM 0x000FC0 #define WIMAX_MAC_HEADER_TYPE_2_PHY_RSV 0x00003F -static int hf_mac_header_type_2_phy_diuc = -1; -static int hf_mac_header_type_2_phy_ul_tx_pwr = -1; -static int hf_mac_header_type_2_phy_ul_hdrm = -1; -static int hf_mac_header_type_2_phy_rsv = -1; +static int hf_mac_header_type_2_phy_diuc; +static int hf_mac_header_type_2_phy_ul_tx_pwr; +static int hf_mac_header_type_2_phy_ul_hdrm; +static int hf_mac_header_type_2_phy_rsv; /* AMC Band Indication Bitmap */ /* 2nd to 5th bytes */ @@ -153,27 +153,27 @@ static int hf_mac_header_type_2_phy_rsv = -1; #define WIMAX_MAC_HEADER_TYPE_2_AMC_CQI_2 0x00007C00 #define WIMAX_MAC_HEADER_TYPE_2_AMC_CQI_3 0x000003E0 #define WIMAX_MAC_HEADER_TYPE_2_AMC_CQI_4 0x0000001F -static int hf_mac_header_type_2_amc_bitmap = -1; -static int hf_mac_header_type_2_amc_cqi_1 = -1; -static int hf_mac_header_type_2_amc_cqi_2 = -1; -static int hf_mac_header_type_2_amc_cqi_3 = -1; -static int hf_mac_header_type_2_amc_cqi_4 = -1; +static int hf_mac_header_type_2_amc_bitmap; +static int hf_mac_header_type_2_amc_cqi_1; +static int hf_mac_header_type_2_amc_cqi_2; +static int hf_mac_header_type_2_amc_cqi_3; +static int hf_mac_header_type_2_amc_cqi_4; /* Life Span of Short-term Precoding Feedback */ /* 2nd byte */ #define WIMAX_MAC_HEADER_TYPE_2_LIFE_SPAN 0xF000 #define WIMAX_MAC_HEADER_TYPE_2_LIFE_SPAN_RSV 0x0FFF -static int hf_mac_header_type_2_life_span = -1; -static int hf_mac_header_type_2_life_span_rsv = -1; +static int hf_mac_header_type_2_life_span; +static int hf_mac_header_type_2_life_span_rsv; /* Multiple Types of Feedback */ /* 2nd to 5th bytes ??? */ #define WIMAX_MAC_HEADER_TYPE_2_MT_NUM_FB_TYPES 0xC0000000 #define WIMAX_MAC_HEADER_TYPE_2_MT_OCCU_FB_TYPE 0x3C000000 #define WIMAX_MAC_HEADER_TYPE_2_MT_FB_CONTENTS 0x03FFFFFF -static int hf_mac_header_type_2_mt_num_fb_types = -1; -static int hf_mac_header_type_2_mt_occu_fb_type = -1; -static int hf_mac_header_type_2_mt_fb_contents = -1; +static int hf_mac_header_type_2_mt_num_fb_types; +static int hf_mac_header_type_2_mt_occu_fb_type; +static int hf_mac_header_type_2_mt_fb_contents; /* Long-term Precoding Feedback */ /* 2nd & 3rd bytes */ @@ -181,17 +181,17 @@ static int hf_mac_header_type_2_mt_fb_contents = -1; #define WIMAX_MAC_HEADER_TYPE_2_LT_RANK 0x0300 #define WIMAX_MAC_HEADER_TYPE_2_LT_FEC_QAM 0x00FC #define WIMAX_MAC_HEADER_TYPE_2_LT_RSV 0x0003 -static int hf_mac_header_type_2_lt_id_fb = -1; -static int hf_mac_header_type_2_lt_rank = -1; -static int hf_mac_header_type_2_lt_fec_qam = -1; -static int hf_mac_header_type_2_lt_rsv = -1; +static int hf_mac_header_type_2_lt_id_fb; +static int hf_mac_header_type_2_lt_rank; +static int hf_mac_header_type_2_lt_fec_qam; +static int hf_mac_header_type_2_lt_rsv; /* Combined DL Average CINR of Active BSs */ /* 2nd & 3rd bytes */ #define WIMAX_MAC_HEADER_TYPE_2_COMB_DL_AVE 0xF800 #define WIMAX_MAC_HEADER_TYPE_2_COMB_DL_RSV 0x0EFF -static int hf_mac_header_type_2_comb_dl_ave = -1; -static int hf_mac_header_type_2_comb_dl_rsv = -1; +static int hf_mac_header_type_2_comb_dl_ave; +static int hf_mac_header_type_2_comb_dl_rsv; /* MIMO Channel Feedback */ /* 2nd byte */ @@ -211,28 +211,28 @@ static int hf_mac_header_type_2_comb_dl_rsv = -1; #define WIMAX_MAC_HEADER_TYPE_2_MI 0x0000C0 #define WIMAX_MAC_HEADER_TYPE_2_CT 0x000020 #define WIMAX_MAC_HEADER_TYPE_2_CQI 0x00001F -static int hf_mac_header_type_2_mimo_diuc = -1; -static int hf_mac_header_type_2_mimo_pbwi = -1; -static int hf_mac_header_type_2_mimo_slpb = -1; -static int hf_mac_header_type_2_mimo_bpri = -1; -static int hf_mac_header_type_2_mimo_bpri_cid = -1; -static int hf_mac_header_type_2_mimo_cid = -1; -static int hf_mac_header_type_2_mimo_cti = -1; -static int hf_mac_header_type_2_mimo_ai_0 = -1; -static int hf_mac_header_type_2_mimo_ai_1 = -1; -static int hf_mac_header_type_2_mimo_ai_2 = -1; -static int hf_mac_header_type_2_mimo_ai_3 = -1; -static int hf_mac_header_type_2_mimo_mi = -1; -static int hf_mac_header_type_2_mimo_ct = -1; -static int hf_mac_header_type_2_mimo_cqi = -1; +static int hf_mac_header_type_2_mimo_diuc; +static int hf_mac_header_type_2_mimo_pbwi; +static int hf_mac_header_type_2_mimo_slpb; +static int hf_mac_header_type_2_mimo_bpri; +static int hf_mac_header_type_2_mimo_bpri_cid; +static int hf_mac_header_type_2_mimo_cid; +static int hf_mac_header_type_2_mimo_cti; +static int hf_mac_header_type_2_mimo_ai_0; +static int hf_mac_header_type_2_mimo_ai_1; +static int hf_mac_header_type_2_mimo_ai_2; +static int hf_mac_header_type_2_mimo_ai_3; +static int hf_mac_header_type_2_mimo_mi; +static int hf_mac_header_type_2_mimo_ct; +static int hf_mac_header_type_2_mimo_cqi; /* CINR Feedback */ /* 2nd byte */ /*#define WIMAX_MAC_HEADER_TYPE_2_CINR_MEAN 0xFF*/ /* 3rd byte */ /*#define WIMAX_MAC_HEADER_TYPE_2_CINR_DEVI 0xFF*/ -static int hf_mac_header_type_2_cinr_mean = -1; -static int hf_mac_header_type_2_cinr_devi = -1; +static int hf_mac_header_type_2_cinr_mean; +static int hf_mac_header_type_2_cinr_devi; /* Close-loop MIMO Feedback */ /* 2nd & 3rd bytes */ @@ -247,21 +247,21 @@ static int hf_mac_header_type_2_cinr_devi = -1; #define WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_CODEBOOK_ID 0x3F00 #define WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_CQI_2 0x00F8 #define WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_RSV_2 0x000E -static int hf_mac_header_type_2_cl_mimo_type = -1; -static int hf_mac_header_type_2_cl_mimo_ant_id = -1; -static int hf_mac_header_type_2_cl_mimo_cqi = -1; -static int hf_mac_header_type_2_cl_mimo_cqi_1 = -1; -static int hf_mac_header_type_2_cl_mimo_cqi_2 = -1; -static int hf_mac_header_type_2_cl_mimo_rsv = -1; -static int hf_mac_header_type_2_cl_mimo_rsv_1 = -1; -static int hf_mac_header_type_2_cl_mimo_rsv_2 = -1; -static int hf_mac_header_type_2_cl_mimo_streams = -1; -static int hf_mac_header_type_2_cl_mimo_ant_sel = -1; -static int hf_mac_header_type_2_cl_mimo_codebook_id = -1; +static int hf_mac_header_type_2_cl_mimo_type; +static int hf_mac_header_type_2_cl_mimo_ant_id; +static int hf_mac_header_type_2_cl_mimo_cqi; +static int hf_mac_header_type_2_cl_mimo_cqi_1; +static int hf_mac_header_type_2_cl_mimo_cqi_2; +static int hf_mac_header_type_2_cl_mimo_rsv; +static int hf_mac_header_type_2_cl_mimo_rsv_1; +static int hf_mac_header_type_2_cl_mimo_rsv_2; +static int hf_mac_header_type_2_cl_mimo_streams; +static int hf_mac_header_type_2_cl_mimo_ant_sel; +static int hf_mac_header_type_2_cl_mimo_codebook_id; /* last byte */ /*#define WIMAX_MAC_HEADER_TYPE_2_HCS 0xFF*/ -static int hf_mac_header_type_2_hcs = -1; +static int hf_mac_header_type_2_hcs; /* CID Inclusion Indication messages */ static const value_string cii_msgs[] = @@ -368,8 +368,8 @@ static const value_string ai_msgs[] = static int dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - gint tvb_len, offset = 0; - guint cii_bit, first_byte, fb_type, mimo_type; + int tvb_len, offset = 0; + unsigned cii_bit, first_byte, fb_type, mimo_type; proto_item *parent_item = NULL; proto_item *ti = NULL; proto_tree *ti_tree = NULL; @@ -407,7 +407,7 @@ static int dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, /* feedback type */ proto_tree_add_item(ti_tree, hf_mac_header_type_2_fb_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* Get the first byte */ - first_byte = tvb_get_guint8(tvb, offset); + first_byte = tvb_get_uint8(tvb, offset); /* get the CII field */ cii_bit = ((first_byte & WIMAX_MAC_HEADER_TYPE_2_CII)?1:0); /* check the Type field */ @@ -624,7 +624,7 @@ static int dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, /* Decode and display the Long-term precoding feedback */ /* Feedback of index */ proto_tree_add_item(ti_tree, hf_mac_header_type_2_lt_id_fb, tvb, offset, 2, ENC_BIG_ENDIAN); - /* rank of prrecoding codebook */ + /* rank of precoding codebook */ proto_tree_add_item(ti_tree, hf_mac_header_type_2_lt_rank, tvb, offset, 2, ENC_BIG_ENDIAN); /* EFC and QAM feedback */ proto_tree_add_item(ti_tree, hf_mac_header_type_2_lt_fec_qam, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -714,7 +714,7 @@ static int dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, break; case CL_MIMO_FB: /* Get the MIMO type */ - mimo_type = ((tvb_get_guint8(tvb, offset) & 0xC0) >> 6); + mimo_type = ((tvb_get_uint8(tvb, offset) & 0xC0) >> 6); /* Decode and display the MIMO type */ proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_type, tvb, offset, 2, ENC_BIG_ENDIAN); if(mimo_type == 1) @@ -1343,7 +1343,7 @@ void wimax_proto_register_mac_header_type_2(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_header_type_2_decoder, }; diff --git a/plugins/epan/wimax/mac_mgmt_msg_decoder.c b/plugins/epan/wimax/mac_mgmt_msg_decoder.c index 57c03977..edd2ed04 100644 --- a/plugins/epan/wimax/mac_mgmt_msg_decoder.c +++ b/plugins/epan/wimax/mac_mgmt_msg_decoder.c @@ -23,13 +23,13 @@ void proto_register_mac_mgmt_msg(void); void proto_reg_handoff_mac_mgmt_msg(void); -static gint proto_mac_mgmt_msg_decoder = -1; -static gint ett_mac_mgmt_msg_decoder = -1; +static int proto_mac_mgmt_msg_decoder; +static int ett_mac_mgmt_msg_decoder; -static gint hf_mac_mgmt_msg_type = -1; -static gint hf_mac_mgmt_msg_values = -1; +static int hf_mac_mgmt_msg_type; +static int hf_mac_mgmt_msg_values; -static expert_field ei_empty_payload = EI_INIT; +static expert_field ei_empty_payload; static dissector_table_t subdissector_message_table; @@ -110,8 +110,8 @@ static value_string_ext mgt_msg_abbrv_vals_ext = VALUE_STRING_EXT_INIT(mgt_msg_a static int dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint message_type; + unsigned offset = 0; + unsigned message_type; proto_item *message_item; proto_tree *message_tree; const char* mgt_msg_str; @@ -127,7 +127,7 @@ static int dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto } /* Get the payload type */ - message_type = tvb_get_guint8(tvb, offset); + message_type = tvb_get_uint8(tvb, offset); proto_tree_add_item(message_tree, hf_mac_mgmt_msg_type, tvb, offset, 1, ENC_NA); mgt_msg_str = val_to_str_ext_const(message_type, &mgt_msg_abbrv_vals_ext, "Unknown"); @@ -179,7 +179,7 @@ void proto_register_mac_mgmt_msg(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_decoder, }; diff --git a/plugins/epan/wimax/msg_aas_beam.c b/plugins/epan/wimax/msg_aas_beam.c index 1e6166fd..48573893 100644 --- a/plugins/epan/wimax/msg_aas_beam.c +++ b/plugins/epan/wimax/msg_aas_beam.c @@ -21,7 +21,7 @@ #include <epan/packet.h> #include "wimax_mac.h" -extern gint proto_mac_mgmt_msg_aas_fbck_decoder; +extern int proto_mac_mgmt_msg_aas_fbck_decoder; #define AAS_BEAM_SELECT_AAS_BEAM_INDEX_MASK 0xFC #define AAS_BEAM_SELECT_RESERVED_MASK 0x03 @@ -37,10 +37,10 @@ void proto_reg_handoff_mac_mgmt_msg_aas_beam(void); static dissector_handle_t aas_handle; -static gint proto_mac_mgmt_msg_aas_beam_decoder = -1; -static gint ett_mac_mgmt_msg_aas_beam_select_decoder = -1; -static gint ett_mac_mgmt_msg_aas_beam_req_decoder = -1; -static gint ett_mac_mgmt_msg_aas_beam_rsp_decoder = -1; +static int proto_mac_mgmt_msg_aas_beam_decoder; +static int ett_mac_mgmt_msg_aas_beam_select_decoder; +static int ett_mac_mgmt_msg_aas_beam_req_decoder; +static int ett_mac_mgmt_msg_aas_beam_rsp_decoder; #ifdef OFDM static const value_string vals_report_types[] = @@ -61,25 +61,25 @@ static const value_string vals_resolution_parameter[] = #endif /* fix fields */ -/* static gint hf_aas_beam_unknown_type = -1; */ -static gint hf_aas_beam_select_index = -1; -static gint hf_aas_beam_select_reserved = -1; +/* static int hf_aas_beam_unknown_type; */ +static int hf_aas_beam_select_index; +static int hf_aas_beam_select_reserved; #ifdef OFDM -static gint hf_aas_beam_frame_number = -1; -static gint hf_aas_beam_feedback_request_number = -1; -static gint hf_aas_beam_measurement_report_type = -1; -static gint hf_aas_beam_resolution_parameter = -1; -static gint hf_aas_beam_beam_bit_mask = -1; -static int hf_aas_beam_freq_value_re = -1; -static int hf_aas_beam_freq_value_im = -1; -static int hf_aas_beam_rssi_value = -1; -static int hf_aas_beam_cinr_value = -1; +static int hf_aas_beam_frame_number; +static int hf_aas_beam_feedback_request_number; +static int hf_aas_beam_measurement_report_type; +static int hf_aas_beam_resolution_parameter; +static int hf_aas_beam_beam_bit_mask; +static int hf_aas_beam_freq_value_re; +static int hf_aas_beam_freq_value_im; +static int hf_aas_beam_rssi_value; +static int hf_aas_beam_cinr_value; #endif static int dissect_mac_mgmt_msg_aas_beam_select_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *aas_beam_item; proto_tree *aas_beam_tree; @@ -102,7 +102,7 @@ static int dissect_mac_mgmt_msg_aas_beam_select_decoder(tvbuff_t *tvb, packet_in #ifdef OFDM static int dissect_mac_mgmt_msg_aas_beam_req_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *aas_beam_item; proto_tree *aas_beam_tree; @@ -136,9 +136,9 @@ static int dissect_mac_mgmt_msg_aas_beam_req_decoder(tvbuff_t *tvb, packet_info static int dissect_mac_mgmt_msg_aas_beam_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len, report_type; - guint number_of_frequencies, indx; + unsigned offset = 0; + unsigned tvb_len, report_type; + unsigned number_of_frequencies, indx; proto_item *aas_beam_item; proto_tree *aas_beam_tree; @@ -157,7 +157,7 @@ static int dissect_mac_mgmt_msg_aas_beam_rsp_decoder(tvbuff_t *tvb, packet_info /* move to next field */ offset++; /* get the Measurement Report Type */ - report_type = tvb_get_guint8(tvb, offset); + report_type = tvb_get_uint8(tvb, offset); /* display the Feedback Request Number */ proto_tree_add_item(aas_beam_tree, hf_aas_beam_feedback_request_number, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the Measurement Report Type */ @@ -297,7 +297,7 @@ void proto_register_mac_mgmt_msg_aas_beam(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_aas_beam_select_decoder, &ett_mac_mgmt_msg_aas_beam_req_decoder, diff --git a/plugins/epan/wimax/msg_aas_fbck.c b/plugins/epan/wimax/msg_aas_fbck.c index 31162822..a82451d7 100644 --- a/plugins/epan/wimax/msg_aas_fbck.c +++ b/plugins/epan/wimax/msg_aas_fbck.c @@ -36,9 +36,9 @@ void proto_reg_handoff_mac_mgmt_msg_aas(void); static dissector_handle_t aas_req_handle; static dissector_handle_t aas_rsp_handle; -static gint proto_mac_mgmt_msg_aas_fbck_decoder = -1; -static gint ett_mac_mgmt_msg_aas_fbck_req_decoder = -1; -static gint ett_mac_mgmt_msg_aas_fbck_rsp_decoder = -1; +static int proto_mac_mgmt_msg_aas_fbck_decoder; +static int ett_mac_mgmt_msg_aas_fbck_req_decoder; +static int ett_mac_mgmt_msg_aas_fbck_rsp_decoder; static const value_string vals_data_types[] = { @@ -66,29 +66,29 @@ static const value_string vals_resolutions_1[] = }; /* fix fields */ -/* static int hf_aas_fbck_unknown_type = -1; */ -static int hf_aas_fbck_frame_number = -1; -static int hf_aas_fbck_number_of_frames = -1; -static int hf_aas_fbck_req_data_type = -1; -static int hf_aas_fbck_rsp_data_type = -1; -static int hf_aas_fbck_req_counter = -1; -static int hf_aas_fbck_rsp_counter = -1; -static int hf_aas_fbck_req_resolution_0 = -1; -static int hf_aas_fbck_rsp_resolution_0 = -1; -static int hf_aas_fbck_req_resolution_1 = -1; -static int hf_aas_fbck_rsp_resolution_1 = -1; -static int hf_aas_fbck_req_reserved = -1; -static int hf_aas_fbck_rsp_reserved = -1; -static int hf_aas_fbck_freq_value_re = -1; -static int hf_aas_fbck_freq_value_im = -1; -static int hf_aas_fbck_rssi_value = -1; -static int hf_aas_fbck_cinr_value = -1; +/* static int hf_aas_fbck_unknown_type; */ +static int hf_aas_fbck_frame_number; +static int hf_aas_fbck_number_of_frames; +static int hf_aas_fbck_req_data_type; +static int hf_aas_fbck_rsp_data_type; +static int hf_aas_fbck_req_counter; +static int hf_aas_fbck_rsp_counter; +static int hf_aas_fbck_req_resolution_0; +static int hf_aas_fbck_rsp_resolution_0; +static int hf_aas_fbck_req_resolution_1; +static int hf_aas_fbck_rsp_resolution_1; +static int hf_aas_fbck_req_reserved; +static int hf_aas_fbck_rsp_reserved; +static int hf_aas_fbck_freq_value_re; +static int hf_aas_fbck_freq_value_im; +static int hf_aas_fbck_rssi_value; +static int hf_aas_fbck_cinr_value; static int dissect_mac_mgmt_msg_aas_fbck_req_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint data_type; + unsigned offset = 0; + unsigned data_type; proto_item *aas_fbck_item; proto_tree *aas_fbck_tree; @@ -106,7 +106,7 @@ static int dissect_mac_mgmt_msg_aas_fbck_req_decoder(tvbuff_t *tvb, packet_info /* move to next field */ offset++; /* get the data type */ - data_type = tvb_get_guint8(tvb, offset); + data_type = tvb_get_uint8(tvb, offset); /* display the number of Frames */ proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_number_of_frames, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the Data Type */ @@ -128,8 +128,8 @@ static int dissect_mac_mgmt_msg_aas_fbck_req_decoder(tvbuff_t *tvb, packet_info static int dissect_mac_mgmt_msg_aas_fbck_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len, data_type; + unsigned offset = 0; + unsigned tvb_len, data_type; proto_item *aas_fbck_item; proto_tree *aas_fbck_tree; @@ -144,7 +144,7 @@ static int dissect_mac_mgmt_msg_aas_fbck_rsp_decoder(tvbuff_t *tvb, packet_info /* Display the AAS-FBCK-RSP message type */ /* get the data type */ - data_type = tvb_get_guint8(tvb, offset); + data_type = tvb_get_uint8(tvb, offset); /* Decode and display the AAS-FBCK-RSP message body */ /* display the reserved fields */ proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rsp_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -310,7 +310,7 @@ void proto_register_mac_mgmt_msg_aas_fbck(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_aas_fbck_req_decoder, &ett_mac_mgmt_msg_aas_fbck_rsp_decoder, diff --git a/plugins/epan/wimax/msg_arq.c b/plugins/epan/wimax/msg_arq.c index c99a66a2..bff0c570 100644 --- a/plugins/epan/wimax/msg_arq.c +++ b/plugins/epan/wimax/msg_arq.c @@ -30,43 +30,43 @@ static dissector_handle_t arq_feedback_handle; static dissector_handle_t arq_discard_handle; static dissector_handle_t arq_reset_handle; -static gint proto_mac_mgmt_msg_arq_decoder = -1; +static int proto_mac_mgmt_msg_arq_decoder; -static gint ett_mac_mgmt_msg_arq_decoder = -1; +static int ett_mac_mgmt_msg_arq_decoder; /* Setup protocol subtree array */ -static gint *ett[] = +static int *ett[] = { &ett_mac_mgmt_msg_arq_decoder, }; /* ARQ fields */ -static gint hf_arq_cid = -1; -static gint hf_arq_last = -1; -static gint hf_arq_ack_type = -1; -static gint hf_ack_type_reserved = -1; -static gint hf_arq_bsn = -1; -static gint hf_arq_num_ack_maps = -1; -static gint hf_arq_selective_map = -1; -static gint hf_arq_seq_format = -1; -static gint hf_arq_0seq_ack_map = -1; -static gint hf_arq_0seq1_len = -1; -static gint hf_arq_0seq2_len = -1; -static gint hf_arq_1seq_ack_map = -1; -static gint hf_arq_1seq1_len = -1; -static gint hf_arq_1seq2_len = -1; -static gint hf_arq_1seq3_len = -1; -static gint hf_arq_reserved = -1; - -static gint hf_arq_discard_cid = -1; -static gint hf_arq_discard_reserved = -1; -static gint hf_arq_discard_bsn = -1; - -static gint hf_arq_reset_cid = -1; -static gint hf_arq_reset_type = -1; -static gint hf_arq_reset_direction = -1; -static gint hf_arq_reset_reserved = -1; +static int hf_arq_cid; +static int hf_arq_last; +static int hf_arq_ack_type; +static int hf_ack_type_reserved; +static int hf_arq_bsn; +static int hf_arq_num_ack_maps; +static int hf_arq_selective_map; +static int hf_arq_seq_format; +static int hf_arq_0seq_ack_map; +static int hf_arq_0seq1_len; +static int hf_arq_0seq2_len; +static int hf_arq_1seq_ack_map; +static int hf_arq_1seq1_len; +static int hf_arq_1seq2_len; +static int hf_arq_1seq3_len; +static int hf_arq_reserved; + +static int hf_arq_discard_cid; +static int hf_arq_discard_reserved; +static int hf_arq_discard_bsn; + +static int hf_arq_reset_cid; +static int hf_arq_reset_type; +static int hf_arq_reset_direction; +static int hf_arq_reset_reserved; /* STRING RESOURCES */ @@ -298,20 +298,20 @@ void proto_register_mac_mgmt_msg_arq_feedback(void) /* Decode ARQ-Feedback messages. */ static int dissect_mac_mgmt_msg_arq_feedback_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint arq_feedback_ie_count = 0; - guint arq_cid; - gboolean arq_last = FALSE; - guint arq_ack_type; - guint arq_bsn; - guint arq_num_ack_maps; - guint tvb_len; + unsigned offset = 0; + unsigned arq_feedback_ie_count = 0; + unsigned arq_cid; + bool arq_last = false; + unsigned arq_ack_type; + unsigned arq_bsn; + unsigned arq_num_ack_maps; + unsigned tvb_len; proto_item *arq_feedback_item; proto_tree *arq_feedback_tree; proto_item *arq_fb_item = NULL; proto_tree *arq_fb_tree = NULL; proto_item *ti = NULL; - guint i, seq_format; + unsigned i, seq_format; { /* we are being asked for details */ @@ -326,10 +326,10 @@ static int dissect_mac_mgmt_msg_arq_feedback_decoder(tvbuff_t *tvb, packet_info { arq_feedback_ie_count++; arq_cid = tvb_get_ntohs(tvb, offset); - arq_last = ((tvb_get_guint8(tvb, offset + 2) & 0x80) != 0); - arq_ack_type = (tvb_get_guint8(tvb, offset + 2) & 0x60) >> 5; + arq_last = ((tvb_get_uint8(tvb, offset + 2) & 0x80) != 0); + arq_ack_type = (tvb_get_uint8(tvb, offset + 2) & 0x60) >> 5; arq_bsn = (tvb_get_ntohs(tvb, offset + 2) & 0x1FFC) >> 2; - arq_num_ack_maps = 1 + (tvb_get_guint8(tvb, offset + 3) & 0x03); + arq_num_ack_maps = 1 + (tvb_get_uint8(tvb, offset + 3) & 0x03); arq_fb_item = proto_tree_add_protocol_format(arq_feedback_tree, proto_mac_mgmt_msg_arq_decoder, tvb, offset, tvb_len, "ARQ_Feedback_IE"); proto_item_append_text(arq_fb_item, ", CID: %u, %s ARQ feedback IE, %s, BSN: %u", @@ -355,7 +355,7 @@ static int dissect_mac_mgmt_msg_arq_feedback_decoder(tvbuff_t *tvb, packet_info proto_tree_add_item(arq_fb_tree, hf_arq_selective_map, tvb, offset, 2, ENC_BIG_ENDIAN); } else { proto_tree_add_item(arq_fb_tree, hf_arq_seq_format, tvb, offset, 1, ENC_BIG_ENDIAN); - seq_format = (tvb_get_guint8(tvb, offset) & 0x80) >> 7; + seq_format = (tvb_get_uint8(tvb, offset) & 0x80) >> 7; if (seq_format == 0) { proto_tree_add_item(arq_fb_tree, hf_arq_0seq_ack_map, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(arq_fb_tree, hf_arq_0seq1_len, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/plugins/epan/wimax/msg_clk_cmp.c b/plugins/epan/wimax/msg_clk_cmp.c index 3fac08db..95411ef0 100644 --- a/plugins/epan/wimax/msg_clk_cmp.c +++ b/plugins/epan/wimax/msg_clk_cmp.c @@ -24,24 +24,24 @@ void proto_reg_handoff_mac_mgmt_msg_clk_cmp(void); static dissector_handle_t clk_cmp_handle; -static gint proto_mac_mgmt_msg_clk_cmp_decoder = -1; +static int proto_mac_mgmt_msg_clk_cmp_decoder; -static gint ett_mac_mgmt_msg_clk_cmp_decoder = -1; +static int ett_mac_mgmt_msg_clk_cmp_decoder; /* CLK_CMP fields */ -static gint hf_clk_cmp_clock_count = -1; -static gint hf_clk_cmp_clock_id = -1; -static gint hf_clk_cmp_seq_number = -1; -static gint hf_clk_cmp_comparison_value = -1; -/* static gint hf_clk_cmp_invalid_tlv = -1; */ +static int hf_clk_cmp_clock_count; +static int hf_clk_cmp_clock_id; +static int hf_clk_cmp_seq_number; +static int hf_clk_cmp_comparison_value; +/* static int hf_clk_cmp_invalid_tlv; */ /* Decode CLK_CMP messages. */ static int dissect_mac_mgmt_msg_clk_cmp_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint i; - guint clock_count; + unsigned offset = 0; + unsigned i; + unsigned clock_count; proto_item *clk_cmp_item; proto_tree *clk_cmp_tree; @@ -51,7 +51,7 @@ static int dissect_mac_mgmt_msg_clk_cmp_decoder(tvbuff_t *tvb, packet_info *pinf /* add MAC CLK_CMP subtree */ clk_cmp_tree = proto_item_add_subtree(clk_cmp_item, ett_mac_mgmt_msg_clk_cmp_decoder); /* get the clock count */ - clock_count = tvb_get_guint8(tvb, offset); + clock_count = tvb_get_uint8(tvb, offset); /* display the clock count */ proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_clock_count, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for clock comparison */ @@ -114,7 +114,7 @@ void proto_register_mac_mgmt_msg_clk_cmp(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_clk_cmp_decoder, }; diff --git a/plugins/epan/wimax/msg_dcd.c b/plugins/epan/wimax/msg_dcd.c index 167e0742..787cd0af 100644 --- a/plugins/epan/wimax/msg_dcd.c +++ b/plugins/epan/wimax/msg_dcd.c @@ -21,102 +21,103 @@ */ #include <epan/packet.h> +#include <epan/unit_strings.h> + +#include <wsutil/array.h> #include "wimax_tlv.h" #include "wimax_mac.h" #include "wimax_utils.h" - -/* Delete the following variable as soon as possible */ -extern gboolean include_cor2_changes; +#include "wimax_prefs.h" void proto_register_mac_mgmt_msg_dcd(void); void proto_reg_handoff_mac_mgmt_msg_dcd(void); static dissector_handle_t dcd_handle; -static gint proto_mac_mgmt_msg_dcd_decoder = -1; -static gint ett_mac_mgmt_msg_dcd_decoder = -1; +static int proto_mac_mgmt_msg_dcd_decoder; +static int ett_mac_mgmt_msg_dcd_decoder; /* fix fields */ -static gint hf_dcd_downlink_channel_id = -1; -static gint hf_dcd_config_change_count = -1; -static gint hf_dcd_dl_burst_profile_rsv = -1; -static gint hf_dcd_dl_burst_profile_diuc = -1; +static int hf_dcd_downlink_channel_id; +static int hf_dcd_config_change_count; +static int hf_dcd_dl_burst_profile_rsv; +static int hf_dcd_dl_burst_profile_diuc; -static gint hf_dcd_bs_eirp = -1; -static gint hf_dcd_frame_duration = -1; -static gint hf_dcd_phy_type = -1; -static gint hf_dcd_power_adjustment = -1; -static gint hf_dcd_channel_nr = -1; -static gint hf_dcd_ttg = -1; -static gint hf_dcd_rtg = -1; +static int hf_dcd_bs_eirp; +static int hf_dcd_frame_duration; +static int hf_dcd_phy_type; +static int hf_dcd_power_adjustment; +static int hf_dcd_channel_nr; +static int hf_dcd_ttg; +static int hf_dcd_rtg; #ifdef WIMAX_16D_2004 -static gint hf_dcd_rss = -1; +static int hf_dcd_rss; #endif -static gint hf_dcd_channel_switch_frame_nr = -1; -static gint hf_dcd_frequency = -1; -static gint hf_dcd_bs_id = -1; -static gint hf_dcd_frame_duration_code = -1; -static gint hf_dcd_frame_nr = -1; +static int hf_dcd_channel_switch_frame_nr; +static int hf_dcd_frequency; +static int hf_dcd_bs_id; +static int hf_dcd_frame_duration_code; +static int hf_dcd_frame_nr; #ifdef WIMAX_16D_2004 -static gint hf_dcd_size_cqich_id = -1; -static gint hf_dcd_h_arq_ack_delay_dl = -1; +static int hf_dcd_size_cqich_id; +static int hf_dcd_h_arq_ack_delay_dl; #else -static gint hf_dcd_h_arq_ack_delay_ul = -1; +static int hf_dcd_h_arq_ack_delay_ul; #endif -static gint hf_dcd_mac_version = -1; -static gint hf_dcd_restart_count = -1; +static int hf_dcd_mac_version; +static int hf_dcd_restart_count; -/* static gint hf_dl_burst_reserved = -1; */ -/* static gint hf_dl_burst_diuc = -1; */ -static gint hf_dcd_burst_freq = -1; -static gint hf_dcd_burst_fec = -1; -static gint hf_dcd_burst_diuc_exit_threshold = -1; -static gint hf_dcd_burst_diuc_entry_threshold = -1; -static gint hf_dcd_burst_tcs = -1; -static gint hf_dcd_tlv_t_19_permutation_type_for_broadcast_regions_in_harq_zone = -1; -static gint hf_dcd_tlv_t_20_maximum_retransmission = -1; -static gint hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter = -1; -static gint hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_physical_cinr_measurements = -1; -static gint hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_rssi_measurements = -1; -static gint hf_dcd_tlv_t_22_dl_amc_allocated_physical_bands_bitmap = -1; +/* static int hf_dl_burst_reserved; */ +/* static int hf_dl_burst_diuc; */ +static int hf_dcd_burst_freq; +static int hf_dcd_burst_fec; +static int hf_dcd_burst_diuc_exit_threshold; +static int hf_dcd_burst_diuc_entry_threshold; +static int hf_dcd_burst_tcs; +static int hf_dcd_tlv_t_19_permutation_type_for_broadcast_regions_in_harq_zone; +static int hf_dcd_tlv_t_20_maximum_retransmission; +static int hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter; +static int hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_physical_cinr_measurements; +static int hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_rssi_measurements; +static int hf_dcd_tlv_t_22_dl_amc_allocated_physical_bands_bitmap; -static gint hf_dcd_tlv_t_34_dl_region_definition = -1; -static gint hf_dcd_tlv_t_34_dl_region_definition_num_region = -1; -static gint hf_dcd_tlv_t_34_dl_region_definition_reserved = -1; -static gint hf_dcd_tlv_t_34_dl_region_definition_symbol_offset = -1; -static gint hf_dcd_eirxp = -1; -static gint hf_dcd_tlv_t_34_dl_region_definition_subchannel_offset = -1; -static gint hf_dcd_tlv_t_34_dl_region_definition_num_symbols = -1; -static gint hf_dcd_tlv_t_34_dl_region_definition_num_subchannels = -1; -static gint hf_dcd_tlv_t_50_ho_type_support = -1; -static gint hf_dcd_tlv_t_50_ho_type_support_ho = -1; -static gint hf_dcd_tlv_t_50_ho_type_support_mdho = -1; -static gint hf_dcd_tlv_t_50_ho_type_support_fbss_ho = -1; -static gint hf_dcd_tlv_t_50_ho_type_support_reserved = -1; -static gint hf_dcd_tlv_t_31_h_add_threshold = -1; -static gint hf_dcd_tlv_t_45_paging_interval_length = -1; -static gint hf_dcd_tlv_t_45_paging_interval_reserved = -1; -static gint hf_dcd_tlv_t_32_h_delete_threshold = -1; -static gint hf_dcd_tlv_t_33_asr = -1; -static gint hf_dcd_tlv_t_33_asr_m = -1; -static gint hf_dcd_tlv_t_33_asr_l = -1; -static gint hf_dcd_tlv_t_35_paging_group_id = -1; -static gint hf_dcd_tlv_t_36_tusc1_permutation_active_subchannels_bitmap = -1; -static gint hf_dcd_tlv_t_37_tusc2_permutation_active_subchannels_bitmap = -1; -static gint hf_dcd_tlv_t_51_hysteresis_margin = -1; -static gint hf_dcd_tlv_t_52_time_to_trigger_duration = -1; -static gint hf_dcd_tlv_t_60_noise_interference = -1; -static gint hf_dcd_tlv_t_153_downlink_burst_profile_for_mutiple_fec_types = -1; +static int hf_dcd_tlv_t_34_dl_region_definition; +static int hf_dcd_tlv_t_34_dl_region_definition_num_region; +static int hf_dcd_tlv_t_34_dl_region_definition_reserved; +static int hf_dcd_tlv_t_34_dl_region_definition_symbol_offset; +static int hf_dcd_eirxp; +static int hf_dcd_tlv_t_34_dl_region_definition_subchannel_offset; +static int hf_dcd_tlv_t_34_dl_region_definition_num_symbols; +static int hf_dcd_tlv_t_34_dl_region_definition_num_subchannels; +static int hf_dcd_tlv_t_50_ho_type_support; +static int hf_dcd_tlv_t_50_ho_type_support_ho; +static int hf_dcd_tlv_t_50_ho_type_support_mdho; +static int hf_dcd_tlv_t_50_ho_type_support_fbss_ho; +static int hf_dcd_tlv_t_50_ho_type_support_reserved; +static int hf_dcd_tlv_t_31_h_add_threshold; +static int hf_dcd_tlv_t_45_paging_interval_length; +static int hf_dcd_tlv_t_45_paging_interval_reserved; +static int hf_dcd_tlv_t_32_h_delete_threshold; +static int hf_dcd_tlv_t_33_asr; +static int hf_dcd_tlv_t_33_asr_m; +static int hf_dcd_tlv_t_33_asr_l; +static int hf_dcd_tlv_t_35_paging_group_id; +static int hf_dcd_tlv_t_36_tusc1_permutation_active_subchannels_bitmap; +static int hf_dcd_tlv_t_37_tusc2_permutation_active_subchannels_bitmap; +static int hf_dcd_tlv_t_51_hysteresis_margin; +static int hf_dcd_tlv_t_52_time_to_trigger_duration; +static int hf_dcd_tlv_t_60_noise_interference; +static int hf_dcd_tlv_t_153_downlink_burst_profile_for_mutiple_fec_types; -static gint hf_dcd_tlv_t_541_type_function_action = -1; -static gint hf_dcd_tlv_t_541_type = -1; -static gint hf_dcd_tlv_t_541_function = -1; -static gint hf_dcd_tlv_t_541_action = -1; -static gint hf_dcd_tlv_t_542_trigger_value = -1; -static gint hf_dcd_tlv_t_543_trigger_averaging_duration = -1; +static int hf_dcd_tlv_t_541_type_function_action; +static int hf_dcd_tlv_t_541_type; +static int hf_dcd_tlv_t_541_function; +static int hf_dcd_tlv_t_541_action; +static int hf_dcd_tlv_t_542_trigger_value; +static int hf_dcd_tlv_t_543_trigger_averaging_duration; -static gint hf_dcd_unknown_type = -1; -static gint hf_dcd_invalid_tlv = -1; +static int hf_dcd_unknown_type; +static int hf_dcd_invalid_tlv; /* DCD DIUC messages (table 143) */ static const value_string diuc_msgs[] = @@ -332,14 +333,14 @@ static const value_string tfs_support[] = /* WiMax MAC Management DCD message (table 15) dissector */ static int dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len, length; - gint tlv_type, tlv_len, tlv_offset, tlv_value_offset; - guint dl_burst_diuc, dl_num_regions; + unsigned offset = 0; + unsigned tvb_len, length; + int tlv_type, tlv_len, tlv_offset, tlv_value_offset; + unsigned dl_burst_diuc, dl_num_regions; proto_item *dcd_item, *tlv_item, *sub_item; proto_tree *dcd_tree, *tlv_tree, *sub_tree; tlv_info_t tlv_info; - gchar* proto_str; + char* proto_str; { /* we are being asked for details */ /* Get the tvb reported length */ @@ -385,7 +386,7 @@ static int dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, p case DCD_DOWNLINK_BURST_PROFILE: { /* Downlink Burst Profile TLV (table 363)*/ /* get the DIUC */ - dl_burst_diuc = (tvb_get_guint8(tvb, offset) & 0x0F); + dl_burst_diuc = (tvb_get_uint8(tvb, offset) & 0x0F); /* display TLV info */ /* add TLV subtree */ proto_str = wmem_strdup_printf(pinfo->pool, "Downlink_Burst_Profile (DIUC=%u)", dl_burst_diuc); @@ -564,7 +565,7 @@ static int dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, p { tlv_item = add_tlv_subtree(&tlv_info, dcd_tree, hf_dcd_tlv_t_34_dl_region_definition, tvb, offset-tlv_value_offset, ENC_NA); tlv_tree = proto_item_add_subtree(tlv_item, ett_mac_mgmt_msg_dcd_decoder); - dl_num_regions = tvb_get_guint8(tvb, offset); + dl_num_regions = tvb_get_uint8(tvb, offset); proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_num_region, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); tlv_offset = offset; @@ -727,21 +728,21 @@ void proto_register_mac_mgmt_msg_dcd(void) &hf_dcd_tlv_t_33_asr_l, { "ASR Switching Period (L)", "wmx.dcd.asr.l", - FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_frame_frames, 0x0f, NULL, HFILL + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_frame_frames), 0x0f, NULL, HFILL } }, { &hf_dcd_tlv_t_33_asr_m, { "ASR Slot Length (M)", "wmx.dcd.asr.m", - FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_frame_frames, 0xf0, NULL, HFILL + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_frame_frames), 0xf0, NULL, HFILL } }, { &hf_dcd_bs_eirp, { "BS EIRP", "wmx.dcd.bs_eirp", - FT_INT16, BASE_DEC|BASE_UNIT_STRING, &wimax_units_dbm, 0x00, NULL, HFILL + FT_INT16, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_dbm), 0x00, NULL, HFILL } }, { @@ -792,7 +793,7 @@ void proto_register_mac_mgmt_msg_dcd(void) &hf_dcd_burst_freq, { "Frequency", "wmx.dcd.burst.freq", - FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_khz, 0x00, NULL, HFILL + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_khz), 0x00, NULL, HFILL } }, #if 0 @@ -935,7 +936,7 @@ void proto_register_mac_mgmt_msg_dcd(void) &hf_dcd_eirxp, { "EIRXP (IR, max)", "wmx.dcd.eirxp", - FT_INT16, BASE_DEC|BASE_UNIT_STRING, &wimax_units_dbm, 0x00, NULL, HFILL + FT_INT16, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_dbm), 0x00, NULL, HFILL } }, #endif @@ -964,14 +965,14 @@ void proto_register_mac_mgmt_msg_dcd(void) &hf_dcd_frequency, { "Downlink Center Frequency", "wmx.dcd.frequency", - FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &wimax_units_khz, 0x00, NULL, HFILL + FT_UINT32, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_khz), 0x00, NULL, HFILL } }, { &hf_dcd_tlv_t_31_h_add_threshold, { "H_add Threshold", "wmx.dcd.h_add_threshold", - FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_db, 0x0, NULL, HFILL + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_db), 0x0, NULL, HFILL } }, #ifdef WIMAX_16D_2004 @@ -979,7 +980,7 @@ void proto_register_mac_mgmt_msg_dcd(void) &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 + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_frame_offset), 0x00, "", HFILL } }, #else @@ -987,7 +988,7 @@ void proto_register_mac_mgmt_msg_dcd(void) &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 + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_frame_offset), 0x00, NULL, HFILL } }, #endif @@ -995,7 +996,7 @@ void proto_register_mac_mgmt_msg_dcd(void) &hf_dcd_tlv_t_32_h_delete_threshold, { "H_delete Threshold", "wmx.dcd.h_delete_threshold", - FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_db, 0x0, NULL, HFILL + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_db), 0x0, NULL, HFILL } }, { @@ -1037,7 +1038,7 @@ void proto_register_mac_mgmt_msg_dcd(void) &hf_dcd_tlv_t_51_hysteresis_margin, { "Hysteresis Margin", "wmx.dcd.hysteresis_margin", - FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_db, 0x0, NULL, HFILL + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_db), 0x0, NULL, HFILL } }, { @@ -1129,7 +1130,7 @@ void proto_register_mac_mgmt_msg_dcd(void) &hf_dcd_rss, { "RSS (IR, max)", "wmx.dcd.rss", - FT_INT16, BASE_DEC|BASE_UNIT_STRING, &wimax_units_dbm, 0x00, "", HFILL + FT_INT16, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_dbm), 0x00, "", HFILL } }, #endif @@ -1137,7 +1138,7 @@ void proto_register_mac_mgmt_msg_dcd(void) &hf_dcd_rtg, { "RTG", "wmx.dcd.rtg", - FT_UINT8, BASE_HEX|BASE_UNIT_STRING, &wimax_units_ps, 0x00, NULL, HFILL + FT_UINT8, BASE_HEX|BASE_UNIT_STRING, UNS(&wimax_units_ps), 0x00, NULL, HFILL } }, #ifdef WIMAX_16D_2004 @@ -1160,7 +1161,7 @@ void proto_register_mac_mgmt_msg_dcd(void) &hf_dcd_tlv_t_52_time_to_trigger_duration, { "Time to Trigger Duration", "wmx.dcd.time_trigger_duration", - FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_ms, 0x0, NULL, HFILL + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_ms), 0x0, NULL, HFILL } }, { @@ -1181,7 +1182,7 @@ void proto_register_mac_mgmt_msg_dcd(void) &hf_dcd_ttg, { "TTG", "wmx.dcd.ttg", - FT_UINT16, BASE_HEX|BASE_UNIT_STRING, &wimax_units_ps, 0x00, NULL, HFILL + FT_UINT16, BASE_HEX|BASE_UNIT_STRING, UNS(&wimax_units_ps), 0x00, NULL, HFILL } }, { @@ -1222,7 +1223,7 @@ void proto_register_mac_mgmt_msg_dcd(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_dcd_decoder, }; diff --git a/plugins/epan/wimax/msg_dlmap.c b/plugins/epan/wimax/msg_dlmap.c index 4df5f213..aba33af5 100644 --- a/plugins/epan/wimax/msg_dlmap.c +++ b/plugins/epan/wimax/msg_dlmap.c @@ -22,8 +22,7 @@ #include "crc.h" #include "wimax_bits.h" #include "wimax_utils.h" - -extern gboolean include_cor2_changes; +#include "wimax_prefs.h" void proto_register_mac_mgmt_msg_dlmap(void); void proto_reg_handoff_mac_mgmt_msg_dlmap(void); @@ -56,67 +55,67 @@ static dissector_handle_t dlmap_handle; nib += nibs; \ } while(0) -gint harq = 0; /* 1 if HARQ enabled (TODO) */ -gint fusc = 0; /* 1 if current zone permutation is FUSC or optional FUSC (TODO) */ -gint tusc = 0; /* 1 if current zone permutation is AMC, TUSC1 or TUSC2 (TODO) */ -gint ir_type = 0; /* reduced AAS map (TODO) */ -gint RCID_Type = 0; -gint N_layer = 0; -gint STC_Zone_Dedicated_Pilots = 0; -gint STC_Zone_Matrix = 0; -gint INC_CID = 0; -gint sub_dl_ul_map = 0; - -static gint proto_mac_mgmt_msg_dlmap_decoder = -1; - -static gint ett_dlmap = -1; -static gint ett_dlmap_ie = -1; -/* static gint ett_dlmap_c_ie = -1; */ -static gint ett_109x = -1; /* SUB-DL-UL-MAP */ -static gint ett_109x_dl = -1; -static gint ett_109x_ul = -1; -static gint ett_275_phy = -1; -static gint ett_275_1 = -1; -static gint ett_277 = -1; -static gint ett_277b = -1; -static gint ett_278 = -1; -static gint ett_279 = -1; -static gint ett_280 = -1; -static gint ett_281 = -1; -static gint ett_282 = -1; -static gint ett_283 = -1; -static gint ett_284 = -1; -static gint ett_285 = -1; -static gint ett_286 = -1; -static gint ett_286a = -1; -static gint ett_286b = -1; -static gint ett_286c = -1; -static gint ett_286d = -1; -static gint ett_286e = -1; -static gint ett_286f = -1; -static gint ett_286g = -1; -static gint ett_286h = -1; -static gint ett_286i = -1; -static gint ett_286j = -1; -static gint ett_286k = -1; -static gint ett_286l = -1; -static gint ett_286m = -1; -static gint ett_286n = -1; -static gint ett_286o = -1; -static gint ett_286p = -1; -static gint ett_286q = -1; -static gint ett_286r = -1; -static gint ett_286s = -1; -static gint ett_286t = -1; -static gint ett_286u = -1; -static gint ett_286v = -1; -static gint ett_286w = -1; -static gint ett_286x = -1; -static gint ett_286y = -1; -static gint ett_286z = -1; -static gint ett_305 = -1; -/* static gint ett_305_dl = -1; */ -static gint ett_308a = -1; +int harq; /* 1 if HARQ enabled (TODO) */ +int fusc; /* 1 if current zone permutation is FUSC or optional FUSC (TODO) */ +int tusc; /* 1 if current zone permutation is AMC, TUSC1 or TUSC2 (TODO) */ +int ir_type; /* reduced AAS map (TODO) */ +int RCID_Type; +int N_layer; +int STC_Zone_Dedicated_Pilots; +int STC_Zone_Matrix; +int INC_CID; +int sub_dl_ul_map; + +static int proto_mac_mgmt_msg_dlmap_decoder; + +static int ett_dlmap; +static int ett_dlmap_ie; +/* static int ett_dlmap_c_ie; */ +static int ett_109x; /* SUB-DL-UL-MAP */ +static int ett_109x_dl; +static int ett_109x_ul; +static int ett_275_phy; +static int ett_275_1; +static int ett_277; +static int ett_277b; +static int ett_278; +static int ett_279; +static int ett_280; +static int ett_281; +static int ett_282; +static int ett_283; +static int ett_284; +static int ett_285; +static int ett_286; +static int ett_286a; +static int ett_286b; +static int ett_286c; +static int ett_286d; +static int ett_286e; +static int ett_286f; +static int ett_286g; +static int ett_286h; +static int ett_286i; +static int ett_286j; +static int ett_286k; +static int ett_286l; +static int ett_286m; +static int ett_286n; +static int ett_286o; +static int ett_286p; +static int ett_286q; +static int ett_286r; +static int ett_286s; +static int ett_286t; +static int ett_286u; +static int ett_286v; +static int ett_286w; +static int ett_286x; +static int ett_286y; +static int ett_286z; +static int ett_305; +/* static int ett_305_dl; */ +static int ett_308a; #define DCD_DOWNLINK_BURST_PROFILE 1 #define DCD_BS_EIRP 2 @@ -234,368 +233,368 @@ static const value_string frames_per_second[] = }; /* dl-map fields */ -static gint hf_dlmap_phy_fdur = -1; -static gint hf_dlmap_phy_fdur_ms = -1; -static gint hf_dlmap_phy_fdur_per_sec = -1; -static gint hf_dlmap_phy_fnum = -1; -/* static gint hf_dlmap_fch_expected = -1; */ -static gint hf_dlmap_dcd = -1; -static gint hf_dlmap_bsid = -1; -static gint hf_dlmap_ofdma_sym = -1; -/* static gint hf_dlmap_ie = -1; */ -static gint hf_dlmap_ie_diuc = -1; -static gint hf_dlmap_ie_reserved_extended2_duic = -1; -static gint hf_dlmap_ie_reserved_extended_duic = -1; -static gint hf_dlmap_ie_diuc_ext = -1; -static gint hf_dlmap_ie_diuc_ext2 = -1; -static gint hf_dlmap_ie_length = -1; -static gint hf_dlmap_ie_bitmap = -1; -static gint hf_dlmap_ie_bitmap_cqi = -1; -static gint hf_dlmap_ie_bitmap_pusc = -1; -static gint hf_dlmap_ie_bitmap_opt_pusc = -1; -static gint hf_dlmap_ie_bitmap_amc = -1; -static gint hf_dlmap_ie_bitmap_aas = -1; -static gint hf_dlmap_ie_bitmap_periodic_ranging = -1; -static gint hf_dlmap_ie_bitmap_sounding = -1; -static gint hf_dlmap_ie_bitmap_mimo = -1; -static gint hf_dlmap_ie_ncid = -1; -static gint hf_dlmap_ie_cid = -1; -static gint hf_dlmap_ie_offsym = -1; -static gint hf_dlmap_ie_offsub = -1; -static gint hf_dlmap_ie_boosting = -1; -static gint hf_dlmap_ie_numsym = -1; -static gint hf_dlmap_ie_numsub = -1; -static gint hf_dlmap_ie_rep = -1; -static gint hf_dlmap_ie_offsym2 = -1; -static gint hf_dlmap_ie_offsub2 = -1; -static gint hf_dlmap_ie_boosting2 = -1; -static gint hf_dlmap_ie_numsym2 = -1; -static gint hf_dlmap_ie_numsub2 = -1; -static gint hf_dlmap_ie_rep2 = -1; - -/* static gint hf_dlmap_xie_diuc = -1; */ -/* static gint hf_dlmap_xie_len = -1; */ - -static gint hf_dlmapc_compr = -1; -static gint hf_dlmapc_ulmap = -1; -static gint hf_dlmapc_rsv = -1; -static gint hf_dlmapc_len = -1; -/* static gint hf_dlmapc_sync = -1; */ -static gint hf_dlmapc_opid = -1; -static gint hf_dlmapc_secid = -1; -static gint hf_dlmapc_count = -1; +static int hf_dlmap_phy_fdur; +static int hf_dlmap_phy_fdur_ms; +static int hf_dlmap_phy_fdur_per_sec; +static int hf_dlmap_phy_fnum; +/* static int hf_dlmap_fch_expected; */ +static int hf_dlmap_dcd; +static int hf_dlmap_bsid; +static int hf_dlmap_ofdma_sym; +/* static int hf_dlmap_ie; */ +static int hf_dlmap_ie_diuc; +static int hf_dlmap_ie_reserved_extended2_duic; +static int hf_dlmap_ie_reserved_extended_duic; +static int hf_dlmap_ie_diuc_ext; +static int hf_dlmap_ie_diuc_ext2; +static int hf_dlmap_ie_length; +static int hf_dlmap_ie_bitmap; +static int hf_dlmap_ie_bitmap_cqi; +static int hf_dlmap_ie_bitmap_pusc; +static int hf_dlmap_ie_bitmap_opt_pusc; +static int hf_dlmap_ie_bitmap_amc; +static int hf_dlmap_ie_bitmap_aas; +static int hf_dlmap_ie_bitmap_periodic_ranging; +static int hf_dlmap_ie_bitmap_sounding; +static int hf_dlmap_ie_bitmap_mimo; +static int hf_dlmap_ie_ncid; +static int hf_dlmap_ie_cid; +static int hf_dlmap_ie_offsym; +static int hf_dlmap_ie_offsub; +static int hf_dlmap_ie_boosting; +static int hf_dlmap_ie_numsym; +static int hf_dlmap_ie_numsub; +static int hf_dlmap_ie_rep; +static int hf_dlmap_ie_offsym2; +static int hf_dlmap_ie_offsub2; +static int hf_dlmap_ie_boosting2; +static int hf_dlmap_ie_numsym2; +static int hf_dlmap_ie_numsub2; +static int hf_dlmap_ie_rep2; + +/* static int hf_dlmap_xie_diuc; */ +/* static int hf_dlmap_xie_len; */ + +static int hf_dlmapc_compr; +static int hf_dlmapc_ulmap; +static int hf_dlmapc_rsv; +static int hf_dlmapc_len; +/* static int hf_dlmapc_sync; */ +static int hf_dlmapc_opid; +static int hf_dlmapc_secid; +static int hf_dlmapc_count; #if 0 -static gint hf_109x_cmi = -1; -static gint hf_109x_len = -1; -static gint hf_109x_rcid = -1; -static gint hf_109x_haoi = -1; -static gint hf_109x_dl = -1; -static gint hf_109x_ul = -1; -static gint hf_109x_dlie = -1; -static gint hf_109x_symofs = -1; -static gint hf_109x_subofs = -1; -static gint hf_109x_rsv = -1; +static int hf_109x_cmi; +static int hf_109x_len; +static int hf_109x_rcid; +static int hf_109x_haoi; +static int hf_109x_dl; +static int hf_109x_ul; +static int hf_109x_dlie; +static int hf_109x_symofs; +static int hf_109x_subofs; +static int hf_109x_rsv; #endif -static gint hf_308a_cmi = -1; -static gint hf_308a_ulmap = -1; -static gint hf_308a_type = -1; -static gint hf_308a_mult = -1; -static gint hf_308a_rsv = -1; -static gint hf_mac_header_compress_dlmap_crc = -1; -static gint hf_mac_header_compress_dlmap_crc_status = -1; -static gint hf_crc16 = -1; -static gint hf_crc16_status = -1; -static gint hf_padding = -1; -static gint hf_cid_mask = -1; -static gint hf_reserved = -1; +static int hf_308a_cmi; +static int hf_308a_ulmap; +static int hf_308a_type; +static int hf_308a_mult; +static int hf_308a_rsv; +static int hf_mac_header_compress_dlmap_crc; +static int hf_mac_header_compress_dlmap_crc_status; +static int hf_crc16; +static int hf_crc16_status; +static int hf_padding; +static int hf_cid_mask; +static int hf_reserved; /* Generated via "one time" script to help create filterable fields */ -static int hf_dlmap_rcid_ie_cid = -1; -static int hf_dlmap_rcid_ie_prefix = -1; -static int hf_dlmap_rcid_ie_cid11 = -1; -static int hf_dlmap_rcid_ie_cid7 = -1; -static int hf_dlmap_rcid_ie_cid3 = -1; -static int hf_dlmap_dedicated_dl_control_length = -1; -static int hf_dlmap_dedicated_dl_control_control_header = -1; -static int hf_dlmap_dedicated_dl_control_num_sdma_layers = -1; -static int hf_dlmap_dedicated_mimo_dl_control_length = -1; -static int hf_dlmap_dedicated_mimo_dl_control_control_header_mimo_control_info = -1; -static int hf_dlmap_dedicated_mimo_dl_control_control_header_cqi_control_info = -1; -static int hf_dlmap_dedicated_mimo_dl_control_control_header_closed_mimo_control_info = -1; -static int hf_dlmap_dedicated_mimo_dl_control_n_layer = -1; -static int hf_dlmap_dedicated_mimo_dl_control_matrix = -1; -static int hf_dlmap_dedicated_mimo_dl_control_num_beamformed_streams = -1; -static int hf_dlmap_dedicated_mimo_dl_control_period = -1; -static int hf_dlmap_dedicated_mimo_dl_control_frame_offset = -1; -static int hf_dlmap_dedicated_mimo_dl_control_duration = -1; -static int hf_dlmap_dedicated_mimo_dl_control_allocation_index = -1; -static int hf_dlmap_dedicated_mimo_dl_control_cqich_num = -1; -static int hf_dlmap_dedicated_mimo_dl_control_feedback_type = -1; -static int hf_dlmap_dedicated_mimo_dl_control_antenna_grouping_index = -1; -static int hf_dlmap_dedicated_mimo_dl_control_num_stream = -1; -static int hf_dlmap_dedicated_mimo_dl_control_antenna_selection_index = -1; -static int hf_dlmap_dedicated_mimo_dl_control_codebook_precoding_index = -1; -static int hf_dlmap_n_sub_burst_isi = -1; -static int hf_dlmap_harq_chase_n_ack_channel = -1; -static int hf_dlmap_harq_chase_duration = -1; -static int hf_dlmap_harq_chase_sub_burst_diuc_indicator = -1; -static int hf_dlmap_reserved_uint = -1; -static int hf_dlmap_harq_chase_diuc = -1; -static int hf_dlmap_harq_chase_repetition_coding_indication = -1; -static int hf_dlmap_harq_chase_acid = -1; -static int hf_dlmap_harq_chase_ai_sn = -1; -static int hf_dlmap_harq_chase_ack_disable = -1; -static int hf_dlmap_harq_chase_dedicated_dl_control_indicator = -1; -static int hf_dlmap_harq_chase_allocation_index = -1; -static int hf_dlmap_harq_chase_period = -1; -static int hf_dlmap_harq_chase_frame_offset = -1; -static int hf_dlmap_harq_ir_ctc_n_ack_channel = -1; -static int hf_dlmap_harq_ir_ctc_nep = -1; -static int hf_dlmap_harq_ir_ctc_nsch = -1; -static int hf_dlmap_harq_ir_ctc_spid = -1; -static int hf_dlmap_harq_ir_ctc_acid = -1; -static int hf_dlmap_harq_ir_ctc_ai_sn = -1; -static int hf_dlmap_harq_ir_ctc_ack_disable = -1; -static int hf_dlmap_harq_ir_ctc_dedicated_dl_control_indicator = -1; -static int hf_dlmap_harq_ir_ctc_duration = -1; -static int hf_dlmap_harq_ir_ctc_allocation_index = -1; -static int hf_dlmap_harq_ir_ctc_period = -1; -static int hf_dlmap_harq_ir_ctc_frame_offset = -1; -static int hf_dlmap_harq_ir_cc_n_ack_channel = -1; -static int hf_dlmap_harq_ir_cc_duration = -1; -static int hf_dlmap_harq_ir_cc_sub_burst_diuc_indicator = -1; -static int hf_dlmap_harq_ir_cc_diuc = -1; -static int hf_dlmap_harq_ir_cc_repetition_coding_indication = -1; -static int hf_dlmap_harq_ir_cc_acid = -1; -static int hf_dlmap_harq_ir_cc_ai_sn = -1; -static int hf_dlmap_harq_ir_cc_spid = -1; -static int hf_dlmap_harq_ir_cc_ack_disable = -1; -static int hf_dlmap_harq_ir_cc_dedicated_dl_control_indicator = -1; -static int hf_dlmap_harq_ir_cc_allocation_index = -1; -static int hf_dlmap_harq_ir_cc_period = -1; -static int hf_dlmap_harq_ir_cc_frame_offset = -1; -static int hf_dlmap_mimo_dl_chase_harq_n_ack_channel = -1; -static int hf_dlmap_mimo_dl_chase_harq_mu_indicator = -1; -static int hf_dlmap_mimo_dl_chase_harq_dedicated_mimo_dl_control_indicator = -1; -static int hf_dlmap_mimo_dl_chase_harq_ack_disable = -1; -static int hf_dlmap_mimo_dl_chase_harq_duration = -1; -static int hf_dlmap_mimo_dl_chase_harq_diuc = -1; -static int hf_dlmap_mimo_dl_chase_harq_repetition_coding_indication = -1; -static int hf_dlmap_mimo_dl_chase_harq_acid = -1; -static int hf_dlmap_mimo_dl_chase_harq_ai_sn = -1; -static int hf_dlmap_mimo_dl_ir_harq_n_ack_channel = -1; -static int hf_dlmap_mimo_dl_ir_harq_mu_indicator = -1; -static int hf_dlmap_mimo_dl_ir_harq_dedicated_mimo_dl_control_indicator = -1; -static int hf_dlmap_mimo_dl_ir_harq_ack_disable = -1; -static int hf_dlmap_mimo_dl_ir_harq_nsch = -1; -static int hf_dlmap_mimo_dl_ir_harq_nep = -1; -static int hf_dlmap_mimo_dl_ir_harq_spid = -1; -static int hf_dlmap_mimo_dl_ir_harq_acid = -1; -static int hf_dlmap_mimo_dl_ir_harq_ai_sn = -1; -static int hf_dlmap_mimo_dl_ir_harq_cc_n_ack_channel = -1; -static int hf_dlmap_mimo_dl_ir_harq_cc_mu_indicator = -1; -static int hf_dlmap_mimo_dl_ir_harq_cc_dedicated_mimo_dl_control_indicator = -1; -static int hf_dlmap_mimo_dl_ir_harq_cc_ack_disable = -1; -static int hf_dlmap_mimo_dl_ir_harq_cc_duration = -1; -static int hf_dlmap_mimo_dl_ir_harq_cc_diuc = -1; -static int hf_dlmap_mimo_dl_ir_harq_cc_repetition_coding_indication = -1; -static int hf_dlmap_mimo_dl_ir_harq_cc_acid = -1; -static int hf_dlmap_mimo_dl_ir_harq_cc_ai_sn = -1; -static int hf_dlmap_mimo_dl_ir_harq_cc_spid = -1; -static int hf_dlmap_mimo_dl_stc_harq_n_ack_channel = -1; -static int hf_dlmap_mimo_dl_stc_harq_tx_count = -1; -static int hf_dlmap_mimo_dl_stc_harq_duration = -1; -static int hf_dlmap_mimo_dl_stc_harq_sub_burst_offset_indication = -1; -static int hf_dlmap_mimo_dl_stc_harq_sub_burst_offset = -1; -static int hf_dlmap_mimo_dl_stc_harq_ack_disable = -1; -static int hf_dlmap_mimo_dl_stc_harq_dedicated_mimo_dl_control_indicator = -1; -static int hf_dlmap_mimo_dl_stc_harq_diuc = -1; -static int hf_dlmap_mimo_dl_stc_harq_repetition_coding_indication = -1; -static int hf_dlmap_mimo_dl_stc_harq_acid = -1; -static int hf_dlmap_mbs_map_extended_2_diuc = -1; -static int hf_dlmap_mbs_map_mbs_zone_identifier = -1; -static int hf_dlmap_mbs_map_macro_diversity_enhanced = -1; -static int hf_dlmap_mbs_map_permutation = -1; -static int hf_dlmap_mbs_map_dl_permbase = -1; -static int hf_dlmap_mbs_map_prbs_id = -1; -static int hf_dlmap_mbs_map_ofdma_symbol_offset = -1; -static int hf_dlmap_mbs_map_diuc_change_indication = -1; -static int hf_dlmap_mbs_map_boosting = -1; -static int hf_dlmap_mbs_map_diuc = -1; -static int hf_dlmap_mbs_map_num_subchannels = -1; -static int hf_dlmap_mbs_map_num_ofdma_symbols = -1; -static int hf_dlmap_mbs_map_repetition_coding_indication = -1; -static int hf_dlmap_mbs_map_cid = -1; -static int hf_dlmap_mbs_map_ofdma_symbols_offset = -1; -static int hf_dlmap_mbs_map_subchannel_offset = -1; -static int hf_dlmap_mbs_map_slc_3_indication = -1; -static int hf_dlmap_mbs_map_next_mbs_map_ie_frame_offset = -1; -static int hf_dlmap_skip_extended_2_diuc = -1; -static int hf_dlmap_skip_mode = -1; -static int hf_dlmap_harq_dl_map_extended_2_diuc = -1; -static int hf_dlmap_harq_dl_map_rcid_type = -1; -static int hf_dlmap_harq_dl_map_boosting = -1; -static int hf_dlmap_harq_dl_map_region_id_use_indicator = -1; -static int hf_dlmap_harq_dl_map_ofdma_symbol_offset = -1; -static int hf_dlmap_harq_dl_map_subchannel_offset = -1; -static int hf_dlmap_harq_dl_map_number_of_ofdma_symbols = -1; -static int hf_dlmap_harq_dl_map_number_of_subchannels = -1; -static int hf_dlmap_harq_dl_map_rectangular_sub_burst_indicator = -1; -static int hf_dlmap_harq_dl_map_region_id = -1; -static int hf_dlmap_harq_dl_map_mode = -1; -static int hf_dlmap_harq_dl_map_sub_burst_ie_length = -1; -static int hf_dlmap_harq_dl_map_reserved_mode = -1; -static int hf_dlmap_harq_ack_bitmap_data = -1; -static int hf_dlmap_enhanced_dl_map_extended_2_diuc = -1; -static int hf_dlmap_enhanced_dl_map_num_assignment = -1; -static int hf_dlmap_enhanced_dl_map_n_cid = -1; -static int hf_dlmap_enhanced_dl_map_cid = -1; -static int hf_dlmap_enhanced_dl_map_diuc = -1; -static int hf_dlmap_enhanced_dl_map_boosting = -1; -static int hf_dlmap_enhanced_dl_map_repetition_coding_indication = -1; -static int hf_dlmap_enhanced_dl_map_region_id = -1; -static int hf_dlmap_aas_sdma_dl_extended_2_diuc = -1; -static int hf_dlmap_aas_sdma_dl_rcid_type = -1; -static int hf_dlmap_aas_sdma_dl_num_burst_region = -1; -static int hf_dlmap_aas_sdma_dl_ofdma_symbol_offset = -1; -static int hf_dlmap_aas_sdma_dl_subchannel_offset = -1; -static int hf_dlmap_aas_sdma_dl_num_ofdma_triple_symbols = -1; -static int hf_dlmap_aas_sdma_dl_num_subchannels = -1; -static int hf_dlmap_aas_sdma_dl_number_of_users = -1; -static int hf_dlmap_aas_sdma_dl_encoding_mode = -1; -static int hf_dlmap_aas_sdma_dl_cqich_allocation = -1; -static int hf_dlmap_aas_sdma_dl_ackch_allocation = -1; -static int hf_dlmap_aas_sdma_dl_pilot_pattern_modifier = -1; -static int hf_dlmap_aas_sdma_dl_preamble_modifier_index = -1; -static int hf_dlmap_aas_sdma_dl_pilot_pattern = -1; -static int hf_dlmap_aas_sdma_dl_diuc = -1; -static int hf_dlmap_aas_sdma_dl_repetition_coding_indication = -1; -static int hf_dlmap_aas_sdma_dl_ack_ch_index = -1; -static int hf_dlmap_aas_sdma_dl_acid = -1; -static int hf_dlmap_aas_sdma_dl_ai_sn = -1; -static int hf_dlmap_aas_sdma_dl_nep = -1; -static int hf_dlmap_aas_sdma_dl_nsch = -1; -static int hf_dlmap_aas_sdma_dl_spid = -1; -static int hf_dlmap_aas_sdma_dl_allocation_index = -1; -static int hf_dlmap_aas_sdma_dl_period = -1; -static int hf_dlmap_aas_sdma_dl_frame_offset = -1; -static int hf_dlmap_aas_sdma_dl_duration = -1; -static int hf_dlmap_channel_measurement_channel_nr = -1; -static int hf_dlmap_channel_measurement_ofdma_symbol_offset = -1; -static int hf_dlmap_channel_measurement_cid = -1; -static int hf_dlmap_stc_zone_ofdma_symbol_offset = -1; -static int hf_dlmap_stc_zone_permutations = -1; -static int hf_dlmap_stc_zone_use_all_sc_indicator = -1; -static int hf_dlmap_stc_zone_stc = -1; -static int hf_dlmap_stc_zone_matrix_indicator = -1; -static int hf_dlmap_stc_zone_dl_permbase = -1; -static int hf_dlmap_stc_zone_prbs_id = -1; -static int hf_dlmap_stc_zone_amc_type = -1; -static int hf_dlmap_stc_zone_midamble_presence = -1; -static int hf_dlmap_stc_zone_midamble_boosting = -1; -static int hf_dlmap_stc_zone_2_3_antenna_select = -1; -static int hf_dlmap_stc_zone_dedicated_pilots = -1; -static int hf_dlmap_aas_dl_ofdma_symbol_offset = -1; -static int hf_dlmap_aas_dl_permutation = -1; -static int hf_dlmap_aas_dl_dl_permbase = -1; -static int hf_dlmap_aas_dl_downlink_preamble_config = -1; -static int hf_dlmap_aas_dl_preamble_type = -1; -static int hf_dlmap_aas_dl_prbs_id = -1; -static int hf_dlmap_aas_dl_diversity_map = -1; -static int hf_dlmap_data_location_another_bs_segment = -1; -static int hf_dlmap_data_location_another_bs_used_subchannels = -1; -static int hf_dlmap_data_location_another_bs_diuc = -1; -static int hf_dlmap_data_location_another_bs_frame_advance = -1; -static int hf_dlmap_data_location_another_bs_ofdma_symbol_offset = -1; -static int hf_dlmap_data_location_another_bs_subchannel_offset = -1; -static int hf_dlmap_data_location_another_bs_boosting = -1; -static int hf_dlmap_data_location_another_bs_preamble_index = -1; -static int hf_dlmap_data_location_another_bs_num_ofdma_symbols = -1; -static int hf_dlmap_data_location_another_bs_num_subchannels = -1; -static int hf_dlmap_data_location_another_bs_repetition_coding_indication = -1; -static int hf_dlmap_data_location_another_bs_cid = -1; -static int hf_dlmap_harq_map_pointer_diuc = -1; -static int hf_dlmap_harq_map_pointer_num_slots = -1; -static int hf_dlmap_harq_map_pointer_repetition_coding_indication = -1; -static int hf_dlmap_harq_map_pointer_map_version = -1; -static int hf_dlmap_harq_map_pointer_idle_users = -1; -static int hf_dlmap_harq_map_pointer_sleep_users = -1; -static int hf_dlmap_harq_map_pointer_cid_mask_length = -1; -static int hf_dlmap_phymod_dl_preamble_modifier_type = -1; -static int hf_dlmap_phymod_dl_preamble_frequency_shift_index = -1; -static int hf_dlmap_phymod_dl_preamble_time_shift_index = -1; -static int hf_dlmap_phymod_dl_pilot_pattern_modifier = -1; -static int hf_dlmap_phymod_dl_pilot_pattern_index = -1; -static int hf_dlmap_broadcast_ctrl_ptr_dcd_ucd_transmission_frame = -1; -static int hf_dlmap_broadcast_ctrl_ptr_skip_broadcast_system_update = -1; -static int hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_type = -1; -static int hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_transmission_frame = -1; -static int hf_dlmap_dl_pusc_burst_allocation_cid = -1; -static int hf_dlmap_dl_pusc_burst_allocation_diuc = -1; -static int hf_dlmap_dl_pusc_burst_allocation_segment = -1; -static int hf_dlmap_dl_pusc_burst_allocation_boosting = -1; -static int hf_dlmap_dl_pusc_burst_allocation_idcell = -1; -static int hf_dlmap_dl_pusc_burst_allocation_dl_permbase = -1; -static int hf_dlmap_dl_pusc_burst_allocation_prbs_id = -1; -static int hf_dlmap_dl_pusc_burst_allocation_repetition_coding_indication = -1; -static int hf_dlmap_dl_pusc_burst_allocation_used_subchannels = -1; -static int hf_dlmap_dl_pusc_burst_allocation_ofdma_symbol_offset = -1; -static int hf_dlmap_dl_pusc_burst_allocation_num_ofdma_symbols = -1; -static int hf_dlmap_dl_pusc_burst_allocation_subchannel_offset = -1; -static int hf_dlmap_dl_pusc_burst_allocation_num_subchannels = -1; -static int hf_dlmap_pusc_asca_alloc_diuc = -1; -static int hf_dlmap_pusc_asca_alloc_short_basic_cid = -1; -static int hf_dlmap_pusc_asca_alloc_ofdma_symbol_offset = -1; -static int hf_dlmap_pusc_asca_alloc_subchannel_offset = -1; -static int hf_dlmap_pusc_asca_alloc_num_ofdma_symbols = -1; -static int hf_dlmap_pusc_asca_alloc_num_symbols = -1; -static int hf_dlmap_pusc_asca_alloc_repetition_coding_information = -1; -static int hf_dlmap_pusc_asca_alloc_permutation_id = -1; -static int hf_dlmap_reduced_aas_num_ie = -1; -static int hf_dlmap_reduced_aas_periodicity = -1; -static int hf_dlmap_reduced_aas_cid_included = -1; -static int hf_dlmap_reduced_aas_dcd_count_included = -1; -static int hf_dlmap_reduced_aas_phy_modification_included = -1; -static int hf_dlmap_reduced_aas_cqich_control_indicator = -1; -static int hf_dlmap_reduced_aas_encoding_mode = -1; -static int hf_dlmap_reduced_aas_separate_mcs_enabled = -1; -static int hf_dlmap_reduced_aas_duration = -1; -static int hf_dlmap_reduced_aas_diuc = -1; -static int hf_dlmap_reduced_aas_repetition_coding_indication = -1; -static int hf_dlmap_reduced_aas_cid = -1; -static int hf_dlmap_reduced_aas_allocation_index = -1; -static int hf_dlmap_reduced_aas_report_period = -1; -static int hf_dlmap_reduced_aas_frame_offset = -1; -static int hf_dlmap_reduced_aas_report_duration = -1; -static int hf_dlmap_reduced_aas_cqi_measurement_type = -1; -static int hf_dlmap_reduced_aas_dcd_count = -1; -static int hf_dlmap_reduced_aas_preamble_select = -1; -static int hf_dlmap_reduced_aas_preamble_shift_index = -1; -static int hf_dlmap_reduced_aas_pilot_pattern_modifier = -1; -static int hf_dlmap_reduced_aas_pilot_pattern_index = -1; -static int hf_dlmap_reduced_aas_dl_frame_offset = -1; -static int hf_dlmap_reduced_aas_zone_symbol_offset = -1; -static int hf_dlmap_reduced_aas_ofdma_symbol_offset = -1; -static int hf_dlmap_reduced_aas_subchannel_offset = -1; -static int hf_dlmap_reduced_aas_num_ofdma_triple_symbol = -1; -static int hf_dlmap_reduced_aas_num_subchannels = -1; -static int hf_dlmap_reduced_aas_num_ofdma_symbols = -1; -static int hf_dlmap_reduced_aas_diuc_nep = -1; -static int hf_dlmap_reduced_aas_dl_harq_ack_bitmap = -1; -static int hf_dlmap_reduced_aas_ack_allocation_index = -1; -static int hf_dlmap_reduced_aas_acid = -1; -static int hf_dlmap_reduced_aas_ai_sn = -1; -static int hf_dlmap_reduced_aas_nsch = -1; -static int hf_dlmap_reduced_aas_spid = -1; - - - -static expert_field ei_dlmap_not_implemented = EI_INIT; -static expert_field ei_crc16 = EI_INIT; -static expert_field ei_mac_header_compress_dlmap_crc = EI_INIT; -static expert_field ei_mac_header_invalid_length = EI_INIT; +static int hf_dlmap_rcid_ie_cid; +static int hf_dlmap_rcid_ie_prefix; +static int hf_dlmap_rcid_ie_cid11; +static int hf_dlmap_rcid_ie_cid7; +static int hf_dlmap_rcid_ie_cid3; +static int hf_dlmap_dedicated_dl_control_length; +static int hf_dlmap_dedicated_dl_control_control_header; +static int hf_dlmap_dedicated_dl_control_num_sdma_layers; +static int hf_dlmap_dedicated_mimo_dl_control_length; +static int hf_dlmap_dedicated_mimo_dl_control_control_header_mimo_control_info; +static int hf_dlmap_dedicated_mimo_dl_control_control_header_cqi_control_info; +static int hf_dlmap_dedicated_mimo_dl_control_control_header_closed_mimo_control_info; +static int hf_dlmap_dedicated_mimo_dl_control_n_layer; +static int hf_dlmap_dedicated_mimo_dl_control_matrix; +static int hf_dlmap_dedicated_mimo_dl_control_num_beamformed_streams; +static int hf_dlmap_dedicated_mimo_dl_control_period; +static int hf_dlmap_dedicated_mimo_dl_control_frame_offset; +static int hf_dlmap_dedicated_mimo_dl_control_duration; +static int hf_dlmap_dedicated_mimo_dl_control_allocation_index; +static int hf_dlmap_dedicated_mimo_dl_control_cqich_num; +static int hf_dlmap_dedicated_mimo_dl_control_feedback_type; +static int hf_dlmap_dedicated_mimo_dl_control_antenna_grouping_index; +static int hf_dlmap_dedicated_mimo_dl_control_num_stream; +static int hf_dlmap_dedicated_mimo_dl_control_antenna_selection_index; +static int hf_dlmap_dedicated_mimo_dl_control_codebook_precoding_index; +static int hf_dlmap_n_sub_burst_isi; +static int hf_dlmap_harq_chase_n_ack_channel; +static int hf_dlmap_harq_chase_duration; +static int hf_dlmap_harq_chase_sub_burst_diuc_indicator; +static int hf_dlmap_reserved_uint; +static int hf_dlmap_harq_chase_diuc; +static int hf_dlmap_harq_chase_repetition_coding_indication; +static int hf_dlmap_harq_chase_acid; +static int hf_dlmap_harq_chase_ai_sn; +static int hf_dlmap_harq_chase_ack_disable; +static int hf_dlmap_harq_chase_dedicated_dl_control_indicator; +static int hf_dlmap_harq_chase_allocation_index; +static int hf_dlmap_harq_chase_period; +static int hf_dlmap_harq_chase_frame_offset; +static int hf_dlmap_harq_ir_ctc_n_ack_channel; +static int hf_dlmap_harq_ir_ctc_nep; +static int hf_dlmap_harq_ir_ctc_nsch; +static int hf_dlmap_harq_ir_ctc_spid; +static int hf_dlmap_harq_ir_ctc_acid; +static int hf_dlmap_harq_ir_ctc_ai_sn; +static int hf_dlmap_harq_ir_ctc_ack_disable; +static int hf_dlmap_harq_ir_ctc_dedicated_dl_control_indicator; +static int hf_dlmap_harq_ir_ctc_duration; +static int hf_dlmap_harq_ir_ctc_allocation_index; +static int hf_dlmap_harq_ir_ctc_period; +static int hf_dlmap_harq_ir_ctc_frame_offset; +static int hf_dlmap_harq_ir_cc_n_ack_channel; +static int hf_dlmap_harq_ir_cc_duration; +static int hf_dlmap_harq_ir_cc_sub_burst_diuc_indicator; +static int hf_dlmap_harq_ir_cc_diuc; +static int hf_dlmap_harq_ir_cc_repetition_coding_indication; +static int hf_dlmap_harq_ir_cc_acid; +static int hf_dlmap_harq_ir_cc_ai_sn; +static int hf_dlmap_harq_ir_cc_spid; +static int hf_dlmap_harq_ir_cc_ack_disable; +static int hf_dlmap_harq_ir_cc_dedicated_dl_control_indicator; +static int hf_dlmap_harq_ir_cc_allocation_index; +static int hf_dlmap_harq_ir_cc_period; +static int hf_dlmap_harq_ir_cc_frame_offset; +static int hf_dlmap_mimo_dl_chase_harq_n_ack_channel; +static int hf_dlmap_mimo_dl_chase_harq_mu_indicator; +static int hf_dlmap_mimo_dl_chase_harq_dedicated_mimo_dl_control_indicator; +static int hf_dlmap_mimo_dl_chase_harq_ack_disable; +static int hf_dlmap_mimo_dl_chase_harq_duration; +static int hf_dlmap_mimo_dl_chase_harq_diuc; +static int hf_dlmap_mimo_dl_chase_harq_repetition_coding_indication; +static int hf_dlmap_mimo_dl_chase_harq_acid; +static int hf_dlmap_mimo_dl_chase_harq_ai_sn; +static int hf_dlmap_mimo_dl_ir_harq_n_ack_channel; +static int hf_dlmap_mimo_dl_ir_harq_mu_indicator; +static int hf_dlmap_mimo_dl_ir_harq_dedicated_mimo_dl_control_indicator; +static int hf_dlmap_mimo_dl_ir_harq_ack_disable; +static int hf_dlmap_mimo_dl_ir_harq_nsch; +static int hf_dlmap_mimo_dl_ir_harq_nep; +static int hf_dlmap_mimo_dl_ir_harq_spid; +static int hf_dlmap_mimo_dl_ir_harq_acid; +static int hf_dlmap_mimo_dl_ir_harq_ai_sn; +static int hf_dlmap_mimo_dl_ir_harq_cc_n_ack_channel; +static int hf_dlmap_mimo_dl_ir_harq_cc_mu_indicator; +static int hf_dlmap_mimo_dl_ir_harq_cc_dedicated_mimo_dl_control_indicator; +static int hf_dlmap_mimo_dl_ir_harq_cc_ack_disable; +static int hf_dlmap_mimo_dl_ir_harq_cc_duration; +static int hf_dlmap_mimo_dl_ir_harq_cc_diuc; +static int hf_dlmap_mimo_dl_ir_harq_cc_repetition_coding_indication; +static int hf_dlmap_mimo_dl_ir_harq_cc_acid; +static int hf_dlmap_mimo_dl_ir_harq_cc_ai_sn; +static int hf_dlmap_mimo_dl_ir_harq_cc_spid; +static int hf_dlmap_mimo_dl_stc_harq_n_ack_channel; +static int hf_dlmap_mimo_dl_stc_harq_tx_count; +static int hf_dlmap_mimo_dl_stc_harq_duration; +static int hf_dlmap_mimo_dl_stc_harq_sub_burst_offset_indication; +static int hf_dlmap_mimo_dl_stc_harq_sub_burst_offset; +static int hf_dlmap_mimo_dl_stc_harq_ack_disable; +static int hf_dlmap_mimo_dl_stc_harq_dedicated_mimo_dl_control_indicator; +static int hf_dlmap_mimo_dl_stc_harq_diuc; +static int hf_dlmap_mimo_dl_stc_harq_repetition_coding_indication; +static int hf_dlmap_mimo_dl_stc_harq_acid; +static int hf_dlmap_mbs_map_extended_2_diuc; +static int hf_dlmap_mbs_map_mbs_zone_identifier; +static int hf_dlmap_mbs_map_macro_diversity_enhanced; +static int hf_dlmap_mbs_map_permutation; +static int hf_dlmap_mbs_map_dl_permbase; +static int hf_dlmap_mbs_map_prbs_id; +static int hf_dlmap_mbs_map_ofdma_symbol_offset; +static int hf_dlmap_mbs_map_diuc_change_indication; +static int hf_dlmap_mbs_map_boosting; +static int hf_dlmap_mbs_map_diuc; +static int hf_dlmap_mbs_map_num_subchannels; +static int hf_dlmap_mbs_map_num_ofdma_symbols; +static int hf_dlmap_mbs_map_repetition_coding_indication; +static int hf_dlmap_mbs_map_cid; +static int hf_dlmap_mbs_map_ofdma_symbols_offset; +static int hf_dlmap_mbs_map_subchannel_offset; +static int hf_dlmap_mbs_map_slc_3_indication; +static int hf_dlmap_mbs_map_next_mbs_map_ie_frame_offset; +static int hf_dlmap_skip_extended_2_diuc; +static int hf_dlmap_skip_mode; +static int hf_dlmap_harq_dl_map_extended_2_diuc; +static int hf_dlmap_harq_dl_map_rcid_type; +static int hf_dlmap_harq_dl_map_boosting; +static int hf_dlmap_harq_dl_map_region_id_use_indicator; +static int hf_dlmap_harq_dl_map_ofdma_symbol_offset; +static int hf_dlmap_harq_dl_map_subchannel_offset; +static int hf_dlmap_harq_dl_map_number_of_ofdma_symbols; +static int hf_dlmap_harq_dl_map_number_of_subchannels; +static int hf_dlmap_harq_dl_map_rectangular_sub_burst_indicator; +static int hf_dlmap_harq_dl_map_region_id; +static int hf_dlmap_harq_dl_map_mode; +static int hf_dlmap_harq_dl_map_sub_burst_ie_length; +static int hf_dlmap_harq_dl_map_reserved_mode; +static int hf_dlmap_harq_ack_bitmap_data; +static int hf_dlmap_enhanced_dl_map_extended_2_diuc; +static int hf_dlmap_enhanced_dl_map_num_assignment; +static int hf_dlmap_enhanced_dl_map_n_cid; +static int hf_dlmap_enhanced_dl_map_cid; +static int hf_dlmap_enhanced_dl_map_diuc; +static int hf_dlmap_enhanced_dl_map_boosting; +static int hf_dlmap_enhanced_dl_map_repetition_coding_indication; +static int hf_dlmap_enhanced_dl_map_region_id; +static int hf_dlmap_aas_sdma_dl_extended_2_diuc; +static int hf_dlmap_aas_sdma_dl_rcid_type; +static int hf_dlmap_aas_sdma_dl_num_burst_region; +static int hf_dlmap_aas_sdma_dl_ofdma_symbol_offset; +static int hf_dlmap_aas_sdma_dl_subchannel_offset; +static int hf_dlmap_aas_sdma_dl_num_ofdma_triple_symbols; +static int hf_dlmap_aas_sdma_dl_num_subchannels; +static int hf_dlmap_aas_sdma_dl_number_of_users; +static int hf_dlmap_aas_sdma_dl_encoding_mode; +static int hf_dlmap_aas_sdma_dl_cqich_allocation; +static int hf_dlmap_aas_sdma_dl_ackch_allocation; +static int hf_dlmap_aas_sdma_dl_pilot_pattern_modifier; +static int hf_dlmap_aas_sdma_dl_preamble_modifier_index; +static int hf_dlmap_aas_sdma_dl_pilot_pattern; +static int hf_dlmap_aas_sdma_dl_diuc; +static int hf_dlmap_aas_sdma_dl_repetition_coding_indication; +static int hf_dlmap_aas_sdma_dl_ack_ch_index; +static int hf_dlmap_aas_sdma_dl_acid; +static int hf_dlmap_aas_sdma_dl_ai_sn; +static int hf_dlmap_aas_sdma_dl_nep; +static int hf_dlmap_aas_sdma_dl_nsch; +static int hf_dlmap_aas_sdma_dl_spid; +static int hf_dlmap_aas_sdma_dl_allocation_index; +static int hf_dlmap_aas_sdma_dl_period; +static int hf_dlmap_aas_sdma_dl_frame_offset; +static int hf_dlmap_aas_sdma_dl_duration; +static int hf_dlmap_channel_measurement_channel_nr; +static int hf_dlmap_channel_measurement_ofdma_symbol_offset; +static int hf_dlmap_channel_measurement_cid; +static int hf_dlmap_stc_zone_ofdma_symbol_offset; +static int hf_dlmap_stc_zone_permutations; +static int hf_dlmap_stc_zone_use_all_sc_indicator; +static int hf_dlmap_stc_zone_stc; +static int hf_dlmap_stc_zone_matrix_indicator; +static int hf_dlmap_stc_zone_dl_permbase; +static int hf_dlmap_stc_zone_prbs_id; +static int hf_dlmap_stc_zone_amc_type; +static int hf_dlmap_stc_zone_midamble_presence; +static int hf_dlmap_stc_zone_midamble_boosting; +static int hf_dlmap_stc_zone_2_3_antenna_select; +static int hf_dlmap_stc_zone_dedicated_pilots; +static int hf_dlmap_aas_dl_ofdma_symbol_offset; +static int hf_dlmap_aas_dl_permutation; +static int hf_dlmap_aas_dl_dl_permbase; +static int hf_dlmap_aas_dl_downlink_preamble_config; +static int hf_dlmap_aas_dl_preamble_type; +static int hf_dlmap_aas_dl_prbs_id; +static int hf_dlmap_aas_dl_diversity_map; +static int hf_dlmap_data_location_another_bs_segment; +static int hf_dlmap_data_location_another_bs_used_subchannels; +static int hf_dlmap_data_location_another_bs_diuc; +static int hf_dlmap_data_location_another_bs_frame_advance; +static int hf_dlmap_data_location_another_bs_ofdma_symbol_offset; +static int hf_dlmap_data_location_another_bs_subchannel_offset; +static int hf_dlmap_data_location_another_bs_boosting; +static int hf_dlmap_data_location_another_bs_preamble_index; +static int hf_dlmap_data_location_another_bs_num_ofdma_symbols; +static int hf_dlmap_data_location_another_bs_num_subchannels; +static int hf_dlmap_data_location_another_bs_repetition_coding_indication; +static int hf_dlmap_data_location_another_bs_cid; +static int hf_dlmap_harq_map_pointer_diuc; +static int hf_dlmap_harq_map_pointer_num_slots; +static int hf_dlmap_harq_map_pointer_repetition_coding_indication; +static int hf_dlmap_harq_map_pointer_map_version; +static int hf_dlmap_harq_map_pointer_idle_users; +static int hf_dlmap_harq_map_pointer_sleep_users; +static int hf_dlmap_harq_map_pointer_cid_mask_length; +static int hf_dlmap_phymod_dl_preamble_modifier_type; +static int hf_dlmap_phymod_dl_preamble_frequency_shift_index; +static int hf_dlmap_phymod_dl_preamble_time_shift_index; +static int hf_dlmap_phymod_dl_pilot_pattern_modifier; +static int hf_dlmap_phymod_dl_pilot_pattern_index; +static int hf_dlmap_broadcast_ctrl_ptr_dcd_ucd_transmission_frame; +static int hf_dlmap_broadcast_ctrl_ptr_skip_broadcast_system_update; +static int hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_type; +static int hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_transmission_frame; +static int hf_dlmap_dl_pusc_burst_allocation_cid; +static int hf_dlmap_dl_pusc_burst_allocation_diuc; +static int hf_dlmap_dl_pusc_burst_allocation_segment; +static int hf_dlmap_dl_pusc_burst_allocation_boosting; +static int hf_dlmap_dl_pusc_burst_allocation_idcell; +static int hf_dlmap_dl_pusc_burst_allocation_dl_permbase; +static int hf_dlmap_dl_pusc_burst_allocation_prbs_id; +static int hf_dlmap_dl_pusc_burst_allocation_repetition_coding_indication; +static int hf_dlmap_dl_pusc_burst_allocation_used_subchannels; +static int hf_dlmap_dl_pusc_burst_allocation_ofdma_symbol_offset; +static int hf_dlmap_dl_pusc_burst_allocation_num_ofdma_symbols; +static int hf_dlmap_dl_pusc_burst_allocation_subchannel_offset; +static int hf_dlmap_dl_pusc_burst_allocation_num_subchannels; +static int hf_dlmap_pusc_asca_alloc_diuc; +static int hf_dlmap_pusc_asca_alloc_short_basic_cid; +static int hf_dlmap_pusc_asca_alloc_ofdma_symbol_offset; +static int hf_dlmap_pusc_asca_alloc_subchannel_offset; +static int hf_dlmap_pusc_asca_alloc_num_ofdma_symbols; +static int hf_dlmap_pusc_asca_alloc_num_symbols; +static int hf_dlmap_pusc_asca_alloc_repetition_coding_information; +static int hf_dlmap_pusc_asca_alloc_permutation_id; +static int hf_dlmap_reduced_aas_num_ie; +static int hf_dlmap_reduced_aas_periodicity; +static int hf_dlmap_reduced_aas_cid_included; +static int hf_dlmap_reduced_aas_dcd_count_included; +static int hf_dlmap_reduced_aas_phy_modification_included; +static int hf_dlmap_reduced_aas_cqich_control_indicator; +static int hf_dlmap_reduced_aas_encoding_mode; +static int hf_dlmap_reduced_aas_separate_mcs_enabled; +static int hf_dlmap_reduced_aas_duration; +static int hf_dlmap_reduced_aas_diuc; +static int hf_dlmap_reduced_aas_repetition_coding_indication; +static int hf_dlmap_reduced_aas_cid; +static int hf_dlmap_reduced_aas_allocation_index; +static int hf_dlmap_reduced_aas_report_period; +static int hf_dlmap_reduced_aas_frame_offset; +static int hf_dlmap_reduced_aas_report_duration; +static int hf_dlmap_reduced_aas_cqi_measurement_type; +static int hf_dlmap_reduced_aas_dcd_count; +static int hf_dlmap_reduced_aas_preamble_select; +static int hf_dlmap_reduced_aas_preamble_shift_index; +static int hf_dlmap_reduced_aas_pilot_pattern_modifier; +static int hf_dlmap_reduced_aas_pilot_pattern_index; +static int hf_dlmap_reduced_aas_dl_frame_offset; +static int hf_dlmap_reduced_aas_zone_symbol_offset; +static int hf_dlmap_reduced_aas_ofdma_symbol_offset; +static int hf_dlmap_reduced_aas_subchannel_offset; +static int hf_dlmap_reduced_aas_num_ofdma_triple_symbol; +static int hf_dlmap_reduced_aas_num_subchannels; +static int hf_dlmap_reduced_aas_num_ofdma_symbols; +static int hf_dlmap_reduced_aas_diuc_nep; +static int hf_dlmap_reduced_aas_dl_harq_ack_bitmap; +static int hf_dlmap_reduced_aas_ack_allocation_index; +static int hf_dlmap_reduced_aas_acid; +static int hf_dlmap_reduced_aas_ai_sn; +static int hf_dlmap_reduced_aas_nsch; +static int hf_dlmap_reduced_aas_spid; + + + +static expert_field ei_dlmap_not_implemented; +static expert_field ei_crc16; +static expert_field ei_mac_header_compress_dlmap_crc; +static expert_field ei_mac_header_invalid_length; /* Copied and renamed from proto.c because global value_strings don't work for plugins */ static const value_string plugin_proto_checksum_vals[] = { @@ -611,15 +610,15 @@ static const value_string plugin_proto_checksum_vals[] = { * DL-MAP Miscellaneous IEs and TLVs *******************************************************************/ -gint RCID_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb, gint RCID_Type_lcl) +int RCID_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb, int RCID_Type_lcl) { /* RCID_IE 8.4.5.3 and 8.4.5.3.20.1 */ /* offset of IE in bits, length is variable */ - gint bit = offset; + int bit = offset; proto_item *ti = NULL; proto_tree *tree = NULL; - gint Prefix = 0; - gint cid = 0; + int Prefix = 0; + int cid = 0; if (RCID_Type_lcl == 0) length = 16; @@ -664,14 +663,14 @@ gint RCID_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb, gin * DL-MAP Extended-2 HARQ sub-burst IEs (8.4.5.3.21) *******************************************************************/ -static gint Dedicated_DL_Control_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Dedicated_DL_Control_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.3.20 */ /* offset of IE in nibbles, length is variable */ - gint nib; - gint nibble; + int nib; + int nibble; proto_tree *tree; - gint len; + int len; nib = offset; @@ -700,13 +699,13 @@ static gint Dedicated_DL_Control_IE(proto_tree *diuc_tree, gint offset, gint len return (length + 1); } -static gint Dedicated_MIMO_DL_Control_IE(proto_tree *diuc_tree, gint offset, gint length _U_, tvbuff_t *tvb) +static int Dedicated_MIMO_DL_Control_IE(proto_tree *diuc_tree, int offset, int length _U_, tvbuff_t *tvb) { /* offset of IE in bits, length is variable */ - gint bit; + int bit; proto_tree *tree; - gint mci, cqi, cmi, matrix = 0, pad, CQICH_num, mimo_mode; - gint j; + int mci, cqi, cmi, matrix = 0, pad, CQICH_num, mimo_mode; + int j; bit = offset; @@ -770,14 +769,14 @@ static gint Dedicated_MIMO_DL_Control_IE(proto_tree *diuc_tree, gint offset, gin return (bit - offset); } -static gint DL_HARQ_Chase_sub_burst_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int DL_HARQ_Chase_sub_burst_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.3.21 DL_HARQ_Chase_sub_burst_IE */ /* offset of IE in nibbles, length is variable */ - gint bit; + int bit; proto_tree *tree; - gint nsub, ddci, dur, sbi; - gint j; + int nsub, ddci, dur, sbi; + int j; bit = NIB_TO_BIT(offset); @@ -823,14 +822,14 @@ static gint DL_HARQ_Chase_sub_burst_IE(proto_tree *diuc_tree, gint offset, gint return (BIT_TO_NIB(bit) - offset); } -static gint DL_HARQ_IR_CTC_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int DL_HARQ_IR_CTC_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* offset of IE in nibbles, length is variable */ - gint bit; + int bit; proto_tree *tree; - gint nsub, ddci, dur; - gint j; - guint32 calculated_crc; + int nsub, ddci, dur; + int j; + uint32_t calculated_crc; bit = NIB_TO_BIT(offset); @@ -879,14 +878,14 @@ static gint DL_HARQ_IR_CTC_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinf return (BIT_TO_NIB(bit) - offset); } -static gint DL_HARQ_IR_CC_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int DL_HARQ_IR_CC_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* offset of IE in nibbles, length is variable */ - gint bit; + int bit; proto_tree *tree; - gint nsub, sbdi, ddci, dur; - gint j; - guint16 calculated_crc; + int nsub, sbdi, ddci, dur; + int j; + uint16_t calculated_crc; bit = NIB_TO_BIT(offset); @@ -943,15 +942,15 @@ static gint DL_HARQ_IR_CC_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo return (BIT_TO_NIB(bit) - offset); } -static gint MIMO_DL_Chase_HARQ_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_DL_Chase_HARQ_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* offset of IE in nibbles, length is variable */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; - gint nsub, mui, dci, akd; - gint i, j; - guint16 calculated_crc; + int nsub, mui, dci, akd; + int i, j; + uint16_t calculated_crc; bit = NIB_TO_BIT(offset); @@ -1004,14 +1003,14 @@ static gint MIMO_DL_Chase_HARQ_sub_burst_IE(proto_tree *diuc_tree, packet_info * return (BIT_TO_NIB(bit) - offset); } -static gint MIMO_DL_IR_HARQ_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_DL_IR_HARQ_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* offset of IE in nibbles, length is variable */ - gint bit; + int bit; proto_tree *tree; - gint nsub, mui, dci, akd; - gint i, j; - guint16 calculated_crc; + int nsub, mui, dci, akd; + int i, j; + uint16_t calculated_crc; bit = NIB_TO_BIT(offset); @@ -1058,14 +1057,14 @@ static gint MIMO_DL_IR_HARQ_sub_burst_IE(proto_tree *diuc_tree, packet_info *pin return (BIT_TO_NIB(bit) - offset); } -static gint MIMO_DL_IR_HARQ_for_CC_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_DL_IR_HARQ_for_CC_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* offset of IE in nibbles, length is variable */ - gint bit; + int bit; proto_tree *tree; - gint nsub, mui, dci, akd; - gint i, j; - guint16 calculated_crc; + int nsub, mui, dci, akd; + int i, j; + uint16_t calculated_crc; bit = NIB_TO_BIT(offset); @@ -1113,14 +1112,14 @@ static gint MIMO_DL_IR_HARQ_for_CC_sub_burst_IE(proto_tree *diuc_tree, packet_in return (BIT_TO_NIB(bit) - offset); } -static gint MIMO_DL_STC_HARQ_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_DL_STC_HARQ_sub_burst_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* offset of IE in nibbles, length is variable */ - gint bit; + int bit; proto_tree *tree; - gint nsub, sbi, txc, akd, dmci; - gint j; - guint16 calculated_crc; + int nsub, sbi, txc, akd, dmci; + int j; + uint16_t calculated_crc; bit = NIB_TO_BIT(offset); @@ -1170,15 +1169,15 @@ static gint MIMO_DL_STC_HARQ_sub_burst_IE(proto_tree *diuc_tree, packet_info *pi * DL-MAP Extended-2 IEs *******************************************************************/ -static gint MBS_MAP_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int MBS_MAP_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended-2 IE = 0 */ /* 8.4.5.3.12 MBS_MAP_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; - gint mde, dci, s3i; + int mde, dci, s3i; bit = NIB_TO_BIT(offset); @@ -1227,13 +1226,13 @@ static gint MBS_MAP_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t return BIT_TO_NIB(bit); } -static gint HO_Anchor_Active_DL_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int HO_Anchor_Active_DL_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended-2 IE = 1 */ /* 8.4.5.3.14 [2] HO_Anchor_Active_DL-MAP_IE TODO 1.1 */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_tree *tree; nib = offset; @@ -1246,13 +1245,13 @@ static gint HO_Anchor_Active_DL_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo return nib; } -static gint HO_Active_Anchor_DL_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int HO_Active_Anchor_DL_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended-2 IE = 2 */ /* 8.4.5.3.15 HO_Active_Anchor_DL_MAP_IE TODO 1.1 */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_tree *tree; nib = offset; @@ -1265,13 +1264,13 @@ static gint HO_Active_Anchor_DL_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo return nib; } -static gint HO_CID_Translation_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int HO_CID_Translation_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended-2 IE = 3 */ /* 8.4.5.3.16 HO_CID_Translation_MAP_IE TODO 1.1 */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_tree *tree; nib = offset; @@ -1284,13 +1283,13 @@ static gint HO_CID_Translation_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, return nib; } -static gint MIMO_in_another_BS_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_in_another_BS_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended-2 IE = 4 */ /* 8.4.5.3.17 [2] MIMO_in_another_BS_IE (not implemented)*/ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_tree *tree; nib = offset; @@ -1303,13 +1302,13 @@ static gint MIMO_in_another_BS_IE(proto_tree *diuc_tree, packet_info *pinfo, gin return nib; } -static gint Macro_MIMO_DL_Basic_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int Macro_MIMO_DL_Basic_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* dl-map extended-2 ie = 5 */ /* 8.4.5.3.18 [2] Macro-MIMO_DL_Basic_IE (not implemented) */ /* offset of tlv in nibbles, length of tlv in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_tree *tree; nib = offset; @@ -1322,13 +1321,13 @@ static gint Macro_MIMO_DL_Basic_IE(proto_tree *diuc_tree, packet_info *pinfo, gi return nib; } -static gint Skip_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Skip_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended-2 IE = 6 */ /* 8.4.5.3.20.2 Skip_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; bit = NIB_TO_BIT(offset); @@ -1344,14 +1343,14 @@ static gint Skip_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *t return BIT_TO_NIB(bit); } -static gint HARQ_DL_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int HARQ_DL_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended-2 IE = 7 */ /* 8.4.5.3.21 [2] HARQ_DL_MAP_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_tree *tree; - gint len, lastbit, rui, mode, sub_len, pad; + int len, lastbit, rui, mode, sub_len, pad; bit = NIB_TO_BIT(offset); @@ -1423,13 +1422,13 @@ static gint HARQ_DL_MAP_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offse return BIT_TO_NIB(bit); } -static gint HARQ_ACK_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int HARQ_ACK_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended-2 IE = 8 */ /* 8.4.5.3.22 HARQ_ACK IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint data; - gint nib; + int data; + int nib; proto_tree *tree; nib = offset; @@ -1444,16 +1443,16 @@ static gint HARQ_ACK_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_ return nib; } -static gint Enhanced_DL_MAP_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Enhanced_DL_MAP_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended-2 IE = 9 */ /* 8.4.5.3.23 Enhanced DL MAP IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; - gint numass, n_cid; - gint i, n; + int numass, n_cid; + int i, n; bit = NIB_TO_BIT(offset); @@ -1479,13 +1478,13 @@ static gint Enhanced_DL_MAP_IE(proto_tree *diuc_tree, gint offset, gint length, return BIT_TO_NIB(bit); } -static gint Closed_loop_MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int Closed_loop_MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended-2 IE = 0xA */ /* 8.4.5.3.24 Closed-loop MIMO DL Enhanced IE (not implemented) */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_tree *tree; nib = offset; @@ -1498,18 +1497,18 @@ static gint Closed_loop_MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, packet_info * return nib; } -static gint AAS_SDMA_DL_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int AAS_SDMA_DL_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended-2 IE = 0xE */ /* 8.4.5.3.26 AAS_SDMA_DL_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; - gint num_region, num_users, pilot_pattern, encoding_mode, ackch_alloc, cqich_alloc; - gint aas_preamble = 1; - gint zone_permut = 0; /* TODO */ - gint i, j; + int num_region, num_users, pilot_pattern, encoding_mode, ackch_alloc, cqich_alloc; + int aas_preamble = 1; + int zone_permut = 0; /* TODO */ + int i, j; bit = NIB_TO_BIT(offset); @@ -1612,13 +1611,13 @@ static gint AAS_SDMA_DL_IE(proto_tree *diuc_tree, gint offset, gint length, tvbu * DL-MAP Extended IEs *******************************************************************/ -static gint Channel_Measurement_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Channel_Measurement_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 0 */ /* 8.4.5.3.5 [1] Channel_Measurement_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_tree *tree; nib = offset; @@ -1634,15 +1633,15 @@ static gint Channel_Measurement_IE(proto_tree *diuc_tree, gint offset, gint leng return nib; } -static gint STC_Zone_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int STC_Zone_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 1 */ /* 8.4.5.3.4 STC_Zone_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ /* set globals: STC_Zone_Dedicated_Pilots, STC_Zone_Matrix * used in 8.4.5.3.21.1 Dedicated MIMO Control IE 286t */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; bit = NIB_TO_BIT(offset); @@ -1669,13 +1668,13 @@ static gint STC_Zone_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_ return BIT_TO_NIB(bit); } -static gint AAS_DL_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int AAS_DL_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 2 */ /* 8.4.5.3.3 AAS_DL_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; bit = NIB_TO_BIT(offset); @@ -1697,13 +1696,13 @@ static gint AAS_DL_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t return BIT_TO_NIB(bit); } -static gint Data_location_in_another_BS_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Data_location_in_another_BS_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 3 */ /* 8.4.5.3.6 Data_location_in_another_BS_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; bit = NIB_TO_BIT(offset); @@ -1730,13 +1729,13 @@ static gint Data_location_in_another_BS_IE(proto_tree *diuc_tree, gint offset, g return BIT_TO_NIB(bit); } -static gint CID_Switch_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int CID_Switch_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 4 */ /* 8.4.5.3.7 [1] CID_Switch_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_tree *tree; nib = offset; @@ -1751,13 +1750,13 @@ static gint CID_Switch_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuf return nib; } -static gint MIMO_DL_Basic_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_DL_Basic_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 5 */ /* 8.4.5.3.8 MIMO_DL_Basic_IE (not implemented) */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_tree *tree; nib = offset; @@ -1770,13 +1769,13 @@ static gint MIMO_DL_Basic_IE(proto_tree *diuc_tree, packet_info *pinfo, gint off return nib; } -static gint MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 6 */ /* 8.4.5.3.9 MIMO_DL_Enhanced_IE (not implemented) */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_tree *tree; nib = offset; @@ -1789,15 +1788,15 @@ static gint MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, packet_info *pinfo, gint return nib; } -static gint HARQ_Map_Pointer_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int HARQ_Map_Pointer_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 7 */ /* 8.4.5.3.10 [2] HARQ_Map_Pointer_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; - gint length_in_bits, map, mask_len; + int length_in_bits, map, mask_len; bit = NIB_TO_BIT(offset); @@ -1838,15 +1837,15 @@ static gint HARQ_Map_Pointer_IE(proto_tree *diuc_tree, gint offset, gint length, return BIT_TO_NIB(bit); } -static gint PHYMOD_DL_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int PHYMOD_DL_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 8 */ /* 8.4.5.3.11 PHYMOD_DL_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; - gint pmt; + int pmt; bit = NIB_TO_BIT(offset); @@ -1867,15 +1866,15 @@ static gint PHYMOD_DL_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff return BIT_TO_NIB(bit); } -static gint Broadcast_Control_Pointer_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Broadcast_Control_Pointer_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 0xA */ /* 8.4.5.3.25 Broadcast Control Pointer IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; - gint skip; + int skip; bit = NIB_TO_BIT(offset); @@ -1893,13 +1892,13 @@ static gint Broadcast_Control_Pointer_IE(proto_tree *diuc_tree, gint offset, gin return BIT_TO_NIB(bit); } -static gint DL_PUSC_Burst_Allocation_in_Other_Segment_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int DL_PUSC_Burst_Allocation_in_Other_Segment_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 0xB */ /* 8.4.5.3.13 DL PUSC Burst Allocation in Other Segment IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; bit = NIB_TO_BIT(offset); @@ -1927,13 +1926,13 @@ static gint DL_PUSC_Burst_Allocation_in_Other_Segment_IE(proto_tree *diuc_tree, return BIT_TO_NIB(bit); } -static gint PUSC_ASCA_Alloc_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int PUSC_ASCA_Alloc_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 0xC */ /* 8.4.5.3.27 PUSC_ASCA_Alloc_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_tree *tree; bit = NIB_TO_BIT(offset); @@ -1955,14 +1954,14 @@ static gint PUSC_ASCA_Alloc_IE(proto_tree *diuc_tree, gint offset, gint length, return BIT_TO_NIB(bit); } -static gint UL_interference_and_noise_level_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int UL_interference_and_noise_level_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb) { /* DL-MAP Extended IE = 0xF */ /* 8.4.5.3.19 UL_interference_and_noise_level_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ proto_tree *tree; - gint nib = offset; - gint bitmap, data; + int nib = offset; + int bitmap, data; tree = proto_tree_add_subtree(diuc_tree, tvb, NIBHI(offset, length), ett_286h, NULL, "UL_interference_and_noise_level_IE"); @@ -2002,7 +2001,7 @@ static gint UL_interference_and_noise_level_IE(proto_tree *diuc_tree, gint offse * DL-MAP Plugin *******************************************************************/ -static gint dissect_dlmap_ie(proto_tree *ie_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb) +static int dissect_dlmap_ie(proto_tree *ie_tree, packet_info *pinfo, int offset, int length, tvbuff_t *tvb) { /* decode a single DL-MAP IE and return the * length of the IE in nibbles @@ -2011,19 +2010,19 @@ static gint dissect_dlmap_ie(proto_tree *ie_tree, packet_info *pinfo, gint offse proto_item *ti = NULL; proto_tree *tree = NULL; - gint nibble = offset; - gint diuc; - gint ext2_diuc; - gint len; - gint ext_diuc; + int nibble = offset; + int diuc; + int ext2_diuc; + int len; + int ext_diuc; - gint alt_format = 0; - guint data = 0; - gint i; - /*gint papr = 0;*/ - gint ie_len = 9; + int alt_format = 0; + unsigned data = 0; + int i; + /*int papr = 0;*/ + int ie_len = 9; - gint n_cid; + int n_cid; /* 8.4.5.3 DL-MAP IE format - table 275 */ diuc = TVB_NIB_NIBBLE(nibble, tvb); @@ -2247,13 +2246,13 @@ static gint dissect_dlmap_ie(proto_tree *ie_tree, packet_info *pinfo, gint offse static int dissect_mac_mgmt_msg_dlmap_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tree, void* data _U_) { /* 6.3.2.3.2 [2] DL-MAP table 16 */ - guint offset = 0; - gint length, nib, pad; + unsigned offset = 0; + int length, nib, pad; proto_item *ti = NULL; proto_tree *dlmap_tree = NULL; proto_tree *ie_tree = NULL; proto_tree *phy_tree = NULL; - gint tvb_len = tvb_reported_length(tvb); + int tvb_len = tvb_reported_length(tvb); INC_CID = 0; @@ -2296,24 +2295,24 @@ static int dissect_mac_mgmt_msg_dlmap_decoder(tvbuff_t *tvb, packet_info *pinfo, return tvb_captured_length(tvb); } -gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tree) +int wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tree) { /* 8.4.5.6.1 [2] Compressed DL-MAP */ /* decode a compressed dl-map and return the length in bytes; */ /* if there is a compressed ul-map, also decode that and include in the length */ - guint offset = 0; + unsigned offset = 0; proto_item *ti = NULL; proto_item *ti_phy = NULL; proto_item *ti_dlmap_ies = NULL; proto_tree *tree = NULL; proto_tree *ie_tree = NULL; proto_tree *phy_tree = NULL; - gint ulmap_appended; - guint length, lennib, pad; - guint mac_len, dl_ie_count; - guint tvb_len = tvb_reported_length(tvb); - guint nib = 0; - guint32 mac_crc, calculated_crc; + int ulmap_appended; + unsigned length, lennib, pad; + unsigned mac_len, dl_ie_count; + unsigned tvb_len = tvb_reported_length(tvb); + unsigned nib = 0; + uint32_t mac_crc, calculated_crc; /* update the info column */ col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Compressed DL-MAP"); @@ -2324,7 +2323,7 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre mac_len = length; lennib = BYTE_TO_NIB(length); - ulmap_appended = (tvb_get_guint8(tvb, offset) >> 4) & 1; /* UL MAP appended? */ + ulmap_appended = (tvb_get_uint8(tvb, offset) >> 4) & 1; /* UL MAP appended? */ /* display MAC Compressed DL-MAP and create subtree */ ti = proto_tree_add_protocol_format(base_tree, proto_mac_mgmt_msg_dlmap_decoder, tvb, offset, length, "Compressed DL-MAP (%u bytes)", length); @@ -2347,7 +2346,7 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre proto_tree_add_item(tree, hf_dlmapc_secid, tvb, offset+8, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_dlmap_ofdma_sym, tvb, offset+9, 1, ENC_BIG_ENDIAN); /* 2005 */ proto_tree_add_item(tree, hf_dlmapc_count, tvb, offset+10,1, ENC_BIG_ENDIAN); - dl_ie_count = tvb_get_guint8(tvb, offset + 10); + dl_ie_count = tvb_get_uint8(tvb, offset + 10); offset += 11; nib = BYTE_TO_NIB(offset); @@ -2407,20 +2406,20 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre return mac_len; } #if 0 -static gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tree) +static int wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tree) { /* decode a SUB-DL-UL-MAP message 6.3.2.3.60 and return the length in bytes */ /* first three bits are 0x7, which following a compressed DL map indicates this message */ proto_tree *tree = NULL; proto_tree *ie_tree = NULL; proto_item *generic_item = NULL; - gint data; - gint i, numie; - guint16 calculated_crc; + int data; + int i, numie; + uint16_t calculated_crc; - gint length = tvb_reported_length(tvb); - gint nib = 0; - gint lennib = BYTE_TO_NIB(length); + int length = tvb_reported_length(tvb); + int nib = 0; + int lennib = BYTE_TO_NIB(length); sub_dl_ul_map = 1; /* set flag */ @@ -2485,22 +2484,22 @@ static gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo, proto_ } #endif -gint wimax_decode_dlmap_reduced_aas(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *base_tree) +int wimax_decode_dlmap_reduced_aas(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *base_tree) { /* 8.4.5.8.1 [2] Reduced AAS private DL-MAP */ /* if there is an appended UL-MAP, also decode that */ - guint offset = 0; + unsigned offset = 0; proto_item *ti = NULL; proto_tree *tree = NULL; - gint ulmap_appended; - gint length; - gint tvb_len = tvb_reported_length(tvb); - gint bit = 0; - guint data, pad, mult; - gint numie = 1; - gint i; - guint16 calculated_crc; - gint smcs,cidi,dcdi,phyi,cqci; + int ulmap_appended; + int length; + int tvb_len = tvb_reported_length(tvb); + int bit = 0; + unsigned data, pad, mult; + int numie = 1; + int i; + uint16_t calculated_crc; + int smcs,cidi,dcdi,phyi,cqci; length = tvb_len; @@ -3389,7 +3388,7 @@ void proto_register_mac_mgmt_msg_dlmap(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_dlmap, &ett_dlmap_ie, diff --git a/plugins/epan/wimax/msg_dreg.c b/plugins/epan/wimax/msg_dreg.c index 8c0cd650..2428f97e 100644 --- a/plugins/epan/wimax/msg_dreg.c +++ b/plugins/epan/wimax/msg_dreg.c @@ -21,8 +21,7 @@ #include "wimax_tlv.h" #include "wimax_mac.h" #include "wimax_utils.h" - -extern gboolean include_cor2_changes; +#include "wimax_prefs.h" void proto_register_mac_mgmt_msg_dreg_req(void); void proto_register_mac_mgmt_msg_dreg_cmd(void); @@ -32,45 +31,45 @@ static dissector_handle_t dreg_req_handle; static dissector_handle_t dreg_cmd_handle; /* Forward reference */ -static void dissect_dreg_tlv(proto_tree *dreg_tree, gint tlv_type, tvbuff_t *tvb, guint tlv_offset, guint tlv_len); +static void dissect_dreg_tlv(proto_tree *dreg_tree, int tlv_type, tvbuff_t *tvb, unsigned tlv_offset, unsigned tlv_len); static int dissect_mac_mgmt_msg_dreg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data); static int dissect_mac_mgmt_msg_dreg_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data); -static gint proto_mac_mgmt_msg_dreg_req_decoder = -1; -static gint proto_mac_mgmt_msg_dreg_cmd_decoder = -1; +static int proto_mac_mgmt_msg_dreg_req_decoder; +static int proto_mac_mgmt_msg_dreg_cmd_decoder; -static gint ett_mac_mgmt_msg_dreg_decoder = -1; +static int ett_mac_mgmt_msg_dreg_decoder; /* Setup protocol subtree array */ -static gint *ett[] = +static int *ett[] = { &ett_mac_mgmt_msg_dreg_decoder, }; /* DREG fields */ -/* static gint hf_ack_type_reserved = -1; */ -static gint hf_dreg_cmd_action = -1; -static gint hf_dreg_cmd_action_cor2 = -1; -static gint hf_dreg_cmd_reserved = -1; -static gint hf_dreg_paging_cycle = -1; -static gint hf_dreg_paging_offset = -1; -static gint hf_dreg_paging_group_id = -1; -static gint hf_dreg_req_duration = -1; -static gint hf_paging_controller_id = -1; -static gint hf_mac_hash_skip_threshold = -1; -static gint hf_dreg_paging_cycle_request = -1; -static gint hf_dreg_retain_ms_service_sbc = -1; -static gint hf_dreg_retain_ms_service_pkm = -1; -static gint hf_dreg_retain_ms_service_reg = -1; -static gint hf_dreg_retain_ms_service_network_address = -1; -static gint hf_dreg_retain_ms_service_tod = -1; -static gint hf_dreg_retain_ms_service_tftp = -1; -static gint hf_dreg_retain_ms_service_full_service = -1; -static gint hf_dreg_consider_paging_pref = -1; -static gint hf_tlv_value = -1; -static gint hf_dreg_req_action = -1; -static gint hf_dreg_req_reserved = -1; -static gint hf_dreg_invalid_tlv = -1; +/* static int hf_ack_type_reserved; */ +static int hf_dreg_cmd_action; +static int hf_dreg_cmd_action_cor2; +static int hf_dreg_cmd_reserved; +static int hf_dreg_paging_cycle; +static int hf_dreg_paging_offset; +static int hf_dreg_paging_group_id; +static int hf_dreg_req_duration; +static int hf_paging_controller_id; +static int hf_mac_hash_skip_threshold; +static int hf_dreg_paging_cycle_request; +static int hf_dreg_retain_ms_service_sbc; +static int hf_dreg_retain_ms_service_pkm; +static int hf_dreg_retain_ms_service_reg; +static int hf_dreg_retain_ms_service_network_address; +static int hf_dreg_retain_ms_service_tod; +static int hf_dreg_retain_ms_service_tftp; +static int hf_dreg_retain_ms_service_full_service; +static int hf_dreg_consider_paging_pref; +static int hf_tlv_value; +static int hf_dreg_req_action; +static int hf_dreg_req_reserved; +static int hf_dreg_invalid_tlv; /* STRING RESOURCES */ static const value_string vals_dreg_req_code[] = { @@ -131,7 +130,7 @@ Action Code 03 cancels this restriction"}, }; /* Decode sub-TLV's of either DREG-REQ or DREG-CMD. */ -static void dissect_dreg_tlv(proto_tree *dreg_tree, gint tlv_type, tvbuff_t *tvb, guint tlv_offset, guint tlv_len) +static void dissect_dreg_tlv(proto_tree *dreg_tree, int tlv_type, tvbuff_t *tvb, unsigned tlv_offset, unsigned tlv_len) { switch (tlv_type) { case DREG_PAGING_INFO: @@ -363,16 +362,16 @@ void proto_register_mac_mgmt_msg_dreg_cmd(void) /* Decode DREG-REQ messages. */ static int dissect_mac_mgmt_msg_dreg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tlv_offset; - guint tvb_len; + unsigned offset = 0; + unsigned tlv_offset; + unsigned tvb_len; proto_item *dreg_req_item; proto_tree *dreg_req_tree; proto_tree *tlv_tree = NULL; tlv_info_t tlv_info; - gint tlv_type; - gint tlv_len; - gboolean hmac_found = FALSE; + int tlv_type; + int tlv_len; + bool hmac_found = false; { /* we are being asked for details */ @@ -410,7 +409,7 @@ static int dissect_mac_mgmt_msg_dreg_req_decoder(tvbuff_t *tvb, packet_info *pin /* decode and display the HMAC Tuple */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dreg_decoder, dreg_req_tree, proto_mac_mgmt_msg_dreg_req_decoder, tvb, offset, tlv_len, "HMAC Tuple"); wimax_hmac_tuple_decoder(tlv_tree, tvb, tlv_offset, tlv_len); - hmac_found = TRUE; + hmac_found = true; break; case CMAC_TUPLE: /* Table 348b */ /* decode and display the CMAC Tuple */ @@ -436,16 +435,16 @@ static int dissect_mac_mgmt_msg_dreg_req_decoder(tvbuff_t *tvb, packet_info *pin /* Decode DREG-CMD messages. */ static int dissect_mac_mgmt_msg_dreg_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tlv_offset; - guint tvb_len; + unsigned offset = 0; + unsigned tlv_offset; + unsigned tvb_len; proto_item *dreg_cmd_item; proto_tree *dreg_cmd_tree; proto_tree *tlv_tree = NULL; tlv_info_t tlv_info; - gint tlv_type; - gint tlv_len; - gboolean hmac_found = FALSE; + int tlv_type; + int tlv_len; + bool hmac_found = false; { /* we are being asked for details */ @@ -486,7 +485,7 @@ static int dissect_mac_mgmt_msg_dreg_cmd_decoder(tvbuff_t *tvb, packet_info *pin /* decode and display the HMAC Tuple */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dreg_decoder, dreg_cmd_tree, proto_mac_mgmt_msg_dreg_cmd_decoder, tvb, offset, tlv_len, "HMAC Tuple"); wimax_hmac_tuple_decoder(tlv_tree, tvb, tlv_offset, tlv_len); - hmac_found = TRUE; + hmac_found = true; break; case CMAC_TUPLE: /* Table 348b */ /* decode and display the CMAC Tuple */ diff --git a/plugins/epan/wimax/msg_dsa.c b/plugins/epan/wimax/msg_dsa.c index 72280baa..e6c9e98e 100644 --- a/plugins/epan/wimax/msg_dsa.c +++ b/plugins/epan/wimax/msg_dsa.c @@ -31,18 +31,18 @@ static dissector_handle_t dsa_req_handle; static dissector_handle_t dsa_rsp_handle; static dissector_handle_t dsa_ack_handle; -static gint proto_mac_mgmt_msg_dsa_decoder = -1; -static gint ett_mac_mgmt_msg_dsa_req_decoder = -1; -static gint ett_mac_mgmt_msg_dsa_rsp_decoder = -1; -static gint ett_mac_mgmt_msg_dsa_ack_decoder = -1; +static int proto_mac_mgmt_msg_dsa_decoder; +static int ett_mac_mgmt_msg_dsa_req_decoder; +static int ett_mac_mgmt_msg_dsa_rsp_decoder; +static int ett_mac_mgmt_msg_dsa_ack_decoder; /* fix fields */ -static gint hf_dsa_transaction_id = -1; -static gint hf_dsa_confirmation_code = -1; +static int hf_dsa_transaction_id; +static int hf_dsa_confirmation_code; static int dissect_mac_mgmt_msg_dsa_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *dsa_item; proto_tree *dsa_tree; @@ -66,7 +66,7 @@ static int dissect_mac_mgmt_msg_dsa_req_decoder(tvbuff_t *tvb, packet_info *pinf static int dissect_mac_mgmt_msg_dsa_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *dsa_item; proto_tree *dsa_tree; @@ -93,7 +93,7 @@ static int dissect_mac_mgmt_msg_dsa_rsp_decoder(tvbuff_t *tvb, packet_info *pinf static int dissect_mac_mgmt_msg_dsa_ack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *dsa_item; proto_tree *dsa_tree; @@ -141,7 +141,7 @@ void proto_register_mac_mgmt_msg_dsa(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_dsa_req_decoder, &ett_mac_mgmt_msg_dsa_rsp_decoder, diff --git a/plugins/epan/wimax/msg_dsc.c b/plugins/epan/wimax/msg_dsc.c index 8f681965..7ac6a290 100644 --- a/plugins/epan/wimax/msg_dsc.c +++ b/plugins/epan/wimax/msg_dsc.c @@ -31,19 +31,19 @@ static dissector_handle_t dsc_req_handle; static dissector_handle_t dsc_rsp_handle; static dissector_handle_t dsc_ack_handle; -static gint proto_mac_mgmt_msg_dsc_decoder = -1; -static gint ett_mac_mgmt_msg_dsc_req_decoder = -1; -static gint ett_mac_mgmt_msg_dsc_rsp_decoder = -1; -static gint ett_mac_mgmt_msg_dsc_ack_decoder = -1; +static int proto_mac_mgmt_msg_dsc_decoder; +static int ett_mac_mgmt_msg_dsc_req_decoder; +static int ett_mac_mgmt_msg_dsc_rsp_decoder; +static int ett_mac_mgmt_msg_dsc_ack_decoder; /* fix fields */ -static gint hf_dsc_transaction_id = -1; -static gint hf_dsc_confirmation_code = -1; +static int hf_dsc_transaction_id; +static int hf_dsc_confirmation_code; static int dissect_mac_mgmt_msg_dsc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *dsc_item; proto_tree *dsc_tree; @@ -67,7 +67,7 @@ static int dissect_mac_mgmt_msg_dsc_req_decoder(tvbuff_t *tvb, packet_info *pinf static int dissect_mac_mgmt_msg_dsc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *dsc_item; proto_tree *dsc_tree; @@ -94,7 +94,7 @@ static int dissect_mac_mgmt_msg_dsc_rsp_decoder(tvbuff_t *tvb, packet_info *pinf static int dissect_mac_mgmt_msg_dsc_ack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *dsc_item; proto_tree *dsc_tree; @@ -142,7 +142,7 @@ void proto_register_mac_mgmt_msg_dsc(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_dsc_req_decoder, &ett_mac_mgmt_msg_dsc_rsp_decoder, diff --git a/plugins/epan/wimax/msg_dsd.c b/plugins/epan/wimax/msg_dsd.c index 6f7c4c07..06de174b 100644 --- a/plugins/epan/wimax/msg_dsd.c +++ b/plugins/epan/wimax/msg_dsd.c @@ -31,27 +31,27 @@ void proto_reg_handoff_mac_mgmt_msg_dsd(void); static dissector_handle_t dsd_req_handle; static dissector_handle_t dsd_rsp_handle; -static gint proto_mac_mgmt_msg_dsd_decoder = -1; -static gint ett_mac_mgmt_msg_dsd_req_decoder = -1; -static gint ett_mac_mgmt_msg_dsd_rsp_decoder = -1; -/* static gint ett_dsd_ul_sfe_decoder = -1; */ -/* static gint ett_dsd_dl_sfe_decoder = -1; */ -/* static gint ett_dsd_hmac_tuple = -1; */ -/* static gint ett_dsd_cmac_tuple = -1; */ +static int proto_mac_mgmt_msg_dsd_decoder; +static int ett_mac_mgmt_msg_dsd_req_decoder; +static int ett_mac_mgmt_msg_dsd_rsp_decoder; +/* static int ett_dsd_ul_sfe_decoder; */ +/* static int ett_dsd_dl_sfe_decoder; */ +/* static int ett_dsd_hmac_tuple; */ +/* static int ett_dsd_cmac_tuple; */ /* fix fields */ -static gint hf_dsd_transaction_id = -1; -static gint hf_dsd_service_flow_id = -1; -static gint hf_dsd_confirmation_code = -1; -static gint hf_dsd_invalid_tlv = -1; -static gint hf_dsd_unknown_type = -1; +static int hf_dsd_transaction_id; +static int hf_dsd_service_flow_id; +static int hf_dsd_confirmation_code; +static int hf_dsd_invalid_tlv; +static int hf_dsd_unknown_type; static int dissect_mac_mgmt_msg_dsd_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len, tlv_len, tlv_value_offset; - gint tlv_type; + unsigned offset = 0; + unsigned tvb_len, tlv_len, tlv_value_offset; + int tlv_type; proto_item *dsd_item; proto_tree *dsd_tree; proto_tree *tlv_tree = NULL; @@ -119,9 +119,9 @@ static int dissect_mac_mgmt_msg_dsd_req_decoder(tvbuff_t *tvb, packet_info *pinf static int dissect_mac_mgmt_msg_dsd_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len, tlv_len, tlv_value_offset; - gint tlv_type; + unsigned offset = 0; + unsigned tvb_len, tlv_len, tlv_value_offset; + int tlv_type; proto_item *dsd_item; proto_tree *dsd_tree; proto_tree *tlv_tree = NULL; @@ -234,7 +234,7 @@ void proto_register_mac_mgmt_msg_dsd(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_dsd_req_decoder, &ett_mac_mgmt_msg_dsd_rsp_decoder, diff --git a/plugins/epan/wimax/msg_dsx_rvd.c b/plugins/epan/wimax/msg_dsx_rvd.c index 4362a9ef..8fbbfb55 100644 --- a/plugins/epan/wimax/msg_dsx_rvd.c +++ b/plugins/epan/wimax/msg_dsx_rvd.c @@ -24,18 +24,18 @@ void proto_reg_handoff_mac_mgmt_msg_dsx_rvd(void); static dissector_handle_t dsx_rvd_handle; -static gint proto_mac_mgmt_msg_dsx_rvd_decoder = -1; -static gint ett_mac_mgmt_msg_dsx_rvd_decoder = -1; +static int proto_mac_mgmt_msg_dsx_rvd_decoder; +static int ett_mac_mgmt_msg_dsx_rvd_decoder; /* fix fields */ -static gint hf_dsx_rvd_transaction_id = -1; -static gint hf_dsx_rvd_confirmation_code = -1; +static int hf_dsx_rvd_transaction_id; +static int hf_dsx_rvd_confirmation_code; /* Decode DSX-RVD messages. */ static int dissect_mac_mgmt_msg_dsx_rvd_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *dsx_rvd_item; proto_tree *dsx_rvd_tree; @@ -71,7 +71,7 @@ void proto_register_mac_mgmt_msg_dsx_rvd(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_dsx_rvd_decoder, }; diff --git a/plugins/epan/wimax/msg_fpc.c b/plugins/epan/wimax/msg_fpc.c index 42b50141..9fc08769 100644 --- a/plugins/epan/wimax/msg_fpc.c +++ b/plugins/epan/wimax/msg_fpc.c @@ -25,29 +25,29 @@ void proto_reg_handoff_mac_mgmt_msg_fpc(void); static dissector_handle_t fpc_handle; -static gint proto_mac_mgmt_msg_fpc_decoder = -1; +static int proto_mac_mgmt_msg_fpc_decoder; -static gint ett_mac_mgmt_msg_fpc_decoder = -1; +static int ett_mac_mgmt_msg_fpc_decoder; /* FPC fields */ -static gint hf_fpc_number_of_stations = -1; -static gint hf_fpc_basic_cid = -1; -static gint hf_fpc_power_adjust = -1; -static gint hf_fpc_power_measurement_frame = -1; -/* static gint hf_fpc_invalid_tlv = -1; */ +static int hf_fpc_number_of_stations; +static int hf_fpc_basic_cid; +static int hf_fpc_power_adjust; +static int hf_fpc_power_measurement_frame; +/* static int hf_fpc_invalid_tlv; */ /* Decode FPC messages. */ static int dissect_mac_mgmt_msg_fpc_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint i; - guint number_stations; - guint tvb_len; + unsigned offset = 0; + unsigned i; + unsigned number_stations; + unsigned tvb_len; proto_item *fpc_item; proto_tree *fpc_tree; - gint8 value; - gfloat power_change; + int8_t value; + float power_change; { /* we are being asked for details */ @@ -61,7 +61,7 @@ static int dissect_mac_mgmt_msg_fpc_decoder(tvbuff_t *tvb, packet_info *pinfo _U /* display the Number of stations */ proto_tree_add_item(fpc_tree, hf_fpc_number_of_stations, tvb, offset, 1, ENC_BIG_ENDIAN); - number_stations = tvb_get_guint8(tvb, offset); + number_stations = tvb_get_uint8(tvb, offset); offset++; for (i = 0; ((i < number_stations) && (offset >= tvb_len)); i++ ) { /* display the Basic CID*/ @@ -69,7 +69,7 @@ static int dissect_mac_mgmt_msg_fpc_decoder(tvbuff_t *tvb, packet_info *pinfo _U offset += 2; /* display the Power adjust value */ - value = tvb_get_gint8(tvb, offset); + value = tvb_get_int8(tvb, offset); power_change = (float)0.25 * value; /* 0.25dB incr */ /* display the Power adjust value in dB */ @@ -130,7 +130,7 @@ void proto_register_mac_mgmt_msg_fpc(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_fpc_decoder, }; diff --git a/plugins/epan/wimax/msg_pkm.c b/plugins/epan/wimax/msg_pkm.c index b91f2601..fc12f067 100644 --- a/plugins/epan/wimax/msg_pkm.c +++ b/plugins/epan/wimax/msg_pkm.c @@ -32,9 +32,9 @@ static dissector_handle_t mac_mgmt_msg_pkm_req_handle; static dissector_handle_t mac_mgmt_msg_pkm_rsp_handle; -static gint proto_mac_mgmt_msg_pkm_decoder = -1; -static gint ett_mac_mgmt_msg_pkm_req_decoder = -1; -static gint ett_mac_mgmt_msg_pkm_rsp_decoder = -1; +static int proto_mac_mgmt_msg_pkm_decoder; +static int ett_mac_mgmt_msg_pkm_req_decoder; +static int ett_mac_mgmt_msg_pkm_rsp_decoder; static const value_string vals_pkm_msg_code[] = { @@ -70,14 +70,14 @@ static const value_string vals_pkm_msg_code[] = }; /* fix fields */ -static gint hf_pkm_msg_code = -1; -static gint hf_pkm_msg_pkm_id = -1; +static int hf_pkm_msg_code; +static int hf_pkm_msg_pkm_id; /* Wimax Mac PKM-REQ Message Dissector */ static int dissect_mac_mgmt_msg_pkm_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *pkm_item; proto_tree *pkm_tree; @@ -101,7 +101,7 @@ static int dissect_mac_mgmt_msg_pkm_req_decoder(tvbuff_t *tvb, packet_info *pinf /* Wimax Mac PKM-RSP Message Dissector */ static int dissect_mac_mgmt_msg_pkm_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *pkm_item; proto_tree *pkm_tree; @@ -140,7 +140,7 @@ void proto_register_mac_mgmt_msg_pkm(void) }; /* Setup protocol subtree array */ - static gint *ett_pkm[] = + static int *ett_pkm[] = { &ett_mac_mgmt_msg_pkm_req_decoder, &ett_mac_mgmt_msg_pkm_rsp_decoder, diff --git a/plugins/epan/wimax/msg_pmc.c b/plugins/epan/wimax/msg_pmc.c index 7fe16e04..75e95b63 100644 --- a/plugins/epan/wimax/msg_pmc.c +++ b/plugins/epan/wimax/msg_pmc.c @@ -19,8 +19,7 @@ #include <epan/packet.h> #include "wimax_mac.h" - -extern gboolean include_cor2_changes; +#include "wimax_prefs.h" void proto_register_mac_mgmt_msg_pmc_req(void); void proto_register_mac_mgmt_msg_pmc_rsp(void); @@ -31,26 +30,26 @@ static int dissect_mac_mgmt_msg_pmc_rsp_decoder(tvbuff_t *tvb, packet_info *pinf static dissector_handle_t pmc_req_handle; static dissector_handle_t pmc_rsp_handle; -static gint proto_mac_mgmt_msg_pmc_req_decoder = -1; -static gint proto_mac_mgmt_msg_pmc_rsp_decoder = -1; +static int proto_mac_mgmt_msg_pmc_req_decoder; +static int proto_mac_mgmt_msg_pmc_rsp_decoder; -static gint ett_mac_mgmt_msg_pmc_decoder = -1; +static int ett_mac_mgmt_msg_pmc_decoder; /* Setup protocol subtree array */ -static gint *ett[] = +static int *ett[] = { &ett_mac_mgmt_msg_pmc_decoder, }; /* PMC fields */ -static gint hf_pmc_req_pwr_control_mode_change = -1; -static gint hf_pmc_req_pwr_control_mode_change_cor2 = -1; -static gint hf_pmc_req_tx_power_level = -1; -static gint hf_pmc_req_confirmation = -1; -static gint hf_pmc_req_reserved = -1; -static gint hf_pmc_rsp_start_frame = -1; -static gint hf_pmc_rsp_power_adjust = -1; -static gint hf_pmc_rsp_offset_BS_per_MS = -1; +static int hf_pmc_req_pwr_control_mode_change; +static int hf_pmc_req_pwr_control_mode_change_cor2; +static int hf_pmc_req_tx_power_level; +static int hf_pmc_req_confirmation; +static int hf_pmc_req_reserved; +static int hf_pmc_rsp_start_frame; +static int hf_pmc_rsp_power_adjust; +static int hf_pmc_rsp_offset_BS_per_MS; /* STRING RESOURCES */ static const value_string vals_pmc_req_pwr[] = { @@ -164,7 +163,7 @@ void proto_register_mac_mgmt_msg_pmc_rsp(void) /* Decode PMC-REQ messages. */ static int dissect_mac_mgmt_msg_pmc_req_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *pmc_req_item; proto_tree *pmc_req_tree; @@ -189,12 +188,12 @@ static int dissect_mac_mgmt_msg_pmc_req_decoder(tvbuff_t *tvb, packet_info *pinf /* Decode PMC-RSP messages. */ static int dissect_mac_mgmt_msg_pmc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *pmc_rsp_item; proto_tree *pmc_rsp_tree; - guint8 pwr_control_mode; - gint8 value; - gfloat power_change; + uint8_t pwr_control_mode; + int8_t value; + float power_change; { /* we are being asked for details */ @@ -210,10 +209,10 @@ static int dissect_mac_mgmt_msg_pmc_rsp_decoder(tvbuff_t *tvb, packet_info *pinf proto_tree_add_item(pmc_rsp_tree, hf_pmc_req_pwr_control_mode_change, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the Power Adjust start frame */ proto_tree_add_item(pmc_rsp_tree, hf_pmc_rsp_start_frame, tvb, offset, 2, ENC_BIG_ENDIAN); - pwr_control_mode = 0xC0 & tvb_get_guint8(tvb, offset); + pwr_control_mode = 0xC0 & tvb_get_uint8(tvb, offset); offset++; - value = tvb_get_gint8(tvb, offset); + value = tvb_get_int8(tvb, offset); power_change = (float)0.25 * value; /* 0.25dB incr */ /* Check if Power Control Mode is 0 */ if (pwr_control_mode == 0) { diff --git a/plugins/epan/wimax/msg_prc_lt_ctrl.c b/plugins/epan/wimax/msg_prc_lt_ctrl.c index f8b5b97f..b6599ca7 100644 --- a/plugins/epan/wimax/msg_prc_lt_ctrl.c +++ b/plugins/epan/wimax/msg_prc_lt_ctrl.c @@ -25,14 +25,14 @@ void proto_reg_handoff_mac_mgmt_msg_prc_lt_ctrl(void); static dissector_handle_t prc_handle; -static gint proto_mac_mgmt_msg_prc_lt_ctrl_decoder = -1; +static int proto_mac_mgmt_msg_prc_lt_ctrl_decoder; -static gint ett_mac_mgmt_msg_prc_lt_ctrl_decoder = -1; +static int ett_mac_mgmt_msg_prc_lt_ctrl_decoder; /* PRC-LT-CTRL fields */ -static gint hf_prc_lt_ctrl_precoding = -1; -static gint hf_prc_lt_ctrl_precoding_delay = -1; -/* static gint hf_prc_lt_ctrl_invalid_tlv = -1; */ +static int hf_prc_lt_ctrl_precoding; +static int hf_prc_lt_ctrl_precoding_delay; +/* static int hf_prc_lt_ctrl_invalid_tlv; */ static const value_string vals_turn_on[] = { {0, "Turn off"}, @@ -44,7 +44,7 @@ static const value_string vals_turn_on[] = { /* Decode PRC-LT-CTRL messages. */ static int dissect_mac_mgmt_msg_prc_lt_ctrl_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - guint offset = 0; + unsigned offset = 0; proto_item *prc_lt_ctrl_item; proto_tree *prc_lt_ctrl_tree; @@ -100,7 +100,7 @@ void proto_register_mac_mgmt_msg_prc_lt_ctrl(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_prc_lt_ctrl_decoder, }; diff --git a/plugins/epan/wimax/msg_reg_req.c b/plugins/epan/wimax/msg_reg_req.c index f0ba1a5f..ede763dd 100644 --- a/plugins/epan/wimax/msg_reg_req.c +++ b/plugins/epan/wimax/msg_reg_req.c @@ -22,129 +22,128 @@ #include "wimax_tlv.h" #include "wimax_mac.h" #include "wimax_utils.h" - -extern gboolean include_cor2_changes; +#include "wimax_prefs.h" void proto_register_mac_mgmt_msg_reg_req(void); void proto_reg_handoff_mac_mgmt_msg_reg_req(void); static dissector_handle_t reg_req_handle; -static gint proto_mac_mgmt_msg_reg_req_decoder = -1; -static gint ett_mac_mgmt_msg_reg_req_decoder = -1; +static int proto_mac_mgmt_msg_reg_req_decoder; +static int ett_mac_mgmt_msg_reg_req_decoder; /* REG-REQ fields */ -static gint hf_reg_ss_mgmt_support = -1; -static gint hf_reg_ip_mgmt_mode = -1; -static gint hf_reg_ip_version = -1; -static gint hf_reg_req_secondary_mgmt_cid = -1; -static gint hf_reg_ul_cids = -1; -static gint hf_reg_max_classifiers = -1; -static gint hf_reg_phs = -1; -static gint hf_reg_arq = -1; -static gint hf_reg_dsx_flow_control = -1; -static gint hf_reg_mac_crc_support = -1; -static gint hf_reg_mca_flow_control = -1; -static gint hf_reg_mcast_polling_cids = -1; -static gint hf_reg_num_dl_trans_cid = -1; -static gint hf_reg_mac_address = -1; -static gint hf_reg_tlv_t_20_1_max_mac_level_data_per_dl_frame = -1; -static gint hf_reg_tlv_t_20_2_max_mac_level_data_per_ul_frame = -1; -static gint hf_reg_tlv_t_21_packing_support = -1; -static gint hf_reg_tlv_t_22_mac_extended_rtps_support = -1; -static gint hf_reg_tlv_t_23_max_num_bursts_concurrently_to_the_ms = -1; -static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_dhcp = -1; -static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_mobile_ipv4 = -1; -static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_dhcpv6 = -1; -static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_ipv6 = -1; -static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_rsvd = -1; -static gint hf_reg_tlv_t_27_handover_fbss_mdho_ho_disable = -1; -static gint hf_reg_tlv_t_27_handover_fbss_mdho_dl_rf_monitoring_maps = -1; -static gint hf_reg_tlv_t_27_handover_mdho_dl_monitoring_single_map = -1; -static gint hf_reg_tlv_t_27_handover_mdho_dl_monitoring_maps = -1; -static gint hf_reg_tlv_t_27_handover_mdho_ul_multiple = -1; -static gint hf_reg_tlv_t_27_handover_reserved = -1; -static gint hf_reg_tlv_t_29_ho_process_opt_ms_timer = -1; -static gint hf_reg_tlv_t_31_mobility_handover = -1; -static gint hf_reg_tlv_t_31_mobility_sleep_mode = -1; -static gint hf_reg_tlv_t_31_mobility_idle_mode = -1; -static gint hf_reg_req_tlv_t_32_sleep_mode_recovery_time = -1; -static gint hf_ms_previous_ip_address_v4 = -1; -static gint hf_ms_previous_ip_address_v6 = -1; -static gint hf_idle_mode_timeout = -1; -static gint hf_reg_req_tlv_t_45_ms_periodic_ranging_timer = -1; -static gint hf_reg_tlv_t_40_arq_ack_type_selective_ack_entry = -1; -static gint hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_entry = -1; -static gint hf_reg_tlv_t_40_arq_ack_type_cumulative_with_selective_ack_entry = -1; -static gint hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_with_block_sequence_ack = -1; -static gint hf_reg_tlv_t_40_arq_ack_type_reserved = -1; -static gint hf_reg_tlv_t_41_ho_connections_param_processing_time = -1; -static gint hf_reg_tlv_t_42_ho_tek_processing_time = -1; -static gint hf_reg_tlv_t_43_bandwidth_request_ul_tx_power_report_header_support = -1; -static gint hf_reg_tlv_t_43_bandwidth_request_cinr_report_header_support = -1; -static gint hf_reg_tlv_t_43_cqich_allocation_request_header_support = -1; -static gint hf_reg_tlv_t_43_phy_channel_report_header_support = -1; -static gint hf_reg_tlv_t_43_bandwidth_request_ul_sleep_control_header_support = -1; -static gint hf_reg_tlv_t_43_sn_report_header_support = -1; -static gint hf_reg_tlv_t_43_feedback_header_support = -1; -static gint hf_reg_tlv_t_43_sdu_sn_extended_subheader_support_and_parameter = -1; -static gint hf_reg_tlv_t_43_sdu_sn_parameter = -1; -static gint hf_reg_tlv_t_43_dl_sleep_control_extended_subheader = -1; -static gint hf_reg_tlv_t_43_feedback_request_extended_subheader = -1; -static gint hf_reg_tlv_t_43_mimo_mode_feedback_extended_subheader = -1; -static gint hf_reg_tlv_t_43_ul_tx_power_report_extended_subheader = -1; -static gint hf_reg_tlv_t_43_mini_feedback_extended_subheader = -1; -static gint hf_reg_tlv_t_43_sn_request_extended_subheader = -1; -static gint hf_reg_tlv_t_43_pdu_sn_short_extended_subheader = -1; -static gint hf_reg_tlv_t_43_pdu_sn_long_extended_subheader = -1; -static gint hf_reg_tlv_t_43_reserved = -1; -static gint hf_reg_tlv_t_46_handover_indication_readiness_timer = -1; -static gint hf_reg_req_min_time_for_intra_fa = -1; -static gint hf_reg_req_min_time_for_inter_fa = -1; -static gint hf_reg_encap_atm_4 = -1; -static gint hf_reg_encap_ipv4_4 = -1; -static gint hf_reg_encap_ipv6_4 = -1; -static gint hf_reg_encap_802_3_4 = -1; -static gint hf_reg_encap_802_1q_4 = -1; -static gint hf_reg_encap_ipv4_802_3_4 = -1; -static gint hf_reg_encap_ipv6_802_3_4 = -1; -static gint hf_reg_encap_ipv4_802_1q_4 = -1; -static gint hf_reg_encap_ipv6_802_1q_4 = -1; -static gint hf_reg_encap_packet_8023_ethernet_and_rohc_header_compression_4 = -1; -static gint hf_reg_encap_packet_8023_ethernet_and_ecrtp_header_compression_4 = -1; -static gint hf_reg_encap_packet_ip_rohc_header_compression_4 = -1; -static gint hf_reg_encap_packet_ip_ecrtp_header_compression_4 = -1; -static gint hf_reg_encap_rsvd_4 = -1; -static gint hf_reg_encap_atm_2 = -1; -static gint hf_reg_encap_ipv4_2 = -1; -static gint hf_reg_encap_ipv6_2 = -1; -static gint hf_reg_encap_802_3_2 = -1; -static gint hf_reg_encap_802_1q_2 = -1; -static gint hf_reg_encap_ipv4_802_3_2 = -1; -static gint hf_reg_encap_ipv6_802_3_2 = -1; -static gint hf_reg_encap_ipv4_802_1q_2 = -1; -static gint hf_reg_encap_ipv6_802_1q_2 = -1; -static gint hf_reg_encap_packet_8023_ethernet_and_rohc_header_compression_2 = -1; -static gint hf_reg_encap_packet_8023_ethernet_and_ecrtp_header_compression_2 = -1; -static gint hf_reg_encap_packet_ip_rohc_header_compression_2 = -1; -static gint hf_reg_encap_packet_ip_ecrtp_header_compression_2 = -1; -static gint hf_reg_encap_rsvd_2 = -1; -static gint hf_tlv_type = -1; -static gint hf_reg_invalid_tlv = -1; -static gint hf_reg_power_saving_class_type_i = -1; -static gint hf_reg_power_saving_class_type_ii = -1; -static gint hf_reg_power_saving_class_type_iii = -1; -static gint hf_reg_multi_active_power_saving_classes = -1; -static gint hf_reg_total_power_saving_class_instances = -1; -static gint hf_reg_power_saving_class_reserved = -1; -static gint hf_reg_power_saving_class_capability = -1; -static gint hf_reg_ip_phs_sdu_encap = -1; -static gint hf_reg_tlv_t_26_method_alloc_ip_addr_secondary_mgmnt_conn = -1; -static gint hf_reg_tlv_t_27_handover_supported = -1; -static gint hf_reg_tlv_t_31_mobility_features_supported = -1; -static gint hf_reg_tlv_t_40_arq_ack_type = -1; -static gint hf_reg_tlv_t_43_mac_header_ext_header_support = -1; -static gint hf_reg_req_bs_switching_timer = -1; +static int hf_reg_ss_mgmt_support; +static int hf_reg_ip_mgmt_mode; +static int hf_reg_ip_version; +static int hf_reg_req_secondary_mgmt_cid; +static int hf_reg_ul_cids; +static int hf_reg_max_classifiers; +static int hf_reg_phs; +static int hf_reg_arq; +static int hf_reg_dsx_flow_control; +static int hf_reg_mac_crc_support; +static int hf_reg_mca_flow_control; +static int hf_reg_mcast_polling_cids; +static int hf_reg_num_dl_trans_cid; +static int hf_reg_mac_address; +static int hf_reg_tlv_t_20_1_max_mac_level_data_per_dl_frame; +static int hf_reg_tlv_t_20_2_max_mac_level_data_per_ul_frame; +static int hf_reg_tlv_t_21_packing_support; +static int hf_reg_tlv_t_22_mac_extended_rtps_support; +static int hf_reg_tlv_t_23_max_num_bursts_concurrently_to_the_ms; +static int hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_dhcp; +static int hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_mobile_ipv4; +static int hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_dhcpv6; +static int hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_ipv6; +static int hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_rsvd; +static int hf_reg_tlv_t_27_handover_fbss_mdho_ho_disable; +static int hf_reg_tlv_t_27_handover_fbss_mdho_dl_rf_monitoring_maps; +static int hf_reg_tlv_t_27_handover_mdho_dl_monitoring_single_map; +static int hf_reg_tlv_t_27_handover_mdho_dl_monitoring_maps; +static int hf_reg_tlv_t_27_handover_mdho_ul_multiple; +static int hf_reg_tlv_t_27_handover_reserved; +static int hf_reg_tlv_t_29_ho_process_opt_ms_timer; +static int hf_reg_tlv_t_31_mobility_handover; +static int hf_reg_tlv_t_31_mobility_sleep_mode; +static int hf_reg_tlv_t_31_mobility_idle_mode; +static int hf_reg_req_tlv_t_32_sleep_mode_recovery_time; +static int hf_ms_previous_ip_address_v4; +static int hf_ms_previous_ip_address_v6; +static int hf_idle_mode_timeout; +static int hf_reg_req_tlv_t_45_ms_periodic_ranging_timer; +static int hf_reg_tlv_t_40_arq_ack_type_selective_ack_entry; +static int hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_entry; +static int hf_reg_tlv_t_40_arq_ack_type_cumulative_with_selective_ack_entry; +static int hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_with_block_sequence_ack; +static int hf_reg_tlv_t_40_arq_ack_type_reserved; +static int hf_reg_tlv_t_41_ho_connections_param_processing_time; +static int hf_reg_tlv_t_42_ho_tek_processing_time; +static int hf_reg_tlv_t_43_bandwidth_request_ul_tx_power_report_header_support; +static int hf_reg_tlv_t_43_bandwidth_request_cinr_report_header_support; +static int hf_reg_tlv_t_43_cqich_allocation_request_header_support; +static int hf_reg_tlv_t_43_phy_channel_report_header_support; +static int hf_reg_tlv_t_43_bandwidth_request_ul_sleep_control_header_support; +static int hf_reg_tlv_t_43_sn_report_header_support; +static int hf_reg_tlv_t_43_feedback_header_support; +static int hf_reg_tlv_t_43_sdu_sn_extended_subheader_support_and_parameter; +static int hf_reg_tlv_t_43_sdu_sn_parameter; +static int hf_reg_tlv_t_43_dl_sleep_control_extended_subheader; +static int hf_reg_tlv_t_43_feedback_request_extended_subheader; +static int hf_reg_tlv_t_43_mimo_mode_feedback_extended_subheader; +static int hf_reg_tlv_t_43_ul_tx_power_report_extended_subheader; +static int hf_reg_tlv_t_43_mini_feedback_extended_subheader; +static int hf_reg_tlv_t_43_sn_request_extended_subheader; +static int hf_reg_tlv_t_43_pdu_sn_short_extended_subheader; +static int hf_reg_tlv_t_43_pdu_sn_long_extended_subheader; +static int hf_reg_tlv_t_43_reserved; +static int hf_reg_tlv_t_46_handover_indication_readiness_timer; +static int hf_reg_req_min_time_for_intra_fa; +static int hf_reg_req_min_time_for_inter_fa; +static int hf_reg_encap_atm_4; +static int hf_reg_encap_ipv4_4; +static int hf_reg_encap_ipv6_4; +static int hf_reg_encap_802_3_4; +static int hf_reg_encap_802_1q_4; +static int hf_reg_encap_ipv4_802_3_4; +static int hf_reg_encap_ipv6_802_3_4; +static int hf_reg_encap_ipv4_802_1q_4; +static int hf_reg_encap_ipv6_802_1q_4; +static int hf_reg_encap_packet_8023_ethernet_and_rohc_header_compression_4; +static int hf_reg_encap_packet_8023_ethernet_and_ecrtp_header_compression_4; +static int hf_reg_encap_packet_ip_rohc_header_compression_4; +static int hf_reg_encap_packet_ip_ecrtp_header_compression_4; +static int hf_reg_encap_rsvd_4; +static int hf_reg_encap_atm_2; +static int hf_reg_encap_ipv4_2; +static int hf_reg_encap_ipv6_2; +static int hf_reg_encap_802_3_2; +static int hf_reg_encap_802_1q_2; +static int hf_reg_encap_ipv4_802_3_2; +static int hf_reg_encap_ipv6_802_3_2; +static int hf_reg_encap_ipv4_802_1q_2; +static int hf_reg_encap_ipv6_802_1q_2; +static int hf_reg_encap_packet_8023_ethernet_and_rohc_header_compression_2; +static int hf_reg_encap_packet_8023_ethernet_and_ecrtp_header_compression_2; +static int hf_reg_encap_packet_ip_rohc_header_compression_2; +static int hf_reg_encap_packet_ip_ecrtp_header_compression_2; +static int hf_reg_encap_rsvd_2; +static int hf_tlv_type; +static int hf_reg_invalid_tlv; +static int hf_reg_power_saving_class_type_i; +static int hf_reg_power_saving_class_type_ii; +static int hf_reg_power_saving_class_type_iii; +static int hf_reg_multi_active_power_saving_classes; +static int hf_reg_total_power_saving_class_instances; +static int hf_reg_power_saving_class_reserved; +static int hf_reg_power_saving_class_capability; +static int hf_reg_ip_phs_sdu_encap; +static int hf_reg_tlv_t_26_method_alloc_ip_addr_secondary_mgmnt_conn; +static int hf_reg_tlv_t_27_handover_supported; +static int hf_reg_tlv_t_31_mobility_features_supported; +static int hf_reg_tlv_t_40_arq_ack_type; +static int hf_reg_tlv_t_43_mac_header_ext_header_support; +static int hf_reg_req_bs_switching_timer; /* STRING RESOURCES */ @@ -213,15 +212,15 @@ static const value_string unique_no_limit[] = { }; /* Decode REG-REQ sub-TLV's. */ -void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb, guint tlv_offset, guint tlv_len, packet_info *pinfo, guint offset, gint proto_registry) +void dissect_extended_tlv(proto_tree *reg_req_tree, int tlv_type, tvbuff_t *tvb, unsigned tlv_offset, unsigned tlv_len, packet_info *pinfo, unsigned offset, int proto_registry) { proto_item *tlv_item; proto_tree *tlv_tree; - guint tvb_len; + unsigned tvb_len; tlv_info_t tlv_info; - guint tlv_end; - guint length; - guint nblocks; + unsigned tlv_end; + unsigned length; + unsigned nblocks; /* Get the tvb reported length */ tvb_len = tvb_reported_length(tvb); @@ -482,16 +481,16 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb /* Decode REG-REQ messages. */ static int dissect_mac_mgmt_msg_reg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tlv_offset; - guint tvb_len; + unsigned offset = 0; + unsigned tlv_offset; + unsigned tvb_len; proto_item *reg_req_item = NULL; proto_tree *reg_req_tree = NULL; proto_tree *tlv_tree = NULL; - gboolean hmac_found = FALSE; + bool hmac_found = false; tlv_info_t tlv_info; - gint tlv_type; - gint tlv_len; + int tlv_type; + int tlv_len; { /* we are being asked for details */ @@ -595,7 +594,7 @@ static int dissect_mac_mgmt_msg_reg_req_decoder(tvbuff_t *tvb, packet_info *pinf /* decode and display the HMAC Tuple */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, proto_mac_mgmt_msg_reg_req_decoder, tvb, offset, tlv_len, "HMAC Tuple"); wimax_hmac_tuple_decoder(tlv_tree, tvb, tlv_offset, tlv_len); - hmac_found = TRUE; + hmac_found = true; break; case CMAC_TUPLE: /* Table 348b */ /* decode and display the CMAC Tuple */ @@ -1404,7 +1403,7 @@ void proto_register_mac_mgmt_msg_reg_req(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_reg_req_decoder }; diff --git a/plugins/epan/wimax/msg_reg_rsp.c b/plugins/epan/wimax/msg_reg_rsp.c index a5f23650..3c7fe131 100644 --- a/plugins/epan/wimax/msg_reg_rsp.c +++ b/plugins/epan/wimax/msg_reg_rsp.c @@ -24,32 +24,31 @@ #include "wimax_tlv.h" #include "wimax_mac.h" #include "wimax_utils.h" +#include "wimax_prefs.h" void proto_register_mac_mgmt_msg_reg_rsp(void); void proto_reg_handoff_mac_mgmt_msg_reg_rsp(void); static dissector_handle_t reg_rsp_handle; -extern gboolean include_cor2_changes; +static dissector_handle_t dsc_rsp_handle; -static dissector_handle_t dsc_rsp_handle = NULL; - -static gint proto_mac_mgmt_msg_reg_rsp_decoder = -1; -static gint ett_mac_mgmt_msg_reg_rsp_decoder = -1; -static gint ett_reg_rsp_message_tree = -1; +static int proto_mac_mgmt_msg_reg_rsp_decoder; +static int ett_mac_mgmt_msg_reg_rsp_decoder; +static int ett_reg_rsp_message_tree; /* NCT messages */ /* REG-RSP fields */ -static gint hf_reg_rsp_status = -1; -static gint hf_tlv_type = -1; -/* static gint hf_tlv_value = -1; */ -static gint hf_reg_rsp_secondary_mgmt_cid = -1; -static gint hf_reg_invalid_tlv = -1; -static gint hf_reg_rsp_new_cid_after_ho = -1; -static gint hf_reg_rsp_service_flow_id = -1; -static gint hf_reg_rsp_system_resource_retain_time = -1; -static gint hf_reg_total_provisioned_sf = -1; +static int hf_reg_rsp_status; +static int hf_tlv_type; +/* static int hf_tlv_value; */ +static int hf_reg_rsp_secondary_mgmt_cid; +static int hf_reg_invalid_tlv; +static int hf_reg_rsp_new_cid_after_ho; +static int hf_reg_rsp_service_flow_id; +static int hf_reg_rsp_system_resource_retain_time; +static int hf_reg_total_provisioned_sf; /* STRING RESOURCES */ @@ -64,23 +63,23 @@ static const value_string vals_reg_rsp_status [] = { /* Decode REG-RSP messages. */ static int dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tlv_offset; - guint tvb_len; + unsigned offset = 0; + unsigned tlv_offset; + unsigned tvb_len; proto_item *reg_rsp_item; proto_tree *reg_rsp_tree; proto_item *tlv_item = NULL; proto_tree *tlv_tree = NULL; proto_tree *sub_tree = NULL; - gboolean hmac_found = FALSE; + bool hmac_found = false; tlv_info_t tlv_info; - gint tlv_type; - guint tlv_len; - guint this_offset = 0; + int tlv_type; + unsigned tlv_len; + unsigned this_offset = 0; tlv_info_t sub_tlv_info; - gint sub_tlv_type; - gint sub_tlv_len; - guint sub_tlv_offset; + int sub_tlv_type; + int sub_tlv_len; + unsigned sub_tlv_offset; { /* we are being asked for details */ @@ -216,7 +215,7 @@ static int dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinf /* decode and display the HMAC Tuple */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_reg_rsp_decoder, reg_rsp_tree, proto_mac_mgmt_msg_reg_rsp_decoder, tvb, offset, tlv_len, "HMAC Tuple"); wimax_hmac_tuple_decoder(tlv_tree, tvb, offset+2, tlv_len); - hmac_found = TRUE; + hmac_found = true; break; case CMAC_TUPLE: /* Table 348b */ /* decode and display the CMAC Tuple */ @@ -327,7 +326,7 @@ void proto_register_mac_mgmt_msg_reg_rsp(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_reg_rsp_decoder, &ett_reg_rsp_message_tree diff --git a/plugins/epan/wimax/msg_rep.c b/plugins/epan/wimax/msg_rep.c index 952e8f5f..707d4231 100644 --- a/plugins/epan/wimax/msg_rep.c +++ b/plugins/epan/wimax/msg_rep.c @@ -31,9 +31,9 @@ void proto_reg_handoff_mac_mgmt_msg_rep(void); static dissector_handle_t rep_req_handle; static dissector_handle_t rep_rsp_handle; -static gint proto_mac_mgmt_msg_rep_decoder = -1; -static gint ett_mac_mgmt_msg_rep_req_decoder = -1; -static gint ett_mac_mgmt_msg_rep_rsp_decoder = -1; +static int proto_mac_mgmt_msg_rep_decoder; +static int ett_mac_mgmt_msg_rep_req_decoder; +static int ett_mac_mgmt_msg_rep_rsp_decoder; static const value_string vals_channel_types[] = { @@ -81,112 +81,112 @@ static const value_string vals_type_of_measurements[] = }; /* fix fields */ -static gint hf_rep_unknown_type = -1; -static gint hf_rep_invalid_tlv = -1; +static int hf_rep_unknown_type; +static int hf_rep_invalid_tlv; -static gint hf_rep_req_report_request = -1; -static gint hf_rep_req_report_type = -1; -static gint hf_rep_req_rep_type_bit0 = -1; -static gint hf_rep_req_rep_type_bit1 = -1; -static gint hf_rep_req_rep_type_bit2 = -1; -static gint hf_rep_req_rep_type_bit3_6 = -1; -static gint hf_rep_req_rep_type_bit7 = -1; -static gint hf_rep_req_channel_number = -1; -static gint hf_rep_req_channel_type = -1; -static gint hf_rep_req_channel_type_request = -1; -static gint hf_rep_req_channel_type_reserved = -1; -static gint hf_rep_req_zone_spec_phy_cinr_request = -1; -static gint hf_rep_req_preamble_phy_cinr_request = -1; -static gint hf_rep_req_zone_spec_effective_cinr_request = -1; -static gint hf_rep_req_preamble_effective_cinr_request = -1; -static gint hf_rep_req_channel_selectivity_report = -1; +static int hf_rep_req_report_request; +static int hf_rep_req_report_type; +static int hf_rep_req_rep_type_bit0; +static int hf_rep_req_rep_type_bit1; +static int hf_rep_req_rep_type_bit2; +static int hf_rep_req_rep_type_bit3_6; +static int hf_rep_req_rep_type_bit7; +static int hf_rep_req_channel_number; +static int hf_rep_req_channel_type; +static int hf_rep_req_channel_type_request; +static int hf_rep_req_channel_type_reserved; +static int hf_rep_req_zone_spec_phy_cinr_request; +static int hf_rep_req_preamble_phy_cinr_request; +static int hf_rep_req_zone_spec_effective_cinr_request; +static int hf_rep_req_preamble_effective_cinr_request; +static int hf_rep_req_channel_selectivity_report; -static gint hf_rep_req_zone_spec_phy_cinr_req_bit0_2 = -1; -static gint hf_rep_req_zone_spec_phy_cinr_req_bit3 = -1; -static gint hf_rep_req_zone_spec_phy_cinr_req_bit4 = -1; -static gint hf_rep_req_zone_spec_phy_cinr_req_bit5_6 = -1; -static gint hf_rep_req_zone_spec_phy_cinr_req_bit7 = -1; -static gint hf_rep_req_zone_spec_phy_cinr_req_bit8_13 = -1; -static gint hf_rep_req_zone_spec_phy_cinr_req_bit14_17 = -1; -static gint hf_rep_req_zone_spec_phy_cinr_req_bit18 = -1; -static gint hf_rep_req_zone_spec_phy_cinr_req_bit19_23 = -1; +static int hf_rep_req_zone_spec_phy_cinr_req_bit0_2; +static int hf_rep_req_zone_spec_phy_cinr_req_bit3; +static int hf_rep_req_zone_spec_phy_cinr_req_bit4; +static int hf_rep_req_zone_spec_phy_cinr_req_bit5_6; +static int hf_rep_req_zone_spec_phy_cinr_req_bit7; +static int hf_rep_req_zone_spec_phy_cinr_req_bit8_13; +static int hf_rep_req_zone_spec_phy_cinr_req_bit14_17; +static int hf_rep_req_zone_spec_phy_cinr_req_bit18; +static int hf_rep_req_zone_spec_phy_cinr_req_bit19_23; -static gint hf_rep_req_zone_spec_effective_cinr_req_bit0_2 = -1; -static gint hf_rep_req_zone_spec_effective_cinr_req_bit3 = -1; -static gint hf_rep_req_zone_spec_effective_cinr_req_bit4 = -1; -static gint hf_rep_req_zone_spec_effective_cinr_req_bit5_6 = -1; -static gint hf_rep_req_zone_spec_effective_cinr_req_bit7 = -1; -static gint hf_rep_req_zone_spec_effective_cinr_req_bit8_13 = -1; -static gint hf_rep_req_zone_spec_effective_cinr_req_bit14_15 = -1; +static int hf_rep_req_zone_spec_effective_cinr_req_bit0_2; +static int hf_rep_req_zone_spec_effective_cinr_req_bit3; +static int hf_rep_req_zone_spec_effective_cinr_req_bit4; +static int hf_rep_req_zone_spec_effective_cinr_req_bit5_6; +static int hf_rep_req_zone_spec_effective_cinr_req_bit7; +static int hf_rep_req_zone_spec_effective_cinr_req_bit8_13; +static int hf_rep_req_zone_spec_effective_cinr_req_bit14_15; -static gint hf_rep_req_preamble_phy_cinr_req_bit0_1 = -1; -static gint hf_rep_req_preamble_phy_cinr_req_bit2_5 = -1; -static gint hf_rep_req_preamble_phy_cinr_req_bit6 = -1; -static gint hf_rep_req_preamble_phy_cinr_req_bit7 = -1; +static int hf_rep_req_preamble_phy_cinr_req_bit0_1; +static int hf_rep_req_preamble_phy_cinr_req_bit2_5; +static int hf_rep_req_preamble_phy_cinr_req_bit6; +static int hf_rep_req_preamble_phy_cinr_req_bit7; -static gint hf_rep_req_preamble_effective_cinr_req_bit0_1 = -1; -static gint hf_rep_req_preamble_effective_cinr_req_bit2_7 = -1; +static int hf_rep_req_preamble_effective_cinr_req_bit0_1; +static int hf_rep_req_preamble_effective_cinr_req_bit2_7; -static gint hf_rep_req_channel_selectivity_rep_bit0 = -1; -static gint hf_rep_req_channel_selectivity_rep_bit1_7 = -1; +static int hf_rep_req_channel_selectivity_rep_bit0; +static int hf_rep_req_channel_selectivity_rep_bit1_7; -static gint hf_rep_rsp_report_type = -1; -static gint hf_rep_rsp_report_type_channel_number = -1; -static gint hf_rep_rsp_report_type_frame_number = -1; -static gint hf_rep_rsp_report_type_duration = -1; -static gint hf_rep_rsp_report_type_basic_report = -1; -static gint hf_rep_rsp_report_type_basic_report_bit0 = -1; -static gint hf_rep_rsp_report_type_basic_report_bit1 = -1; -static gint hf_rep_rsp_report_type_basic_report_bit2 = -1; -static gint hf_rep_rsp_report_type_basic_report_bit3 = -1; -static gint hf_rep_rsp_report_type_basic_report_reserved = -1; -static gint hf_rep_rsp_report_type_cinr_report = -1; -static gint hf_rep_rsp_report_type_cinr_report_mean = -1; -static gint hf_rep_rsp_report_type_cinr_report_deviation = -1; -static gint hf_rep_rsp_report_type_rssi_report = -1; -static gint hf_rep_rsp_report_type_rssi_report_mean = -1; -static gint hf_rep_rsp_report_type_rssi_report_deviation = -1; -static gint hf_rep_rsp_current_transmitted_power = -1; -static gint hf_rep_rsp_channel_type_report = -1; -static gint hf_rep_rsp_channel_type_subchannel = -1; -static gint hf_rep_rsp_channel_type_band_amc = -1; -static gint hf_rep_rsp_channel_type_safety_channel = -1; -static gint hf_rep_rsp_channel_type_enhanced_band_amc = -1; -static gint hf_rep_rsp_channel_type_sounding = -1; +static int hf_rep_rsp_report_type; +static int hf_rep_rsp_report_type_channel_number; +static int hf_rep_rsp_report_type_frame_number; +static int hf_rep_rsp_report_type_duration; +static int hf_rep_rsp_report_type_basic_report; +static int hf_rep_rsp_report_type_basic_report_bit0; +static int hf_rep_rsp_report_type_basic_report_bit1; +static int hf_rep_rsp_report_type_basic_report_bit2; +static int hf_rep_rsp_report_type_basic_report_bit3; +static int hf_rep_rsp_report_type_basic_report_reserved; +static int hf_rep_rsp_report_type_cinr_report; +static int hf_rep_rsp_report_type_cinr_report_mean; +static int hf_rep_rsp_report_type_cinr_report_deviation; +static int hf_rep_rsp_report_type_rssi_report; +static int hf_rep_rsp_report_type_rssi_report_mean; +static int hf_rep_rsp_report_type_rssi_report_deviation; +static int hf_rep_rsp_current_transmitted_power; +static int hf_rep_rsp_channel_type_report; +static int hf_rep_rsp_channel_type_subchannel; +static int hf_rep_rsp_channel_type_band_amc; +static int hf_rep_rsp_channel_type_safety_channel; +static int hf_rep_rsp_channel_type_enhanced_band_amc; +static int hf_rep_rsp_channel_type_sounding; -static gint hf_rep_rsp_zone_spec_phy_cinr_report = -1; -static gint hf_rep_rsp_zone_spec_phy_cinr_rep_mean = -1; -static gint hf_rep_rsp_zone_spec_phy_cinr_rep_report_type = -1; -static gint hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1 = -1; -static gint hf_rep_rsp_zone_spec_phy_cinr_rep_deviation = -1; -static gint hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2 = -1; -static gint hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc0 = -1; -static gint hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc1 = -1; -static gint hf_rep_rsp_zone_spec_phy_cinr_rep_fusc = -1; -static gint hf_rep_rsp_zone_spec_phy_cinr_rep_optional_fusc = -1; -static gint hf_rep_rsp_zone_spec_phy_cinr_rep_safety_channel = -1; -static gint hf_rep_rsp_zone_spec_phy_cinr_rep_amc = -1; -static gint hf_rep_rsp_preamble_phy_cinr_report = -1; -static gint hf_rep_rsp_preamble_phy_cinr_rep_configuration_1 = -1; -static gint hf_rep_rsp_preamble_phy_cinr_rep_configuration_3 = -1; -static gint hf_rep_rsp_preamble_phy_cinr_rep_band_amc_zone = -1; -static gint hf_rep_rsp_zone_spec_effective_cinr_report = -1; -static gint hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr = -1; -static gint hf_rep_rsp_zone_spec_effective_cinr_rep_report_type = -1; -static gint hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id = -1; -static gint hf_rep_rsp_preamble_effective_cinr_report = -1; -static gint hf_rep_rsp_preamble_effective_cinr_rep_cqich_id = -1; -static gint hf_rep_rsp_channel_selectivity_report = -1; -static gint hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc0 = -1; -static gint hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc1 = -1; -static gint hf_rep_rsp_zone_spec_effective_cinr_rep_fusc = -1; -static gint hf_rep_rsp_zone_spec_effective_cinr_rep_optional_fusc = -1; -static gint hf_rep_rsp_zone_spec_effective_cinr_rep_amc_aas = -1; -static gint hf_rep_rsp_preamble_effective_cinr_rep_configuration_1 = -1; -static gint hf_rep_rsp_preamble_effective_cinr_rep_configuration_3 = -1; -static gint hf_rep_rsp_channel_selectivity_rep_frequency_a = -1; -static gint hf_rep_rsp_channel_selectivity_rep_frequency_b = -1; -static gint hf_rep_rsp_channel_selectivity_rep_frequency_c = -1; +static int hf_rep_rsp_zone_spec_phy_cinr_report; +static int hf_rep_rsp_zone_spec_phy_cinr_rep_mean; +static int hf_rep_rsp_zone_spec_phy_cinr_rep_report_type; +static int hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1; +static int hf_rep_rsp_zone_spec_phy_cinr_rep_deviation; +static int hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2; +static int hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc0; +static int hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc1; +static int hf_rep_rsp_zone_spec_phy_cinr_rep_fusc; +static int hf_rep_rsp_zone_spec_phy_cinr_rep_optional_fusc; +static int hf_rep_rsp_zone_spec_phy_cinr_rep_safety_channel; +static int hf_rep_rsp_zone_spec_phy_cinr_rep_amc; +static int hf_rep_rsp_preamble_phy_cinr_report; +static int hf_rep_rsp_preamble_phy_cinr_rep_configuration_1; +static int hf_rep_rsp_preamble_phy_cinr_rep_configuration_3; +static int hf_rep_rsp_preamble_phy_cinr_rep_band_amc_zone; +static int hf_rep_rsp_zone_spec_effective_cinr_report; +static int hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr; +static int hf_rep_rsp_zone_spec_effective_cinr_rep_report_type; +static int hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id; +static int hf_rep_rsp_preamble_effective_cinr_report; +static int hf_rep_rsp_preamble_effective_cinr_rep_cqich_id; +static int hf_rep_rsp_channel_selectivity_report; +static int hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc0; +static int hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc1; +static int hf_rep_rsp_zone_spec_effective_cinr_rep_fusc; +static int hf_rep_rsp_zone_spec_effective_cinr_rep_optional_fusc; +static int hf_rep_rsp_zone_spec_effective_cinr_rep_amc_aas; +static int hf_rep_rsp_preamble_effective_cinr_rep_configuration_1; +static int hf_rep_rsp_preamble_effective_cinr_rep_configuration_3; +static int hf_rep_rsp_channel_selectivity_rep_frequency_a; +static int hf_rep_rsp_channel_selectivity_rep_frequency_b; +static int hf_rep_rsp_channel_selectivity_rep_frequency_c; /* bit masks */ #define REP_REQ_REPORT_TYPE_BIT0 0x01 @@ -248,9 +248,9 @@ static gint hf_rep_rsp_channel_selectivity_rep_frequency_c = -1; /* Wimax Mac REP-REQ Message Dissector */ static int dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len; - gint tlv_type, tlv_len, tlv_value_offset, length, tlv_offset; + unsigned offset = 0; + unsigned tvb_len; + int tlv_type, tlv_len, tlv_value_offset, length, tlv_offset; proto_item *rep_item, *tlv_item, *ti_item; proto_tree *rep_tree, *tlv_tree, *ti_tree; tlv_info_t tlv_info; @@ -289,7 +289,7 @@ static int dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinf { case REP_REQ_REPORT_REQUEST: /* process the REP-REQ report request TLVs */ - tlv_item = add_tlv_subtree(&tlv_info, rep_tree, hf_rep_req_report_request, tvb, offset-tlv_value_offset, FALSE); + tlv_item = add_tlv_subtree(&tlv_info, rep_tree, hf_rep_req_report_request, tvb, offset-tlv_value_offset, false); tlv_tree = proto_item_add_subtree(tlv_item, ett_mac_mgmt_msg_rep_req_decoder); for( tlv_offset = 0; tlv_offset < tlv_len; ) { /* get the TLV information */ @@ -405,14 +405,14 @@ static int dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinf /* Wimax Mac REP-RSP Message Dissector */ static int dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len, length, value; - gint tlv_type, tlv_len, tlv_value_offset, tlv_offset; - gint db_val; + unsigned offset = 0; + unsigned tvb_len, length, value; + int tlv_type, tlv_len, tlv_value_offset, tlv_offset; + int db_val; proto_item *rep_item, *tlv_item, *ti, *ti_item; proto_tree *rep_tree, *tlv_tree, *ti_tree; tlv_info_t tlv_info; - gfloat current_power; + float current_power; { /* we are being asked for details */ /* Get the tvb reported length */ @@ -489,12 +489,12 @@ static int dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinf case REP_RSP_REPORT_CINR_REPORT: ti_item = add_tlv_subtree(&tlv_info, tlv_tree, hf_rep_rsp_report_type_cinr_report, tvb, (offset + tlv_offset)-get_tlv_value_offset(&tlv_info), ENC_NA); ti_tree = proto_item_add_subtree(ti_item, ett_mac_mgmt_msg_rep_rsp_decoder); - db_val = tvb_get_guint8(tvb, offset + tlv_offset) - 20; + db_val = tvb_get_uint8(tvb, offset + tlv_offset) - 20; if (db_val > 37) db_val = 37; proto_item_append_text(ti_item, " (%d dBm)", db_val); ti = proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_cinr_report_deviation, tvb, (offset + tlv_offset +1), 1, ENC_BIG_ENDIAN); - db_val = tvb_get_guint8(tvb, offset + tlv_offset + 1) - 20; + db_val = tvb_get_uint8(tvb, offset + tlv_offset + 1) - 20; if (db_val > 37) db_val = 37; proto_item_append_text(ti, " (%d dBm)", db_val); @@ -503,12 +503,12 @@ static int dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinf ti_item = add_tlv_subtree(&tlv_info, tlv_tree, hf_rep_rsp_report_type_rssi_report, tvb, (offset + tlv_offset)-get_tlv_value_offset(&tlv_info), ENC_NA); ti_tree = proto_item_add_subtree(ti_item, ett_mac_mgmt_msg_rep_rsp_decoder); ti = proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_rssi_report_mean, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); - db_val = tvb_get_guint8(tvb, offset + tlv_offset) - 123; + db_val = tvb_get_uint8(tvb, offset + tlv_offset) - 123; if (db_val > -40) db_val = -40; proto_item_append_text(ti, " (%d dBm)", db_val); ti = proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_rssi_report_deviation, tvb, (offset + tlv_offset +1), 1, ENC_BIG_ENDIAN); - db_val = tvb_get_guint8(tvb, offset + tlv_offset + 1) - 123; + db_val = tvb_get_uint8(tvb, offset + tlv_offset + 1) - 123; if (db_val > -40) db_val = -40; proto_item_append_text(ti, " (%d dBm)", db_val); @@ -814,8 +814,8 @@ static int dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinf break; case CURRENT_TX_POWER: tlv_item = add_tlv_subtree(&tlv_info, rep_tree, hf_rep_rsp_current_transmitted_power, tvb, offset-tlv_value_offset, ENC_BIG_ENDIAN); - value = tvb_get_guint8(tvb, offset); - current_power = ((gfloat)value - 128) / 2; + value = tvb_get_uint8(tvb, offset); + current_power = ((float)value - 128) / 2; proto_item_append_text(tlv_item, " (%.1f dBm)", current_power); break; default: @@ -1525,7 +1525,7 @@ void proto_register_mac_mgmt_msg_rep(void) }; /* Setup protocol subtree array */ - static gint *ett_rep[] = + static int *ett_rep[] = { &ett_mac_mgmt_msg_rep_req_decoder, &ett_mac_mgmt_msg_rep_rsp_decoder, diff --git a/plugins/epan/wimax/msg_res_cmd.c b/plugins/epan/wimax/msg_res_cmd.c index 67d321da..9ac732f5 100644 --- a/plugins/epan/wimax/msg_res_cmd.c +++ b/plugins/epan/wimax/msg_res_cmd.c @@ -30,20 +30,20 @@ void proto_reg_handoff_mac_mgmt_msg_res_cmd(void); static dissector_handle_t res_cmd_handle; -static gint proto_mac_mgmt_msg_res_cmd_decoder = -1; -static gint ett_mac_mgmt_msg_res_cmd_decoder = -1; +static int proto_mac_mgmt_msg_res_cmd_decoder; +static int ett_mac_mgmt_msg_res_cmd_decoder; /* fix fields */ -static gint hf_res_cmd_unknown_type = -1; -static gint hf_res_cmd_invalid_tlv = -1; +static int hf_res_cmd_unknown_type; +static int hf_res_cmd_invalid_tlv; /* Wimax Mac RES-CMD Message Dissector */ static int dissect_mac_mgmt_msg_res_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len; - gint tlv_type, tlv_len, tlv_value_offset; + unsigned offset = 0; + unsigned tvb_len; + int tlv_type, tlv_len, tlv_value_offset; proto_item *res_cmd_item; proto_tree *res_cmd_tree; proto_tree *tlv_tree = NULL; @@ -118,7 +118,7 @@ void proto_register_mac_mgmt_msg_res_cmd(void) }; /* Setup protocol subtree array */ - static gint *ett_res_cmd[] = + static int *ett_res_cmd[] = { &ett_mac_mgmt_msg_res_cmd_decoder, }; diff --git a/plugins/epan/wimax/msg_rng_req.c b/plugins/epan/wimax/msg_rng_req.c index 68f9569b..f4f85d2e 100644 --- a/plugins/epan/wimax/msg_rng_req.c +++ b/plugins/epan/wimax/msg_rng_req.c @@ -20,56 +20,55 @@ #include "wimax_tlv.h" #include "wimax_mac.h" #include "wimax_utils.h" +#include "wimax_prefs.h" void proto_register_mac_mgmt_msg_rng_req(void); void proto_reg_handoff_mac_mgmt_msg_rng_req(void); static dissector_handle_t rng_req_handle; -extern gboolean include_cor2_changes; - -static gint proto_mac_mgmt_msg_rng_req_decoder = -1; -static gint ett_mac_mgmt_msg_rng_req_decoder = -1; +static int proto_mac_mgmt_msg_rng_req_decoder; +static int ett_mac_mgmt_msg_rng_req_decoder; /* RNG-REQ fields */ -static gint hf_rng_req_reserved = -1; -static gint hf_rng_req_dl_burst_profile_diuc = -1; -static gint hf_rng_req_dl_burst_profile_lsb_ccc = -1; -static gint hf_rng_req_ss_mac_address = -1; -static gint hf_rng_req_ranging_anomalies_max_power = -1; -static gint hf_rng_req_ranging_anomalies_min_power = -1; -static gint hf_rng_req_ranging_anomalies_timing_adj = -1; -static gint hf_rng_req_aas_broadcast = -1; -static gint hf_rng_req_serving_bs_id = -1; -static gint hf_rng_req_ranging_purpose_ho_indication = -1; -static gint hf_rng_req_ranging_purpose_location_update_request = -1; -static gint hf_rng_req_ranging_purpose_reserved = -1; -static gint hf_rng_req_ho_id = -1; -static gint hf_rng_req_power_down_indicator = -1; -static gint hf_rng_req_repetition_coding_level = -1; -static gint hf_rng_req_requested_downlink_repetition_coding_level_reserved = -1; -static gint hf_rng_req_cmac_key_count = -1; -static gint hf_rng_definition_of_power_saving_class_present = -1; -static gint hf_rng_activation_of_power_saving_class = -1; -static gint hf_rng_trf_ind_required = -1; -static gint hf_rng_power_saving_class_reserved = -1; -static gint hf_rng_power_saving_class_id = -1; -static gint hf_rng_power_saving_class_type = -1; -static gint hf_rng_power_saving_first_sleep_window_frame = -1; -static gint hf_rng_power_saving_initial_sleep_window = -1; -static gint hf_rng_power_saving_listening_window = -1; -static gint hf_rng_power_saving_final_sleep_window_base = -1; -static gint hf_rng_power_saving_final_sleep_window_exp = -1; -static gint hf_rng_power_saving_slpid = -1; -static gint hf_rng_power_saving_included_cid = -1; -static gint hf_rng_power_saving_mgmt_connection_direction = -1; -static gint hf_tlv_type = -1; -static gint hf_rng_invalid_tlv = -1; -static gint hf_rng_power_saving_class_flags = -1; -static gint hf_rng_req_dl_burst_profile = -1; -static gint hf_rng_req_ranging_anomalies = -1; -static gint hf_rng_req_ranging_purpose_indication = -1; -static gint hf_rng_req_requested_rep_coding_level = -1; +static int hf_rng_req_reserved; +static int hf_rng_req_dl_burst_profile_diuc; +static int hf_rng_req_dl_burst_profile_lsb_ccc; +static int hf_rng_req_ss_mac_address; +static int hf_rng_req_ranging_anomalies_max_power; +static int hf_rng_req_ranging_anomalies_min_power; +static int hf_rng_req_ranging_anomalies_timing_adj; +static int hf_rng_req_aas_broadcast; +static int hf_rng_req_serving_bs_id; +static int hf_rng_req_ranging_purpose_ho_indication; +static int hf_rng_req_ranging_purpose_location_update_request; +static int hf_rng_req_ranging_purpose_reserved; +static int hf_rng_req_ho_id; +static int hf_rng_req_power_down_indicator; +static int hf_rng_req_repetition_coding_level; +static int hf_rng_req_requested_downlink_repetition_coding_level_reserved; +static int hf_rng_req_cmac_key_count; +static int hf_rng_definition_of_power_saving_class_present; +static int hf_rng_activation_of_power_saving_class; +static int hf_rng_trf_ind_required; +static int hf_rng_power_saving_class_reserved; +static int hf_rng_power_saving_class_id; +static int hf_rng_power_saving_class_type; +static int hf_rng_power_saving_first_sleep_window_frame; +static int hf_rng_power_saving_initial_sleep_window; +static int hf_rng_power_saving_listening_window; +static int hf_rng_power_saving_final_sleep_window_base; +static int hf_rng_power_saving_final_sleep_window_exp; +static int hf_rng_power_saving_slpid; +static int hf_rng_power_saving_included_cid; +static int hf_rng_power_saving_mgmt_connection_direction; +static int hf_tlv_type; +static int hf_rng_invalid_tlv; +static int hf_rng_power_saving_class_flags; +static int hf_rng_req_dl_burst_profile; +static int hf_rng_req_ranging_anomalies; +static int hf_rng_req_ranging_purpose_indication; +static int hf_rng_req_requested_rep_coding_level; /* STRING RESOURCES */ @@ -112,13 +111,13 @@ static const true_false_string tfs_rng_timing_adj = { }; /* Decode RNG Power Saving Class parameters (Sub TLV's). */ -void dissect_power_saving_class(proto_tree *rng_req_tree, gint tlv_type, tvbuff_t *tvb, guint compound_tlv_len, packet_info *pinfo, guint offset) +void dissect_power_saving_class(proto_tree *rng_req_tree, int tlv_type, tvbuff_t *tvb, unsigned compound_tlv_len, packet_info *pinfo, unsigned offset) { proto_item *tlv_item; proto_tree *tlv_tree; proto_tree *power_saving_class_tree = NULL; - guint tlv_len; - guint tlv_offset; + unsigned tlv_len; + unsigned tlv_offset; tlv_info_t tlv_info; /* Add a subtree for the power saving class parameters */ @@ -199,14 +198,14 @@ void dissect_power_saving_class(proto_tree *rng_req_tree, gint tlv_type, tvbuff_ /* Decode RNG-REQ messages. */ static int dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tlv_offset; - guint tvb_len; + unsigned offset = 0; + unsigned tlv_offset; + unsigned tvb_len; proto_item *rng_req_item, *tlv_item; proto_tree *rng_req_tree, *tlv_tree; tlv_info_t tlv_info; - gint tlv_type; - gint tlv_len; + int tlv_type; + int tlv_len; { /* we are being asked for details */ @@ -595,7 +594,7 @@ void proto_register_mac_mgmt_msg_rng_req(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_rng_req_decoder, }; diff --git a/plugins/epan/wimax/msg_rng_rsp.c b/plugins/epan/wimax/msg_rng_rsp.c index f1587ebc..6b3506e0 100644 --- a/plugins/epan/wimax/msg_rng_rsp.c +++ b/plugins/epan/wimax/msg_rng_rsp.c @@ -17,83 +17,84 @@ #include "config.h" #include <epan/packet.h> +#include <epan/tfs.h> + +#include <wsutil/array.h> #include "wimax_tlv.h" #include "wimax_mac.h" #include "wimax_utils.h" +#include "wimax_prefs.h" void proto_register_mac_mgmt_msg_rng_rsp(void); void proto_reg_handoff_mac_mgmt_msg_rng_rsp(void); -extern gboolean include_cor2_changes; - - -static dissector_handle_t rng_rsp_handle = NULL; -static dissector_handle_t sbc_rsp_handle = NULL; -static dissector_handle_t reg_rsp_handle = NULL; +static dissector_handle_t rng_rsp_handle; +static dissector_handle_t sbc_rsp_handle; +static dissector_handle_t reg_rsp_handle; -static gint proto_mac_mgmt_msg_rng_rsp_decoder = -1; -static gint ett_mac_mgmt_msg_rng_rsp_decoder = -1; -static gint ett_rng_rsp_message_tree = -1; +static int proto_mac_mgmt_msg_rng_rsp_decoder; +static int ett_mac_mgmt_msg_rng_rsp_decoder; +static int ett_rng_rsp_message_tree; /* RNG-RSP fields */ -static gint hf_rng_req_reserved = -1; -/* static gint hf_rng_rsp_ul_channel_id = -1; */ -static gint hf_rng_rsp_timing_adjust = -1; -static gint hf_rng_rsp_power_level_adjust = -1; -static gint hf_rng_rsp_offset_freq_adjust = -1; -static gint hf_rng_rsp_ranging_status = -1; -static gint hf_rng_rsp_dl_freq_override = -1; -static gint hf_rng_rsp_ul_chan_id_override = -1; -static gint hf_rng_rsp_dl_operational_burst_profile = -1; -static gint hf_rng_rsp_dl_operational_burst_profile_diuc = -1; -static gint hf_rng_rsp_dl_operational_burst_profile_ccc = -1; -static gint hf_rng_rsp_ss_mac_address = -1; -static gint hf_rng_rsp_basic_cid = -1; -static gint hf_rng_rsp_primary_mgmt_cid = -1; -static gint hf_rng_rsp_broadcast = -1; -static gint hf_rng_rsp_frame_number = -1; -static gint hf_rng_rsp_opportunity_number = -1; -static gint hf_rng_rsp_service_level_prediction = -1; -static gint hf_rng_rsp_resource_retain_flag = -1; -static gint hf_rng_rsp_ho_process_optimization = -1; -static gint hf_rng_rsp_ho_process_optimization_0 = -1; -static gint hf_rng_rsp_ho_process_optimization_1_2 = -1; -static gint hf_rng_rsp_ho_process_optimization_3 = -1; -static gint hf_rng_rsp_ho_process_optimization_4 = -1; -static gint hf_rng_rsp_ho_process_optimization_5 = -1; -static gint hf_rng_rsp_ho_process_optimization_6 = -1; -static gint hf_rng_rsp_ho_process_optimization_7 = -1; -static gint hf_rng_rsp_ho_process_optimization_8 = -1; -static gint hf_rng_rsp_ho_process_optimization_9 = -1; -static gint hf_rng_rsp_ho_process_optimization_10 = -1; -static gint hf_rng_rsp_ho_process_optimization_11 = -1; -static gint hf_rng_rsp_ho_process_optimization_12 = -1; -static gint hf_rng_rsp_ho_process_optimization_13 = -1; -static gint hf_rng_rsp_ho_process_optimization_14 = -1; -static gint hf_rng_rsp_ho_process_optimization_15 = -1; +static int hf_rng_req_reserved; +/* static int hf_rng_rsp_ul_channel_id; */ +static int hf_rng_rsp_timing_adjust; +static int hf_rng_rsp_power_level_adjust; +static int hf_rng_rsp_offset_freq_adjust; +static int hf_rng_rsp_ranging_status; +static int hf_rng_rsp_dl_freq_override; +static int hf_rng_rsp_ul_chan_id_override; +static int hf_rng_rsp_dl_operational_burst_profile; +static int hf_rng_rsp_dl_operational_burst_profile_diuc; +static int hf_rng_rsp_dl_operational_burst_profile_ccc; +static int hf_rng_rsp_ss_mac_address; +static int hf_rng_rsp_basic_cid; +static int hf_rng_rsp_primary_mgmt_cid; +static int hf_rng_rsp_broadcast; +static int hf_rng_rsp_frame_number; +static int hf_rng_rsp_opportunity_number; +static int hf_rng_rsp_service_level_prediction; +static int hf_rng_rsp_resource_retain_flag; +static int hf_rng_rsp_ho_process_optimization; +static int hf_rng_rsp_ho_process_optimization_0; +static int hf_rng_rsp_ho_process_optimization_1_2; +static int hf_rng_rsp_ho_process_optimization_3; +static int hf_rng_rsp_ho_process_optimization_4; +static int hf_rng_rsp_ho_process_optimization_5; +static int hf_rng_rsp_ho_process_optimization_6; +static int hf_rng_rsp_ho_process_optimization_7; +static int hf_rng_rsp_ho_process_optimization_8; +static int hf_rng_rsp_ho_process_optimization_9; +static int hf_rng_rsp_ho_process_optimization_10; +static int hf_rng_rsp_ho_process_optimization_11; +static int hf_rng_rsp_ho_process_optimization_12; +static int hf_rng_rsp_ho_process_optimization_13; +static int hf_rng_rsp_ho_process_optimization_14; +static int hf_rng_rsp_ho_process_optimization_15; /* Added the following to help implement RNG-RSP message encoding 33 (Table 367 in IEEE 802.16e-2007) */ -static gint hf_rng_rsp_dl_op_burst_profile_ofdma = -1; -static gint hf_rng_rsp_least_robust_diuc = -1; -static gint hf_rng_rsp_repetition_coding_indication = -1; -static gint hf_rng_rsp_config_change_count_of_dcd = -1; +static int hf_rng_rsp_dl_op_burst_profile_ofdma; +static int hf_rng_rsp_least_robust_diuc; +static int hf_rng_rsp_repetition_coding_indication; +static int hf_rng_rsp_config_change_count_of_dcd; /* Added the following to help implement RNG-RSP message encoding 22 (Table 367 in IEEE 802.16e-2007) */ -static gint hf_rng_rsp_ho_id = -1; -static gint hf_rng_rsp_location_update_response = -1; +static int hf_rng_rsp_ho_id; +static int hf_rng_rsp_location_update_response; /* Added the following to help implement RNG-RSP message encoding 24 (Table 367 in IEEE 802.16e-2007) */ -static gint hf_rng_rsp_paging_information = -1; -static gint hf_rng_rsp_paging_cycle = -1; -static gint hf_rng_rsp_paging_offset = -1; -static gint hf_rng_rsp_paging_group_id = -1; -static gint hf_rng_rsp_bs_random = -1; -static gint hf_rng_rsp_akid = -1; -static gint hf_rng_rsp_ranging_subchan = -1; -static gint hf_rng_rsp_time_symbol_reference = -1; -static gint hf_rng_rsp_subchannel_reference = -1; -static gint hf_rng_rsp_ranging_code_index = -1; -static gint hf_rng_rsp_frame_number2 = -1; -static gint hf_tlv_type = -1; -/* static gint hf_tlv_value = -1; */ -static gint hf_rng_invalid_tlv = -1; +static int hf_rng_rsp_paging_information; +static int hf_rng_rsp_paging_cycle; +static int hf_rng_rsp_paging_offset; +static int hf_rng_rsp_paging_group_id; +static int hf_rng_rsp_bs_random; +static int hf_rng_rsp_akid; +static int hf_rng_rsp_ranging_subchan; +static int hf_rng_rsp_time_symbol_reference; +static int hf_rng_rsp_subchannel_reference; +static int hf_rng_rsp_ranging_code_index; +static int hf_rng_rsp_frame_number2; +static int hf_tlv_type; +/* static int hf_tlv_value; */ +static int hf_rng_invalid_tlv; /* STRING RESOURCES */ @@ -260,21 +261,21 @@ static int dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinf proto_item *frame_number_item = NULL; proto_item *opportunity_number_item = NULL; - guint offset = 0; - guint tlv_offset; - guint tvb_len; + unsigned offset = 0; + unsigned tlv_offset; + unsigned tvb_len; proto_item *rng_rsp_item, *sub_item; proto_item *tlv_item = NULL; proto_tree *rng_rsp_tree; proto_tree *sub_tree = NULL; tlv_info_t tlv_info; - gint tlv_type; - guint tlv_len; - guint this_offset = 0; + int tlv_type; + unsigned tlv_len; + unsigned this_offset = 0; tlv_info_t sub_tlv_info; - gint sub_tlv_type; - gint sub_tlv_len; - guint sub_tlv_offset; + int sub_tlv_type; + int sub_tlv_len; + unsigned sub_tlv_offset; float timing_adjust; float power_level_adjust; @@ -319,7 +320,7 @@ static int dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinf } case RNG_RSP_POWER_LEVEL_ADJUST: { sub_tree = add_tlv_subtree_no_item(&tlv_info, rng_rsp_tree, hf_rng_rsp_power_level_adjust, tvb, offset); - power_level_adjust = (float)(tvb_get_guint8(tvb, tlv_offset) / 4.0); + power_level_adjust = (float)(tvb_get_uint8(tvb, tlv_offset) / 4.0); proto_tree_add_float_format_value(sub_tree, hf_rng_rsp_power_level_adjust, tvb, tlv_offset, 1, power_level_adjust, " %.2f dB", power_level_adjust); break; @@ -568,7 +569,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void) &hf_rng_rsp_dl_freq_override, { "Downlink Frequency Override", "wmx.rng_rsp.dl_freq_override", - FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &wimax_units_hz, 0x00, NULL, HFILL + FT_UINT32, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_hz), 0x00, NULL, HFILL } }, { @@ -759,7 +760,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void) &hf_rng_rsp_offset_freq_adjust, { "Offset Frequency Adjust", "wmx.rng_rsp.offset_freq_adjust", - FT_INT32, BASE_DEC|BASE_UNIT_STRING, &wimax_units_hz, 0x00, NULL, HFILL + FT_INT32, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_hz), 0x00, NULL, HFILL } }, { @@ -923,7 +924,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_rng_rsp_decoder, &ett_rng_rsp_message_tree diff --git a/plugins/epan/wimax/msg_sbc.c b/plugins/epan/wimax/msg_sbc.c index cfdc2393..fd278d28 100644 --- a/plugins/epan/wimax/msg_sbc.c +++ b/plugins/epan/wimax/msg_sbc.c @@ -24,6 +24,7 @@ #include "wimax_tlv.h" #include "wimax_mac.h" #include "wimax_utils.h" +#include "wimax_prefs.h" void proto_register_mac_mgmt_msg_sbc(void); @@ -32,260 +33,256 @@ void proto_reg_handoff_mac_mgmt_msg_sbc(void); static dissector_handle_t sbc_req_handle; static dissector_handle_t sbc_rsp_handle; -/* This is a global variable declared in mac_hd_generic_decoder.c, which determines whether - * or not cor2 changes are included */ -extern gboolean include_cor2_changes; - -static gint proto_mac_mgmt_msg_sbc_decoder = -1; -static gint ett_mac_mgmt_msg_sbc_decoder = -1; -static gint ett_sbc_req_tlv_subtree = -1; -static gint ett_sbc_rsp_tlv_subtree = -1; +static int proto_mac_mgmt_msg_sbc_decoder; +static int ett_mac_mgmt_msg_sbc_decoder; +static int ett_sbc_req_tlv_subtree; +static int ett_sbc_rsp_tlv_subtree; /* fix fields */ -static gint hf_sbc_unknown_type = -1; +static int hf_sbc_unknown_type; -static gint hf_sbc_bw_alloc_support = -1; -static gint hf_sbc_bw_alloc_support_rsvd0 = -1; -static gint hf_sbc_bw_alloc_support_duplex = -1; -static gint hf_sbc_bw_alloc_support_rsvd1 = -1; -static gint hf_sbc_curr_transmit_power = -1; -static gint hf_sbc_transition_gaps = -1; -static gint hf_sbc_ssttg = -1; -static gint hf_sbc_ssrtg = -1; -static gint hf_sbc_mac_pdu = -1; -static gint hf_sbc_mac_pdu_piggybacked = -1; -static gint hf_sbc_mac_pdu_fsn = -1; -static gint hf_sbc_mac_pdu_rsvd = -1; -static gint hf_sbc_max_transmit_power = -1; -static gint hf_sbc_bpsk = -1; -static gint hf_sbc_qpsk = -1; -static gint hf_sbc_qam16 = -1; -static gint hf_sbc_qam64 = -1; -static gint hf_sbc_current_transmitted_power = -1; -static gint hf_sbc_ss_fft_sizes = -1; -static gint hf_sbc_ss_fft_256 = -1; -static gint hf_sbc_ss_fft_2048 = -1; -static gint hf_sbc_ss_fft_128 = -1; -static gint hf_sbc_ss_fft_512 = -1; -static gint hf_sbc_ss_fft_1024 = -1; -static gint hf_sbc_ss_cinr_measure_capability = -1; -static gint hf_sbc_ss_phy_cinr_measurement_preamble = -1; -static gint hf_sbc_ss_phy_cinr_measurement_permutation_zone_from_pilot_subcarriers = -1; -static gint hf_sbc_ss_phy_cinr_measurement_permutation_zone_from_data_subcarriers = -1; -static gint hf_sbc_ss_effective_cinr_measurement_preamble = -1; -static gint hf_sbc_ss_effective_cinr_measurement_permutation_zone_from_pilot_subcarriers = -1; -static gint hf_sbc_ss_effective_cinr_measurement_permutation_zone_from_data_subcarriers = -1; -static gint hf_sbc_ss_support_2_concurrent_cqi_channels = -1; -static gint hf_sbc_ss_frequency_selectivity_characterization_report = -1; +static int hf_sbc_bw_alloc_support; +static int hf_sbc_bw_alloc_support_rsvd0; +static int hf_sbc_bw_alloc_support_duplex; +static int hf_sbc_bw_alloc_support_rsvd1; +static int hf_sbc_curr_transmit_power; +static int hf_sbc_transition_gaps; +static int hf_sbc_ssttg; +static int hf_sbc_ssrtg; +static int hf_sbc_mac_pdu; +static int hf_sbc_mac_pdu_piggybacked; +static int hf_sbc_mac_pdu_fsn; +static int hf_sbc_mac_pdu_rsvd; +static int hf_sbc_max_transmit_power; +static int hf_sbc_bpsk; +static int hf_sbc_qpsk; +static int hf_sbc_qam16; +static int hf_sbc_qam64; +static int hf_sbc_current_transmitted_power; +static int hf_sbc_ss_fft_sizes; +static int hf_sbc_ss_fft_256; +static int hf_sbc_ss_fft_2048; +static int hf_sbc_ss_fft_128; +static int hf_sbc_ss_fft_512; +static int hf_sbc_ss_fft_1024; +static int hf_sbc_ss_cinr_measure_capability; +static int hf_sbc_ss_phy_cinr_measurement_preamble; +static int hf_sbc_ss_phy_cinr_measurement_permutation_zone_from_pilot_subcarriers; +static int hf_sbc_ss_phy_cinr_measurement_permutation_zone_from_data_subcarriers; +static int hf_sbc_ss_effective_cinr_measurement_preamble; +static int hf_sbc_ss_effective_cinr_measurement_permutation_zone_from_pilot_subcarriers; +static int hf_sbc_ss_effective_cinr_measurement_permutation_zone_from_data_subcarriers; +static int hf_sbc_ss_support_2_concurrent_cqi_channels; +static int hf_sbc_ss_frequency_selectivity_characterization_report; -static gint hf_sbc_ss_fft_rsvd1 = -1; -static gint hf_sbc_ss_fft_rsvd2 = -1; -static gint hf_sbc_ss_demodulator = -1; -static gint hf_sbc_ss_demodulator_64qam = -1; -static gint hf_sbc_ss_demodulator_btc = -1; -static gint hf_sbc_ss_demodulator_ctc = -1; -static gint hf_sbc_ss_demodulator_stc = -1; -static gint hf_sbc_ss_demodulator_cc_with_optional_interleaver = -1; -static gint hf_sbc_ss_demodulator_harq_chase = -1; -static gint hf_sbc_ss_demodulator_harq_ctc_ir = -1; -static gint hf_sbc_ss_demodulator_reserved = -1; -/* static gint hf_sbc_ss_demodulator_reserved1 = -1; */ -static gint hf_sbc_ss_demodulator_64qam_2 = -1; -static gint hf_sbc_ss_demodulator_btc_2 = -1; -static gint hf_sbc_ss_demodulator_ctc_2 = -1; -static gint hf_sbc_ss_demodulator_stc_2 = -1; -static gint hf_sbc_ss_demodulator_cc_with_optional_interleaver_2 = -1; -static gint hf_sbc_ss_demodulator_harq_chase_2 = -1; -static gint hf_sbc_ss_demodulator_harq_ctc_ir_2 = -1; -static gint hf_sbc_ss_demodulator_reserved_2 = -1; -static gint hf_sbc_ss_demodulator_harq_cc_ir_2 = -1; -static gint hf_sbc_ss_demodulator_ldpc_2 = -1; -static gint hf_sbc_ss_demodulator_dedicated_pilots_2 = -1; -static gint hf_sbc_ss_demodulator_reserved1_2 = -1; +static int hf_sbc_ss_fft_rsvd1; +static int hf_sbc_ss_fft_rsvd2; +static int hf_sbc_ss_demodulator; +static int hf_sbc_ss_demodulator_64qam; +static int hf_sbc_ss_demodulator_btc; +static int hf_sbc_ss_demodulator_ctc; +static int hf_sbc_ss_demodulator_stc; +static int hf_sbc_ss_demodulator_cc_with_optional_interleaver; +static int hf_sbc_ss_demodulator_harq_chase; +static int hf_sbc_ss_demodulator_harq_ctc_ir; +static int hf_sbc_ss_demodulator_reserved; +/* static int hf_sbc_ss_demodulator_reserved1; */ +static int hf_sbc_ss_demodulator_64qam_2; +static int hf_sbc_ss_demodulator_btc_2; +static int hf_sbc_ss_demodulator_ctc_2; +static int hf_sbc_ss_demodulator_stc_2; +static int hf_sbc_ss_demodulator_cc_with_optional_interleaver_2; +static int hf_sbc_ss_demodulator_harq_chase_2; +static int hf_sbc_ss_demodulator_harq_ctc_ir_2; +static int hf_sbc_ss_demodulator_reserved_2; +static int hf_sbc_ss_demodulator_harq_cc_ir_2; +static int hf_sbc_ss_demodulator_ldpc_2; +static int hf_sbc_ss_demodulator_dedicated_pilots_2; +static int hf_sbc_ss_demodulator_reserved1_2; -static gint hf_sbc_ss_modulator = -1; -static gint hf_sbc_ss_modulator_64qam = -1; -static gint hf_sbc_ss_modulator_btc = -1; -static gint hf_sbc_ss_modulator_ctc = -1; -static gint hf_sbc_ss_modulator_stc = -1; -static gint hf_sbc_ss_modulator_harq_chase = -1; -static gint hf_sbc_ss_modulator_ctc_ir = -1; -static gint hf_sbc_ss_modulator_cc_ir = -1; -static gint hf_sbc_ss_modulator_ldpc = -1; +static int hf_sbc_ss_modulator; +static int hf_sbc_ss_modulator_64qam; +static int hf_sbc_ss_modulator_btc; +static int hf_sbc_ss_modulator_ctc; +static int hf_sbc_ss_modulator_stc; +static int hf_sbc_ss_modulator_harq_chase; +static int hf_sbc_ss_modulator_ctc_ir; +static int hf_sbc_ss_modulator_cc_ir; +static int hf_sbc_ss_modulator_ldpc; -static gint hf_sbc_number_ul_arq_ack_channel = -1; -static gint hf_sbc_number_dl_arq_ack_channel = -1; -static gint hf_sbc_ss_permutation_support = -1; -static gint hf_sbc_ss_optimal_pusc = -1; -static gint hf_sbc_ss_optimal_fusc = -1; -static gint hf_sbc_ss_amc_1x6 = -1; -static gint hf_sbc_ss_amc_2x3 = -1; -static gint hf_sbc_ss_amc_3x2 = -1; -static gint hf_sbc_ss_amc_with_harq_map = -1; -static gint hf_sbc_ss_tusc1_support = -1; -static gint hf_sbc_ss_tusc2_support = -1; -static gint hf_sbc_ss_ofdma_aas_private = -1; -static gint hf_sbc_ofdma_aas_harq_map_capability = -1; -static gint hf_sbc_ofdma_aas_private_map_support = -1; -static gint hf_sbc_ofdma_aas_reduced_private_map_support = -1; -static gint hf_sbc_ofdma_aas_private_chain_enable = -1; -static gint hf_sbc_ofdma_aas_private_map_dl_frame_offset = -1; -static gint hf_sbc_ofdma_aas_private_ul_frame_offset = -1; -static gint hf_sbc_ofdma_aas_private_map_concurrency = -1; -static gint hf_sbc_ofdma_aas_capabilities = -1; -static gint hf_sbc_ss_ofdma_aas_zone = -1; -static gint hf_sbc_ss_ofdma_aas_diversity_map_scan = -1; -static gint hf_sbc_ss_ofdma_aas_fbck_rsp_support = -1; -static gint hf_sbc_ss_ofdma_downlink_aas_preamble = -1; -static gint hf_sbc_ss_ofdma_uplink_aas_preamble = -1; -static gint hf_sbc_ss_ofdma_aas_capabilities_rsvd = -1; +static int hf_sbc_number_ul_arq_ack_channel; +static int hf_sbc_number_dl_arq_ack_channel; +static int hf_sbc_ss_permutation_support; +static int hf_sbc_ss_optimal_pusc; +static int hf_sbc_ss_optimal_fusc; +static int hf_sbc_ss_amc_1x6; +static int hf_sbc_ss_amc_2x3; +static int hf_sbc_ss_amc_3x2; +static int hf_sbc_ss_amc_with_harq_map; +static int hf_sbc_ss_tusc1_support; +static int hf_sbc_ss_tusc2_support; +static int hf_sbc_ss_ofdma_aas_private; +static int hf_sbc_ofdma_aas_harq_map_capability; +static int hf_sbc_ofdma_aas_private_map_support; +static int hf_sbc_ofdma_aas_reduced_private_map_support; +static int hf_sbc_ofdma_aas_private_chain_enable; +static int hf_sbc_ofdma_aas_private_map_dl_frame_offset; +static int hf_sbc_ofdma_aas_private_ul_frame_offset; +static int hf_sbc_ofdma_aas_private_map_concurrency; +static int hf_sbc_ofdma_aas_capabilities; +static int hf_sbc_ss_ofdma_aas_zone; +static int hf_sbc_ss_ofdma_aas_diversity_map_scan; +static int hf_sbc_ss_ofdma_aas_fbck_rsp_support; +static int hf_sbc_ss_ofdma_downlink_aas_preamble; +static int hf_sbc_ss_ofdma_uplink_aas_preamble; +static int hf_sbc_ss_ofdma_aas_capabilities_rsvd; -static gint hf_sbc_tlv_t_167_association_type_support = -1; -static gint hf_sbc_tlv_t_167_association_type_support_bit0 = -1; -static gint hf_sbc_tlv_t_167_association_type_support_bit1 = -1; -static gint hf_sbc_tlv_t_167_association_type_support_bit2 = -1; -static gint hf_sbc_tlv_t_167_association_type_support_bit3 = -1; -static gint hf_sbc_tlv_t_167_association_type_support_bit4 = -1; -static gint hf_sbc_tlv_t_167_association_type_support_reserved = -1; -static gint hf_sbc_ofdma_ss_uplink_power_control_support = -1; -static gint hf_sbc_ofdma_ss_uplink_power_control_support_open_loop = -1; -static gint hf_sbc_ofdma_ss_uplink_power_control_support_aas_preamble = -1; -static gint hf_sbc_ofdma_ss_uplink_power_control_support_rsvd = -1; -/* static gint hf_sbc_ofdm_ss_minimum_num_of_frames = -1; */ -static gint hf_sbc_tlv_t_27_extension_capability = -1; -static gint hf_sbc_tlv_t_27_extension_capability_bit0 = -1; -static gint hf_sbc_tlv_t_27_extension_capability_reserved = -1; -static gint hf_sbc_tlv_t_28_ho_trigger_metric_support = -1; -static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_bit0 = -1; -static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_bit1 = -1; -static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_bit2 = -1; -static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_bit3 = -1; -static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_reserved = -1; -static gint hf_sbc_tlv_t_171_minimum_num_of_frames = -1; -static gint hf_sbc_tlv_t_172_harq_map_capability = -1; -static gint hf_sbc_tlv_t_172_extended_harq_ie_capability = -1; -static gint hf_sbc_tlv_t_172_sub_map_capability_first_zone = -1; -static gint hf_sbc_tlv_t_172_sub_map_capability_other_zones = -1; -static gint hf_sbc_tlv_t_172_dl_region_definition_support = -1; -static gint hf_sbc_tlv_t_172_reserved = -1; -static gint hf_sbc_tlv_t_172 = -1; -static gint hf_sbc_tlv_t_173_ul_ctl_channel_support = -1; -static gint hf_sbc_tlv_t_173_3_bit_mimo_fast_feedback = -1; -static gint hf_sbc_tlv_t_173_enhanced_fast_feedback = -1; -static gint hf_sbc_tlv_t_173_ul_ack = -1; -static gint hf_sbc_tlv_t_173_reserved = -1; -static gint hf_sbc_tlv_t_173_uep_fast_feedback = -1; -static gint hf_sbc_tlv_t_173_measurement_report = -1; -static gint hf_sbc_tlv_t_173_primary_secondary_fast_feedback = -1; -static gint hf_sbc_tlv_t_173_diuc_cqi_fast_feedback = -1; -static gint hf_sbc_tlv_t_174_ofdma_ms_csit_capability = -1; -static gint hf_sbc_tlv_t_174_csit_compatibility_type_a = -1; -static gint hf_sbc_tlv_t_174_csit_compatibility_type_b = -1; -static gint hf_sbc_tlv_t_174_power_assignment_capability = -1; -static gint hf_sbc_tlv_t_174_sounding_rsp_time_capability = -1; -static gint hf_sbc_tlv_t_174_max_num_simultanous_sounding_instructions = -1; -static gint hf_sbc_tlv_t_174_ss_csit_type_a_support = -1; -static gint hf_sbc_tlv_t_204_ofdma_parameters_sets = -1; -static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_a = -1; -static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_b = -1; -static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_harq_parameters_set = -1; -static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_a = -1; -static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_b = -1; -static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_reserved = -1; -static gint hf_sbc_tlv_t_174_ss_csit_reserved = -1; -static gint hf_sbc_tlv_t_175_max_num_bst_per_frm_capability_harq = -1; -static gint hf_sbc_tlv_t_175_max_num_ul_harq_bst = -1; -static gint hf_sbc_tlv_t_175_max_num_ul_harq_per_frm_include_one_non_harq_bst = -1; -static gint hf_sbc_tlv_t_175_max_num_dl_harq_bst_per_harq_per_frm = -1; -static gint hf_sbc_tlv_t_176 = -1; -static gint hf_sbc_tlv_t_176_bit0 = -1; -static gint hf_sbc_tlv_t_176_bit1 = -1; -static gint hf_sbc_tlv_t_176_bit2 = -1; -/* static gint hf_sbc_tlv_t_176_bit2_cor2 = -1; */ -static gint hf_sbc_tlv_t_176_bit3 = -1; -static gint hf_sbc_tlv_t_176_bit4 = -1; -static gint hf_sbc_tlv_t_176_bit5 = -1; -static gint hf_sbc_tlv_t_176_bit6 = -1; -static gint hf_sbc_tlv_t_176_bit7 = -1; -static gint hf_sbc_tlv_t_176_bit8 = -1; -static gint hf_sbc_tlv_t_176_bit9 = -1; -static gint hf_sbc_tlv_t_176_bit10 = -1; -static gint hf_sbc_tlv_t_176_bit11 = -1; -static gint hf_sbc_tlv_t_176_bit12 = -1; -static gint hf_sbc_tlv_t_176_bit13 = -1; -static gint hf_sbc_tlv_t_176_bit14 = -1; -static gint hf_sbc_tlv_t_176_bit15 = -1; -static gint hf_sbc_tlv_t_176_bit16 = -1; -static gint hf_sbc_tlv_t_176_bit17 = -1; -static gint hf_sbc_tlv_t_176_bit18 = -1; -static gint hf_sbc_tlv_t_176_bit19 = -1; -static gint hf_sbc_tlv_t_176_reserved = -1; -static gint hf_sbc_tlv_t_177_ofdma_ss_modulator_for_mimo_support = -1; -static gint hf_sbc_tlv_t_177_stc_matrix_a = -1; -static gint hf_sbc_tlv_t_177_stc_matrix_b_vertical = -1; -static gint hf_sbc_tlv_t_177_stc_matrix_b_horizontal = -1; -static gint hf_sbc_tlv_t_177_two_transmit_antennas = -1; -static gint hf_sbc_tlv_t_177_capable_of_transmit_diversity = -1; -static gint hf_sbc_tlv_t_177_capable_of_spacial_multiplexing = -1; -static gint hf_sbc_tlv_t_177_beamforming = -1; -static gint hf_sbc_tlv_t_177_adaptive_rate_ctl = -1; -static gint hf_sbc_tlv_t_177_single_antenna = -1; -static gint hf_sbc_tlv_t_177_collaborative_sm_with_one_antenna = -1; -static gint hf_sbc_tlv_t_177_collaborative_sm_with_two_antennas = -1; -static gint hf_sbc_tlv_t_177_capable_of_two_antenna = -1; -static gint hf_sbc_tlv_t_177_rsvd = -1; -static gint hf_sbc_tlv_t_178_sdma_pilot_capability = -1; -static gint hf_sbc_tlv_t_178_sdma_pilot_pattern_support_for_amc_zone = -1; -static gint hf_sbc_tlv_t_178_reserved = -1; -static gint hf_sbc_tlv_t_179_ofdma_multiple_dl_burst_profile_support = -1; -static gint hf_sbc_tlv_t_179_dl_bst_profile_for_multiple_fec = -1; -static gint hf_sbc_tlv_t_179_ul_bst_profile_for_multiple_fec = -1; -static gint hf_sbc_tlv_t_179_reserved = -1; -static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability = -1; -static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_NEP = -1; -static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_dl = -1; -static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_ul = -1; -static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved1 = -1; -static gint hf_sbc_tlv_t_162_ul_harq_incremental_redundancy_buffer_capability_NEP = -1; -static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved2 = -1; -static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability = -1; -static gint hf_sbc_tlv_t_163_dl_harq_buffering_capability_for_chase_combining = -1; -static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_dl = -1; -static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved1 = -1; -static gint hf_sbc_tlv_t_163_ul_harq_buffering_capability_for_chase_combining = -1; -static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_ul = -1; -static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved2 = -1; +static int hf_sbc_tlv_t_167_association_type_support; +static int hf_sbc_tlv_t_167_association_type_support_bit0; +static int hf_sbc_tlv_t_167_association_type_support_bit1; +static int hf_sbc_tlv_t_167_association_type_support_bit2; +static int hf_sbc_tlv_t_167_association_type_support_bit3; +static int hf_sbc_tlv_t_167_association_type_support_bit4; +static int hf_sbc_tlv_t_167_association_type_support_reserved; +static int hf_sbc_ofdma_ss_uplink_power_control_support; +static int hf_sbc_ofdma_ss_uplink_power_control_support_open_loop; +static int hf_sbc_ofdma_ss_uplink_power_control_support_aas_preamble; +static int hf_sbc_ofdma_ss_uplink_power_control_support_rsvd; +/* static int hf_sbc_ofdm_ss_minimum_num_of_frames; */ +static int hf_sbc_tlv_t_27_extension_capability; +static int hf_sbc_tlv_t_27_extension_capability_bit0; +static int hf_sbc_tlv_t_27_extension_capability_reserved; +static int hf_sbc_tlv_t_28_ho_trigger_metric_support; +static int hf_sbc_tlv_t_28_ho_trigger_metric_support_bit0; +static int hf_sbc_tlv_t_28_ho_trigger_metric_support_bit1; +static int hf_sbc_tlv_t_28_ho_trigger_metric_support_bit2; +static int hf_sbc_tlv_t_28_ho_trigger_metric_support_bit3; +static int hf_sbc_tlv_t_28_ho_trigger_metric_support_reserved; +static int hf_sbc_tlv_t_171_minimum_num_of_frames; +static int hf_sbc_tlv_t_172_harq_map_capability; +static int hf_sbc_tlv_t_172_extended_harq_ie_capability; +static int hf_sbc_tlv_t_172_sub_map_capability_first_zone; +static int hf_sbc_tlv_t_172_sub_map_capability_other_zones; +static int hf_sbc_tlv_t_172_dl_region_definition_support; +static int hf_sbc_tlv_t_172_reserved; +static int hf_sbc_tlv_t_172; +static int hf_sbc_tlv_t_173_ul_ctl_channel_support; +static int hf_sbc_tlv_t_173_3_bit_mimo_fast_feedback; +static int hf_sbc_tlv_t_173_enhanced_fast_feedback; +static int hf_sbc_tlv_t_173_ul_ack; +static int hf_sbc_tlv_t_173_reserved; +static int hf_sbc_tlv_t_173_uep_fast_feedback; +static int hf_sbc_tlv_t_173_measurement_report; +static int hf_sbc_tlv_t_173_primary_secondary_fast_feedback; +static int hf_sbc_tlv_t_173_diuc_cqi_fast_feedback; +static int hf_sbc_tlv_t_174_ofdma_ms_csit_capability; +static int hf_sbc_tlv_t_174_csit_compatibility_type_a; +static int hf_sbc_tlv_t_174_csit_compatibility_type_b; +static int hf_sbc_tlv_t_174_power_assignment_capability; +static int hf_sbc_tlv_t_174_sounding_rsp_time_capability; +static int hf_sbc_tlv_t_174_max_num_simultanous_sounding_instructions; +static int hf_sbc_tlv_t_174_ss_csit_type_a_support; +static int hf_sbc_tlv_t_204_ofdma_parameters_sets; +static int hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_a; +static int hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_b; +static int hf_sbc_tlv_t_204_ofdma_parameters_sets_harq_parameters_set; +static int hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_a; +static int hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_b; +static int hf_sbc_tlv_t_204_ofdma_parameters_sets_reserved; +static int hf_sbc_tlv_t_174_ss_csit_reserved; +static int hf_sbc_tlv_t_175_max_num_bst_per_frm_capability_harq; +static int hf_sbc_tlv_t_175_max_num_ul_harq_bst; +static int hf_sbc_tlv_t_175_max_num_ul_harq_per_frm_include_one_non_harq_bst; +static int hf_sbc_tlv_t_175_max_num_dl_harq_bst_per_harq_per_frm; +static int hf_sbc_tlv_t_176; +static int hf_sbc_tlv_t_176_bit0; +static int hf_sbc_tlv_t_176_bit1; +static int hf_sbc_tlv_t_176_bit2; +/* static int hf_sbc_tlv_t_176_bit2_cor2; */ +static int hf_sbc_tlv_t_176_bit3; +static int hf_sbc_tlv_t_176_bit4; +static int hf_sbc_tlv_t_176_bit5; +static int hf_sbc_tlv_t_176_bit6; +static int hf_sbc_tlv_t_176_bit7; +static int hf_sbc_tlv_t_176_bit8; +static int hf_sbc_tlv_t_176_bit9; +static int hf_sbc_tlv_t_176_bit10; +static int hf_sbc_tlv_t_176_bit11; +static int hf_sbc_tlv_t_176_bit12; +static int hf_sbc_tlv_t_176_bit13; +static int hf_sbc_tlv_t_176_bit14; +static int hf_sbc_tlv_t_176_bit15; +static int hf_sbc_tlv_t_176_bit16; +static int hf_sbc_tlv_t_176_bit17; +static int hf_sbc_tlv_t_176_bit18; +static int hf_sbc_tlv_t_176_bit19; +static int hf_sbc_tlv_t_176_reserved; +static int hf_sbc_tlv_t_177_ofdma_ss_modulator_for_mimo_support; +static int hf_sbc_tlv_t_177_stc_matrix_a; +static int hf_sbc_tlv_t_177_stc_matrix_b_vertical; +static int hf_sbc_tlv_t_177_stc_matrix_b_horizontal; +static int hf_sbc_tlv_t_177_two_transmit_antennas; +static int hf_sbc_tlv_t_177_capable_of_transmit_diversity; +static int hf_sbc_tlv_t_177_capable_of_spacial_multiplexing; +static int hf_sbc_tlv_t_177_beamforming; +static int hf_sbc_tlv_t_177_adaptive_rate_ctl; +static int hf_sbc_tlv_t_177_single_antenna; +static int hf_sbc_tlv_t_177_collaborative_sm_with_one_antenna; +static int hf_sbc_tlv_t_177_collaborative_sm_with_two_antennas; +static int hf_sbc_tlv_t_177_capable_of_two_antenna; +static int hf_sbc_tlv_t_177_rsvd; +static int hf_sbc_tlv_t_178_sdma_pilot_capability; +static int hf_sbc_tlv_t_178_sdma_pilot_pattern_support_for_amc_zone; +static int hf_sbc_tlv_t_178_reserved; +static int hf_sbc_tlv_t_179_ofdma_multiple_dl_burst_profile_support; +static int hf_sbc_tlv_t_179_dl_bst_profile_for_multiple_fec; +static int hf_sbc_tlv_t_179_ul_bst_profile_for_multiple_fec; +static int hf_sbc_tlv_t_179_reserved; +static int hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability; +static int hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_NEP; +static int hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_dl; +static int hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_ul; +static int hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved1; +static int hf_sbc_tlv_t_162_ul_harq_incremental_redundancy_buffer_capability_NEP; +static int hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved2; +static int hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability; +static int hf_sbc_tlv_t_163_dl_harq_buffering_capability_for_chase_combining; +static int hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_dl; +static int hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved1; +static int hf_sbc_tlv_t_163_ul_harq_buffering_capability_for_chase_combining; +static int hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_ul; +static int hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved2; -static gint hf_sbc_ss_demodulator_mimo_support = -1; -static gint hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_a = -1; -static gint hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_b_vertical = -1; -static gint hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_b_horizontal = -1; -static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_a = -1; -static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_b_vertical = -1; -static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_b_horizontal = -1; -static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_vertical = -1; -static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_horizontal = -1; -static gint hf_sbc_ss_demodulator_mimo_rsvd = -1; -static gint hf_sbc_ss_mimo_uplink_support = -1; -static gint hf_sbc_ss_mimo_uplink_support_2_ann_sttd = -1; -static gint hf_sbc_ss_mimo_uplink_support_2_ann_sm_vertical = -1; -static gint hf_sbc_ss_mimo_uplink_support_1_ann_coop_sm = -1; -static gint hf_sbc_ss_mimo_uplink_support_rsvd = -1; +static int hf_sbc_ss_demodulator_mimo_support; +static int hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_a; +static int hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_b_vertical; +static int hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_b_horizontal; +static int hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_a; +static int hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_b_vertical; +static int hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_b_horizontal; +static int hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_vertical; +static int hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_horizontal; +static int hf_sbc_ss_demodulator_mimo_rsvd; +static int hf_sbc_ss_mimo_uplink_support; +static int hf_sbc_ss_mimo_uplink_support_2_ann_sttd; +static int hf_sbc_ss_mimo_uplink_support_2_ann_sm_vertical; +static int hf_sbc_ss_mimo_uplink_support_1_ann_coop_sm; +static int hf_sbc_ss_mimo_uplink_support_rsvd; -static gint hf_sbc_power_save_class_types_capability = -1; -static gint hf_sbc_power_save_class_types_capability_bit0 = -1; -static gint hf_sbc_power_save_class_types_capability_bit1 = -1; -static gint hf_sbc_power_save_class_types_capability_bit2 = -1; -static gint hf_sbc_power_save_class_types_capability_bits34 = -1; -static gint hf_sbc_power_save_class_types_capability_bits567 = -1; +static int hf_sbc_power_save_class_types_capability; +static int hf_sbc_power_save_class_types_capability_bit0; +static int hf_sbc_power_save_class_types_capability_bit1; +static int hf_sbc_power_save_class_types_capability_bit2; +static int hf_sbc_power_save_class_types_capability_bits34; +static int hf_sbc_power_save_class_types_capability_bits567; -static gint hf_sbc_pkm_flow_control = -1; -static gint hf_sbc_auth_policy = -1; -static gint hf_sbc_privacy_802_16 = -1; -static gint hf_sbc_privacy_rsvd = -1; -static gint hf_sbc_max_security_associations = -1; +static int hf_sbc_pkm_flow_control; +static int hf_sbc_auth_policy; +static int hf_sbc_privacy_802_16; +static int hf_sbc_privacy_rsvd; +static int hf_sbc_max_security_associations; -static gint hf_sbc_invalid_tlv = -1; +static int hf_sbc_invalid_tlv; static const true_false_string tfs_sbc_bw_alloc_support_duplex = { @@ -559,18 +556,18 @@ static const value_string vals_sbc_sdma_str[ ] = }; -static void sbc_tlv_decoder(tlv_info_t* tlv_info, int ett, proto_tree* sbc_tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint tlv_offset) +static void sbc_tlv_decoder(tlv_info_t* tlv_info, int ett, proto_tree* sbc_tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned tlv_offset) { proto_item *tlv_item, *ti; proto_tree *tlv_tree; - gint tlv_type = get_tlv_type(tlv_info), + int tlv_type = get_tlv_type(tlv_info), tlv_len = get_tlv_length(tlv_info), value; - gfloat power_bpsk; - gfloat power_qpsk; - gfloat power_qam16; - gfloat power_qam64; - gfloat current_power; + float power_bpsk; + float power_qpsk; + float power_qam16; + float power_qam64; + float current_power; /* process SBC TLV Encoded information */ switch (tlv_type) @@ -608,23 +605,23 @@ static void sbc_tlv_decoder(tlv_info_t* tlv_info, int ett, proto_tree* sbc_tree, tlv_item = add_tlv_subtree(tlv_info, sbc_tree, hf_sbc_max_transmit_power, tvb, tlv_offset, ENC_BIG_ENDIAN); tlv_tree = proto_item_add_subtree(tlv_item, ett); /* display the detail meanings of the TLV value */ - power_bpsk = (gfloat)(tvb_get_guint8(tvb, offset) - 128) / 2; - power_qpsk = (gfloat)(tvb_get_guint8(tvb, (offset + 1)) - 128) / 2; - power_qam16 = (gfloat)(tvb_get_guint8(tvb, (offset + 2)) - 128) / 2; - power_qam64 = (gfloat)(tvb_get_guint8(tvb, (offset + 3)) - 128) / 2; - proto_tree_add_float_format_value(tlv_tree, hf_sbc_bpsk, tvb, offset, 1, power_bpsk, "%.2f dBm", (gdouble)power_bpsk); - proto_tree_add_float_format_value(tlv_tree, hf_sbc_qpsk, tvb, (offset + 1), 1, power_qpsk, "%.2f dBm", (gdouble)power_qpsk); - proto_tree_add_float_format_value(tlv_tree, hf_sbc_qam16, tvb, (offset + 2), 1, power_qam16, "%.2f dBm", (gdouble)power_qam16); - proto_tree_add_float_format_value(tlv_tree, hf_sbc_qam64, tvb, (offset + 3), 1, power_qam64, "%.2f dBm", (gdouble)power_qam64); + power_bpsk = (float)(tvb_get_uint8(tvb, offset) - 128) / 2; + power_qpsk = (float)(tvb_get_uint8(tvb, (offset + 1)) - 128) / 2; + power_qam16 = (float)(tvb_get_uint8(tvb, (offset + 2)) - 128) / 2; + power_qam64 = (float)(tvb_get_uint8(tvb, (offset + 3)) - 128) / 2; + proto_tree_add_float_format_value(tlv_tree, hf_sbc_bpsk, tvb, offset, 1, power_bpsk, "%.2f dBm", (double)power_bpsk); + proto_tree_add_float_format_value(tlv_tree, hf_sbc_qpsk, tvb, (offset + 1), 1, power_qpsk, "%.2f dBm", (double)power_qpsk); + proto_tree_add_float_format_value(tlv_tree, hf_sbc_qam16, tvb, (offset + 2), 1, power_qam16, "%.2f dBm", (double)power_qam16); + proto_tree_add_float_format_value(tlv_tree, hf_sbc_qam64, tvb, (offset + 3), 1, power_qam64, "%.2f dBm", (double)power_qam64); break; case SBC_REQ_CURR_TRANSMITTED_POWER: /* add TLV subtree */ tlv_item = add_tlv_subtree(tlv_info, sbc_tree, hf_sbc_curr_transmit_power, tvb, tlv_offset, ENC_BIG_ENDIAN); tlv_tree = proto_item_add_subtree(tlv_item, ett); /* display the detail meanings of the TLV value */ - value = tvb_get_guint8(tvb, offset); - current_power = (gfloat)(value - 128) / 2; - proto_tree_add_float_format_value(tlv_tree, hf_sbc_current_transmitted_power, tvb, offset, 1, current_power, "%.2f dBm (Value: 0x%x)", (gdouble)current_power, value); + value = tvb_get_uint8(tvb, offset); + current_power = (float)(value - 128) / 2; + proto_tree_add_float_format_value(tlv_tree, hf_sbc_current_transmitted_power, tvb, offset, 1, current_power, "%.2f dBm (Value: 0x%x)", (double)current_power, value); break; case SBC_SS_FFT_SIZES: /* add TLV subtree */ @@ -778,7 +775,7 @@ static void sbc_tlv_decoder(tlv_info_t* tlv_info, int ett, proto_tree* sbc_tree, case SBC_PKM_FLOW_CONTROL: /* add TLV subtree */ tlv_item = add_tlv_subtree(tlv_info, sbc_tree, hf_sbc_pkm_flow_control, tvb, tlv_offset, ENC_BIG_ENDIAN); - if(tvb_get_guint8(tvb, offset) == 0) + if(tvb_get_uint8(tvb, offset) == 0) proto_item_append_text(tlv_item, " (default - no limit)"); break; case SBC_AUTH_POLICY_SUPPORT: @@ -1023,9 +1020,9 @@ static void sbc_tlv_decoder(tlv_info_t* tlv_info, int ett, proto_tree* sbc_tree, /* Wimax Mac SBC-REQ Message Dissector */ static int dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len; - gint tlv_type, tlv_len, tlv_value_offset; + unsigned offset = 0; + unsigned tvb_len; + int tlv_type, tlv_len, tlv_value_offset; proto_item *sbc_item; proto_tree *sbc_tree; tlv_info_t tlv_info; @@ -1077,9 +1074,9 @@ static int dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinf /* Wimax Mac SBC-RSP Message Dissector */ static int dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len; - gint tlv_type, tlv_len, tlv_value_offset; + unsigned offset = 0; + unsigned tvb_len; + int tlv_type, tlv_len, tlv_value_offset; proto_item *sbc_item; proto_tree *sbc_tree; tlv_info_t tlv_info; @@ -2794,7 +2791,7 @@ void proto_register_mac_mgmt_msg_sbc(void) }; /* Setup protocol subtree array */ - static gint *ett_sbc[] = + static int *ett_sbc[] = { &ett_mac_mgmt_msg_sbc_decoder, &ett_sbc_req_tlv_subtree, diff --git a/plugins/epan/wimax/msg_ucd.c b/plugins/epan/wimax/msg_ucd.c index ab6d811d..0779f4ab 100644 --- a/plugins/epan/wimax/msg_ucd.c +++ b/plugins/epan/wimax/msg_ucd.c @@ -21,103 +21,106 @@ */ #include <epan/packet.h> +#include <epan/tfs.h> +#include <epan/unit_strings.h> + +#include <wsutil/array.h> #include "wimax_tlv.h" #include "wimax_mac.h" #include "wimax_utils.h" +#include "wimax_prefs.h" void proto_register_mac_mgmt_msg_ucd(void); void proto_reg_handoff_mac_mgmt_msg_ucd(void); static dissector_handle_t ucd_handle; -extern gboolean include_cor2_changes; - -guint cqich_id_size; /* Set for CQICH_Alloc_IE */ +unsigned cqich_id_size; /* Set for CQICH_Alloc_IE */ -static gint proto_mac_mgmt_msg_ucd_decoder = -1; -static gint ett_mac_mgmt_msg_ucd_decoder = -1; +static int proto_mac_mgmt_msg_ucd_decoder; +static int ett_mac_mgmt_msg_ucd_decoder; /* fix fields */ -static gint hf_ucd_res_timeout = -1; -static gint hf_ucd_bw_req_size = -1; -static gint hf_ucd_ranging_req_size = -1; -static gint hf_ucd_freq = -1; -/* static gint hf_ucd_subchan_params_num_chan = -1; */ -static gint hf_ucd_ul_allocated_subchannles_bitmap = -1; -/* static gint hf_ucd_subchan_params_num_sym = -1; */ -/* static gint hf_ucd_subchan_codes = -1; */ +static int hf_ucd_res_timeout; +static int hf_ucd_bw_req_size; +static int hf_ucd_ranging_req_size; +static int hf_ucd_freq; +/* static int hf_ucd_subchan_params_num_chan; */ +static int hf_ucd_ul_allocated_subchannles_bitmap; +/* static int hf_ucd_subchan_params_num_sym; */ +/* static int hf_ucd_subchan_codes; */ -static gint hf_ucd_ul_burst_reserved = -1; -static gint hf_ucd_ul_burst_uiuc = -1; -static gint hf_ucd_burst_fec = -1; -static gint hf_ucd_burst_ranging_data_ratio = -1; -/*static gint hf_ucd_burst_power_boost = -1; -*static gint hf_ucd_burst_tcs_enable = -1; +static int hf_ucd_ul_burst_reserved; +static int hf_ucd_ul_burst_uiuc; +static int hf_ucd_burst_fec; +static int hf_ucd_burst_ranging_data_ratio; +/*static int hf_ucd_burst_power_boost; +*static int hf_ucd_burst_tcs_enable; */ -static gint hf_ucd_tlv_t_159_band_amc_allocation_threshold = -1; -static gint hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap = -1; -static gint hf_ucd_tlv_t_160_band_amc_release_threshold = -1; -static gint hf_ucd_tlv_t_161_band_amc_allocation_timer = -1; -static gint hf_ucd_tlv_t_162_band_amc_release_timer = -1; -static gint hf_ucd_tlv_t_163_band_status_report_max_period = -1; -static gint hf_ucd_tlv_t_164_band_amc_retry_timer = -1; -static gint hf_ucd_tlv_t_171_harq_ack_delay_dl_burst = -1; -static gint hf_ucd_tlv_t_170_safety_channel_retry_timer = -1; -static gint hf_ucd_tlv_t_172_cqich_band_amc_transition_delay = -1; -static gint hf_ucd_tlv_t_174_maximum_retransmission = -1; -static gint hf_ucd_tlv_t_177_normalized_cn_override2 = -1; -static gint hf_ucd_tlv_t_177_normalized_cn_override2_first_line = -1; -static gint hf_ucd_tlv_t_177_normalized_cn_override2_list = -1; -static gint hf_ucd_tlv_t_176_size_of_cqich_id_field = -1; -static gint hf_ucd_tlv_t_186_upper_bound_aas_preamble = -1; -static gint hf_ucd_tlv_t_187_lower_bound_aas_preamble = -1; -static gint hf_ucd_tlv_t_188_allow_aas_beam_select_message = -1; -static gint hf_ucd_tlv_t_189_use_cqich_indication_flag = -1; -static gint hf_ucd_tlv_t_190_ms_specific_up_power_addjustment_step = -1; -static gint hf_ucd_tlv_t_191_ms_specific_down_power_addjustment_step = -1; -static gint hf_ucd_tlv_t_192_min_level_power_offset_adjustment = -1; -static gint hf_ucd_tlv_t_193_max_level_power_offset_adjustment = -1; -static gint hf_ucd_tlv_t_194_handover_ranging_codes = -1; -static gint hf_ucd_tlv_t_195_initial_ranging_interval = -1; -static gint hf_ucd_tlv_t_196_tx_power_report = -1; -static gint hf_ucd_tlv_t_196_tx_power_report_threshold = -1; -static gint hf_ucd_tlv_t_196_tx_power_report_interval = -1; -static gint hf_ucd_tlv_t_196_tx_power_report_a_p_avg = -1; -static gint hf_ucd_tlv_t_196_tx_power_report_threshold_icqch = -1; -static gint hf_ucd_tlv_t_196_tx_power_report_interval_icqch = -1; -static gint hf_ucd_tlv_t_196_tx_power_report_a_p_avg_icqch = -1; -/* static gint hf_ucd_tlv_t_197_normalized_cn_channel_sounding = -1; */ -static gint hf_ucd_tlv_t_202_uplink_burst_profile_for_multiple_fec_types = -1; -static gint hf_ucd_tlv_t_203_ul_pusc_subchannel_rotation = -1; -static gint hf_ucd_tlv_t_205_relative_power_offset_ul_harq_burst = -1; -static gint hf_ucd_tlv_t_206_relative_power_offset_ul_burst_containing_mac_mgmt_msg = -1; -static gint hf_ucd_tlv_t_207_ul_initial_transmit_timing = -1; -static gint hf_ucd_tlv_t_210_fast_feedback_region = -1; -static gint hf_ucd_tlv_t_211_harq_ack_region = -1; -static gint hf_ucd_tlv_t_212_ranging_region = -1; -static gint hf_ucd_tlv_t_213_sounding_region = -1; -static gint hf_ucd_tlv_t_150_initial_ranging_codes = -1; -static gint hf_ucd_tlv_t_151_periodic_ranging_codes = -1; -static gint hf_ucd_tlv_t_152_bandwidth_request_codes = -1; -static gint hf_ucd_tlv_t_155_start_of_ranging_codes_group = -1; -static gint hf_ucd_tlv_t_156_permutation_base = -1; -static gint hf_ucd_ho_ranging_start = -1; -static gint hf_ucd_ho_ranging_end = -1; -static gint hf_ucd_initial_range_backoff_start = -1; -static gint hf_ucd_initial_range_backoff_end = -1; -static gint hf_ucd_bandwidth_backoff_start = -1; -static gint hf_ucd_bandwidth_backoff_end = -1; -static gint hf_ucd_periodic_ranging_backoff_start = -1; -static gint hf_ucd_periodic_ranging_backoff_end = -1; -static gint hf_ucd_config_change_count = -1; -static gint hf_ucd_ranging_backoff_start = -1; -static gint hf_ucd_ranging_backoff_end = -1; -static gint hf_ucd_request_backoff_start = -1; -static gint hf_ucd_request_backoff_end = -1; +static int hf_ucd_tlv_t_159_band_amc_allocation_threshold; +static int hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap; +static int hf_ucd_tlv_t_160_band_amc_release_threshold; +static int hf_ucd_tlv_t_161_band_amc_allocation_timer; +static int hf_ucd_tlv_t_162_band_amc_release_timer; +static int hf_ucd_tlv_t_163_band_status_report_max_period; +static int hf_ucd_tlv_t_164_band_amc_retry_timer; +static int hf_ucd_tlv_t_171_harq_ack_delay_dl_burst; +static int hf_ucd_tlv_t_170_safety_channel_retry_timer; +static int hf_ucd_tlv_t_172_cqich_band_amc_transition_delay; +static int hf_ucd_tlv_t_174_maximum_retransmission; +static int hf_ucd_tlv_t_177_normalized_cn_override2; +static int hf_ucd_tlv_t_177_normalized_cn_override2_first_line; +static int hf_ucd_tlv_t_177_normalized_cn_override2_list; +static int hf_ucd_tlv_t_176_size_of_cqich_id_field; +static int hf_ucd_tlv_t_186_upper_bound_aas_preamble; +static int hf_ucd_tlv_t_187_lower_bound_aas_preamble; +static int hf_ucd_tlv_t_188_allow_aas_beam_select_message; +static int hf_ucd_tlv_t_189_use_cqich_indication_flag; +static int hf_ucd_tlv_t_190_ms_specific_up_power_addjustment_step; +static int hf_ucd_tlv_t_191_ms_specific_down_power_addjustment_step; +static int hf_ucd_tlv_t_192_min_level_power_offset_adjustment; +static int hf_ucd_tlv_t_193_max_level_power_offset_adjustment; +static int hf_ucd_tlv_t_194_handover_ranging_codes; +static int hf_ucd_tlv_t_195_initial_ranging_interval; +static int hf_ucd_tlv_t_196_tx_power_report; +static int hf_ucd_tlv_t_196_tx_power_report_threshold; +static int hf_ucd_tlv_t_196_tx_power_report_interval; +static int hf_ucd_tlv_t_196_tx_power_report_a_p_avg; +static int hf_ucd_tlv_t_196_tx_power_report_threshold_icqch; +static int hf_ucd_tlv_t_196_tx_power_report_interval_icqch; +static int hf_ucd_tlv_t_196_tx_power_report_a_p_avg_icqch; +/* static int hf_ucd_tlv_t_197_normalized_cn_channel_sounding; */ +static int hf_ucd_tlv_t_202_uplink_burst_profile_for_multiple_fec_types; +static int hf_ucd_tlv_t_203_ul_pusc_subchannel_rotation; +static int hf_ucd_tlv_t_205_relative_power_offset_ul_harq_burst; +static int hf_ucd_tlv_t_206_relative_power_offset_ul_burst_containing_mac_mgmt_msg; +static int hf_ucd_tlv_t_207_ul_initial_transmit_timing; +static int hf_ucd_tlv_t_210_fast_feedback_region; +static int hf_ucd_tlv_t_211_harq_ack_region; +static int hf_ucd_tlv_t_212_ranging_region; +static int hf_ucd_tlv_t_213_sounding_region; +static int hf_ucd_tlv_t_150_initial_ranging_codes; +static int hf_ucd_tlv_t_151_periodic_ranging_codes; +static int hf_ucd_tlv_t_152_bandwidth_request_codes; +static int hf_ucd_tlv_t_155_start_of_ranging_codes_group; +static int hf_ucd_tlv_t_156_permutation_base; +static int hf_ucd_ho_ranging_start; +static int hf_ucd_ho_ranging_end; +static int hf_ucd_initial_range_backoff_start; +static int hf_ucd_initial_range_backoff_end; +static int hf_ucd_bandwidth_backoff_start; +static int hf_ucd_bandwidth_backoff_end; +static int hf_ucd_periodic_ranging_backoff_start; +static int hf_ucd_periodic_ranging_backoff_end; +static int hf_ucd_config_change_count; +static int hf_ucd_ranging_backoff_start; +static int hf_ucd_ranging_backoff_end; +static int hf_ucd_request_backoff_start; +static int hf_ucd_request_backoff_end; -/* static gint hf_ucd_unknown_type = -1; */ -static gint hf_ucd_invalid_tlv = -1; +/* static int hf_ucd_unknown_type; */ +static int hf_ucd_invalid_tlv; #if 0 static const value_string vals_dcd_burst_tcs[] = @@ -210,19 +213,19 @@ static const value_string vals_yes_no_str[] = /* UCD dissector */ static int dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len, length; - gint tlv_type, tlv_len, tlv_offset, tlv_value_offset; + unsigned offset = 0; + unsigned tvb_len, length; + int tlv_type, tlv_len, tlv_offset, tlv_value_offset; tlv_info_t tlv_info; - gchar* proto_str; + char* proto_str; { /* we are being asked for details */ proto_item *ucd_item; proto_tree *ucd_tree; - guint ucd_ranging_backoff_start; - guint ucd_ranging_backoff_end; - guint ucd_request_backoff_start; - guint ucd_request_backoff_end; + unsigned ucd_ranging_backoff_start; + unsigned ucd_ranging_backoff_end; + unsigned ucd_request_backoff_start; + unsigned ucd_request_backoff_end; tvb_len = tvb_reported_length(tvb); /* display MAC payload type UCD */ @@ -235,22 +238,22 @@ static int dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, p offset++; /* get the ranging backoff start */ - ucd_ranging_backoff_start = tvb_get_guint8(tvb, offset); + ucd_ranging_backoff_start = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format_value(ucd_tree, hf_ucd_ranging_backoff_start, tvb, offset, 1, (1 << ucd_ranging_backoff_start), "2^%u = %u", ucd_ranging_backoff_start, (1 << ucd_ranging_backoff_start)); offset++; /* get the ranging backoff end */ - ucd_ranging_backoff_end = tvb_get_guint8(tvb, offset); + ucd_ranging_backoff_end = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format_value(ucd_tree, hf_ucd_ranging_backoff_end, tvb, offset, 1, (1 << ucd_ranging_backoff_end), "2^%u = %u", ucd_ranging_backoff_end, (1 << ucd_ranging_backoff_end)); offset++; /* get the request backoff start */ - ucd_request_backoff_start = tvb_get_guint8(tvb, offset); + ucd_request_backoff_start = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format_value(ucd_tree, hf_ucd_request_backoff_start, tvb, offset, 1, (1 << ucd_request_backoff_start), "2^%u = %u", ucd_request_backoff_start, (1 << ucd_request_backoff_start)); offset++; /* get the request backoff end */ - ucd_request_backoff_end = tvb_get_guint8(tvb, offset); + ucd_request_backoff_end = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format_value(ucd_tree, hf_ucd_request_backoff_end, tvb, offset, 1, (1 << ucd_request_backoff_end), "2^%u = %u", ucd_request_backoff_end, (1 << ucd_request_backoff_end)); offset++; @@ -258,8 +261,8 @@ static int dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, p { proto_tree *tlv_tree; proto_item *tlv_item1; - guint ul_burst_uiuc; - guint utemp; + unsigned ul_burst_uiuc; + unsigned utemp; /* get the TLV information */ init_tlv_info(&tlv_info, tvb, offset); /* get the TLV type */ @@ -331,7 +334,7 @@ static int dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, p case UCD_UPLINK_BURST_PROFILE: { /* get the UIUC */ - ul_burst_uiuc = tvb_get_guint8(tvb, offset) & 0x0F; + ul_burst_uiuc = tvb_get_uint8(tvb, offset) & 0x0F; /* add TLV subtree */ proto_str = wmem_strdup_printf(pinfo->pool, "Uplink Burst Profile (UIUC = %u)", ul_burst_uiuc); tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, proto_mac_mgmt_msg_ucd_decoder, tvb, offset-tlv_value_offset, tlv_len, proto_str); @@ -406,14 +409,14 @@ static int dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, p case UCD_TLV_T_7_HO_RANGING_START: { tlv_tree = add_tlv_subtree_no_item(&tlv_info, ucd_tree, hf_ucd_ho_ranging_start, tvb, offset-tlv_value_offset); - utemp = tvb_get_guint8(tvb, offset); + utemp = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format_value(tlv_tree, hf_ucd_ho_ranging_start, tvb, offset, tvb_len, utemp, "2^%u = %u", utemp, (1 << utemp)); break; } case UCD_TLV_T_8_RANGING_HO_END: { tlv_tree = add_tlv_subtree_no_item(&tlv_info, ucd_tree, hf_ucd_ho_ranging_end, tvb, offset-tlv_value_offset); - utemp = tvb_get_guint8(tvb, offset); + utemp = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format_value(tlv_tree, hf_ucd_ho_ranging_end, tvb, offset, tvb_len, utemp, "2^%u = %u", utemp, (1 << utemp)); break; } @@ -474,7 +477,7 @@ static int dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, p } case UCD_TLV_T_176_SIZE_OF_CQICH_ID_FIELD: { - utemp = tvb_get_guint8(tvb, offset); + utemp = tvb_get_uint8(tvb, offset); cqich_id_size = 0; /* Default is 0 */ if (utemp && utemp < 8) { /* Set for CQICH_Alloc_IE */ @@ -562,28 +565,28 @@ static int dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, p case UCD_TLV_T_198_INTIAL_RANGING_BACKOFF_START: { tlv_tree = add_tlv_subtree_no_item(&tlv_info, ucd_tree, hf_ucd_initial_range_backoff_start, tvb, offset-tlv_value_offset); - utemp = tvb_get_guint8(tvb, offset); + utemp = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format_value(tlv_tree, hf_ucd_initial_range_backoff_start, tvb, offset, tvb_len, utemp, "2^%u = %u", utemp, (1 << utemp)); break; } case UCD_TLV_T_199_INITIAL_RANGING_BACKOFF_END: { tlv_tree = add_tlv_subtree_no_item(&tlv_info, ucd_tree, hf_ucd_initial_range_backoff_end, tvb, offset-tlv_value_offset); - utemp = tvb_get_guint8(tvb, offset); + utemp = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format_value(tlv_tree, hf_ucd_initial_range_backoff_end, tvb, offset, tvb_len, utemp, "2^%u = %u", utemp, (1 << utemp)); break; } case UCD_TLV_T_200_BANDWIDTH_REQUESET_BACKOFF_START: { tlv_tree = add_tlv_subtree_no_item(&tlv_info, ucd_tree, hf_ucd_bandwidth_backoff_start, tvb, offset-tlv_value_offset); - utemp = tvb_get_guint8(tvb, offset); + utemp = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format_value(tlv_tree, hf_ucd_bandwidth_backoff_start, tvb, offset, tvb_len, utemp, "2^%u = %u", utemp, (1 << utemp)); break; } case UCD_TLV_T_201_BANDWIDTH_REQUEST_BACKOFF_END: { tlv_tree = add_tlv_subtree_no_item(&tlv_info, ucd_tree, hf_ucd_bandwidth_backoff_end, tvb, offset-tlv_value_offset); - utemp = tvb_get_guint8(tvb, offset); + utemp = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format_value(tlv_tree, hf_ucd_bandwidth_backoff_end, tvb, offset, tvb_len, utemp, "2^%u = %u", utemp, (1 << utemp)); break; } @@ -610,7 +613,7 @@ static int dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, p case UCD_PERIODIC_RANGING_BACKOFF_START: { tlv_tree = add_tlv_subtree_no_item(&tlv_info, ucd_tree, hf_ucd_periodic_ranging_backoff_start, tvb, offset-tlv_value_offset); - utemp = tvb_get_guint8(tvb, offset); + utemp = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format_value(tlv_tree, hf_ucd_periodic_ranging_backoff_start, tvb, offset, tvb_len, utemp, "2^%u = %u", utemp, (1 << utemp)); break; @@ -618,7 +621,7 @@ static int dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, p case UCD_PERIODIC_RANGING_BACKOFF_END: { tlv_tree = add_tlv_subtree_no_item(&tlv_info, ucd_tree, hf_ucd_periodic_ranging_backoff_end, tvb, offset-tlv_value_offset); - utemp = tvb_get_guint8(tvb, offset); + utemp = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format_value(tlv_tree, hf_ucd_periodic_ranging_backoff_end, tvb, offset, tvb_len, utemp, "2^%u = %u", utemp, (1 << utemp)); break; } @@ -682,42 +685,42 @@ void proto_register_mac_mgmt_msg_ucd(void) &hf_ucd_tlv_t_159_band_amc_allocation_threshold, { "Band AMC Allocation Threshold", "wmx.ucd.band_amc.allocation_threshold", - FT_UINT8, BASE_HEX|BASE_UNIT_STRING, &wimax_units_db, 0, NULL, HFILL + FT_UINT8, BASE_HEX|BASE_UNIT_STRING, UNS(&wimax_units_db), 0, NULL, HFILL } }, { &hf_ucd_tlv_t_161_band_amc_allocation_timer, { "Band AMC Allocation Timer", "wmx.ucd.band_amc.allocation_timer", - FT_UINT8, BASE_HEX|BASE_UNIT_STRING, &wimax_units_frame_frames, 0, NULL, HFILL + FT_UINT8, BASE_HEX|BASE_UNIT_STRING, UNS(&wimax_units_frame_frames), 0, NULL, HFILL } }, { &hf_ucd_tlv_t_160_band_amc_release_threshold, { "Band AMC Release Threshold", "wmx.ucd.band_amc.release_threshold", - FT_UINT8, BASE_HEX|BASE_UNIT_STRING, &wimax_units_db, 0, NULL, HFILL + FT_UINT8, BASE_HEX|BASE_UNIT_STRING, UNS(&wimax_units_db), 0, NULL, HFILL } }, { &hf_ucd_tlv_t_162_band_amc_release_timer, { "Band AMC Release Timer", "wmx.ucd.band_amc.release_timer", - FT_UINT8, BASE_HEX|BASE_UNIT_STRING, &wimax_units_frame_frames, 0, NULL, HFILL + FT_UINT8, BASE_HEX|BASE_UNIT_STRING, UNS(&wimax_units_frame_frames), 0, NULL, HFILL } }, { &hf_ucd_tlv_t_164_band_amc_retry_timer, { "Band AMC Retry Timer", "wmx.ucd.band_amc.retry_timer", - FT_UINT8, BASE_HEX|BASE_UNIT_STRING, &wimax_units_frame_frames, 0, NULL, HFILL + FT_UINT8, BASE_HEX|BASE_UNIT_STRING, UNS(&wimax_units_frame_frames), 0, NULL, HFILL } }, { &hf_ucd_tlv_t_163_band_status_report_max_period, { "Band Status Report MAC Period", "wmx.ucd.band_status.report_max_period", - FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_frame_frames, 0, NULL, HFILL + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_frame_frames), 0, NULL, HFILL } }, { @@ -738,7 +741,7 @@ void proto_register_mac_mgmt_msg_ucd(void) &hf_ucd_burst_ranging_data_ratio, { "Ranging Data Ratio", "wmx.ucd.burst.ranging_data_ratio", - FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_db, 0, NULL, HFILL + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_db), 0, NULL, HFILL } }, { @@ -758,7 +761,7 @@ void proto_register_mac_mgmt_msg_ucd(void) #if 0 { &hf_ucd_burst_power_boost, - {"Focused Contention Power Boost", "wmx.ucd.burst.power_boost", FT_UINT8, BASE_HEX|BASE_UNIT_STRING, &wimax_units_db, 0, NULL, HFILL} + {"Focused Contention Power Boost", "wmx.ucd.burst.power_boost", FT_UINT8, BASE_HEX|BASE_UNIT_STRING, UNS(&wimax_units_db), 0, NULL, HFILL} }, { &hf_ucd_burst_tcs_enable, @@ -769,21 +772,21 @@ void proto_register_mac_mgmt_msg_ucd(void) &hf_ucd_bw_req_size, { "Bandwidth Request Opportunity Size", "wmx.ucd.bw_req_size", - FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &wimax_units_ps, 0, NULL, HFILL + FT_UINT16, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_ps), 0, NULL, HFILL } }, { &hf_ucd_tlv_t_172_cqich_band_amc_transition_delay, { "CQICH Band AMC-Transition Delay", "wmx.ucd.cqich_band_amc_transition_delay", - FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_frame_frames, 0, NULL, HFILL + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_frame_frames), 0, NULL, HFILL } }, { &hf_ucd_freq, { "Frequency", "wmx.ucd.frequency", - FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &wimax_units_khz, 0, NULL, HFILL + FT_UINT32, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_khz), 0, NULL, HFILL } }, { @@ -797,7 +800,7 @@ void proto_register_mac_mgmt_msg_ucd(void) &hf_ucd_tlv_t_171_harq_ack_delay_dl_burst, { "HARQ ACK Delay for DL Burst", "wmx.ucd.harq_ack_delay_dl_burst", - FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_frame_offset, 0, NULL, HFILL + FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_frame_offset), 0, NULL, HFILL } }, { @@ -918,7 +921,7 @@ void proto_register_mac_mgmt_msg_ucd(void) &hf_ucd_ranging_req_size, { "Ranging Request Opportunity Size", "wmx.ucd.ranging_req_size", - FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &wimax_units_db, 0, NULL, HFILL + FT_UINT16, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_db), 0, NULL, HFILL } }, { @@ -932,7 +935,7 @@ void proto_register_mac_mgmt_msg_ucd(void) &hf_ucd_tlv_t_170_safety_channel_retry_timer, { "Safety Channel Release Timer", "wmx.ucd.safety_channel_release_timer", - FT_UINT8, BASE_HEX|BASE_UNIT_STRING, &wimax_units_frame_frames, 0, NULL, HFILL + FT_UINT8, BASE_HEX|BASE_UNIT_STRING, UNS(&wimax_units_frame_frames), 0, NULL, HFILL } }, { @@ -1208,7 +1211,7 @@ void proto_register_mac_mgmt_msg_ucd(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_mac_mgmt_msg_ucd_decoder, }; diff --git a/plugins/epan/wimax/msg_ulmap.c b/plugins/epan/wimax/msg_ulmap.c index b4909cc5..d0794266 100644 --- a/plugins/epan/wimax/msg_ulmap.c +++ b/plugins/epan/wimax/msg_ulmap.c @@ -21,8 +21,9 @@ #include "wimax_mac.h" #include "wimax_bits.h" #include "wimax_utils.h" - -extern gboolean include_cor2_changes; +#if 0 +#include "wimax_prefs.h" +#endif static dissector_handle_t ulmap_handle; @@ -49,62 +50,62 @@ void proto_reg_handoff_mac_mgmt_msg_ulmap(void); } while(0) /* from msg_ucd.c */ -extern guint cqich_id_size; /* Set for CQICH_Alloc_IE */ +extern unsigned cqich_id_size; /* Set for CQICH_Alloc_IE */ /* from msg_dlmap.c */ -extern gint harq; -extern gint ir_type; -extern gint N_layer; -extern gint RCID_Type; - -static gint proto_mac_mgmt_msg_ulmap_decoder = -1; - -static gint ett_ulmap = -1; -static gint ett_ulmap_ie = -1; -static gint ett_ulmap_ffb = -1; -/* static gint ett_ulmap_c = -1; */ -/* static gint ett_ulmap_c_ie = -1; */ -/* static gint ett_ulmap_s = -1; */ -/* static gint ett_ulmap_s_ie = -1; */ -static gint ett_287_1 = -1; -static gint ett_287_2 = -1; -static gint ett_289 = -1; -static gint ett_290 = -1; -static gint ett_290b = -1; -static gint ett_291 = -1; -static gint ett_292 = -1; -static gint ett_293 = -1; -static gint ett_294 = -1; -static gint ett_295 = -1; -static gint ett_299 = -1; -static gint ett_300 = -1; -static gint ett_302 = -1; -static gint ett_302a = -1; -static gint ett_302b = -1; -static gint ett_302c = -1; -static gint ett_302d = -1; -static gint ett_302e = -1; -static gint ett_302f = -1; -static gint ett_302g = -1; -static gint ett_302h = -1; -static gint ett_302i = -1; -static gint ett_302j = -1; -static gint ett_302k = -1; -static gint ett_302l = -1; -static gint ett_302m = -1; -static gint ett_302n = -1; -static gint ett_302o = -1; -static gint ett_302p = -1; -static gint ett_302q = -1; -static gint ett_302r = -1; -static gint ett_302s = -1; -static gint ett_302t = -1; -static gint ett_302u = -1; -static gint ett_302v = -1; -static gint ett_306 = -1; -static gint ett_306_ul = -1; -static gint ett_308b = -1; -static gint ett_315d = -1; +extern int harq; +extern int ir_type; +extern int N_layer; +extern int RCID_Type; + +static int proto_mac_mgmt_msg_ulmap_decoder; + +static int ett_ulmap; +static int ett_ulmap_ie; +static int ett_ulmap_ffb; +/* static int ett_ulmap_c; */ +/* static int ett_ulmap_c_ie; */ +/* static int ett_ulmap_s; */ +/* static int ett_ulmap_s_ie; */ +static int ett_287_1; +static int ett_287_2; +static int ett_289; +static int ett_290; +static int ett_290b; +static int ett_291; +static int ett_292; +static int ett_293; +static int ett_294; +static int ett_295; +static int ett_299; +static int ett_300; +static int ett_302; +static int ett_302a; +static int ett_302b; +static int ett_302c; +static int ett_302d; +static int ett_302e; +static int ett_302f; +static int ett_302g; +static int ett_302h; +static int ett_302i; +static int ett_302j; +static int ett_302k; +static int ett_302l; +static int ett_302m; +static int ett_302n; +static int ett_302o; +static int ett_302p; +static int ett_302q; +static int ett_302r; +static int ett_302s; +static int ett_302t; +static int ett_302u; +static int ett_302v; +static int ett_306; +static int ett_306_ul; +static int ett_308b; +static int ett_315d; #define DCD_DOWNLINK_BURST_PROFILE 1 #define DCD_BS_EIRP 2 @@ -196,348 +197,348 @@ static const value_string boost_msgs[] = #endif /* ul-map fields */ -static gint hf_ulmap_reserved = -1; -static gint hf_ulmap_ucd_count = -1; -static gint hf_ulmap_alloc_start_time = -1; -static gint hf_ulmap_ofdma_sym = -1; -static gint hf_ulmap_ie_diuc_ext = -1; -static gint hf_ulmap_ie_diuc_ext2 = -1; -static gint hf_ulmap_ie_length = -1; -static gint hf_ulmap_ie_reserved_extended2_duic = -1; -static gint hf_ulmap_ie_reserved_extended_duic = -1; -/* static gint hf_ulmap_fch_expected = -1; */ - -/* static gint hf_ulmap_ie = -1; */ - -static gint hf_ulmap_ie_cid = -1; -static gint hf_ulmap_ie_uiuc = -1; -static gint hf_ulmap_uiuc12_symofs = -1; -static gint hf_ulmap_uiuc12_subofs = -1; -static gint hf_ulmap_uiuc12_numsym = -1; -static gint hf_ulmap_uiuc12_numsub = -1; -static gint hf_ulmap_uiuc12_method = -1; -static gint hf_ulmap_uiuc12_dri = -1; -static gint hf_ulmap_uiuc10_dur = -1; -static gint hf_ulmap_uiuc10_rep = -1; -static gint hf_ulmap_uiuc10_slot_offset = -1; - -static gint hf_ulmap_uiuc14_dur = -1; -static gint hf_ulmap_uiuc14_uiuc = -1; -static gint hf_ulmap_uiuc14_rep = -1; -static gint hf_ulmap_uiuc14_idx = -1; -static gint hf_ulmap_uiuc14_code = -1; -static gint hf_ulmap_uiuc14_sym = -1; -static gint hf_ulmap_uiuc14_sub = -1; -static gint hf_ulmap_uiuc14_bwr = -1; - -/* static gint hf_ulmap_uiuc11_ext = -1; */ -/* static gint hf_ulmap_uiuc11_len = -1; */ -/* static gint hf_ulmap_uiuc11_data = -1; */ -/* static gint hf_ulmap_uiuc15_ext = -1; */ -/* static gint hf_ulmap_uiuc15_len = -1; */ -/* static gint hf_ulmap_uiuc15_data = -1; */ - -static gint hf_ulmap_uiuc0_symofs = -1; -static gint hf_ulmap_uiuc0_subofs = -1; -static gint hf_ulmap_uiuc0_numsym = -1; -static gint hf_ulmap_uiuc0_numsub = -1; -static gint hf_ulmap_uiuc0_rsv = -1; - -static gint hf_ulmap_uiuc13_symofs = -1; -static gint hf_ulmap_uiuc13_subofs = -1; -static gint hf_ulmap_uiuc13_numsym = -1; -static gint hf_ulmap_uiuc13_numsub = -1; -static gint hf_ulmap_uiuc13_papr = -1; -static gint hf_ulmap_uiuc13_zone = -1; -static gint hf_ulmap_uiuc13_rsv = -1; -/* static gint hf_ulmap_crc16 = -1; */ -/* static gint hf_ulmap_crc16_status = -1; */ -static gint hf_ulmap_padding = -1; +static int hf_ulmap_reserved; +static int hf_ulmap_ucd_count; +static int hf_ulmap_alloc_start_time; +static int hf_ulmap_ofdma_sym; +static int hf_ulmap_ie_diuc_ext; +static int hf_ulmap_ie_diuc_ext2; +static int hf_ulmap_ie_length; +static int hf_ulmap_ie_reserved_extended2_duic; +static int hf_ulmap_ie_reserved_extended_duic; +/* static int hf_ulmap_fch_expected; */ + +/* static int hf_ulmap_ie; */ + +static int hf_ulmap_ie_cid; +static int hf_ulmap_ie_uiuc; +static int hf_ulmap_uiuc12_symofs; +static int hf_ulmap_uiuc12_subofs; +static int hf_ulmap_uiuc12_numsym; +static int hf_ulmap_uiuc12_numsub; +static int hf_ulmap_uiuc12_method; +static int hf_ulmap_uiuc12_dri; +static int hf_ulmap_uiuc10_dur; +static int hf_ulmap_uiuc10_rep; +static int hf_ulmap_uiuc10_slot_offset; + +static int hf_ulmap_uiuc14_dur; +static int hf_ulmap_uiuc14_uiuc; +static int hf_ulmap_uiuc14_rep; +static int hf_ulmap_uiuc14_idx; +static int hf_ulmap_uiuc14_code; +static int hf_ulmap_uiuc14_sym; +static int hf_ulmap_uiuc14_sub; +static int hf_ulmap_uiuc14_bwr; + +/* static int hf_ulmap_uiuc11_ext; */ +/* static int hf_ulmap_uiuc11_len; */ +/* static int hf_ulmap_uiuc11_data; */ +/* static int hf_ulmap_uiuc15_ext; */ +/* static int hf_ulmap_uiuc15_len; */ +/* static int hf_ulmap_uiuc15_data; */ + +static int hf_ulmap_uiuc0_symofs; +static int hf_ulmap_uiuc0_subofs; +static int hf_ulmap_uiuc0_numsym; +static int hf_ulmap_uiuc0_numsub; +static int hf_ulmap_uiuc0_rsv; + +static int hf_ulmap_uiuc13_symofs; +static int hf_ulmap_uiuc13_subofs; +static int hf_ulmap_uiuc13_numsym; +static int hf_ulmap_uiuc13_numsub; +static int hf_ulmap_uiuc13_papr; +static int hf_ulmap_uiuc13_zone; +static int hf_ulmap_uiuc13_rsv; +/* static int hf_ulmap_crc16; */ +/* static int hf_ulmap_crc16_status; */ +static int hf_ulmap_padding; /* Generated via "one time" script to help create filterable fields */ -static int hf_ulmap_dedicated_ul_control_length = -1; -static int hf_ulmap_dedicated_ul_control_control_header = -1; -static int hf_ulmap_dedicated_ul_control_num_sdma_layers = -1; -static int hf_ulmap_dedicated_ul_control_pilot_pattern = -1; -static int hf_ulmap_dedicated_mimo_ul_control_matrix = -1; -static int hf_ulmap_dedicated_mimo_ul_control_n_layer = -1; -static int hf_ulmap_harq_chase_dedicated_ul_control_indicator = -1; -static int hf_ulmap_harq_chase_uiuc = -1; -static int hf_ulmap_harq_chase_repetition_coding_indication = -1; -static int hf_ulmap_harq_chase_duration = -1; -static int hf_ulmap_harq_chase_acid = -1; -static int hf_ulmap_harq_chase_ai_sn = -1; -static int hf_ulmap_harq_chase_ack_disable = -1; -static int hf_ulmap_reserved_uint = -1; -static int hf_ulmap_harq_ir_ctc_dedicated_ul_control_indicator = -1; -static int hf_ulmap_harq_ir_ctc_nep = -1; -static int hf_ulmap_harq_ir_ctc_nsch = -1; -static int hf_ulmap_harq_ir_ctc_spid = -1; -static int hf_ulmap_harq_ir_ctc_acin = -1; -static int hf_ulmap_harq_ir_ctc_ai_sn = -1; -static int hf_ulmap_harq_ir_ctc_ack_disable = -1; -static int hf_ulmap_harq_ir_cc_dedicated_ul_control_indicator = -1; -static int hf_ulmap_harq_ir_cc_uiuc = -1; -static int hf_ulmap_harq_ir_cc_repetition_coding_indication = -1; -static int hf_ulmap_harq_ir_cc_duration = -1; -static int hf_ulmap_harq_ir_cc_spid = -1; -static int hf_ulmap_harq_ir_cc_acid = -1; -static int hf_ulmap_harq_ir_cc_ai_sn = -1; -static int hf_ulmap_harq_ir_cc_ack_disable = -1; -static int hf_ulmap_mimo_ul_chase_harq_mu_indicator = -1; -static int hf_ulmap_mimo_ul_chase_harq_dedicated_mimo_ulcontrol_indicator = -1; -static int hf_ulmap_mimo_ul_chase_harq_ack_disable = -1; -static int hf_ulmap_mimo_ul_chase_harq_matrix = -1; -static int hf_ulmap_mimo_ul_chase_harq_duration = -1; -static int hf_ulmap_mimo_ul_chase_harq_uiuc = -1; -static int hf_ulmap_mimo_ul_chase_harq_repetition_coding_indication = -1; -static int hf_ulmap_mimo_ul_chase_harq_acid = -1; -static int hf_ulmap_mimo_ul_chase_harq_ai_sn = -1; -static int hf_ulmap_mimo_ul_ir_harq_mu_indicator = -1; -static int hf_ulmap_mimo_ul_ir_harq_dedicated_mimo_ul_control_indicator = -1; -static int hf_ulmap_mimo_ul_ir_harq_ack_disable = -1; -static int hf_ulmap_mimo_ul_ir_harq_matrix = -1; -static int hf_ulmap_mimo_ul_ir_harq_nsch = -1; -static int hf_ulmap_mimo_ul_ir_harq_nep = -1; -static int hf_ulmap_mimo_ul_ir_harq_spid = -1; -static int hf_ulmap_mimo_ul_ir_harq_acid = -1; -static int hf_ulmap_mimo_ul_ir_harq_ai_sn = -1; -static int hf_ulmap_mimo_ul_ir_harq_cc_mu_indicator = -1; -static int hf_ulmap_mimo_ul_ir_harq_cc_dedicated_mimo_ul_control_indicator = -1; -static int hf_ulmap_mimo_ul_ir_harq_cc_ack_disable = -1; -static int hf_ulmap_mimo_ul_ir_harq_cc_matrix = -1; -static int hf_ulmap_mimo_ul_ir_harq_cc_duration = -1; -static int hf_ulmap_mimo_ul_ir_harq_cc_uiuc = -1; -static int hf_ulmap_mimo_ul_ir_harq_cc_repetition_coding_indication = -1; -static int hf_ulmap_mimo_ul_ir_harq_cc_acid = -1; -static int hf_ulmap_mimo_ul_ir_harq_cc_ai_sn = -1; -static int hf_ulmap_mimo_ul_ir_harq_cc_spid = -1; -static int hf_ulmap_mimo_ul_stc_harq_tx_count = -1; -static int hf_ulmap_mimo_ul_stc_harq_duration = -1; -static int hf_ulmap_mimo_ul_stc_harq_sub_burst_offset_indication = -1; -static int hf_ulmap_mimo_ul_stc_harq_sub_burst_offset = -1; -static int hf_ulmap_mimo_ul_stc_harq_ack_disable = -1; -static int hf_ulmap_mimo_ul_stc_harq_uiuc = -1; -static int hf_ulmap_mimo_ul_stc_harq_repetition_coding_indication = -1; -static int hf_ulmap_mimo_ul_stc_harq_acid = -1; -static int hf_ulmap_power_control = -1; -static int hf_ulmap_power_measurement_frame = -1; -static int hf_ulmap_mini_subcha_alloc_extended_2_uiuc = -1; -static int hf_ulmap_mini_subcha_alloc_length = -1; -static int hf_ulmap_mini_subcha_alloc_ctype = -1; -static int hf_ulmap_mini_subcha_alloc_duration = -1; -static int hf_ulmap_mini_subcha_alloc_cid = -1; -static int hf_ulmap_mini_subcha_alloc_uiuc = -1; -static int hf_ulmap_mini_subcha_alloc_repetition = -1; -static int hf_ulmap_mini_subcha_alloc_padding = -1; -static int hf_ulmap_aas_ul_extended_uiuc = -1; -static int hf_ulmap_aas_ul_length = -1; -static int hf_ulmap_aas_ul_permutation = -1; -static int hf_ulmap_aas_ul_ul_permbase = -1; -static int hf_ulmap_aas_ul_ofdma_symbol_offset = -1; -static int hf_ulmap_aas_ul_aas_zone_length = -1; -static int hf_ulmap_aas_ul_uplink_preamble_config = -1; -static int hf_ulmap_aas_ul_preamble_type = -1; -static int hf_ulmap_cqich_alloc_extended_uiuc = -1; -static int hf_ulmap_cqich_alloc_length = -1; -static int hf_ulmap_cqich_alloc_cqich_id = -1; -static int hf_ulmap_cqich_alloc_allocation_offset = -1; -static int hf_ulmap_cqich_alloc_period = -1; -static int hf_ulmap_cqich_alloc_frame_offset = -1; -static int hf_ulmap_cqich_alloc_duration = -1; -static int hf_ulmap_cqich_alloc_report_configuration_included = -1; -static int hf_ulmap_cqich_alloc_feedback_type = -1; -static int hf_ulmap_cqich_alloc_report_type = -1; -static int hf_ulmap_cqich_alloc_cinr_preamble_report_type = -1; -static int hf_ulmap_cqich_alloc_zone_permutation = -1; -static int hf_ulmap_cqich_alloc_zone_type = -1; -static int hf_ulmap_cqich_alloc_zone_prbs_id = -1; -static int hf_ulmap_cqich_alloc_major_group_indication = -1; -static int hf_ulmap_cqich_alloc_pusc_major_group_bitmap = -1; -static int hf_ulmap_cqich_alloc_cinr_zone_measurement_type = -1; -static int hf_ulmap_cqich_alloc_averaging_parameter_included = -1; -static int hf_ulmap_cqich_alloc_averaging_parameter = -1; -static int hf_ulmap_cqich_alloc_mimo_permutation_feedback_cycle = -1; -static int hf_ulmap_zone_extended_uiuc = -1; -static int hf_ulmap_zone_length = -1; -static int hf_ulmap_zone_ofdma_symbol_offset = -1; -static int hf_ulmap_zone_permutation = -1; -static int hf_ulmap_zone_ul_permbase = -1; -static int hf_ulmap_zone_amc_type = -1; -static int hf_ulmap_zone_use_all_sc_indicator = -1; -static int hf_ulmap_zone_disable_subchannel_rotation = -1; -static int hf_ulmap_phymod_ul_extended_uiuc = -1; -static int hf_ulmap_phymod_ul_length = -1; -static int hf_ulmap_phymod_ul_preamble_modifier_type = -1; -static int hf_ulmap_phymod_ul_preamble_frequency_shift_index = -1; -static int hf_ulmap_phymod_ul_preamble_time_shift_index = -1; -static int hf_ulmap_phymod_ul_pilot_pattern_modifier = -1; -static int hf_ulmap_phymod_ul_pilot_pattern_index = -1; -static int hf_ulmap_fast_tracking_extended_uiuc = -1; -static int hf_ulmap_fast_tracking_length = -1; -static int hf_ulmap_fast_tracking_map_index = -1; -static int hf_ulmap_fast_tracking_power_correction = -1; -static int hf_ulmap_fast_tracking_frequency_correction = -1; -static int hf_ulmap_fast_tracking_time_correction = -1; -static int hf_ulmap_pusc_burst_allocation_extended_uiuc = -1; -static int hf_ulmap_pusc_burst_allocation_length = -1; -static int hf_ulmap_pusc_burst_allocation_uiuc = -1; -static int hf_ulmap_pusc_burst_allocation_segment = -1; -static int hf_ulmap_pusc_burst_allocation_ul_permbase = -1; -static int hf_ulmap_pusc_burst_allocation_ofdma_symbol_offset = -1; -static int hf_ulmap_pusc_burst_allocation_subchannel_offset = -1; -static int hf_ulmap_pusc_burst_allocation_duration = -1; -static int hf_ulmap_pusc_burst_allocation_repetition_coding_indication = -1; -static int hf_ulmap_fast_ranging_extended_uiuc = -1; -static int hf_ulmap_fast_ranging_length = -1; -static int hf_ulmap_fast_ranging_ho_id_indicator = -1; -static int hf_ulmap_fast_ranging_ho_id = -1; -static int hf_ulmap_fast_ranging_mac_address = -1; -static int hf_ulmap_fast_ranging_uiuc = -1; -static int hf_ulmap_fast_ranging_duration = -1; -static int hf_ulmap_fast_ranging_repetition_coding_indication = -1; -static int hf_ulmap_allocation_start_extended_uiuc = -1; -static int hf_ulmap_allocation_start_length = -1; -static int hf_ulmap_allocation_start_ofdma_symbol_offset = -1; -static int hf_ulmap_allocation_start_subchannel_offset = -1; -static int hf_ulmap_cqich_enhanced_alloc_extended_2_uiuc = -1; -static int hf_ulmap_cqich_enhanced_alloc_length = -1; -static int hf_ulmap_cqich_enhanced_alloc_cqich_id = -1; -static int hf_ulmap_cqich_enhanced_alloc_period = -1; -static int hf_ulmap_cqich_enhanced_alloc_frame_offset = -1; -static int hf_ulmap_cqich_enhanced_alloc_duration = -1; -static int hf_ulmap_cqich_enhanced_alloc_cqich_num = -1; -static int hf_ulmap_cqich_enhanced_alloc_feedback_type = -1; -static int hf_ulmap_cqich_enhanced_alloc_allocation_index = -1; -static int hf_ulmap_cqich_enhanced_alloc_cqich_type = -1; -static int hf_ulmap_cqich_enhanced_alloc_sttd_indication = -1; -static int hf_ulmap_cqich_enhanced_alloc_band_amc_precoding_mode = -1; -static int hf_ulmap_cqich_enhanced_alloc_nr_precoders_feedback = -1; -static int hf_ulmap_anchor_bs_switch_extended_2_uiuc = -1; -static int hf_ulmap_anchor_bs_switch_length = -1; -static int hf_ulmap_anchor_bs_switch_n_anchor_bs_switch = -1; -static int hf_ulmap_anchor_bs_switch_reduced_cid = -1; -static int hf_ulmap_anchor_bs_switch_action_code = -1; -static int hf_ulmap_anchor_bs_switch_action_time = -1; -static int hf_ulmap_anchor_bs_switch_temp_bs_id = -1; -static int hf_ulmap_anchor_bs_switch_ak_change_indicator = -1; -static int hf_ulmap_anchor_bs_switch_cqich_allocation_indicator = -1; -static int hf_ulmap_anchor_bs_switch_cqich_id = -1; -static int hf_ulmap_anchor_bs_switch_feedback_channel_offset = -1; -static int hf_ulmap_anchor_bs_switch_period = -1; -static int hf_ulmap_anchor_bs_switch_frame_offset = -1; -static int hf_ulmap_anchor_bs_switch_duration = -1; -static int hf_ulmap_anchor_bs_switch_mimo_permutation_feedback_code = -1; -static int hf_ulmap_sounding_command_extended_2_uiuc = -1; -static int hf_ulmap_sounding_command_length = -1; -static int hf_ulmap_sounding_command_type = -1; -static int hf_ulmap_sounding_command_send_sounding_report_flag = -1; -static int hf_ulmap_sounding_command_relevance_flag = -1; -static int hf_ulmap_sounding_command_relevance = -1; -static int hf_ulmap_sounding_command_include_additional_feedback = -1; -static int hf_ulmap_sounding_command_num_sounding_symbols = -1; -static int hf_ulmap_sounding_command_separability_type = -1; -static int hf_ulmap_sounding_command_max_cyclic_shift_index_p = -1; -static int hf_ulmap_sounding_command_decimation_value = -1; -static int hf_ulmap_sounding_command_decimation_offset_randomization = -1; -static int hf_ulmap_sounding_command_symbol_index = -1; -static int hf_ulmap_sounding_command_number_of_cids = -1; -static int hf_ulmap_sounding_command_shorted_basic_cid = -1; -static int hf_ulmap_sounding_command_power_assignment_method = -1; -static int hf_ulmap_sounding_command_power_boost = -1; -static int hf_ulmap_sounding_command_multi_antenna_flag = -1; -static int hf_ulmap_sounding_command_allocation_mode = -1; -static int hf_ulmap_sounding_command_band_bit_map = -1; -static int hf_ulmap_sounding_command_starting_frequency_band = -1; -static int hf_ulmap_sounding_command_number_of_frequency_bands = -1; -static int hf_ulmap_sounding_command_cyclic_time_shift_index = -1; -static int hf_ulmap_sounding_command_decimation_offset = -1; -static int hf_ulmap_sounding_command_use_same_symbol_for_additional_feedback = -1; -static int hf_ulmap_sounding_command_periodicity = -1; -static int hf_ulmap_sounding_command_permutation = -1; -static int hf_ulmap_sounding_command_dl_permbase = -1; -static int hf_ulmap_sounding_command_shortened_basic_cid = -1; -static int hf_ulmap_sounding_command_subchannel_offset = -1; -static int hf_ulmap_sounding_command_number_of_subchannels = -1; -static int hf_ulmap_harq_ulmap_extended_2_uiuc = -1; -static int hf_ulmap_harq_ulmap_length = -1; -static int hf_ulmap_harq_ulmap_rcid_type = -1; -static int hf_ulmap_harq_ulmap_mode = -1; -static int hf_ulmap_harq_ulmap_allocation_start_indication = -1; -static int hf_ulmap_harq_ulmap_ofdma_symbol_offset = -1; -static int hf_ulmap_harq_ulmap_subchannel_offset = -1; -static int hf_ulmap_harq_ulmap_n_sub_burst = -1; -static int hf_ulmap_harq_ackch_region_alloc_extended_2_uiuc = -1; -static int hf_ulmap_harq_ackch_region_alloc_length = -1; -static int hf_ulmap_harq_ackch_region_alloc_ofdma_symbol_offset = -1; -static int hf_ulmap_harq_ackch_region_alloc_subchannel_offset = -1; -static int hf_ulmap_harq_ackch_region_alloc_num_ofdma_symbols = -1; -static int hf_ulmap_harq_ackch_region_alloc_num_subchannels = -1; -static int hf_ulmap_aas_sdma_extended_2_uiuc = -1; -static int hf_ulmap_aas_sdma_length = -1; -static int hf_ulmap_aas_sdma_rcid_type = -1; -static int hf_ulmap_aas_sdma_num_burst_region = -1; -static int hf_ulmap_aas_sdma_slot_offset = -1; -static int hf_ulmap_aas_sdma_slot_duration = -1; -static int hf_ulmap_aas_sdma_number_of_users = -1; -static int hf_ulmap_aas_sdma_encoding_mode = -1; -static int hf_ulmap_aas_sdma_power_adjust = -1; -static int hf_ulmap_aas_sdma_pilot_pattern_modifier = -1; -static int hf_ulmap_aas_sdma_preamble_modifier_index = -1; -static int hf_ulmap_aas_sdma_pilot_pattern = -1; -static int hf_ulmap_aas_sdma_diuc = -1; -static int hf_ulmap_aas_sdma_repetition_coding_indication = -1; -static int hf_ulmap_aas_sdma_acid = -1; -static int hf_ulmap_aas_sdma_ai_sn = -1; -static int hf_ulmap_aas_sdma_nep = -1; -static int hf_ulmap_aas_sdma_nsch = -1; -static int hf_ulmap_aas_sdma_spid = -1; -static int hf_ulmap_aas_sdma_power_adjustment = -1; -static int hf_ulmap_feedback_polling_extended_2_uiuc = -1; -static int hf_ulmap_feedback_polling_length = -1; -static int hf_ulmap_feedback_polling_num_allocation = -1; -static int hf_ulmap_feedback_polling_dedicated_ul_allocation_included = -1; -static int hf_ulmap_feedback_polling_basic_cid = -1; -static int hf_ulmap_feedback_polling_allocation_duration = -1; -static int hf_ulmap_feedback_polling_type = -1; -static int hf_ulmap_feedback_polling_frame_offset = -1; -static int hf_ulmap_feedback_polling_period = -1; -static int hf_ulmap_feedback_polling_uiuc = -1; -static int hf_ulmap_feedback_polling_ofdma_symbol_offset = -1; -static int hf_ulmap_feedback_polling_subchannel_offset = -1; -static int hf_ulmap_feedback_polling_duration = -1; -static int hf_ulmap_feedback_polling_repetition_coding_indication = -1; -static int hf_ulmap_reduced_aas_aas_zone_configuration_included = -1; -static int hf_ulmap_reduced_aas_aas_zone_position_included = -1; -static int hf_ulmap_reduced_aas_ul_map_information_included = -1; -static int hf_ulmap_reduced_aas_phy_modification_included = -1; -static int hf_ulmap_reduced_aas_power_control_included = -1; -static int hf_ulmap_reduced_aas_include_feedback_header = -1; -static int hf_ulmap_reduced_aas_encoding_mode = -1; -static int hf_ulmap_reduced_aas_permutation = -1; -static int hf_ulmap_reduced_aas_ul_permbase = -1; -static int hf_ulmap_reduced_aas_preamble_indication = -1; -static int hf_ulmap_reduced_aas_padding = -1; -static int hf_ulmap_reduced_aas_zone_symbol_offset = -1; -static int hf_ulmap_reduced_aas_zone_length = -1; -static int hf_ulmap_reduced_aas_ucd_count = -1; -static int hf_ulmap_reduced_aas_private_map_alloc_start_time = -1; -static int hf_ulmap_reduced_aas_pilot_pattern_index = -1; -static int hf_ulmap_reduced_aas_preamble_select = -1; -static int hf_ulmap_reduced_aas_preamble_shift_index = -1; -static int hf_ulmap_reduced_aas_pilot_pattern_modifier = -1; -static int hf_ulmap_reduced_aas_power_control = -1; -static int hf_ulmap_reduced_aas_ul_frame_offset = -1; -static int hf_ulmap_reduced_aas_slot_offset = -1; -static int hf_ulmap_reduced_aas_slot_duration = -1; -static int hf_ulmap_reduced_aas_uiuc_nep = -1; -static int hf_ulmap_reduced_aas_acid = -1; -static int hf_ulmap_reduced_aas_ai_sn = -1; -static int hf_ulmap_reduced_aas_nsch = -1; -static int hf_ulmap_reduced_aas_spid = -1; -static int hf_ulmap_reduced_aas_repetition_coding_indication = -1; - -static expert_field ei_ulmap_not_implemented = EI_INIT; +static int hf_ulmap_dedicated_ul_control_length; +static int hf_ulmap_dedicated_ul_control_control_header; +static int hf_ulmap_dedicated_ul_control_num_sdma_layers; +static int hf_ulmap_dedicated_ul_control_pilot_pattern; +static int hf_ulmap_dedicated_mimo_ul_control_matrix; +static int hf_ulmap_dedicated_mimo_ul_control_n_layer; +static int hf_ulmap_harq_chase_dedicated_ul_control_indicator; +static int hf_ulmap_harq_chase_uiuc; +static int hf_ulmap_harq_chase_repetition_coding_indication; +static int hf_ulmap_harq_chase_duration; +static int hf_ulmap_harq_chase_acid; +static int hf_ulmap_harq_chase_ai_sn; +static int hf_ulmap_harq_chase_ack_disable; +static int hf_ulmap_reserved_uint; +static int hf_ulmap_harq_ir_ctc_dedicated_ul_control_indicator; +static int hf_ulmap_harq_ir_ctc_nep; +static int hf_ulmap_harq_ir_ctc_nsch; +static int hf_ulmap_harq_ir_ctc_spid; +static int hf_ulmap_harq_ir_ctc_acin; +static int hf_ulmap_harq_ir_ctc_ai_sn; +static int hf_ulmap_harq_ir_ctc_ack_disable; +static int hf_ulmap_harq_ir_cc_dedicated_ul_control_indicator; +static int hf_ulmap_harq_ir_cc_uiuc; +static int hf_ulmap_harq_ir_cc_repetition_coding_indication; +static int hf_ulmap_harq_ir_cc_duration; +static int hf_ulmap_harq_ir_cc_spid; +static int hf_ulmap_harq_ir_cc_acid; +static int hf_ulmap_harq_ir_cc_ai_sn; +static int hf_ulmap_harq_ir_cc_ack_disable; +static int hf_ulmap_mimo_ul_chase_harq_mu_indicator; +static int hf_ulmap_mimo_ul_chase_harq_dedicated_mimo_ulcontrol_indicator; +static int hf_ulmap_mimo_ul_chase_harq_ack_disable; +static int hf_ulmap_mimo_ul_chase_harq_matrix; +static int hf_ulmap_mimo_ul_chase_harq_duration; +static int hf_ulmap_mimo_ul_chase_harq_uiuc; +static int hf_ulmap_mimo_ul_chase_harq_repetition_coding_indication; +static int hf_ulmap_mimo_ul_chase_harq_acid; +static int hf_ulmap_mimo_ul_chase_harq_ai_sn; +static int hf_ulmap_mimo_ul_ir_harq_mu_indicator; +static int hf_ulmap_mimo_ul_ir_harq_dedicated_mimo_ul_control_indicator; +static int hf_ulmap_mimo_ul_ir_harq_ack_disable; +static int hf_ulmap_mimo_ul_ir_harq_matrix; +static int hf_ulmap_mimo_ul_ir_harq_nsch; +static int hf_ulmap_mimo_ul_ir_harq_nep; +static int hf_ulmap_mimo_ul_ir_harq_spid; +static int hf_ulmap_mimo_ul_ir_harq_acid; +static int hf_ulmap_mimo_ul_ir_harq_ai_sn; +static int hf_ulmap_mimo_ul_ir_harq_cc_mu_indicator; +static int hf_ulmap_mimo_ul_ir_harq_cc_dedicated_mimo_ul_control_indicator; +static int hf_ulmap_mimo_ul_ir_harq_cc_ack_disable; +static int hf_ulmap_mimo_ul_ir_harq_cc_matrix; +static int hf_ulmap_mimo_ul_ir_harq_cc_duration; +static int hf_ulmap_mimo_ul_ir_harq_cc_uiuc; +static int hf_ulmap_mimo_ul_ir_harq_cc_repetition_coding_indication; +static int hf_ulmap_mimo_ul_ir_harq_cc_acid; +static int hf_ulmap_mimo_ul_ir_harq_cc_ai_sn; +static int hf_ulmap_mimo_ul_ir_harq_cc_spid; +static int hf_ulmap_mimo_ul_stc_harq_tx_count; +static int hf_ulmap_mimo_ul_stc_harq_duration; +static int hf_ulmap_mimo_ul_stc_harq_sub_burst_offset_indication; +static int hf_ulmap_mimo_ul_stc_harq_sub_burst_offset; +static int hf_ulmap_mimo_ul_stc_harq_ack_disable; +static int hf_ulmap_mimo_ul_stc_harq_uiuc; +static int hf_ulmap_mimo_ul_stc_harq_repetition_coding_indication; +static int hf_ulmap_mimo_ul_stc_harq_acid; +static int hf_ulmap_power_control; +static int hf_ulmap_power_measurement_frame; +static int hf_ulmap_mini_subcha_alloc_extended_2_uiuc; +static int hf_ulmap_mini_subcha_alloc_length; +static int hf_ulmap_mini_subcha_alloc_ctype; +static int hf_ulmap_mini_subcha_alloc_duration; +static int hf_ulmap_mini_subcha_alloc_cid; +static int hf_ulmap_mini_subcha_alloc_uiuc; +static int hf_ulmap_mini_subcha_alloc_repetition; +static int hf_ulmap_mini_subcha_alloc_padding; +static int hf_ulmap_aas_ul_extended_uiuc; +static int hf_ulmap_aas_ul_length; +static int hf_ulmap_aas_ul_permutation; +static int hf_ulmap_aas_ul_ul_permbase; +static int hf_ulmap_aas_ul_ofdma_symbol_offset; +static int hf_ulmap_aas_ul_aas_zone_length; +static int hf_ulmap_aas_ul_uplink_preamble_config; +static int hf_ulmap_aas_ul_preamble_type; +static int hf_ulmap_cqich_alloc_extended_uiuc; +static int hf_ulmap_cqich_alloc_length; +static int hf_ulmap_cqich_alloc_cqich_id; +static int hf_ulmap_cqich_alloc_allocation_offset; +static int hf_ulmap_cqich_alloc_period; +static int hf_ulmap_cqich_alloc_frame_offset; +static int hf_ulmap_cqich_alloc_duration; +static int hf_ulmap_cqich_alloc_report_configuration_included; +static int hf_ulmap_cqich_alloc_feedback_type; +static int hf_ulmap_cqich_alloc_report_type; +static int hf_ulmap_cqich_alloc_cinr_preamble_report_type; +static int hf_ulmap_cqich_alloc_zone_permutation; +static int hf_ulmap_cqich_alloc_zone_type; +static int hf_ulmap_cqich_alloc_zone_prbs_id; +static int hf_ulmap_cqich_alloc_major_group_indication; +static int hf_ulmap_cqich_alloc_pusc_major_group_bitmap; +static int hf_ulmap_cqich_alloc_cinr_zone_measurement_type; +static int hf_ulmap_cqich_alloc_averaging_parameter_included; +static int hf_ulmap_cqich_alloc_averaging_parameter; +static int hf_ulmap_cqich_alloc_mimo_permutation_feedback_cycle; +static int hf_ulmap_zone_extended_uiuc; +static int hf_ulmap_zone_length; +static int hf_ulmap_zone_ofdma_symbol_offset; +static int hf_ulmap_zone_permutation; +static int hf_ulmap_zone_ul_permbase; +static int hf_ulmap_zone_amc_type; +static int hf_ulmap_zone_use_all_sc_indicator; +static int hf_ulmap_zone_disable_subchannel_rotation; +static int hf_ulmap_phymod_ul_extended_uiuc; +static int hf_ulmap_phymod_ul_length; +static int hf_ulmap_phymod_ul_preamble_modifier_type; +static int hf_ulmap_phymod_ul_preamble_frequency_shift_index; +static int hf_ulmap_phymod_ul_preamble_time_shift_index; +static int hf_ulmap_phymod_ul_pilot_pattern_modifier; +static int hf_ulmap_phymod_ul_pilot_pattern_index; +static int hf_ulmap_fast_tracking_extended_uiuc; +static int hf_ulmap_fast_tracking_length; +static int hf_ulmap_fast_tracking_map_index; +static int hf_ulmap_fast_tracking_power_correction; +static int hf_ulmap_fast_tracking_frequency_correction; +static int hf_ulmap_fast_tracking_time_correction; +static int hf_ulmap_pusc_burst_allocation_extended_uiuc; +static int hf_ulmap_pusc_burst_allocation_length; +static int hf_ulmap_pusc_burst_allocation_uiuc; +static int hf_ulmap_pusc_burst_allocation_segment; +static int hf_ulmap_pusc_burst_allocation_ul_permbase; +static int hf_ulmap_pusc_burst_allocation_ofdma_symbol_offset; +static int hf_ulmap_pusc_burst_allocation_subchannel_offset; +static int hf_ulmap_pusc_burst_allocation_duration; +static int hf_ulmap_pusc_burst_allocation_repetition_coding_indication; +static int hf_ulmap_fast_ranging_extended_uiuc; +static int hf_ulmap_fast_ranging_length; +static int hf_ulmap_fast_ranging_ho_id_indicator; +static int hf_ulmap_fast_ranging_ho_id; +static int hf_ulmap_fast_ranging_mac_address; +static int hf_ulmap_fast_ranging_uiuc; +static int hf_ulmap_fast_ranging_duration; +static int hf_ulmap_fast_ranging_repetition_coding_indication; +static int hf_ulmap_allocation_start_extended_uiuc; +static int hf_ulmap_allocation_start_length; +static int hf_ulmap_allocation_start_ofdma_symbol_offset; +static int hf_ulmap_allocation_start_subchannel_offset; +static int hf_ulmap_cqich_enhanced_alloc_extended_2_uiuc; +static int hf_ulmap_cqich_enhanced_alloc_length; +static int hf_ulmap_cqich_enhanced_alloc_cqich_id; +static int hf_ulmap_cqich_enhanced_alloc_period; +static int hf_ulmap_cqich_enhanced_alloc_frame_offset; +static int hf_ulmap_cqich_enhanced_alloc_duration; +static int hf_ulmap_cqich_enhanced_alloc_cqich_num; +static int hf_ulmap_cqich_enhanced_alloc_feedback_type; +static int hf_ulmap_cqich_enhanced_alloc_allocation_index; +static int hf_ulmap_cqich_enhanced_alloc_cqich_type; +static int hf_ulmap_cqich_enhanced_alloc_sttd_indication; +static int hf_ulmap_cqich_enhanced_alloc_band_amc_precoding_mode; +static int hf_ulmap_cqich_enhanced_alloc_nr_precoders_feedback; +static int hf_ulmap_anchor_bs_switch_extended_2_uiuc; +static int hf_ulmap_anchor_bs_switch_length; +static int hf_ulmap_anchor_bs_switch_n_anchor_bs_switch; +static int hf_ulmap_anchor_bs_switch_reduced_cid; +static int hf_ulmap_anchor_bs_switch_action_code; +static int hf_ulmap_anchor_bs_switch_action_time; +static int hf_ulmap_anchor_bs_switch_temp_bs_id; +static int hf_ulmap_anchor_bs_switch_ak_change_indicator; +static int hf_ulmap_anchor_bs_switch_cqich_allocation_indicator; +static int hf_ulmap_anchor_bs_switch_cqich_id; +static int hf_ulmap_anchor_bs_switch_feedback_channel_offset; +static int hf_ulmap_anchor_bs_switch_period; +static int hf_ulmap_anchor_bs_switch_frame_offset; +static int hf_ulmap_anchor_bs_switch_duration; +static int hf_ulmap_anchor_bs_switch_mimo_permutation_feedback_code; +static int hf_ulmap_sounding_command_extended_2_uiuc; +static int hf_ulmap_sounding_command_length; +static int hf_ulmap_sounding_command_type; +static int hf_ulmap_sounding_command_send_sounding_report_flag; +static int hf_ulmap_sounding_command_relevance_flag; +static int hf_ulmap_sounding_command_relevance; +static int hf_ulmap_sounding_command_include_additional_feedback; +static int hf_ulmap_sounding_command_num_sounding_symbols; +static int hf_ulmap_sounding_command_separability_type; +static int hf_ulmap_sounding_command_max_cyclic_shift_index_p; +static int hf_ulmap_sounding_command_decimation_value; +static int hf_ulmap_sounding_command_decimation_offset_randomization; +static int hf_ulmap_sounding_command_symbol_index; +static int hf_ulmap_sounding_command_number_of_cids; +static int hf_ulmap_sounding_command_shorted_basic_cid; +static int hf_ulmap_sounding_command_power_assignment_method; +static int hf_ulmap_sounding_command_power_boost; +static int hf_ulmap_sounding_command_multi_antenna_flag; +static int hf_ulmap_sounding_command_allocation_mode; +static int hf_ulmap_sounding_command_band_bit_map; +static int hf_ulmap_sounding_command_starting_frequency_band; +static int hf_ulmap_sounding_command_number_of_frequency_bands; +static int hf_ulmap_sounding_command_cyclic_time_shift_index; +static int hf_ulmap_sounding_command_decimation_offset; +static int hf_ulmap_sounding_command_use_same_symbol_for_additional_feedback; +static int hf_ulmap_sounding_command_periodicity; +static int hf_ulmap_sounding_command_permutation; +static int hf_ulmap_sounding_command_dl_permbase; +static int hf_ulmap_sounding_command_shortened_basic_cid; +static int hf_ulmap_sounding_command_subchannel_offset; +static int hf_ulmap_sounding_command_number_of_subchannels; +static int hf_ulmap_harq_ulmap_extended_2_uiuc; +static int hf_ulmap_harq_ulmap_length; +static int hf_ulmap_harq_ulmap_rcid_type; +static int hf_ulmap_harq_ulmap_mode; +static int hf_ulmap_harq_ulmap_allocation_start_indication; +static int hf_ulmap_harq_ulmap_ofdma_symbol_offset; +static int hf_ulmap_harq_ulmap_subchannel_offset; +static int hf_ulmap_harq_ulmap_n_sub_burst; +static int hf_ulmap_harq_ackch_region_alloc_extended_2_uiuc; +static int hf_ulmap_harq_ackch_region_alloc_length; +static int hf_ulmap_harq_ackch_region_alloc_ofdma_symbol_offset; +static int hf_ulmap_harq_ackch_region_alloc_subchannel_offset; +static int hf_ulmap_harq_ackch_region_alloc_num_ofdma_symbols; +static int hf_ulmap_harq_ackch_region_alloc_num_subchannels; +static int hf_ulmap_aas_sdma_extended_2_uiuc; +static int hf_ulmap_aas_sdma_length; +static int hf_ulmap_aas_sdma_rcid_type; +static int hf_ulmap_aas_sdma_num_burst_region; +static int hf_ulmap_aas_sdma_slot_offset; +static int hf_ulmap_aas_sdma_slot_duration; +static int hf_ulmap_aas_sdma_number_of_users; +static int hf_ulmap_aas_sdma_encoding_mode; +static int hf_ulmap_aas_sdma_power_adjust; +static int hf_ulmap_aas_sdma_pilot_pattern_modifier; +static int hf_ulmap_aas_sdma_preamble_modifier_index; +static int hf_ulmap_aas_sdma_pilot_pattern; +static int hf_ulmap_aas_sdma_diuc; +static int hf_ulmap_aas_sdma_repetition_coding_indication; +static int hf_ulmap_aas_sdma_acid; +static int hf_ulmap_aas_sdma_ai_sn; +static int hf_ulmap_aas_sdma_nep; +static int hf_ulmap_aas_sdma_nsch; +static int hf_ulmap_aas_sdma_spid; +static int hf_ulmap_aas_sdma_power_adjustment; +static int hf_ulmap_feedback_polling_extended_2_uiuc; +static int hf_ulmap_feedback_polling_length; +static int hf_ulmap_feedback_polling_num_allocation; +static int hf_ulmap_feedback_polling_dedicated_ul_allocation_included; +static int hf_ulmap_feedback_polling_basic_cid; +static int hf_ulmap_feedback_polling_allocation_duration; +static int hf_ulmap_feedback_polling_type; +static int hf_ulmap_feedback_polling_frame_offset; +static int hf_ulmap_feedback_polling_period; +static int hf_ulmap_feedback_polling_uiuc; +static int hf_ulmap_feedback_polling_ofdma_symbol_offset; +static int hf_ulmap_feedback_polling_subchannel_offset; +static int hf_ulmap_feedback_polling_duration; +static int hf_ulmap_feedback_polling_repetition_coding_indication; +static int hf_ulmap_reduced_aas_aas_zone_configuration_included; +static int hf_ulmap_reduced_aas_aas_zone_position_included; +static int hf_ulmap_reduced_aas_ul_map_information_included; +static int hf_ulmap_reduced_aas_phy_modification_included; +static int hf_ulmap_reduced_aas_power_control_included; +static int hf_ulmap_reduced_aas_include_feedback_header; +static int hf_ulmap_reduced_aas_encoding_mode; +static int hf_ulmap_reduced_aas_permutation; +static int hf_ulmap_reduced_aas_ul_permbase; +static int hf_ulmap_reduced_aas_preamble_indication; +static int hf_ulmap_reduced_aas_padding; +static int hf_ulmap_reduced_aas_zone_symbol_offset; +static int hf_ulmap_reduced_aas_zone_length; +static int hf_ulmap_reduced_aas_ucd_count; +static int hf_ulmap_reduced_aas_private_map_alloc_start_time; +static int hf_ulmap_reduced_aas_pilot_pattern_index; +static int hf_ulmap_reduced_aas_preamble_select; +static int hf_ulmap_reduced_aas_preamble_shift_index; +static int hf_ulmap_reduced_aas_pilot_pattern_modifier; +static int hf_ulmap_reduced_aas_power_control; +static int hf_ulmap_reduced_aas_ul_frame_offset; +static int hf_ulmap_reduced_aas_slot_offset; +static int hf_ulmap_reduced_aas_slot_duration; +static int hf_ulmap_reduced_aas_uiuc_nep; +static int hf_ulmap_reduced_aas_acid; +static int hf_ulmap_reduced_aas_ai_sn; +static int hf_ulmap_reduced_aas_nsch; +static int hf_ulmap_reduced_aas_spid; +static int hf_ulmap_reduced_aas_repetition_coding_indication; + +static expert_field ei_ulmap_not_implemented; /* This gets called each time a capture file is loaded. */ void init_wimax_globals(void) @@ -555,13 +556,13 @@ void init_wimax_globals(void) * these functions take offset/length in bits *******************************************************************/ -static gint Dedicated_UL_Control_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Dedicated_UL_Control_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.4.24.1 Dedicated_UL_Control_IE -- table 302r */ /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */ - gint bit; + int bit; proto_item *tree; - gint sdma; + int sdma; bit = offset; @@ -576,11 +577,11 @@ static gint Dedicated_UL_Control_IE(proto_tree *uiuc_tree, gint offset, gint len return (bit - offset); /* length in bits */ } -static gint Dedicated_MIMO_UL_Control_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Dedicated_MIMO_UL_Control_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.4.24.2 Dedicated_MIMO_UL_Control_IE -- table 302s */ /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */ - gint bit; + int bit; proto_item *tree; bit = offset; @@ -595,15 +596,15 @@ static gint Dedicated_MIMO_UL_Control_IE(proto_tree *uiuc_tree, gint offset, gin /* begin Sub-Burst IEs */ -static gint UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.4.24 UL_HARQ_Chase_sub_burst_IE -- table 302k */ /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */ - gint bit; + int bit; proto_item *tree; /*proto_item *generic_item = NULL;*/ - gint duci; - /*guint16 calculated_crc;*/ + int duci; + /*uint16_t calculated_crc;*/ bit = offset; @@ -625,7 +626,7 @@ static gint UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint #if 0 if (include_cor2_changes) { - calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); + calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc, ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY); bit += 16; @@ -635,15 +636,15 @@ static gint UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint return (bit - offset); /* length in bits */ } -static gint UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.4.24 UL_HARQ_IR_CTC_sub_burst_IE -- table 302l */ /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */ - gint bit; + int bit; proto_item *tree; /*proto_item *generic_item = NULL;*/ - gint duci; - /*guint16 calculated_crc;*/ + int duci; + /*uint16_t calculated_crc;*/ bit = offset; @@ -666,7 +667,7 @@ static gint UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint if (include_cor2_changes) { /* CRC-16 is always appended */ - calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); + calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc, ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY); bit += 16; @@ -676,15 +677,15 @@ static gint UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint return (bit - offset); /* length in bits */ } -static gint UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.4.24 UL_HARQ_IR_CC_sub_burst_IE -- table 302m */ /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */ - gint bit; + int bit; proto_item *tree; /*proto_item *generic_item = NULL;*/ - gint duci; - /*guint16 calculated_crc;*/ + int duci; + /*uint16_t calculated_crc;*/ bit = offset; @@ -708,7 +709,7 @@ static gint UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint if (include_cor2_changes) { /* CRC-16 is always appended */ - calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); + calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc, ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY); @@ -719,15 +720,15 @@ static gint UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint return (bit - offset); /* length in bits */ } -static gint MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.4.24 MIMO_UL_Chase_HARQ_Sub_Burst_IE -- table 302n */ /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */ - gint bit; + int bit; proto_item *tree; /*proto_item *generic_item = NULL;*/ - gint muin,dmci,ackd,i; - /*guint16 calculated_crc;*/ + int muin,dmci,ackd,i; + /*uint16_t calculated_crc;*/ bit = offset; @@ -761,7 +762,7 @@ static gint MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, if (include_cor2_changes) { /* CRC-16 is always appended */ - calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); + calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc, ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY); @@ -772,15 +773,15 @@ static gint MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, return (bit - offset); /* length in bits */ } -static gint MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.4.24 MIMO_UL_IR_HARQ__Sub_Burst_IE -- table 302o */ /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */ - gint bit; + int bit; proto_item *tree; /*proto_item *generic_item = NULL;*/ - gint muin,dmci,ackd,i; - /*guint16 calculated_crc;*/ + int muin,dmci,ackd,i; + /*uint16_t calculated_crc;*/ bit = offset; @@ -814,7 +815,7 @@ static gint MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi if (include_cor2_changes) { /* CRC-16 is always appended */ - calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); + calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc, ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY); @@ -825,15 +826,15 @@ static gint MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi return (bit - offset); /* length in bits */ } -static gint MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.4.24 MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE -- table 302p */ /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */ - gint bit; + int bit; proto_item *tree; /*proto_item *generic_item = NULL;*/ - gint muin,dmci,ackd,i; - /*guint16 calculated_crc;*/ + int muin,dmci,ackd,i; + /*uint16_t calculated_crc;*/ bit = offset; @@ -868,7 +869,7 @@ static gint MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, gint off if (include_cor2_changes) { /* CRC-16 is always appended */ - calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); + calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc, ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY); @@ -879,15 +880,15 @@ static gint MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, gint off return (bit - offset); /* length in bits */ } -static gint MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.4.24 MIMO_UL_STC_HARQ_Sub_Burst_IE -- table 302q */ /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */ - gint bit; + int bit; proto_item *tree; /*proto_item *generic_item = NULL;*/ - gint ackd,txct,sboi; - /*guint16 calculated_crc;*/ + int ackd,txct,sboi; + /*uint16_t calculated_crc;*/ bit = offset; @@ -914,7 +915,7 @@ static gint MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi if (include_cor2_changes) { /* CRC-16 is always appended */ - calculated_crc = wimax_mac_calc_crc16((guint8 *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); + calculated_crc = wimax_mac_calc_crc16((uint8_t *)tvb_get_ptr(tvb, 0, BIT_TO_BYTE(bit)), BIT_TO_BYTE(bit)); proto_tree_add_checksum(tree, tvb, BITHI(bit,16), hf_ulmap_crc16, hf_ulmap_crc16_status, &ei_ulmap_crc16, pinfo, calculated_crc, ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY); @@ -930,13 +931,13 @@ static gint MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, gint offset, gi * table 290a *******************************************************************/ -static gint Power_Control_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Power_Control_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended IE = 0 */ /* 8.4.5.4.5 Power_Control_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_item *tree; nib = offset; @@ -951,17 +952,17 @@ static gint Power_Control_IE(proto_tree *uiuc_tree, gint offset, gint length, tv return nib; } -static gint Mini_Subchannel_allocation_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Mini_Subchannel_allocation_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended IE = 1 */ /* 8.4.5.4.8 [2] Mini-Subchannel_allocation_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; - guint idx; + int bit; + int data; + unsigned idx; proto_item *tree; - gint j, M; - const gint m_table[4] = { 2, 2, 3, 6 }; + int j, M; + const int m_table[4] = { 2, 2, 3, 6 }; bit = NIB_TO_BIT(offset); @@ -991,12 +992,12 @@ static gint Mini_Subchannel_allocation_IE(proto_tree *uiuc_tree, gint offset, gi return BIT_TO_NIB(bit); } -static gint AAS_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int AAS_UL_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended IE = 2 */ /* 8.4.5.4.6 [2] AAS_UL_IE*/ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_item *tree; bit = NIB_TO_BIT(offset); @@ -1016,16 +1017,16 @@ static gint AAS_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t return BIT_TO_NIB(bit); } -static gint CQICH_Alloc_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int CQICH_Alloc_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended IE = 3 */ /* 8.4.5.4.12 [2] CQICH_Alloc_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; - gint target; + int bit; + int data; + int target; proto_item *tree; - gint rci, rtype, ftype, zperm, mgi, api, pad; + int rci, rtype, ftype, zperm, mgi, api, pad; bit = NIB_TO_BIT(offset); @@ -1086,12 +1087,12 @@ static gint CQICH_Alloc_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbu return BIT_TO_NIB(bit); /* Return position in nibbles. */ } -static gint UL_Zone_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int UL_Zone_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended IE = 4 */ /* 8.4.5.4.7 [2] UL_Zone_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_item *tree; bit = NIB_TO_BIT(offset); @@ -1111,14 +1112,14 @@ static gint UL_Zone_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t return BIT_TO_NIB(bit); } -static gint PHYMOD_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int PHYMOD_UL_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended IE = 5 */ /* 8.4.5.4.14 [2] PHYMOD_UL_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_item *tree; - gint pmt; + int pmt; bit = NIB_TO_BIT(offset); @@ -1138,13 +1139,13 @@ static gint PHYMOD_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff return BIT_TO_NIB(bit); } -static gint MIMO_UL_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_UL_IE(proto_tree *uiuc_tree, packet_info* pinfo, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended IE = 6 */ /* 8.4.5.4.11 MIMO_UL_Basic_IE (not implemented) */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_item *tree; nib = offset; @@ -1157,12 +1158,12 @@ static gint MIMO_UL_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, g return nib; } -static gint ULMAP_Fast_Tracking_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int ULMAP_Fast_Tracking_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended IE = 7 */ /* 8.4.5.4.22 [2] ULMAP_Fast_Tracking_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_item *tree; bit = NIB_TO_BIT(offset); @@ -1184,12 +1185,12 @@ static gint ULMAP_Fast_Tracking_IE(proto_tree *uiuc_tree, gint offset, gint leng return BIT_TO_NIB(bit); } -static gint UL_PUSC_Burst_Allocation_in_other_segment_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int UL_PUSC_Burst_Allocation_in_other_segment_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended IE = 8 */ /* 8.4.5.4.17 [2] UL_PUSC_Burst_Allocation_in_other_segment_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_item *tree; bit = NIB_TO_BIT(offset); @@ -1210,14 +1211,14 @@ static gint UL_PUSC_Burst_Allocation_in_other_segment_IE(proto_tree *uiuc_tree, return BIT_TO_NIB(bit); } -static gint Fast_Ranging_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Fast_Ranging_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended IE = 9 */ /* 8.4.5.4.21 [2] Fast_Ranging_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_item *tree; - gint hidi; + int hidi; bit = NIB_TO_BIT(offset); @@ -1241,12 +1242,12 @@ static gint Fast_Ranging_IE(proto_tree *uiuc_tree, gint offset, gint length, tvb return BIT_TO_NIB(bit); } -static gint UL_Allocation_Start_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int UL_Allocation_Start_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended IE = 0xA */ /* 8.4.5.4.15 [2] UL_Allocation_Start_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_item *tree; bit = NIB_TO_BIT(offset); @@ -1268,16 +1269,16 @@ static gint UL_Allocation_Start_IE(proto_tree *uiuc_tree, gint offset, gint leng * table 290c *******************************************************************/ -static gint CQICH_Enhanced_Allocation_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int CQICH_Enhanced_Allocation_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended-2 IE = 0 */ /* 8.4.5.4.16 [2] CQICH_Enhanced_Allocation_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_item *tree; - gint i, cnum, bapm; - guint pad; + int i, cnum, bapm; + unsigned pad; bit = NIB_TO_BIT(offset); @@ -1319,13 +1320,13 @@ static gint CQICH_Enhanced_Allocation_IE(proto_tree *uiuc_tree, gint offset, gin return BIT_TO_NIB(bit); } -static gint HO_Anchor_Active_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb) +static int HO_Anchor_Active_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended-2 IE = 1 */ /* 8.4.5.4.18 [2] HO_Anchor_Active_UL_MAP_IE (not implemented) */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_item *tree; nib = offset; @@ -1338,13 +1339,13 @@ static gint HO_Anchor_Active_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo return nib; } -static gint HO_Active_Anchor_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb) +static int HO_Active_Anchor_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended-2 IE = 2 */ /* 8.4.5.4.19 [2] HO_Active_Anchor_UL_MAP_IE (not implemented) */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_item *tree; nib = offset; @@ -1357,16 +1358,16 @@ static gint HO_Active_Anchor_UL_MAP_IE(proto_tree *uiuc_tree, packet_info* pinfo return nib; } -static gint Anchor_BS_switch_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Anchor_BS_switch_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended-2 IE = 3 */ /* 8.4.5.4.23 [2] Anchor_BS_switch_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; - gint data; + int bit; + int data; proto_item *tree; - gint nbss, acod, cqai, pad; - gint i; + int nbss, acod, cqai, pad; + int i; bit = NIB_TO_BIT(offset); @@ -1415,16 +1416,16 @@ static gint Anchor_BS_switch_IE(proto_tree *uiuc_tree, gint offset, gint length, return BIT_TO_NIB(bit); } -static gint UL_sounding_command_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int UL_sounding_command_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended-2 IE = 4 */ /* 8.4.5.4.26 [2] UL_sounding_command_IE */ /* see 8.4.6.2.7.1 */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_item *tree; - gint stype, srlf, iafb, pad, sept, nssym, ncid, amod; - gint i, j; + int stype, srlf, iafb, pad, sept, nssym, ncid, amod; + int i, j; bit = NIB_TO_BIT(offset); @@ -1519,13 +1520,13 @@ static gint UL_sounding_command_IE(proto_tree *uiuc_tree, gint offset, gint leng return BIT_TO_NIB(bit); } -static gint MIMO_UL_Enhanced_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb) +static int MIMO_UL_Enhanced_IE(proto_tree *uiuc_tree, packet_info* pinfo, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended-2 IE = 6 */ /* 8.4.5.4.20 [2] MIMO_UL_Enhanced_IE (not implemented) */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint nib; - gint data; + int nib; + int data; proto_item *tree; nib = offset; @@ -1538,17 +1539,17 @@ static gint MIMO_UL_Enhanced_IE(proto_tree *uiuc_tree, packet_info* pinfo, gint return nib; } -static gint HARQ_ULMAP_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int HARQ_ULMAP_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended-2 IE = 7 */ /* 8.4.5.4.24 HARQ_ULMAP_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_item *tree; - gint bitlength; - gint lastbit; - gint pad, mode, alsi, nsub; - gint i; + int bitlength; + int lastbit; + int pad, mode, alsi, nsub; + int i; bit = NIB_TO_BIT(offset); bitlength = NIB_TO_BIT(length); @@ -1598,12 +1599,12 @@ static gint HARQ_ULMAP_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuf return BIT_TO_NIB(bit); } -static gint HARQ_ACKCH_Region_Allocation_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int HARQ_ACKCH_Region_Allocation_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended-2 IE = 8 */ /* 8.4.5.4.25 [2] HARQ_ACKCH_Region_Allocation_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_item *tree; bit = NIB_TO_BIT(offset); @@ -1620,16 +1621,16 @@ static gint HARQ_ACKCH_Region_Allocation_IE(proto_tree *uiuc_tree, gint offset, return BIT_TO_NIB(bit); } -static gint AAS_SDMA_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int AAS_SDMA_UL_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended-2 IE = 0xE */ /* 8.4.5.4.27 [2] AAS_SDMA_UL_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_item *tree; - gint nreg, pad, user, encm, ppmd, padj; - gint aasp = 0; /* TODO AAS UL preamble used */ - gint ii, jj; + int nreg, pad, user, encm, ppmd, padj; + int aasp = 0; /* TODO AAS UL preamble used */ + int ii, jj; bit = NIB_TO_BIT(offset); @@ -1701,15 +1702,15 @@ static gint AAS_SDMA_UL_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbu return BIT_TO_NIB(bit); } -static gint Feedback_Polling_IE(proto_tree *uiuc_tree, gint offset, gint length, tvbuff_t *tvb) +static int Feedback_Polling_IE(proto_tree *uiuc_tree, int offset, int length, tvbuff_t *tvb) { /* UL-MAP Extended-2 IE = 0xF */ /* 8.4.5.4.28 [2] Feedback_Polling_IE */ /* offset of TLV in nibbles, length of TLV in nibbles */ - gint bit; + int bit; proto_item *tree; - gint nalloc, dula, pad, adur; - gint i; + int nalloc, dula, pad, adur; + int i; bit = NIB_TO_BIT(offset); @@ -1750,7 +1751,7 @@ static gint Feedback_Polling_IE(proto_tree *uiuc_tree, gint offset, gint length, * UL-MAP Miscellany *******************************************************************/ -gint dissect_ulmap_ie( proto_tree *ie_tree, packet_info* pinfo, gint offset, gint length _U_, tvbuff_t *tvb) +int dissect_ulmap_ie( proto_tree *ie_tree, packet_info* pinfo, int offset, int length _U_, tvbuff_t *tvb) { /* decode a single UL-MAP IE and return the * length of the IE in nibbles @@ -1758,11 +1759,11 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, packet_info* pinfo, gint offset, gin * length = total length of tvb (nibbles) */ proto_item *ti; proto_tree *tree; - gint nibble; - gint uiuc, ext_uiuc, ext2_uiuc, len, aas_or_amc; - guint cid; - guint data; - guint32 data32; + int nibble; + int uiuc, ext_uiuc, ext2_uiuc, len, aas_or_amc; + unsigned cid; + unsigned data; + uint32_t data32; nibble = offset; @@ -2041,13 +2042,13 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, packet_info* pinfo, gint offset, gin static int dissect_mac_mgmt_msg_ulmap_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { /* 6.3.2.3.4 [2] UL-MAP table 18 */ - guint offset = 0; - guint length; - guint nib, pad; + unsigned offset = 0; + unsigned length; + unsigned nib, pad; proto_item *ti = NULL; proto_tree *ulmap_tree = NULL; proto_tree *ie_tree = NULL; - guint tvb_len; + unsigned tvb_len; tvb_len = tvb_reported_length(tvb); @@ -2081,13 +2082,13 @@ static int dissect_mac_mgmt_msg_ulmap_decoder(tvbuff_t *tvb, packet_info *pinfo return tvb_captured_length(tvb); } -/*gint wimax_decode_ulmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)*/ -gint wimax_decode_ulmapc(proto_tree *base_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb) +/*int wimax_decode_ulmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)*/ +int wimax_decode_ulmapc(proto_tree *base_tree, packet_info* pinfo, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.6.2 [2] Compressed UL-MAP */ /* returns length in nibbles */ - gint nib; - guint data; + int nib; + unsigned data; proto_item *ti = NULL; proto_tree *tree = NULL; proto_tree *ie_tree = NULL; @@ -2125,16 +2126,16 @@ gint wimax_decode_ulmapc(proto_tree *base_tree, packet_info* pinfo, gint offset, } -gint wimax_decode_ulmap_reduced_aas(proto_tree *base_tree, gint offset, gint length, tvbuff_t *tvb) +int wimax_decode_ulmap_reduced_aas(proto_tree *base_tree, int offset, int length, tvbuff_t *tvb) { /* 8.4.5.8.2 Reduced AAS private UL-MAP */ /* offset and length are in bits since this is called from within * the Reduced AAS private DL-MAP * return length in bits */ - gint bit; - guint data; + int bit; + unsigned data; proto_tree *tree; - gint azci, azpi, umii, phmi, powi; + int azci, azpi, umii, phmi, powi; bit = offset; @@ -2816,7 +2817,7 @@ void proto_register_mac_mgmt_msg_ulmap(void) { &hf_ulmap_feedback_polling_allocation_duration, { "Allocation Duration (d)", "wmx.ulmap.feedback_polling.allocation_duration", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, { &hf_ulmap_feedback_polling_type, { "Feedback type", "wmx.ulmap.feedback_polling.feedback_polling.type", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, { &hf_ulmap_feedback_polling_frame_offset, { "Frame Offset", "wmx.ulmap.feedback_polling.frame_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, - { &hf_ulmap_feedback_polling_period, { "Period (p)", "wmx.ulmap.feedback_polling.perio", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, + { &hf_ulmap_feedback_polling_period, { "Period (p)", "wmx.ulmap.feedback_polling.period", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, { &hf_ulmap_feedback_polling_uiuc, { "UIUC", "wmx.ulmap.feedback_polling.uiuc", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, { &hf_ulmap_feedback_polling_ofdma_symbol_offset, { "OFDMA Symbol Offset", "wmx.ulmap.feedback_polling.ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, { &hf_ulmap_feedback_polling_subchannel_offset, { "Subchannel offset", "wmx.ulmap.feedback_polling.subchannel_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, @@ -2854,7 +2855,7 @@ void proto_register_mac_mgmt_msg_ulmap(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_ulmap, &ett_ulmap_ie, diff --git a/plugins/epan/wimax/packet-m2m.c b/plugins/epan/wimax/packet-m2m.c index bd08ebb1..d14f3e19 100644 --- a/plugins/epan/wimax/packet-m2m.c +++ b/plugins/epan/wimax/packet-m2m.c @@ -25,14 +25,14 @@ /* forward reference */ void proto_reg_handoff_m2m(void); void proto_register_m2m(void); -static void fch_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo); -static void cdma_code_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo); -static void pdu_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo, gint burst_number, gint frag_type, gint frag_number); -static void fast_feedback_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo); -static void harq_ack_bursts_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo); -static void physical_attributes_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo); +static void fch_burst_decoder(proto_tree *tree, tvbuff_t *tvb, int offset, int length, packet_info *pinfo); +static void cdma_code_decoder(proto_tree *tree, tvbuff_t *tvb, int offset, int length, packet_info *pinfo); +static void pdu_burst_decoder(proto_tree *tree, tvbuff_t *tvb, int offset, int length, packet_info *pinfo, int burst_number, int frag_type, int frag_number); +static void fast_feedback_burst_decoder(proto_tree *tree, tvbuff_t *tvb, int offset, int length, packet_info *pinfo); +static void harq_ack_bursts_decoder(proto_tree *tree, tvbuff_t *tvb, int offset, int length, packet_info *pinfo); +static void physical_attributes_decoder(proto_tree *tree, tvbuff_t *tvb, int offset, int length, packet_info *pinfo); static void extended_tlv_decoder(packet_info *pinfo); -void proto_tree_add_tlv(tlv_info_t *self, tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree, gint hf, guint encoding); +void proto_tree_add_tlv(tlv_info_t *self, tvbuff_t *tvb, unsigned offset, packet_info *pinfo, proto_tree *tree, int hf, unsigned encoding); /* Global variables */ static dissector_handle_t m2m_handle; @@ -45,13 +45,13 @@ static dissector_handle_t wimax_phy_attributes_burst_handle; static reassembly_table pdu_reassembly_table; -static gint proto_m2m = -1; +static int proto_m2m; -static gint ett_m2m = -1; -static gint ett_m2m_tlv = -1; -static gint ett_m2m_fch = -1; -static gint ett_m2m_cdma = -1; -static gint ett_m2m_ffb = -1; +static int ett_m2m; +static int ett_m2m_tlv; +static int ett_m2m_fch; +static int ett_m2m_cdma; +static int ett_m2m_ffb; /* TLV types (rev:0.2) */ #define TLV_PROTO_VER 1 @@ -118,31 +118,31 @@ static const value_string tlv_crc16_status[] = { 0, NULL } }; -static gint hf_m2m_sequence_number = -1; -static gint hf_m2m_frame_number = -1; -static gint hf_m2m_tlv_count = -1; - -static gint hf_m2m_type = -1; -static gint hf_m2m_len = -1; -static gint hf_m2m_len_size = -1; -/* static gint hf_m2m_value_bytes = -1; */ -static gint hf_wimax_invalid_tlv = -1; -static gint hf_m2m_value_protocol_vers_uint8 = -1; -static gint hf_m2m_value_burst_num_uint8 = -1; -static gint hf_m2m_value_frag_type_uint8 = -1; -static gint hf_m2m_value_frag_num_uint8 = -1; -static gint hf_m2m_value_pdu_burst = -1; -static gint hf_m2m_value_fast_fb = -1; -static gint hf_m2m_value_fch_burst_uint24 = -1; -static gint hf_m2m_value_cdma_code_uint24 = -1; -static gint hf_m2m_value_crc16_status_uint8 = -1; -static gint hf_m2m_value_burst_power_uint16 = -1; -static gint hf_m2m_value_burst_cinr_uint16 = -1; -static gint hf_m2m_value_preamble_uint16 = -1; -static gint hf_m2m_value_harq_ack_burst_bytes = -1; -static gint hf_m2m_phy_attributes = -1; - -static expert_field ei_m2m_unexpected_length = EI_INIT; +static int hf_m2m_sequence_number; +static int hf_m2m_frame_number; +static int hf_m2m_tlv_count; + +static int hf_m2m_type; +static int hf_m2m_len; +static int hf_m2m_len_size; +/* static int hf_m2m_value_bytes; */ +static int hf_wimax_invalid_tlv; +static int hf_m2m_value_protocol_vers_uint8; +static int hf_m2m_value_burst_num_uint8; +static int hf_m2m_value_frag_type_uint8; +static int hf_m2m_value_frag_num_uint8; +static int hf_m2m_value_pdu_burst; +static int hf_m2m_value_fast_fb; +static int hf_m2m_value_fch_burst_uint24; +static int hf_m2m_value_cdma_code_uint24; +static int hf_m2m_value_crc16_status_uint8; +static int hf_m2m_value_burst_power_uint16; +static int hf_m2m_value_burst_cinr_uint16; +static int hf_m2m_value_preamble_uint16; +static int hf_m2m_value_harq_ack_burst_bytes; +static int hf_m2m_phy_attributes; + +static expert_field ei_m2m_unexpected_length; /* WiMax MAC to MAC protocol dissector */ @@ -152,16 +152,16 @@ static int dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void proto_item *m2m_item = NULL; proto_tree *m2m_tree = NULL; proto_tree *tlv_tree = NULL; - gint burst_number = 0; - gint length, offset = 0; - gint tlv_count; - gint tlv_type, tlv_len, tlv_offset, tlv_value; - gint tlv_frag_type = 0; - gint tlv_frag_number = 0; + int burst_number = 0; + int length, offset = 0; + int tlv_count; + int tlv_type, tlv_len, tlv_offset, tlv_value; + int tlv_frag_type = 0; + int tlv_frag_number = 0; tlv_info_t m2m_tlv_info; - gint hf; - guint encoding; - guint frame_number; + int hf; + unsigned encoding; + unsigned frame_number; int expected_len; /* display the M2M protocol name */ @@ -221,7 +221,7 @@ static int dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void { case TLV_PROTO_VER: /* get the protocol version */ - tlv_value = tvb_get_guint8( tvb, offset ); + tlv_value = tvb_get_uint8( tvb, offset ); /* add the description */ proto_item_append_text(ti, ": %d", tlv_value); hf = hf_m2m_value_protocol_vers_uint8; @@ -231,7 +231,7 @@ static int dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void case TLV_BURST_NUM: /* get the burst number */ - burst_number = tvb_get_guint8( tvb, offset ); + burst_number = tvb_get_uint8( tvb, offset ); /* add the description */ proto_item_append_text(ti, ": %d", burst_number); hf = hf_m2m_value_burst_num_uint8; @@ -241,7 +241,7 @@ static int dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void case TLV_FRAG_TYPE: /* add the description */ - tlv_frag_type = tvb_get_guint8( tvb, offset ); + tlv_frag_type = tvb_get_uint8( tvb, offset ); proto_item_append_text(ti, ": %s", val_to_str_const(tlv_frag_type, tlv_frag_type_name, "Unknown")); hf = hf_m2m_value_frag_type_uint8; encoding = ENC_BIG_ENDIAN; @@ -250,7 +250,7 @@ static int dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void case TLV_FRAG_NUM: /* get the fragment number */ - tlv_frag_number = tvb_get_guint8( tvb, offset ); + tlv_frag_number = tvb_get_uint8( tvb, offset ); /* add the description */ proto_item_append_text(ti, ": %d", tlv_frag_number); hf = hf_m2m_value_frag_num_uint8; @@ -308,7 +308,7 @@ static int dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void case TLV_CRC16_STATUS: /* add the description */ - tlv_value = tvb_get_guint8( tvb, offset ); + tlv_value = tvb_get_uint8( tvb, offset ); proto_item_append_text(ti, ": %s", val_to_str_const(tlv_value, tlv_crc16_status, "Unknown")); hf = hf_m2m_value_crc16_status_uint8; encoding = ENC_BIG_ENDIAN; @@ -389,7 +389,7 @@ static int dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void } /* Decode and display the FCH burst */ -static void fch_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo) +static void fch_burst_decoder(proto_tree *tree, tvbuff_t *tvb, int offset, int length, packet_info *pinfo) { if(wimax_fch_burst_handle) { /* call FCH dissector */ @@ -402,7 +402,7 @@ static void fch_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint } /* Decode and display the CDMA Code Attribute */ -static void cdma_code_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo) +static void cdma_code_decoder(proto_tree *tree, tvbuff_t *tvb, int offset, int length, packet_info *pinfo) { if(wimax_cdma_code_burst_handle) { /* call CDMA dissector */ @@ -415,7 +415,7 @@ static void cdma_code_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint } /* Decode and display the PDU Burst */ -static void pdu_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo, gint burst_number, gint frag_type, gint frag_number) +static void pdu_burst_decoder(proto_tree *tree, tvbuff_t *tvb, int offset, int length, packet_info *pinfo, int burst_number, int frag_type, int frag_number) { fragment_head *pdu_frag; tvbuff_t *pdu_tvb = NULL; @@ -471,7 +471,7 @@ static void pdu_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint } /* Decode and display the Fast Feedback Burst */ -static void fast_feedback_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo) +static void fast_feedback_burst_decoder(proto_tree *tree, tvbuff_t *tvb, int offset, int length, packet_info *pinfo) { if(wimax_ffb_burst_handle) { /* display the TLV Fast Feedback Burst dissector info */ @@ -483,7 +483,7 @@ static void fast_feedback_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint of } } -static void harq_ack_bursts_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo) +static void harq_ack_bursts_decoder(proto_tree *tree, tvbuff_t *tvb, int offset, int length, packet_info *pinfo) { if(wimax_hack_burst_handle) { /* call the TLV HARQ ACK Bursts dissector */ @@ -495,7 +495,7 @@ static void harq_ack_bursts_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset } } -static void physical_attributes_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo) +static void physical_attributes_decoder(proto_tree *tree, tvbuff_t *tvb, int offset, int length, packet_info *pinfo) { if(wimax_phy_attributes_burst_handle) { /* call the TLV PDU Burst Physical Attributes dissector */ @@ -515,10 +515,10 @@ static void extended_tlv_decoder(packet_info *pinfo) } /* Display the raw WiMax TLV */ -void proto_tree_add_tlv(tlv_info_t *self, tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree, gint hf, guint encoding) +void proto_tree_add_tlv(tlv_info_t *self, tvbuff_t *tvb, unsigned offset, packet_info *pinfo, proto_tree *tree, int hf, unsigned encoding) { - guint tlv_offset; - gint tlv_type, tlv_len; + unsigned tlv_offset; + int tlv_type, tlv_len; /* make sure the TLV information is valid */ if(!self->valid) @@ -748,7 +748,7 @@ void proto_register_m2m(void) } }; - static gint *ett[] = + static int *ett[] = { &ett_m2m, &ett_m2m_tlv, diff --git a/plugins/epan/wimax/packet-wmx.c b/plugins/epan/wimax/packet-wmx.c index 5a38b111..b1f12509 100644 --- a/plugins/epan/wimax/packet-wmx.c +++ b/plugins/epan/wimax/packet-wmx.c @@ -23,34 +23,38 @@ #include "wimax-int.h" #include "wimax_tlv.h" #include "wimax_utils.h" +#include "wimax_prefs.h" void proto_register_wimax(void); void proto_reg_handoff_wimax(void); -/* Global variables */ -gint proto_wimax = -1; -gint8 arq_enabled = 0; -gint scheduling_service_type = 0; -gint mac_sdu_length = 49; /* default SDU size is 49 bytes (11.13.16) */ -extern guint global_cid_max_basic; -extern gboolean include_cor2_changes; +/* + * Global variables + * + * XXX - are these per-packet state? If so, they should be made so, + * rather than being global. + */ +int proto_wimax; +int8_t arq_enabled; +int scheduling_service_type; +int mac_sdu_length = 49; /* default SDU size is 49 bytes (11.13.16) */ address bs_address = ADDRESS_INIT_NONE; -static int hf_tlv_type = -1; -static int hf_tlv_length = -1; -static int hf_tlv_length_size = -1; +static int hf_tlv_type; +static int hf_tlv_length; +static int hf_tlv_length_size; #define MAX_NUM_TLVS 256 /* Global TLV array to retrieve unique subtree identifiers */ -static gint ett_tlv[MAX_NUM_TLVS]; +static int ett_tlv[MAX_NUM_TLVS]; -static const gchar tlv_val_1byte[] = "TLV value: %s (0x%02x)"; -static const gchar tlv_val_2byte[] = "TLV value: %s (0x%04x)"; -static const gchar tlv_val_3byte[] = "TLV value: %s (0x%06x)"; -static const gchar tlv_val_4byte[] = "TLV value: %s (0x%08x)"; -static const gchar tlv_val_5byte[] = "TLV value: %s (0x%08x...)"; +static const char tlv_val_1byte[] = "TLV value: %s (0x%02x)"; +static const char tlv_val_2byte[] = "TLV value: %s (0x%04x)"; +static const char tlv_val_3byte[] = "TLV value: %s (0x%06x)"; +static const char tlv_val_4byte[] = "TLV value: %s (0x%08x)"; +static const char tlv_val_5byte[] = "TLV value: %s (0x%08x...)"; /*************************************************************/ /* add_tlv_subtree() */ @@ -66,14 +70,14 @@ static const gchar tlv_val_5byte[] = "TLV value: %s (0x%08x...)"; /* return: */ /* pointer to a proto_item */ /*************************************************************/ -proto_item *add_tlv_subtree(tlv_info_t *self, proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start, const guint encoding) +proto_item *add_tlv_subtree(tlv_info_t *self, proto_tree *tree, int hfindex, tvbuff_t *tvb, int start, const unsigned encoding) { header_field_info *hf; proto_tree *tlv_tree; proto_item *tlv_item; - gint tlv_value_length, tlv_val_offset; - guint8 size_of_tlv_length_field; - guint8 tlv_type; + int tlv_value_length, tlv_val_offset; + uint8_t size_of_tlv_length_field; + uint8_t tlv_type; /* Make sure we're dealing with a valid TLV here */ if (get_tlv_type(self) < 0) @@ -120,13 +124,13 @@ proto_item *add_tlv_subtree(tlv_info_t *self, proto_tree *tree, int hfindex, tvb /* return: */ /* pointer to a proto_tree (to then add value) */ /*************************************************************/ -proto_tree *add_tlv_subtree_no_item(tlv_info_t *self, proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start) +proto_tree *add_tlv_subtree_no_item(tlv_info_t *self, proto_tree *tree, int hfindex, tvbuff_t *tvb, int start) { header_field_info *hf; proto_tree *tlv_tree; - gint tlv_value_length, tlv_val_offset; - guint8 size_of_tlv_length_field; - guint8 tlv_type; + int tlv_value_length, tlv_val_offset; + uint8_t size_of_tlv_length_field; + uint8_t tlv_type; /* Make sure we're dealing with a valid TLV here */ if (get_tlv_type(self) < 0) @@ -173,16 +177,16 @@ proto_tree *add_tlv_subtree_no_item(tlv_info_t *self, proto_tree *tree, int hfin /* return: */ /* pointer to a proto_tree */ /*************************************************************/ -proto_tree *add_protocol_subtree(tlv_info_t *self, gint idx, proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start, gint length _U_, const char *label) +proto_tree *add_protocol_subtree(tlv_info_t *self, int idx, proto_tree *tree, int hfindex, tvbuff_t *tvb, int start, int length _U_, const char *label) { /* Declare local variables */ proto_tree *tlv_tree; proto_item *tlv_item; - gint tlv_value_length, tlv_val_offset; - guint8 size_of_tlv_length_field; - guint8 tlv_type; - guint32 tlv_value; - const gchar *hex_fmt; + int tlv_value_length, tlv_val_offset; + uint8_t size_of_tlv_length_field; + uint8_t tlv_type; + uint32_t tlv_value; + const char *hex_fmt; /* Make sure we're dealing with a valid TLV here */ if (get_tlv_type(self) < 0) @@ -214,7 +218,7 @@ proto_tree *add_protocol_subtree(tlv_info_t *self, gint idx, proto_tree *tree, i switch (tlv_value_length) { case 1: - tlv_value = tvb_get_guint8(tvb, start+tlv_val_offset); + tlv_value = tvb_get_uint8(tvb, start+tlv_val_offset); hex_fmt = tlv_val_1byte; break; case 2: @@ -254,14 +258,14 @@ static int dissect_wimax(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree return tvb_captured_length(tvb); } -gboolean is_down_link(packet_info *pinfo) +bool is_down_link(packet_info *pinfo) { if (pinfo->p2p_dir == P2P_DIR_RECV) - return TRUE; + return true; if (pinfo->p2p_dir == P2P_DIR_UNKNOWN) if(bs_address.len && !cmp_address(&bs_address, &pinfo->src)) - return TRUE; - return FALSE; + return true; + return false; } @@ -277,7 +281,7 @@ void proto_register_wimax(void) { &hf_tlv_length_size, { "Size of TLV length field", "wmx.tlv_length_size", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, }; - gint *ett_reg[MAX_NUM_TLVS]; + int *ett_reg[MAX_NUM_TLVS]; /* Register the WiMax protocols here */ proto_wimax = proto_register_protocol ( @@ -291,7 +295,6 @@ void proto_register_wimax(void) /* Register the ett TLV array to retrieve unique subtree identifiers */ for (i = 0; i < MAX_NUM_TLVS; i++) { - ett_tlv[i] = -1; ett_reg[i] = &ett_tlv[i]; } @@ -313,9 +316,9 @@ void proto_register_wimax(void) prefs_register_bool_preference(wimax_module, "corrigendum_2_version", "Corrigendum 2 Version", - "Set to TRUE to use the Corrigendum" + "Set to true to use the Corrigendum" " 2 version of Wimax message decoding." - " Set to FALSE to use the 802.16e-2005" + " Set to false to use the 802.16e-2005" " version.", &include_cor2_changes); prefs_register_obsolete_preference(wimax_module, "wimax.basic_cid_max"); diff --git a/plugins/epan/wimax/wimax_bits.h b/plugins/epan/wimax/wimax_bits.h index f844d549..5f1c34ad 100644 --- a/plugins/epan/wimax/wimax_bits.h +++ b/plugins/epan/wimax/wimax_bits.h @@ -39,14 +39,14 @@ /* extract the nibble at the given nibble address 'n' of tvbuff_t 't' */ #define TVB_NIB_NIBBLE(n,t) \ (((n) & 1) \ - ? tvb_get_guint8((t), (n)/2) & NIBBLE_MASK \ - : (tvb_get_guint8((t), (n)/2) >> 4) & NIBBLE_MASK) + ? tvb_get_uint8((t), (n)/2) & NIBBLE_MASK \ + : (tvb_get_uint8((t), (n)/2) >> 4) & NIBBLE_MASK) /* extract the byte at the given nibble address 'n' of tvbuff_t 't' */ #define TVB_NIB_BYTE(n,t) \ (n) & 1 \ ? (tvb_get_ntohs((t), (n)/2) >> 4) & BYTE_MASK \ - : tvb_get_guint8((t), (n)/2) + : tvb_get_uint8((t), (n)/2) /* extract 12 bits at the given nibble address */ #define TVB_NIB_BITS12(n,t) \ @@ -55,13 +55,13 @@ /* extract the word at the given nibble address 'n' of tvbuff_t 't' */ #define TVB_NIB_WORD(n,t) \ (n) & 1 \ - ? (gint)((tvb_get_ntohl((t), (n)/2) >> 12) & 0x0000FFFF) \ + ? (int)((tvb_get_ntohl((t), (n)/2) >> 12) & 0x0000FFFF) \ : tvb_get_ntohs((t), (n)/2) /* extract the word at the given nibble address 'n' of tvbuff_t 't' */ #define TVB_NIB_LONG(n,t) \ (n) & 1 \ - ? (tvb_get_ntohl((t), (n)/2) << 4) | ((tvb_get_guint8((t), (n)/2 + 4) >> 4) & NIBBLE_MASK) \ + ? (tvb_get_ntohl((t), (n)/2) << 4) | ((tvb_get_uint8((t), (n)/2 + 4) >> 4) & NIBBLE_MASK) \ : tvb_get_ntohl((t), (n)/2) /* Only currently used with nib == 1 or 2 */ @@ -122,7 +122,7 @@ * tvb ... tvbuff_t */ #define TVB_BIT_BIT(bit, tvb) \ - (( tvb_get_guint8(tvb, ADDR(bit)) >> SHIFT(bit,1) ) & 0x1) + (( tvb_get_uint8(tvb, ADDR(bit)) >> SHIFT(bit,1) ) & 0x1) /* extract bitfield up to 9 bits * bit ... bit address @@ -155,11 +155,11 @@ | TVB_BIT_BITS64b(bit,tvb,num) ) #define TVB_BIT_BITS(bit, tvb, num) \ - ((num) == 1 ? (gint)TVB_BIT_BIT(bit,tvb) : \ - ((num) <= 9 ? (gint)TVB_BIT_BITS16(bit,tvb,num) : \ - ((num) <= 24 ? (gint)TVB_BIT_BITS32(bit,tvb,num) : \ - ((num) <= 32 ? (gint)TVB_BIT_BITS64(bit,tvb,num) : \ - (gint)0 )))) + ((num) == 1 ? (int)TVB_BIT_BIT(bit,tvb) : \ + ((num) <= 9 ? (int)TVB_BIT_BITS16(bit,tvb,num) : \ + ((num) <= 24 ? (int)TVB_BIT_BITS32(bit,tvb,num) : \ + ((num) <= 32 ? (int)TVB_BIT_BITS64(bit,tvb,num) : \ + (int)0 )))) /* to highlight bitfields correctly in wireshark * AddItem(..., WSADDR(buf,bit), WSLEN(bit), ...) */ diff --git a/plugins/epan/wimax/wimax_cdma_code_decoder.c b/plugins/epan/wimax/wimax_cdma_code_decoder.c index 65b52109..45bae8d9 100644 --- a/plugins/epan/wimax/wimax_cdma_code_decoder.c +++ b/plugins/epan/wimax/wimax_cdma_code_decoder.c @@ -19,16 +19,16 @@ #include <epan/packet.h> #include "wimax-int.h" -static int proto_wimax_cdma_code_decoder = -1; -static gint ett_wimax_cdma_code_decoder = -1; +static int proto_wimax_cdma_code_decoder; +static int ett_wimax_cdma_code_decoder; -static int hf_wimax_ranging_code = -1; -static int hf_wimax_ranging_symbol_offset = -1; -static int hf_wimax_ranging_subchannel_offset = -1; +static int hf_wimax_ranging_code; +static int hf_wimax_ranging_symbol_offset; +static int hf_wimax_ranging_subchannel_offset; static int dissect_wimax_cdma_code_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - gint offset = 0; + int offset = 0; proto_item *cdma_item; proto_tree *cdma_tree; @@ -83,7 +83,7 @@ void wimax_proto_register_wimax_cdma(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_wimax_cdma_code_decoder, }; diff --git a/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c index c69bd687..615ff085 100644 --- a/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c +++ b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c @@ -20,7 +20,7 @@ #include "wimax-int.h" #include "wimax_compact_dlmap_ie_decoder.h" -extern gint proto_wimax; +extern int proto_wimax; /* MASKs */ #define MSB_NIBBLE_MASK 0xF0 @@ -32,33 +32,33 @@ extern gint proto_wimax; #define CID_TYPE_RCID3 3 /* Global Variables */ -guint cid_type = 0; -guint band_amc_subchannel_type = 0; -guint max_logical_bands = 12; -guint num_of_broadcast_symbols = 0; -guint num_of_dl_band_amc_symbols = 0; -guint num_of_ul_band_amc_symbols = 0; +unsigned cid_type; +unsigned band_amc_subchannel_type; +unsigned max_logical_bands = 12; +unsigned num_of_broadcast_symbols; +unsigned num_of_dl_band_amc_symbols; +unsigned num_of_ul_band_amc_symbols; /* from switch HARQ mode extension IE */ -guint harq_mode = 0; +unsigned harq_mode; /* forward reference */ -static guint wimax_compact_dlmap_format_configuration_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); -static guint wimax_compact_dlmap_rcid_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); -static guint wimax_compact_dlmap_harq_control_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); -static guint wimax_compact_dlmap_cqich_control_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); -static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); -guint wimax_extended_diuc_dependent_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); +static unsigned wimax_compact_dlmap_format_configuration_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); +static unsigned wimax_compact_dlmap_rcid_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); +static unsigned wimax_compact_dlmap_harq_control_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); +static unsigned wimax_compact_dlmap_cqich_control_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); +static unsigned wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); +unsigned wimax_extended_diuc_dependent_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); -static gint proto_wimax_compact_dlmap_ie_decoder = -1; +static int proto_wimax_compact_dlmap_ie_decoder; #if 0 /* not used ?? */ -static gint ett_wimax_compact_dlmap_ie_decoder = -1; -static gint ett_wimax_format_configuration_ie_decoder = -1; -static gint ett_wimax_rcid_ie_decoder = -1; -static gint ett_wimax_harq_control_ie_decoder = -1; -static gint ett_wimax_extended_diuc_dependent_ie_decoder = -1; -static gint ett_wimax_cqich_control_ie_decoder = -1; -static gint ett_wimax_extension_type_ie_decoder = -1; +static int ett_wimax_compact_dlmap_ie_decoder; +static int ett_wimax_format_configuration_ie_decoder; +static int ett_wimax_rcid_ie_decoder; +static int ett_wimax_harq_control_ie_decoder; +static int ett_wimax_extended_diuc_dependent_ie_decoder; +static int ett_wimax_cqich_control_ie_decoder; +static int ett_wimax_extension_type_ie_decoder; #endif /* New Format Indications */ @@ -142,79 +142,79 @@ static const value_string vals_allocation_modes[] = #define SHORTENED_DIUC_MASK_1 0x0E00 #define COMPANDED_SC_MASK_1 0x01F0 -/* display indexies */ -static gint hf_cdlmap_dl_map_type = -1; -static gint hf_cdlmap_ul_map_append = -1; -static gint hf_cdlmap_reserved = -1; -static gint hf_cdlmap_nep_code = -1; -static gint hf_cdlmap_nsch_code = -1; -static gint hf_cdlmap_num_bands = -1; -static gint hf_cdlmap_band_index = -1; -static gint hf_cdlmap_nb_bitmap = -1; -static gint hf_cdlmap_dl_map_type_1 = -1; -static gint hf_cdlmap_ul_map_append_1 = -1; -static gint hf_cdlmap_reserved_1 = -1; -static gint hf_cdlmap_nep_code_1 = -1; -static gint hf_cdlmap_nsch_code_1 = -1; -static gint hf_cdlmap_num_bands_1 = -1; -/*static gint hf_cdlmap_band_index_1 = -1;*/ -static gint hf_cdlmap_nb_bitmap_1 = -1; - -static gint hf_cdlmap_shortened_diuc = -1; -static gint hf_cdlmap_companded_sc = -1; -static gint hf_cdlmap_shortened_uiuc = -1; -static gint hf_cdlmap_shortened_diuc_1 = -1; -static gint hf_cdlmap_companded_sc_1 = -1; -static gint hf_cdlmap_shortened_uiuc_1 = -1; - -static gint hf_cdlmap_bin_offset = -1; -static gint hf_cdlmap_bin_offset_1 = -1; - -static gint hf_cdlmap_diuc_num_of_subchannels = -1; -static gint hf_cdlmap_diuc_num_of_subchannels_1 = -1; -static gint hf_cdlmap_diuc_repetition_coding_indication = -1; -static gint hf_cdlmap_diuc_repetition_coding_indication_1 = -1; -static gint hf_cdlmap_diuc_reserved = -1; -static gint hf_cdlmap_diuc_reserved_1 = -1; - -static gint hf_cdlmap_bit_map_length = -1; -static gint hf_cdlmap_bit_map_length_1 = -1; -static gint hf_cdlmap_bit_map = -1; - -static gint hf_cdlmap_diuc = -1; -static gint hf_cdlmap_diuc_1 = -1; - -static gint hf_cdlmap_allocation_mode = -1; -static gint hf_cdlmap_allocation_mode_rsvd = -1; -static gint hf_cdlmap_num_subchannels = -1; -static gint hf_cdlmap_allocation_mode_1 = -1; -static gint hf_cdlmap_allocation_mode_rsvd_1 = -1; -static gint hf_cdlmap_num_subchannels_1 = -1; - -/* static gint hf_cdlmap_reserved_type = -1; */ -static gint hf_cdlmap_reserved_type_1 = -1; +/* display indices */ +static int hf_cdlmap_dl_map_type; +static int hf_cdlmap_ul_map_append; +static int hf_cdlmap_reserved; +static int hf_cdlmap_nep_code; +static int hf_cdlmap_nsch_code; +static int hf_cdlmap_num_bands; +static int hf_cdlmap_band_index; +static int hf_cdlmap_nb_bitmap; +static int hf_cdlmap_dl_map_type_1; +static int hf_cdlmap_ul_map_append_1; +static int hf_cdlmap_reserved_1; +static int hf_cdlmap_nep_code_1; +static int hf_cdlmap_nsch_code_1; +static int hf_cdlmap_num_bands_1; +/*static int hf_cdlmap_band_index_1;*/ +static int hf_cdlmap_nb_bitmap_1; + +static int hf_cdlmap_shortened_diuc; +static int hf_cdlmap_companded_sc; +static int hf_cdlmap_shortened_uiuc; +static int hf_cdlmap_shortened_diuc_1; +static int hf_cdlmap_companded_sc_1; +static int hf_cdlmap_shortened_uiuc_1; + +static int hf_cdlmap_bin_offset; +static int hf_cdlmap_bin_offset_1; + +static int hf_cdlmap_diuc_num_of_subchannels; +static int hf_cdlmap_diuc_num_of_subchannels_1; +static int hf_cdlmap_diuc_repetition_coding_indication; +static int hf_cdlmap_diuc_repetition_coding_indication_1; +static int hf_cdlmap_diuc_reserved; +static int hf_cdlmap_diuc_reserved_1; + +static int hf_cdlmap_bit_map_length; +static int hf_cdlmap_bit_map_length_1; +static int hf_cdlmap_bit_map; + +static int hf_cdlmap_diuc; +static int hf_cdlmap_diuc_1; + +static int hf_cdlmap_allocation_mode; +static int hf_cdlmap_allocation_mode_rsvd; +static int hf_cdlmap_num_subchannels; +static int hf_cdlmap_allocation_mode_1; +static int hf_cdlmap_allocation_mode_rsvd_1; +static int hf_cdlmap_num_subchannels_1; + +/* static int hf_cdlmap_reserved_type; */ +static int hf_cdlmap_reserved_type_1; /* display indexies */ -static gint hf_format_config_ie_dl_map_type = -1; -static gint hf_format_config_ie_dl_map_type_1 = -1; -static gint hf_format_config_ie_dl_map_type_32 = -1; -static gint hf_format_config_ie_new_format_indication = -1; -static gint hf_format_config_ie_new_format_indication_1 = -1; -static gint hf_format_config_ie_new_format_indication_32 = -1; -static gint hf_format_config_ie_cid_type = -1; -static gint hf_format_config_ie_cid_type_1 = -1; -static gint hf_format_config_ie_safety_pattern = -1; -static gint hf_format_config_ie_safety_pattern_1 = -1; -static gint hf_format_config_ie_subchannel_type = -1; -static gint hf_format_config_ie_subchannel_type_1 = -1; -static gint hf_format_config_ie_max_logical_bands = -1; -static gint hf_format_config_ie_max_logical_bands_1 = -1; -static gint hf_format_config_ie_num_of_broadcast_symbol = -1; -static gint hf_format_config_ie_num_of_broadcast_symbol_1 = -1; -static gint hf_format_config_ie_num_of_dl_band_amc_symbol = -1; -static gint hf_format_config_ie_num_of_dl_band_amc_symbol_1 = -1; -static gint hf_format_config_ie_num_of_ul_band_amc_symbol = -1; -static gint hf_format_config_ie_num_of_ul_band_amc_symbol_1 = -1; +static int hf_format_config_ie_dl_map_type; +static int hf_format_config_ie_dl_map_type_1; +static int hf_format_config_ie_dl_map_type_32; +static int hf_format_config_ie_new_format_indication; +static int hf_format_config_ie_new_format_indication_1; +static int hf_format_config_ie_new_format_indication_32; +static int hf_format_config_ie_cid_type; +static int hf_format_config_ie_cid_type_1; +static int hf_format_config_ie_safety_pattern; +static int hf_format_config_ie_safety_pattern_1; +static int hf_format_config_ie_subchannel_type; +static int hf_format_config_ie_subchannel_type_1; +static int hf_format_config_ie_max_logical_bands; +static int hf_format_config_ie_max_logical_bands_1; +static int hf_format_config_ie_num_of_broadcast_symbol; +static int hf_format_config_ie_num_of_broadcast_symbol_1; +static int hf_format_config_ie_num_of_dl_band_amc_symbol; +static int hf_format_config_ie_num_of_dl_band_amc_symbol_1; +static int hf_format_config_ie_num_of_ul_band_amc_symbol; +static int hf_format_config_ie_num_of_ul_band_amc_symbol_1; /* Format Configuration IE Masks */ #define FORMAT_CONFIG_IE_DL_MAP_TYPE_MASK 0xE0000000 @@ -235,18 +235,18 @@ static gint hf_format_config_ie_num_of_ul_band_amc_symbol_1 = -1; #define NUM_UL_AMC_SYMBOLS_MASK 0x000003F0 /* display indexies */ -static gint hf_harq_rcid_ie_prefix = -1; -static gint hf_harq_rcid_ie_prefix_1 = -1; -static gint hf_harq_rcid_ie_normal_cid = -1; -static gint hf_harq_rcid_ie_normal_cid_1 = -1; -static gint hf_harq_rcid_ie_cid3 = -1; -static gint hf_harq_rcid_ie_cid3_1 = -1; -static gint hf_harq_rcid_ie_cid7 = -1; -static gint hf_harq_rcid_ie_cid7_1 = -1; -static gint hf_harq_rcid_ie_cid11 = -1; -static gint hf_harq_rcid_ie_cid11_1 = -1; -static gint hf_harq_rcid_ie_cid11_2 = -1; -static gint hf_harq_rcid_ie_cid11_3 = -1; +static int hf_harq_rcid_ie_prefix; +static int hf_harq_rcid_ie_prefix_1; +static int hf_harq_rcid_ie_normal_cid; +static int hf_harq_rcid_ie_normal_cid_1; +static int hf_harq_rcid_ie_cid3; +static int hf_harq_rcid_ie_cid3_1; +static int hf_harq_rcid_ie_cid7; +static int hf_harq_rcid_ie_cid7_1; +static int hf_harq_rcid_ie_cid11; +static int hf_harq_rcid_ie_cid11_1; +static int hf_harq_rcid_ie_cid11_2; +static int hf_harq_rcid_ie_cid11_3; /* Masks */ #define WIMAX_RCID_IE_NORMAL_CID_MASK_1 0x0FFFF0 @@ -260,16 +260,16 @@ static gint hf_harq_rcid_ie_cid11_3 = -1; #define WIMAX_RCID_IE_CID11_MASK_1 0x07FF /* HARQ MAP HARQ Control IE display indexies */ -static gint hf_harq_control_ie_prefix = -1; -static gint hf_harq_control_ie_ai_sn = -1; -static gint hf_harq_control_ie_spid = -1; -static gint hf_harq_control_ie_acid = -1; -static gint hf_harq_control_ie_reserved = -1; -static gint hf_harq_control_ie_prefix_1 = -1; -static gint hf_harq_control_ie_ai_sn_1 = -1; -static gint hf_harq_control_ie_spid_1 = -1; -static gint hf_harq_control_ie_acid_1 = -1; -static gint hf_harq_control_ie_reserved_1 = -1; +static int hf_harq_control_ie_prefix; +static int hf_harq_control_ie_ai_sn; +static int hf_harq_control_ie_spid; +static int hf_harq_control_ie_acid; +static int hf_harq_control_ie_reserved; +static int hf_harq_control_ie_prefix_1; +static int hf_harq_control_ie_ai_sn_1; +static int hf_harq_control_ie_spid_1; +static int hf_harq_control_ie_acid_1; +static int hf_harq_control_ie_reserved_1; /* Masks */ #define WIMAX_HARQ_CONTROL_IE_PREFIX_MASK 0x80 @@ -284,18 +284,18 @@ static gint hf_harq_control_ie_reserved_1 = -1; #define WIMAX_HARQ_CONTROL_IE_RESERVED_MASK_1 0x0700 /* HARQ MAP CQICH Control IE display indexies */ -static gint hf_cqich_control_ie_indicator = -1; -static gint hf_cqich_control_ie_alloc_id = -1; -static gint hf_cqich_control_ie_period = -1; -static gint hf_cqich_control_ie_frame_offset = -1; -static gint hf_cqich_control_ie_duration = -1; -static gint hf_cqich_control_ie_cqi_rep_threshold = -1; -static gint hf_cqich_control_ie_indicator_1 = -1; -static gint hf_cqich_control_ie_alloc_id_1 = -1; -static gint hf_cqich_control_ie_period_1 = -1; -static gint hf_cqich_control_ie_frame_offset_1 = -1; -static gint hf_cqich_control_ie_duration_1 = -1; -static gint hf_cqich_control_ie_cqi_rep_threshold_1 = -1; +static int hf_cqich_control_ie_indicator; +static int hf_cqich_control_ie_alloc_id; +static int hf_cqich_control_ie_period; +static int hf_cqich_control_ie_frame_offset; +static int hf_cqich_control_ie_duration; +static int hf_cqich_control_ie_cqi_rep_threshold; +static int hf_cqich_control_ie_indicator_1; +static int hf_cqich_control_ie_alloc_id_1; +static int hf_cqich_control_ie_period_1; +static int hf_cqich_control_ie_frame_offset_1; +static int hf_cqich_control_ie_duration_1; +static int hf_cqich_control_ie_cqi_rep_threshold_1; /* Masks */ #define WIMAX_CQICH_CONTROL_IE_INDICATOR_MASK 0x8000 @@ -319,37 +319,37 @@ static gint hf_cqich_control_ie_cqi_rep_threshold_1 = -1; #define EXTENSION_LENGTH_MASK 0x00F0 #define EXTENSION_LENGTH_MASK_1 0x000F -static gint hf_cdlmap_extension_type = -1; -static gint hf_cdlmap_extension_subtype = -1; -static gint hf_cdlmap_extension_length = -1; -static gint hf_cdlmap_extension_type_1 = -1; -static gint hf_cdlmap_extension_subtype_1 = -1; -static gint hf_cdlmap_extension_length_1 = -1; +static int hf_cdlmap_extension_type; +static int hf_cdlmap_extension_subtype; +static int hf_cdlmap_extension_length; +static int hf_cdlmap_extension_type_1; +static int hf_cdlmap_extension_subtype_1; +static int hf_cdlmap_extension_length_1; -static gint hf_cdlmap_extension_time_diversity_mbs = -1; -static gint hf_cdlmap_extension_harq_mode = -1; -static gint hf_cdlmap_extension_unknown_sub_type = -1; -static gint hf_cdlmap_extension_time_diversity_mbs_1 = -1; -static gint hf_cdlmap_extension_harq_mode_1 = -1; -static gint hf_cdlmap_extension_unknown_sub_type_1 = -1; +static int hf_cdlmap_extension_time_diversity_mbs; +static int hf_cdlmap_extension_harq_mode; +static int hf_cdlmap_extension_unknown_sub_type; +static int hf_cdlmap_extension_time_diversity_mbs_1; +static int hf_cdlmap_extension_harq_mode_1; +static int hf_cdlmap_extension_unknown_sub_type_1; /* Extended DIUC dependent IE display indexies */ -static gint hf_extended_diuc_dependent_ie_diuc = -1; -static gint hf_extended_diuc_dependent_ie_diuc_1 = -1; -static gint hf_extended_diuc_dependent_ie_length = -1; -static gint hf_extended_diuc_dependent_ie_length_1 = -1; -static gint hf_extended_diuc_dependent_ie_channel_measurement = -1; -static gint hf_extended_diuc_dependent_ie_stc_zone = -1; -static gint hf_extended_diuc_dependent_ie_aas_dl = -1; -static gint hf_extended_diuc_dependent_ie_data_location = -1; -static gint hf_extended_diuc_dependent_ie_cid_switch = -1; -static gint hf_extended_diuc_dependent_ie_mimo_dl_basic = -1; -static gint hf_extended_diuc_dependent_ie_mimo_dl_enhanced = -1; -static gint hf_extended_diuc_dependent_ie_harq_map_pointer = -1; -static gint hf_extended_diuc_dependent_ie_phymod_dl = -1; -static gint hf_extended_diuc_dependent_ie_dl_pusc_burst_allocation = -1; -static gint hf_extended_diuc_dependent_ie_ul_interference_and_noise_level = -1; -static gint hf_extended_diuc_dependent_ie_unknown_diuc = -1; +static int hf_extended_diuc_dependent_ie_diuc; +static int hf_extended_diuc_dependent_ie_diuc_1; +static int hf_extended_diuc_dependent_ie_length; +static int hf_extended_diuc_dependent_ie_length_1; +static int hf_extended_diuc_dependent_ie_channel_measurement; +static int hf_extended_diuc_dependent_ie_stc_zone; +static int hf_extended_diuc_dependent_ie_aas_dl; +static int hf_extended_diuc_dependent_ie_data_location; +static int hf_extended_diuc_dependent_ie_cid_switch; +static int hf_extended_diuc_dependent_ie_mimo_dl_basic; +static int hf_extended_diuc_dependent_ie_mimo_dl_enhanced; +static int hf_extended_diuc_dependent_ie_harq_map_pointer; +static int hf_extended_diuc_dependent_ie_phymod_dl; +static int hf_extended_diuc_dependent_ie_dl_pusc_burst_allocation; +static int hf_extended_diuc_dependent_ie_ul_interference_and_noise_level; +static int hf_extended_diuc_dependent_ie_unknown_diuc; /* Compact DL-MAP IE Types (table 89) */ @@ -363,12 +363,12 @@ static gint hf_extended_diuc_dependent_ie_unknown_diuc = -1; #define COMPACT_DL_MAP_TYPE_EXTENSION 7 /* Compact DL-MAP IE decoder */ -guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset) +unsigned wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { - guint diuc, byte, length = 0; - guint dl_map_type, ul_map_append; - guint dl_map_offset, nibble_length, bit_map_length; - guint nband, band_count, i, allocation_mode; + unsigned diuc, byte, length = 0; + unsigned dl_map_type, ul_map_append; + unsigned dl_map_offset, nibble_length, bit_map_length; + unsigned nband, band_count, i, allocation_mode; #ifdef DEBUG /* update the info column */ @@ -377,7 +377,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* set the local offset */ dl_map_offset = offset; /* Get the first byte */ - byte = tvb_get_guint8(tvb, dl_map_offset); + byte = tvb_get_uint8(tvb, dl_map_offset); if(nibble_offset & 1) { dl_map_type = ((byte & DL_MAP_TYPE_MASK_1) >> 1); @@ -560,7 +560,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* get the Nband */ if(max_logical_bands) { /* get and display the Nband */ - nband = tvb_get_guint8(tvb, dl_map_offset); + nband = tvb_get_uint8(tvb, dl_map_offset); if(nibble_offset & 1) { nband = (nband & LSB_NIBBLE_MASK); @@ -630,7 +630,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf length++; } /* Get the Allocation Mode */ - byte = tvb_get_guint8(tvb, dl_map_offset); + byte = tvb_get_uint8(tvb, dl_map_offset); if(nibble_offset & 1) { allocation_mode = ((byte & 0x0C) >> 2); @@ -829,7 +829,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* move to next byte */ dl_map_offset++; /* get the new byte */ - byte = tvb_get_guint8(tvb, dl_map_offset); + byte = tvb_get_uint8(tvb, dl_map_offset); /* get the DIUC */ diuc = ((byte & MSB_NIBBLE_MASK) >> 4); /* display the DIUC */ @@ -842,7 +842,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* display the reserved */ proto_tree_add_item(tree, hf_cdlmap_reserved, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* get the DIUC */ - diuc = (tvb_get_guint8(tvb, dl_map_offset) & LSB_NIBBLE_MASK); + diuc = (tvb_get_uint8(tvb, dl_map_offset) & LSB_NIBBLE_MASK); /* display the DIUC */ proto_tree_add_item(tree, hf_cdlmap_diuc_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ @@ -905,7 +905,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* move to next byte */ dl_map_offset++; /* get the bit map length */ - byte = tvb_get_guint8(tvb, dl_map_offset); + byte = tvb_get_uint8(tvb, dl_map_offset); bit_map_length = ((byte & MSB_NIBBLE_MASK) >> 4); /* display BITMAP Length */ proto_tree_add_item(tree, hf_cdlmap_bit_map_length, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); @@ -932,7 +932,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf } break; case COMPACT_DL_MAP_TYPE_EXTENSION:/* 6.3.2.3.43.6.6 */ - /* decode the Compact DL-MAP externsion IE */ + /* decode the Compact DL-MAP extension IE */ nibble_length = wimax_cdlmap_extension_ie_decoder(tree, pinfo, tvb, dl_map_offset, nibble_offset);/*, cqich_indicator);*/ length = nibble_length; break; @@ -963,12 +963,12 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /*#define NUM_UL_AMC_SYMBOLS_SHIFT_1 0*/ /* Compact DL-MAP Format Configuration IE (6.3.2.3.43.2) decoder */ -static guint wimax_compact_dlmap_format_configuration_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, guint offset, guint nibble_offset) +static unsigned wimax_compact_dlmap_format_configuration_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { - guint length = 0; - guint dl_map_type, new_format_ind; - guint dl_map_offset; - guint32 tvb_value; + unsigned length = 0; + unsigned dl_map_type, new_format_ind; + unsigned dl_map_offset; + uint32_t tvb_value; #ifdef DEBUG /* update the info column */ @@ -977,7 +977,7 @@ static guint wimax_compact_dlmap_format_configuration_ie_decoder(proto_tree *tre /* set the local offset */ dl_map_offset = offset; /* Get the first byte */ - tvb_value = tvb_get_guint8(tvb, dl_map_offset); + tvb_value = tvb_get_uint8(tvb, dl_map_offset); if(nibble_offset & 1) { /* get the DL-MAP type */ dl_map_type = ((tvb_value & DL_MAP_TYPE_MASK_1) >> 1); @@ -1083,10 +1083,10 @@ static guint wimax_compact_dlmap_format_configuration_ie_decoder(proto_tree *tre } /* Compact DL-MAP Reduced CID IE (6.3.2.3.43.3) decoder */ -static guint wimax_compact_dlmap_rcid_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, guint offset, guint nibble_offset) +static unsigned wimax_compact_dlmap_rcid_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { - guint length = 0; - guint prefix; + unsigned length = 0; + unsigned prefix; #ifdef DEBUG /* update the info column */ @@ -1101,7 +1101,7 @@ static guint wimax_compact_dlmap_rcid_ie_decoder(proto_tree *tree, packet_info * } else { /* Get the prefix bit */ - prefix = (tvb_get_guint8(tvb, offset) & 0x08); + prefix = (tvb_get_uint8(tvb, offset) & 0x08); /* display the prefix */ proto_tree_add_item(tree, hf_harq_rcid_ie_prefix_1, tvb, offset, 2, ENC_BIG_ENDIAN); if(prefix) @@ -1138,7 +1138,7 @@ static guint wimax_compact_dlmap_rcid_ie_decoder(proto_tree *tree, packet_info * } else { /* Get the prefix bit */ - prefix = (tvb_get_guint8(tvb, offset) & 0x08); + prefix = (tvb_get_uint8(tvb, offset) & 0x08); /* display the prefix */ proto_tree_add_item(tree, hf_harq_rcid_ie_prefix, tvb, offset, 2, ENC_BIG_ENDIAN); if(prefix || (cid_type == CID_TYPE_RCID11)) @@ -1171,16 +1171,16 @@ static guint wimax_compact_dlmap_rcid_ie_decoder(proto_tree *tree, packet_info * } /* Compact DL-MAP HARQ Control IE (6.3.2.3.43.4) decoder */ -static guint wimax_compact_dlmap_harq_control_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, guint offset, guint nibble_offset) +static unsigned wimax_compact_dlmap_harq_control_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { - guint byte, prefix, length = 0; + unsigned byte, prefix, length = 0; #ifdef DEBUG /* update the info column */ col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "HARQ Control IE"); #endif /* Get the first byte */ - byte = tvb_get_guint8(tvb, offset); + byte = tvb_get_uint8(tvb, offset); if(nibble_offset & 1) { /* Get the prefix bit */ prefix = (byte & 0x08); @@ -1226,16 +1226,16 @@ static guint wimax_compact_dlmap_harq_control_ie_decoder(proto_tree *tree, packe } /* Compact DL-MAP CQICH Control IE (6.3.2.3.43.5) decoder */ -static guint wimax_compact_dlmap_cqich_control_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, guint offset, guint nibble_offset) +static unsigned wimax_compact_dlmap_cqich_control_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { - guint byte, cqich_indicator, length = 0; + unsigned byte, cqich_indicator, length = 0; #ifdef DEBUG /* update the info column */ col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "CQICH Control IE"); #endif /* Get the first byte */ - byte = tvb_get_guint8(tvb, offset); + byte = tvb_get_uint8(tvb, offset); if(nibble_offset & 1) { /* Get the CQICH indicator */ cqich_indicator = (byte & 0x08); @@ -1293,9 +1293,9 @@ static guint wimax_compact_dlmap_cqich_control_ie_decoder(proto_tree *tree, pack #define HARQ_MODE_SWITCH 1 /* Compact DL-MAP Extension IE (6.3.2.3.43.6.6) decoder */ -static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, guint offset, guint nibble_offset) +static unsigned wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { - guint tvb_value, dl_map_type, sub_type, length; + unsigned tvb_value, dl_map_type, sub_type, length; #ifdef DEBUG /* update the info column */ @@ -1329,7 +1329,7 @@ static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pi /* display the HARQ mode */ proto_tree_add_item(tree, hf_cdlmap_extension_harq_mode, tvb, offset, 1, ENC_BIG_ENDIAN); /* Get the next byte */ - tvb_value = tvb_get_guint8(tvb, offset); + tvb_value = tvb_get_uint8(tvb, offset); /* get the HARQ mode */ harq_mode = ((tvb_value & MSB_NIBBLE_MASK) >> 4); break; @@ -1390,13 +1390,13 @@ static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pi #define UL_INTERFERENCE_AND_NOISE_LEVEL_IE 15 /* Extended DIUC IE (8.4.5.3.2) */ -guint wimax_extended_diuc_dependent_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, guint offset, guint nibble_offset) +unsigned wimax_extended_diuc_dependent_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { - guint ext_diuc, length; - guint8 byte; + unsigned ext_diuc, length; + uint8_t byte; /* get the first byte */ - byte = tvb_get_guint8(tvb, offset); + byte = tvb_get_uint8(tvb, offset); if(nibble_offset & 1) { /* get the extended DIUC */ ext_diuc = (byte & LSB_NIBBLE_MASK); @@ -1405,7 +1405,7 @@ guint wimax_extended_diuc_dependent_ie_decoder(proto_tree *tree, packet_info *pi /* move to next byte */ offset++; /* get the 2nd byte */ - byte = tvb_get_guint8(tvb, offset); + byte = tvb_get_uint8(tvb, offset); /* get the length */ length = ((byte & MSB_NIBBLE_MASK) >> 4); /* display extended DIUC length */ @@ -2073,7 +2073,7 @@ void wimax_proto_register_wimax_compact_dlmap_ie(void) #if 0 /* Not used ?? */ /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_wimax_compact_dlmap_ie_decoder, &ett_wimax_format_configuration_ie_decoder, diff --git a/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.h b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.h index f91c8d23..40d22479 100644 --- a/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.h +++ b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.h @@ -15,6 +15,6 @@ #ifndef _WIMAX_COMPACT_DLMAP_IE_DECODER_H_ #define _WIMAX_COMPACT_DLMAP_IE_DECODER_H_ -extern guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); +extern unsigned wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); #endif /* _WIMAX_COMPACT_DLMAP_IE_DECODER_H_ */ diff --git a/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c index efa90abd..778748cd 100644 --- a/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c +++ b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c @@ -30,30 +30,30 @@ #define CID_TYPE_RCID3 3 /* Global Variables */ -extern guint cid_type; -extern guint band_amc_subchannel_type; -extern guint max_logical_bands; -extern guint num_of_broadcast_symbols; -extern guint num_of_dl_band_amc_symbols; -extern guint num_of_ul_band_amc_symbols; -extern guint harq_mode; -extern gint proto_wimax; +extern unsigned cid_type; +extern unsigned band_amc_subchannel_type; +extern unsigned max_logical_bands; +extern unsigned num_of_broadcast_symbols; +extern unsigned num_of_dl_band_amc_symbols; +extern unsigned num_of_ul_band_amc_symbols; +extern unsigned harq_mode; +extern int proto_wimax; /* forward reference */ -guint wimax_cdma_allocation_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); -guint wimax_extended_uiuc_dependent_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); -static guint wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); -static guint wimax_compact_ulmap_harq_control_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); -static guint wimax_culmap_extension_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); +unsigned wimax_cdma_allocation_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); +unsigned wimax_extended_uiuc_dependent_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); +static unsigned wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); +static unsigned wimax_compact_ulmap_harq_control_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); +static unsigned wimax_culmap_extension_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); -static gint proto_wimax_compact_ulmap_ie_decoder = -1; +static int proto_wimax_compact_ulmap_ie_decoder; #if 0 /* not used ?? */ -static gint ett_wimax_compact_ulmap_ie_decoder = -1; -static gint ett_wimax_rcid_ie_decoder = -1; -static gint ett_wimax_harq_control_ie_decoder = -1; -static gint ett_wimax_extended_uiuc_dependent_ie_decoder = -1; -static gint ett_wimax_extension_type_ie_decoder = -1; +static int ett_wimax_compact_ulmap_ie_decoder; +static int ett_wimax_rcid_ie_decoder; +static int ett_wimax_harq_control_ie_decoder; +static int ett_wimax_extended_uiuc_dependent_ie_decoder; +static int ett_wimax_extension_type_ie_decoder; #endif /* Prefixes */ @@ -122,83 +122,83 @@ static const value_string vals_ctypes[] = #define ALLOCATION_MODE_MASK_1 0x0C /* display indexies */ -static gint hf_culmap_ul_map_type = -1; -static gint hf_culmap_reserved = -1; -static gint hf_culmap_nep_code = -1; -static gint hf_culmap_nsch_code = -1; -static gint hf_culmap_num_bands = -1; -static gint hf_culmap_band_index = -1; -static gint hf_culmap_nb_bitmap = -1; -static gint hf_culmap_ul_map_type_1 = -1; -static gint hf_culmap_reserved_1 = -1; -static gint hf_culmap_nep_code_1 = -1; -static gint hf_culmap_nsch_code_1 = -1; -static gint hf_culmap_num_bands_1 = -1; -/*static gint hf_culmap_band_index_1 = -1;*/ -static gint hf_culmap_nb_bitmap_1 = -1; - -static gint hf_culmap_shortened_uiuc = -1; -static gint hf_culmap_companded_sc = -1; -static gint hf_culmap_shortened_uiuc_1 = -1; -static gint hf_culmap_companded_sc_1 = -1; - -static gint hf_culmap_bin_offset = -1; -static gint hf_culmap_bin_offset_1 = -1; - -static gint hf_culmap_uiuc_ofdma_symbol_offset = -1; -static gint hf_culmap_uiuc_ofdma_symbol_offset_1 = -1; -static gint hf_culmap_uiuc_subchannel_offset_7 = -1; -static gint hf_culmap_uiuc_num_of_ofdma_symbols_7 = -1; -static gint hf_culmap_uiuc_num_of_subchannels_7 = -1; -static gint hf_culmap_uiuc_ranging_method = -1; -static gint hf_culmap_uiuc_reserved = -1; -static gint hf_culmap_uiuc_subchannel_offset_7_1 = -1; -static gint hf_culmap_uiuc_num_of_ofdma_symbols_7_1 = -1; -static gint hf_culmap_uiuc_num_of_subchannels_7_1 = -1; -static gint hf_culmap_uiuc_ranging_method_1 = -1; -static gint hf_culmap_uiuc_reserved_1 = -1; -static gint hf_culmap_uiuc_repetition_coding_indication = -1; -static gint hf_culmap_uiuc_repetition_coding_indication_1 = -1; -/* static gint hf_culmap_uiuc_reserved1 = -1; */ -/* static gint hf_culmap_uiuc_reserved11_1 = -1; */ -static gint hf_culmap_uiuc_subchannel_offset = -1; -static gint hf_culmap_uiuc_subchannel_offset_1 = -1; -static gint hf_culmap_uiuc_num_of_ofdma_symbols = -1; -static gint hf_culmap_uiuc_num_of_ofdma_symbols_1 = -1; -static gint hf_culmap_uiuc_num_of_subchannels = -1; -static gint hf_culmap_uiuc_num_of_subchannels_1 = -1; - -static gint hf_culmap_harq_region_change_indication = -1; -static gint hf_culmap_harq_region_change_indication_1 = -1; -static gint hf_culmap_cqi_region_change_indication = -1; -static gint hf_culmap_cqi_region_change_indication_1 = -1; - -static gint hf_culmap_uiuc = -1; -static gint hf_culmap_uiuc_1 = -1; - -static gint hf_culmap_allocation_mode = -1; -static gint hf_culmap_allocation_mode_rsvd = -1; -static gint hf_culmap_num_subchannels = -1; -static gint hf_culmap_allocation_mode_1 = -1; -static gint hf_culmap_allocation_mode_rsvd_1 = -1; -static gint hf_culmap_num_subchannels_1 = -1; - -/* static gint hf_culmap_reserved_type = -1; */ -static gint hf_culmap_reserved_type_1 = -1; +static int hf_culmap_ul_map_type; +static int hf_culmap_reserved; +static int hf_culmap_nep_code; +static int hf_culmap_nsch_code; +static int hf_culmap_num_bands; +static int hf_culmap_band_index; +static int hf_culmap_nb_bitmap; +static int hf_culmap_ul_map_type_1; +static int hf_culmap_reserved_1; +static int hf_culmap_nep_code_1; +static int hf_culmap_nsch_code_1; +static int hf_culmap_num_bands_1; +/*static int hf_culmap_band_index_1;*/ +static int hf_culmap_nb_bitmap_1; + +static int hf_culmap_shortened_uiuc; +static int hf_culmap_companded_sc; +static int hf_culmap_shortened_uiuc_1; +static int hf_culmap_companded_sc_1; + +static int hf_culmap_bin_offset; +static int hf_culmap_bin_offset_1; + +static int hf_culmap_uiuc_ofdma_symbol_offset; +static int hf_culmap_uiuc_ofdma_symbol_offset_1; +static int hf_culmap_uiuc_subchannel_offset_7; +static int hf_culmap_uiuc_num_of_ofdma_symbols_7; +static int hf_culmap_uiuc_num_of_subchannels_7; +static int hf_culmap_uiuc_ranging_method; +static int hf_culmap_uiuc_reserved; +static int hf_culmap_uiuc_subchannel_offset_7_1; +static int hf_culmap_uiuc_num_of_ofdma_symbols_7_1; +static int hf_culmap_uiuc_num_of_subchannels_7_1; +static int hf_culmap_uiuc_ranging_method_1; +static int hf_culmap_uiuc_reserved_1; +static int hf_culmap_uiuc_repetition_coding_indication; +static int hf_culmap_uiuc_repetition_coding_indication_1; +/* static int hf_culmap_uiuc_reserved1; */ +/* static int hf_culmap_uiuc_reserved11_1; */ +static int hf_culmap_uiuc_subchannel_offset; +static int hf_culmap_uiuc_subchannel_offset_1; +static int hf_culmap_uiuc_num_of_ofdma_symbols; +static int hf_culmap_uiuc_num_of_ofdma_symbols_1; +static int hf_culmap_uiuc_num_of_subchannels; +static int hf_culmap_uiuc_num_of_subchannels_1; + +static int hf_culmap_harq_region_change_indication; +static int hf_culmap_harq_region_change_indication_1; +static int hf_culmap_cqi_region_change_indication; +static int hf_culmap_cqi_region_change_indication_1; + +static int hf_culmap_uiuc; +static int hf_culmap_uiuc_1; + +static int hf_culmap_allocation_mode; +static int hf_culmap_allocation_mode_rsvd; +static int hf_culmap_num_subchannels; +static int hf_culmap_allocation_mode_1; +static int hf_culmap_allocation_mode_rsvd_1; +static int hf_culmap_num_subchannels_1; + +/* static int hf_culmap_reserved_type; */ +static int hf_culmap_reserved_type_1; /* display indexies */ -static gint hf_rcid_ie_prefix = -1; -static gint hf_rcid_ie_prefix_1 = -1; -static gint hf_rcid_ie_normal_cid = -1; -static gint hf_rcid_ie_normal_cid_1 = -1; -static gint hf_rcid_ie_cid3 = -1; -static gint hf_rcid_ie_cid3_1 = -1; -static gint hf_rcid_ie_cid7 = -1; -static gint hf_rcid_ie_cid7_1 = -1; -static gint hf_rcid_ie_cid11 = -1; -static gint hf_rcid_ie_cid11_1 = -1; -static gint hf_rcid_ie_cid11_2 = -1; -static gint hf_rcid_ie_cid11_3 = -1; +static int hf_rcid_ie_prefix; +static int hf_rcid_ie_prefix_1; +static int hf_rcid_ie_normal_cid; +static int hf_rcid_ie_normal_cid_1; +static int hf_rcid_ie_cid3; +static int hf_rcid_ie_cid3_1; +static int hf_rcid_ie_cid7; +static int hf_rcid_ie_cid7_1; +static int hf_rcid_ie_cid11; +static int hf_rcid_ie_cid11_1; +static int hf_rcid_ie_cid11_2; +static int hf_rcid_ie_cid11_3; /* Masks */ #define WIMAX_RCID_IE_NORMAL_CID_MASK_1 0x0FFFF0 @@ -212,16 +212,16 @@ static gint hf_rcid_ie_cid11_3 = -1; #define WIMAX_RCID_IE_CID11_MASK_1 0x07FF /* HARQ MAP HARQ Control IE display indexies */ -static gint hf_harq_control_ie_prefix = -1; -static gint hf_harq_control_ie_ai_sn = -1; -static gint hf_harq_control_ie_spid = -1; -static gint hf_harq_control_ie_acid = -1; -static gint hf_harq_control_ie_reserved = -1; -static gint hf_harq_control_ie_prefix_1 = -1; -static gint hf_harq_control_ie_ai_sn_1 = -1; -static gint hf_harq_control_ie_spid_1 = -1; -static gint hf_harq_control_ie_acid_1 = -1; -static gint hf_harq_control_ie_reserved_1 = -1; +static int hf_harq_control_ie_prefix; +static int hf_harq_control_ie_ai_sn; +static int hf_harq_control_ie_spid; +static int hf_harq_control_ie_acid; +static int hf_harq_control_ie_reserved; +static int hf_harq_control_ie_prefix_1; +static int hf_harq_control_ie_ai_sn_1; +static int hf_harq_control_ie_spid_1; +static int hf_harq_control_ie_acid_1; +static int hf_harq_control_ie_reserved_1; /* Masks */ #define WIMAX_HARQ_CONTROL_IE_PREFIX_MASK 0x80 @@ -243,19 +243,19 @@ static gint hf_harq_control_ie_reserved_1 = -1; #define EXTENSION_LENGTH_MASK 0x00F0 #define EXTENSION_LENGTH_MASK_1 0x000F -static gint hf_culmap_extension_type = -1; -static gint hf_culmap_extension_subtype = -1; -static gint hf_culmap_extension_length = -1; -static gint hf_culmap_extension_type_1 = -1; -static gint hf_culmap_extension_subtype_1 = -1; -static gint hf_culmap_extension_length_1 = -1; +static int hf_culmap_extension_type; +static int hf_culmap_extension_subtype; +static int hf_culmap_extension_length; +static int hf_culmap_extension_type_1; +static int hf_culmap_extension_subtype_1; +static int hf_culmap_extension_length_1; -/* static gint hf_culmap_extension_time_diversity_mbs = -1; */ -static gint hf_culmap_extension_harq_mode = -1; -static gint hf_culmap_extension_unknown_sub_type = -1; -/* static gint hf_culmap_extension_time_diversity_mbs_1 = -1; */ -static gint hf_culmap_extension_harq_mode_1 = -1; -static gint hf_culmap_extension_unknown_sub_type_1 = -1; +/* static int hf_culmap_extension_time_diversity_mbs; */ +static int hf_culmap_extension_harq_mode; +static int hf_culmap_extension_unknown_sub_type; +/* static int hf_culmap_extension_time_diversity_mbs_1; */ +static int hf_culmap_extension_harq_mode_1; +static int hf_culmap_extension_unknown_sub_type_1; /* UL-MAP CDMA Allocation IE */ #define CDMA_ALLOCATION_DURATION_MASK 0xFC00 @@ -275,22 +275,22 @@ static gint hf_culmap_extension_unknown_sub_type_1 = -1; #define CDMA_ALLOCATION_RANGING_SUBCHANNEL_MASK_1 0x00000FE0 #define CDMA_ALLOCATION_BW_REQUEST_MANDATORY_MASK_1 0x00000010 -static gint hf_cdma_allocation_duration = -1; -static gint hf_cdma_allocation_uiuc = -1; -static gint hf_cdma_allocation_repetition = -1; -static gint hf_cdma_allocation_frame_number_index = -1; -static gint hf_cdma_allocation_ranging_code = -1; -static gint hf_cdma_allocation_ranging_symbol = -1; -static gint hf_cdma_allocation_ranging_subchannel = -1; -static gint hf_cdma_allocation_bw_req = -1; -static gint hf_cdma_allocation_duration_1 = -1; -static gint hf_cdma_allocation_uiuc_1 = -1; -static gint hf_cdma_allocation_repetition_1 = -1; -static gint hf_cdma_allocation_frame_number_index_1 = -1; -static gint hf_cdma_allocation_ranging_code_1 = -1; -static gint hf_cdma_allocation_ranging_symbol_1 = -1; -static gint hf_cdma_allocation_ranging_subchannel_1 = -1; -static gint hf_cdma_allocation_bw_req_1 = -1; +static int hf_cdma_allocation_duration; +static int hf_cdma_allocation_uiuc; +static int hf_cdma_allocation_repetition; +static int hf_cdma_allocation_frame_number_index; +static int hf_cdma_allocation_ranging_code; +static int hf_cdma_allocation_ranging_symbol; +static int hf_cdma_allocation_ranging_subchannel; +static int hf_cdma_allocation_bw_req; +static int hf_cdma_allocation_duration_1; +static int hf_cdma_allocation_uiuc_1; +static int hf_cdma_allocation_repetition_1; +static int hf_cdma_allocation_frame_number_index_1; +static int hf_cdma_allocation_ranging_code_1; +static int hf_cdma_allocation_ranging_symbol_1; +static int hf_cdma_allocation_ranging_subchannel_1; +static int hf_cdma_allocation_bw_req_1; /* UL-MAP Extended UIUCs (table 290a) */ #define MINI_SUBCHANNEL_CTYPE_MASK 0xC0 @@ -312,42 +312,42 @@ static gint hf_cdma_allocation_bw_req_1 = -1; #define MINI_SUBCHANNEL_PADDING_MASK 0xF0 #define MINI_SUBCHANNEL_PADDING_MASK_1 0x0000000F -static gint hf_extended_uiuc_ie_uiuc = -1; -static gint hf_extended_uiuc_ie_length = -1; -static gint hf_extended_uiuc_ie_uiuc_1 = -1; -static gint hf_extended_uiuc_ie_length_1 = -1; -static gint hf_extended_uiuc_ie_power_control = -1; -static gint hf_extended_uiuc_ie_power_measurement_frame = -1; -static gint hf_extended_uiuc_ie_power_control_24 = -1; -static gint hf_extended_uiuc_ie_power_measurement_frame_24 = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_ctype = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_duration = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_ctype_16 = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_duration_16 = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_cid = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_repetition = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_padding = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_cid_1 = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_1 = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_1 = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_cid_2 = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_2 = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_2 = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_cid_3 = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_3 = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_3 = -1; -static gint hf_extended_uiuc_ie_mini_subchannel_alloc_padding_1 = -1; -static gint hf_extended_uiuc_ie_aas_ul = -1; -static gint hf_extended_uiuc_ie_cqich_alloc = -1; -static gint hf_extended_uiuc_ie_ul_zone = -1; -static gint hf_extended_uiuc_ie_phymod_ul = -1; -static gint hf_extended_uiuc_ie_mimo_ul_basic = -1; -static gint hf_extended_uiuc_ie_fast_tracking = -1; -static gint hf_extended_uiuc_ie_ul_pusc_burst_allocation = -1; -static gint hf_extended_uiuc_ie_fast_ranging = -1; -static gint hf_extended_uiuc_ie_ul_allocation_start = -1; -static gint hf_extended_uiuc_ie_unknown_uiuc = -1; +static int hf_extended_uiuc_ie_uiuc; +static int hf_extended_uiuc_ie_length; +static int hf_extended_uiuc_ie_uiuc_1; +static int hf_extended_uiuc_ie_length_1; +static int hf_extended_uiuc_ie_power_control; +static int hf_extended_uiuc_ie_power_measurement_frame; +static int hf_extended_uiuc_ie_power_control_24; +static int hf_extended_uiuc_ie_power_measurement_frame_24; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_ctype; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_duration; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_ctype_16; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_duration_16; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_cid; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_repetition; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_padding; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_cid_1; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_1; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_1; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_cid_2; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_2; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_2; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_cid_3; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_3; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_3; +static int hf_extended_uiuc_ie_mini_subchannel_alloc_padding_1; +static int hf_extended_uiuc_ie_aas_ul; +static int hf_extended_uiuc_ie_cqich_alloc; +static int hf_extended_uiuc_ie_ul_zone; +static int hf_extended_uiuc_ie_phymod_ul; +static int hf_extended_uiuc_ie_mimo_ul_basic; +static int hf_extended_uiuc_ie_fast_tracking; +static int hf_extended_uiuc_ie_ul_pusc_burst_allocation; +static int hf_extended_uiuc_ie_fast_ranging; +static int hf_extended_uiuc_ie_ul_allocation_start; +static int hf_extended_uiuc_ie_unknown_uiuc; /* Compact UL-MAP IE Types (table 90) */ @@ -361,14 +361,14 @@ static gint hf_extended_uiuc_ie_unknown_uiuc = -1; #define COMPACT_UL_MAP_TYPE_EXTENSION 7 /* Compact UL-MAP IE decoder */ -guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset) +unsigned wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { - guint uiuc, byte, length = 0; - guint ul_map_type; - guint harq_region_change_indication; - guint cqi_region_change_indication; - guint ul_map_offset, nibble_length; - guint nband, band_count, i, allocation_mode; + unsigned uiuc, byte, length = 0; + unsigned ul_map_type; + unsigned harq_region_change_indication; + unsigned cqi_region_change_indication; + unsigned ul_map_offset, nibble_length; + unsigned nband, band_count, i, allocation_mode; #ifdef DEBUG /* update the info column */ @@ -377,7 +377,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* set the local offset */ ul_map_offset = offset; /* Get the first byte */ - byte = tvb_get_guint8(tvb, ul_map_offset); + byte = tvb_get_uint8(tvb, ul_map_offset); /* get the ul-map type */ if(nibble_offset & 1) { @@ -515,7 +515,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* get the Nband */ if(max_logical_bands) { /* get and display the Nband */ - nband = tvb_get_guint8(tvb, ul_map_offset); + nband = tvb_get_uint8(tvb, ul_map_offset); length++; if(nibble_offset & 1) { @@ -585,7 +585,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf length++; } /* Get the Allocation Mode */ - byte = tvb_get_guint8(tvb, ul_map_offset); + byte = tvb_get_uint8(tvb, ul_map_offset); if(nibble_offset & 1) { allocation_mode = ((byte & ALLOCATION_MODE_MASK_1) >> 2); @@ -723,7 +723,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* move to next byte */ ul_map_offset++; /* get the new byte */ - byte = tvb_get_guint8(tvb, ul_map_offset); + byte = tvb_get_uint8(tvb, ul_map_offset); /* get the UIUC */ uiuc = ((byte & MSB_NIBBLE_MASK) >> 4); /* display the UIUC */ @@ -936,7 +936,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf } break; case COMPACT_UL_MAP_TYPE_EXTENSION:/* 6.3.2.3.43.7.7 */ - /* decode the Compact UL-MAP externsion IE */ + /* decode the Compact UL-MAP extension IE */ nibble_length = wimax_culmap_extension_ie_decoder(tree, pinfo, tvb, ul_map_offset, nibble_offset);/*, cqich_indicator);*/ length = nibble_length; break; @@ -951,10 +951,10 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf } /* Compact UL-MAP Reduced CID IE (6.3.2.3.43.3) decoder */ -static guint wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, guint offset, guint nibble_offset) +static unsigned wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { - guint length = 0; - guint prefix; + unsigned length = 0; + unsigned prefix; #ifdef DEBUG /* update the info column */ @@ -969,7 +969,7 @@ static guint wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info * } else { /* Get the prefix bit */ - prefix = (tvb_get_guint8(tvb, offset) & 0x08); + prefix = (tvb_get_uint8(tvb, offset) & 0x08); /* display the prefix */ proto_tree_add_item(tree, hf_rcid_ie_prefix_1, tvb, offset, 2, ENC_BIG_ENDIAN); if(prefix) @@ -1006,7 +1006,7 @@ static guint wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info * } else { /* Get the prefix bit */ - prefix = (tvb_get_guint8(tvb, offset) & 0x08); + prefix = (tvb_get_uint8(tvb, offset) & 0x08); /* display the prefix */ proto_tree_add_item(tree, hf_rcid_ie_prefix, tvb, offset, 2, ENC_BIG_ENDIAN); if(prefix || (cid_type == CID_TYPE_RCID11)) @@ -1039,16 +1039,16 @@ static guint wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info * } /* Compact UL-MAP HARQ Control IE (6.3.2.3.43.4) decoder */ -static guint wimax_compact_ulmap_harq_control_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, guint offset, guint nibble_offset) +static unsigned wimax_compact_ulmap_harq_control_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { - guint byte, prefix, length = 0; + unsigned byte, prefix, length = 0; #ifdef DEBUG /* update the info column */ col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "HARQ Control IE"); #endif /* Get the first byte */ - byte = tvb_get_guint8(tvb, offset); + byte = tvb_get_uint8(tvb, offset); if(nibble_offset & 1) { /* Get the prefix bit */ prefix = (byte & 0x08); @@ -1102,9 +1102,9 @@ static guint wimax_compact_ulmap_harq_control_ie_decoder(proto_tree *tree, packe #define EXTENSION_LENGTH_SHIFT 4 /* Compact UL-MAP Extension IE (6.3.2.3.43.7.7) decoder */ -static guint wimax_culmap_extension_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, guint offset, guint nibble_offset) +static unsigned wimax_culmap_extension_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { - guint tvb_value, ul_map_type, sub_type, length; + unsigned tvb_value, ul_map_type, sub_type, length; #ifdef DEBUG /* update the info column */ @@ -1134,7 +1134,7 @@ static guint wimax_culmap_extension_ie_decoder(proto_tree *tree, packet_info *pi /* display the HARQ mode */ proto_tree_add_item(tree, hf_culmap_extension_harq_mode, tvb, offset, 1, ENC_BIG_ENDIAN); /* Get the next byte */ - tvb_value = tvb_get_guint8(tvb, offset); + tvb_value = tvb_get_uint8(tvb, offset); /* get the HARQ mode */ harq_mode = ((tvb_value & MSB_NIBBLE_MASK) >> 4); break; @@ -1178,7 +1178,7 @@ static guint wimax_culmap_extension_ie_decoder(proto_tree *tree, packet_info *pi } /* 8.4.5.4.3 (table 290) */ -guint wimax_cdma_allocation_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, guint offset, guint nibble_offset) +unsigned wimax_cdma_allocation_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { #ifdef DEBUG /* update the info column */ @@ -1238,10 +1238,10 @@ guint wimax_cdma_allocation_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, #define UL_ALLOCATION_START_IE 10 /* 8.4.5.4.4.1 (table 290b) */ -guint wimax_extended_uiuc_dependent_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, guint offset, guint nibble_offset) +unsigned wimax_extended_uiuc_dependent_ie_decoder(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset) { - guint ext_uiuc, length, m, i; - guint8 byte; + unsigned ext_uiuc, length, m, i; + uint8_t byte; #ifdef DEBUG /* update the info column */ @@ -1249,7 +1249,7 @@ guint wimax_extended_uiuc_dependent_ie_decoder(proto_tree *tree, packet_info *pi #endif /* get the first byte */ - byte = tvb_get_guint8(tvb, offset); + byte = tvb_get_uint8(tvb, offset); if(nibble_offset & 1) { /* get the extended UIUC */ ext_uiuc = (byte & LSB_NIBBLE_MASK); @@ -1258,7 +1258,7 @@ guint wimax_extended_uiuc_dependent_ie_decoder(proto_tree *tree, packet_info *pi /* move to next byte */ offset++; /* get the 2nd byte */ - byte = tvb_get_guint8(tvb, offset); + byte = tvb_get_uint8(tvb, offset); /* get the length */ length = ((byte & MSB_NIBBLE_MASK) >> 4); /* display extended UIUC length */ @@ -2090,7 +2090,7 @@ void wimax_proto_register_wimax_compact_ulmap_ie(void) #if 0 /* not used ?? */ /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_wimax_compact_ulmap_ie_decoder, &ett_wimax_rcid_ie_decoder, diff --git a/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.h b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.h index ef0d832f..5511e6a4 100644 --- a/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.h +++ b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.h @@ -15,6 +15,6 @@ #ifndef _WIMAX_COMPACT_ULMAP_IE_DECODER_H_ #define _WIMAX_COMPACT_ULMAP_IE_DECODER_H_ -extern guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset); +extern unsigned wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, unsigned offset, unsigned nibble_offset); #endif /* _WIMAX_COMPACT_ULMAP_IE_DECODER_H_ */ diff --git a/plugins/epan/wimax/wimax_fch_decoder.c b/plugins/epan/wimax/wimax_fch_decoder.c index 60f0251b..4e828a49 100644 --- a/plugins/epan/wimax/wimax_fch_decoder.c +++ b/plugins/epan/wimax/wimax_fch_decoder.c @@ -21,12 +21,12 @@ #include <epan/packet.h> #include "wimax-int.h" -extern gint proto_wimax; +extern int proto_wimax; extern address bs_address; /* declared in packet-wmx.c */ -static int proto_wimax_fch_decoder = -1; -static gint ett_wimax_fch_decoder = -1; +static int proto_wimax_fch_decoder; +static int ett_wimax_fch_decoder; #define FCH_BURST_LENGTH 3 /* FCH Burst bits */ @@ -42,17 +42,17 @@ static gint ett_wimax_fch_decoder = -1; #define DL_MAP_LENGTH 0x000FF0 #define FCH_RESERVED_2 0x00000F -static int hf_fch_used_subchannel_group0 = -1; -static int hf_fch_used_subchannel_group1 = -1; -static int hf_fch_used_subchannel_group2 = -1; -static int hf_fch_used_subchannel_group3 = -1; -static int hf_fch_used_subchannel_group4 = -1; -static int hf_fch_used_subchannel_group5 = -1; -static int hf_fch_reserved_1 = -1; -static int hf_fch_repetition_coding_indication = -1; -static int hf_fch_coding_indication = -1; -static int hf_fch_dlmap_length = -1; -static int hf_fch_reserved_2 = -1; +static int hf_fch_used_subchannel_group0; +static int hf_fch_used_subchannel_group1; +static int hf_fch_used_subchannel_group2; +static int hf_fch_used_subchannel_group3; +static int hf_fch_used_subchannel_group4; +static int hf_fch_used_subchannel_group5; +static int hf_fch_reserved_1; +static int hf_fch_repetition_coding_indication; +static int hf_fch_coding_indication; +static int hf_fch_dlmap_length; +static int hf_fch_reserved_2; static const value_string used_or_not_used[] = { @@ -87,7 +87,7 @@ static const value_string coding_indications[] = static int dissect_wimax_fch_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - gint offset = 0; + int offset = 0; proto_item *fch_item = NULL; proto_tree *fch_tree = NULL; @@ -218,7 +218,7 @@ void wimax_proto_register_wimax_fch(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_wimax_fch_decoder, }; diff --git a/plugins/epan/wimax/wimax_ffb_decoder.c b/plugins/epan/wimax/wimax_ffb_decoder.c index 8a9ccad3..661bee3d 100644 --- a/plugins/epan/wimax/wimax_ffb_decoder.c +++ b/plugins/epan/wimax/wimax_ffb_decoder.c @@ -19,23 +19,23 @@ #include <epan/packet.h> #include "wimax-int.h" -extern gint proto_wimax; +extern int proto_wimax; -static gint proto_wimax_ffb_decoder = -1; -static gint ett_wimax_ffb_decoder = -1; +static int proto_wimax_ffb_decoder; +static int ett_wimax_ffb_decoder; -/* static gint hf_ffb_burst = -1; */ -static gint hf_ffb_num_of_ffbs = -1; -static gint hf_ffb_type = -1; -static gint hf_ffb_subchannel = -1; -static gint hf_ffb_symboloffset = -1; -static gint hf_ffb_value = -1; +/* static int hf_ffb_burst; */ +static int hf_ffb_num_of_ffbs; +static int hf_ffb_type; +static int hf_ffb_subchannel; +static int hf_ffb_symboloffset; +static int hf_ffb_value; static int dissect_wimax_ffb_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - gint offset = 0; - guint length, num_of_ffbs, i; + int offset = 0; + unsigned length, num_of_ffbs, i; proto_item *ffb_item = NULL; proto_tree *ffb_tree = NULL; @@ -50,7 +50,7 @@ static int dissect_wimax_ffb_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tr /* add Fast Feedback Burst subtree */ ffb_tree = proto_item_add_subtree(ffb_item, ett_wimax_ffb_decoder); /* get the number of FFBs */ - num_of_ffbs = tvb_get_guint8(tvb, offset); + num_of_ffbs = tvb_get_uint8(tvb, offset); /* display the number of FFBs */ proto_tree_add_item(ffb_tree, hf_ffb_num_of_ffbs, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the FFB type */ @@ -101,7 +101,7 @@ void wimax_proto_register_wimax_ffb(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_wimax_ffb_decoder, }; diff --git a/plugins/epan/wimax/wimax_hack_decoder.c b/plugins/epan/wimax/wimax_hack_decoder.c index 1c44e299..19442d0c 100644 --- a/plugins/epan/wimax/wimax_hack_decoder.c +++ b/plugins/epan/wimax/wimax_hack_decoder.c @@ -19,10 +19,10 @@ #include <epan/packet.h> #include "wimax-int.h" -extern gint proto_wimax; +extern int proto_wimax; -static gint proto_wimax_hack_decoder = -1; -static gint ett_wimax_hack_decoder = -1; +static int proto_wimax_hack_decoder; +static int ett_wimax_hack_decoder; static const value_string vals_flags[] = { @@ -38,18 +38,18 @@ static const value_string vals_values[] = {0, NULL} }; -/* static gint hf_hack_burst = -1; */ -static gint hf_hack_num_of_hacks = -1; -static gint hf_hack_half_slot_flag = -1; -static gint hf_hack_subchannel = -1; -static gint hf_hack_symboloffset = -1; -static gint hf_hack_value = -1; +/* static int hf_hack_burst; */ +static int hf_hack_num_of_hacks; +static int hf_hack_half_slot_flag; +static int hf_hack_subchannel; +static int hf_hack_symboloffset; +static int hf_hack_value; static int dissect_wimax_hack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - gint offset = 0; - guint length, num_of_hacks, i; + int offset = 0; + unsigned length, num_of_hacks, i; proto_item *hack_item = NULL; proto_tree *hack_tree = NULL; @@ -64,7 +64,7 @@ static int dissect_wimax_hack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t /* add HARQ ACK Burst subtree */ hack_tree = proto_item_add_subtree(hack_item, ett_wimax_hack_decoder); /* get the number of HARQ ACKs */ - num_of_hacks = tvb_get_guint8(tvb, offset); + num_of_hacks = tvb_get_uint8(tvb, offset); /* display the number of HARQ ACKs */ proto_tree_add_item(hack_tree, hf_hack_num_of_hacks, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the HARQ ACKs */ @@ -114,7 +114,7 @@ void wimax_proto_register_wimax_hack(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_wimax_hack_decoder, }; diff --git a/plugins/epan/wimax/wimax_harq_map_decoder.c b/plugins/epan/wimax/wimax_harq_map_decoder.c index ec99de00..02921119 100644 --- a/plugins/epan/wimax/wimax_harq_map_decoder.c +++ b/plugins/epan/wimax/wimax_harq_map_decoder.c @@ -23,10 +23,10 @@ #include "wimax_compact_dlmap_ie_decoder.h" #include "wimax_compact_ulmap_ie_decoder.h" -extern gint proto_wimax; +extern int proto_wimax; -static gint proto_wimax_harq_map_decoder = -1; -static gint ett_wimax_harq_map_decoder = -1; +static int proto_wimax_harq_map_decoder; +static int ett_wimax_harq_map_decoder; /* MASKs */ #define LSB_NIBBLE_MASK 0x0F @@ -41,15 +41,15 @@ static gint ett_wimax_harq_map_decoder = -1; #define WIMAX_HARQ_MAP_DL_IE_COUNT_SHIFT 4 /* HARQ MAP display indexies */ -static gint hf_harq_map_indicator = -1; -static gint hf_harq_ul_map_appended = -1; -static gint hf_harq_map_reserved = -1; -static gint hf_harq_map_msg_length = -1; -static gint hf_harq_dl_ie_count = -1; -static gint hf_harq_map_msg_crc = -1; -static gint hf_harq_map_msg_crc_status = -1; +static int hf_harq_map_indicator; +static int hf_harq_ul_map_appended; +static int hf_harq_map_reserved; +static int hf_harq_map_msg_length; +static int hf_harq_dl_ie_count; +static int hf_harq_map_msg_crc; +static int hf_harq_map_msg_crc_status; -static expert_field ei_harq_map_msg_crc = EI_INIT; +static expert_field ei_harq_map_msg_crc; /* Copied and renamed from proto.c because global value_strings don't work for plugins */ @@ -65,16 +65,16 @@ static const value_string plugin_proto_checksum_vals[] = { /* HARQ MAP message decoder */ static int dissector_wimax_harq_map_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint i, offset = 0; - guint tvb_len, length, dl_ie_count; - guint ie_length; + unsigned i, offset = 0; + unsigned tvb_len, length, dl_ie_count; + unsigned ie_length; proto_item *harq_map_item = NULL; proto_tree *harq_map_tree = NULL; - guint nibble_offset; + unsigned nibble_offset; proto_item *parent_item = NULL; - guint ulmap_appended; - guint32 harq_map_msg_crc, calculated_crc; - guint32 first_24bits; + unsigned ulmap_appended; + uint32_t harq_map_msg_crc, calculated_crc; + uint32_t first_24bits; /* check the tvb reported length */ tvb_len = tvb_reported_length(tvb); @@ -147,7 +147,7 @@ static int dissector_wimax_harq_map_decoder(tvbuff_t *tvb, packet_info *pinfo, p { /* add the Padding info */ proto_item_append_text(parent_item, ",Padding"); - proto_tree_add_protocol_format(harq_map_tree, proto_wimax_harq_map_decoder, tvb, offset, 1, "Padding Nibble: 0x%x", (tvb_get_guint8(tvb, offset) & LSB_NIBBLE_MASK)); + proto_tree_add_protocol_format(harq_map_tree, proto_wimax_harq_map_decoder, tvb, offset, 1, "Padding Nibble: 0x%x", (tvb_get_uint8(tvb, offset) & LSB_NIBBLE_MASK)); } /* add the CRC info */ proto_item_append_text(parent_item, ",CRC"); @@ -198,7 +198,7 @@ void wimax_proto_register_wimax_harq_map(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_wimax_harq_map_decoder, }; diff --git a/plugins/epan/wimax/wimax_pdu_decoder.c b/plugins/epan/wimax/wimax_pdu_decoder.c index a7e7eaf2..0fe05ad6 100644 --- a/plugins/epan/wimax/wimax_pdu_decoder.c +++ b/plugins/epan/wimax/wimax_pdu_decoder.c @@ -21,14 +21,14 @@ #include "wimax-int.h" #include "wimax_utils.h" -extern gint proto_wimax; +extern int proto_wimax; void proto_reg_handoff_wimax_pdu(void); -static dissector_handle_t mac_generic_decoder_handle = NULL; -static dissector_handle_t mac_header_type1_handle = NULL; -static dissector_handle_t mac_header_type2_handle = NULL; -static dissector_handle_t wimax_harq_map_handle = NULL; +static dissector_handle_t mac_generic_decoder_handle; +static dissector_handle_t mac_header_type1_handle; +static dissector_handle_t mac_header_type2_handle; +static dissector_handle_t wimax_harq_map_handle; #define WIMAX_PDU_PADDING_MASK 0xFF #define WIMAX_INVALID_PDU_MASK 0xF0 @@ -45,19 +45,19 @@ static dissector_handle_t wimax_harq_map_handle = NULL; #define WIMAX_HARQ_MAP_MSG_LENGTH_MASK1 0x07FC /* Global Variables. */ -gboolean first_gmh; +bool first_gmh; -static gint proto_wimax_pdu_decoder = -1; -static gint ett_wimax_pdu_decoder = -1; +static int proto_wimax_pdu_decoder; +static int ett_wimax_pdu_decoder; -static int hf_wimax_value_bytes = -1; +static int hf_wimax_value_bytes; static int dissect_wimax_pdu_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset; - guint mac_ht, mac_ec; - guint first_byte, length; - guint mac_hcs, mac_hcs_calculated; + unsigned offset; + unsigned mac_ht, mac_ec; + unsigned first_byte, length; + unsigned mac_hcs, mac_hcs_calculated; proto_item *pdu_item = NULL; proto_tree *pdu_tree = NULL; @@ -73,16 +73,16 @@ static int dissect_wimax_pdu_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tr { if (offset == 0) { - first_gmh = TRUE; + first_gmh = true; } else { - first_gmh = FALSE; + first_gmh = false; } /* get the length of the remainder */ length = tvb_reported_length_remaining(tvb, offset); /* get the first byte at offset */ - first_byte = tvb_get_guint8(tvb, offset); + first_byte = tvb_get_uint8(tvb, offset); /* check for padding */ if(first_byte == WIMAX_PDU_PADDING_MASK) { /* Padding */ @@ -137,7 +137,7 @@ static int dissect_wimax_pdu_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tr /* calculate the MAC header HCS */ mac_hcs_calculated = wimax_mac_calc_crc8(tvb_get_ptr(tvb, offset, WIMAX_MAC_HEADER_INFO_FIELDS), WIMAX_MAC_HEADER_INFO_FIELDS); /* get the Header Check Sequence (HCS) in the header */ - mac_hcs = tvb_get_guint8(tvb, offset + WIMAX_MAC_HEADER_SIZE - 1); + mac_hcs = tvb_get_uint8(tvb, offset + WIMAX_MAC_HEADER_SIZE - 1); /* verify the HCS */ if(mac_hcs != mac_hcs_calculated) { @@ -159,8 +159,8 @@ static int dissect_wimax_pdu_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tr if(!mac_ht) { /* Generic MAC Header with payload */ /* get the MAC length */ - length = (tvb_get_guint8(tvb, offset+1) & WIMAX_MAC_HEADER_LENGTH_MSB_MASK); - length = ((length<<8) | tvb_get_guint8(tvb, offset+2)); + length = (tvb_get_uint8(tvb, offset+1) & WIMAX_MAC_HEADER_LENGTH_MSB_MASK); + length = ((length<<8) | tvb_get_uint8(tvb, offset+2)); } else /* MAC signaling Headers or Bandwidth Request Headers */ { /* set the mac length */ @@ -220,7 +220,7 @@ void wimax_proto_register_wimax_pdu(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_wimax_pdu_decoder, }; diff --git a/plugins/epan/wimax/wimax_phy_attributes_decoder.c b/plugins/epan/wimax/wimax_phy_attributes_decoder.c index 25572401..646040d3 100644 --- a/plugins/epan/wimax/wimax_phy_attributes_decoder.c +++ b/plugins/epan/wimax/wimax_phy_attributes_decoder.c @@ -19,10 +19,10 @@ #include <epan/packet.h> #include "wimax-int.h" -extern gint proto_wimax; +extern int proto_wimax; -static gint proto_wimax_phy_attributes_decoder = -1; -static gint ett_wimax_phy_attributes_decoder = -1; +static int proto_wimax_phy_attributes_decoder; +static int ett_wimax_phy_attributes_decoder; static const value_string vals_subchannel_types[] = { @@ -53,22 +53,22 @@ static const value_string vals_encoding_types[] = {0, NULL} }; -static gint hf_phy_attributes_subchannelization_type = -1; -static gint hf_phy_attributes_permbase = -1; -static gint hf_phy_attributes_modulation_rate = -1; -static gint hf_phy_attributes_encoding_type = -1; -static gint hf_phy_attributes_num_repeat = -1; -static gint hf_phy_attributes_symbol_offset = -1; -static gint hf_phy_attributes_num_of_slots = -1; -static gint hf_phy_attributes_subchannel = -1; +static int hf_phy_attributes_subchannelization_type; +static int hf_phy_attributes_permbase; +static int hf_phy_attributes_modulation_rate; +static int hf_phy_attributes_encoding_type; +static int hf_phy_attributes_num_repeat; +static int hf_phy_attributes_symbol_offset; +static int hf_phy_attributes_num_of_slots; +static int hf_phy_attributes_subchannel; static int dissect_wimax_phy_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0; - guint tvb_len; -/* guint num_of_slots;*/ + unsigned offset = 0; + unsigned tvb_len; +/* unsigned num_of_slots;*/ proto_item *phy_item = NULL; proto_tree *phy_tree = NULL; @@ -98,7 +98,7 @@ static int dissect_wimax_phy_attributes_decoder(tvbuff_t *tvb, packet_info *pinf /* display the number of slots */ proto_tree_add_item(phy_tree, hf_phy_attributes_num_of_slots, tvb, offset, 2, ENC_BIG_ENDIAN); /* get the number of slots */ -/* num_of_slots = tvb_get_guint16(tvb, offset);*/ +/* num_of_slots = tvb_get_uint16(tvb, offset);*/ /* move to next field */ offset += 2; /* display the physical subchannel list */ @@ -151,7 +151,7 @@ void wimax_proto_register_wimax_phy_attributes(void) }; /* Setup protocol subtree array */ - static gint *ett[] = + static int *ett[] = { &ett_wimax_phy_attributes_decoder }; diff --git a/plugins/epan/wimax/wimax_prefs.h b/plugins/epan/wimax/wimax_prefs.h new file mode 100644 index 00000000..e2edad96 --- /dev/null +++ b/plugins/epan/wimax/wimax_prefs.h @@ -0,0 +1,20 @@ +/* wimax_prefs.h + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1999 Gerald Combs + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef __WIMAX_PREFS_H__ +#define __WIMAX_PREFS_H__ + +/* + * Preferences used in more than one source file. + */ + +extern bool include_cor2_changes; +extern unsigned global_cid_max_basic; + +#endif diff --git a/plugins/epan/wimax/wimax_tlv.c b/plugins/epan/wimax/wimax_tlv.c index fe06728b..b447208f 100644 --- a/plugins/epan/wimax/wimax_tlv.c +++ b/plugins/epan/wimax/wimax_tlv.c @@ -16,23 +16,23 @@ #include "wimax_tlv.h" -/*************************************************************/ -/* init_tlv_info() */ -/* retrive the tlv information from specified tvb and offset */ -/* parameter: */ -/* info - pointer of a tlv information data structure */ -/* return: */ -/* 0-success */ -/* !=0-the invalid size of the TLV length (failed) */ -/*************************************************************/ -gint init_tlv_info(tlv_info_t *info, tvbuff_t *tvb, gint offset) +/**************************************************************/ +/* init_tlv_info() */ +/* retrieve the tlv information from specified tvb and offset */ +/* parameter: */ +/* info - pointer of a tlv information data structure */ +/* return: */ +/* 0-success */ +/* !=0-the invalid size of the TLV length (failed) */ +/**************************************************************/ +int init_tlv_info(tlv_info_t *info, tvbuff_t *tvb, int offset) { - guint tlv_len; + unsigned tlv_len; /* get TLV type */ - info->type = (guint8)tvb_get_guint8( tvb, offset ); + info->type = (uint8_t)tvb_get_uint8( tvb, offset ); /* get TLV length */ - tlv_len = (guint)tvb_get_guint8( tvb, (offset + 1) ); + tlv_len = (unsigned)tvb_get_uint8( tvb, (offset + 1) ); /* set the TLV value offset */ info->value_offset = 2; /* adjust for multiple-byte TLV length */ @@ -50,22 +50,22 @@ gint init_tlv_info(tlv_info_t *info, tvbuff_t *tvb, gint offset) info->length = 0; /* no length */ break; case 1: - info->length = (gint32)tvb_get_guint8( tvb, (offset + 2) ); /* 8 bit */ + info->length = (int32_t)tvb_get_uint8( tvb, (offset + 2) ); /* 8 bit */ break; case 2: - info->length = (gint32)tvb_get_ntohs( tvb, (offset + 2) ); /* 16 bit */ + info->length = (int32_t)tvb_get_ntohs( tvb, (offset + 2) ); /* 16 bit */ break; case 3: - info->length = (gint32)tvb_get_ntoh24( tvb, (offset + 2) ); /* 24 bit */ + info->length = (int32_t)tvb_get_ntoh24( tvb, (offset + 2) ); /* 24 bit */ break; case 4: - info->length = (gint32)tvb_get_ntohl( tvb, (offset + 2) ); /* 32 bit */ + info->length = (int32_t)tvb_get_ntohl( tvb, (offset + 2) ); /* 32 bit */ break; default: /* mark invalid tlv */ info->valid = 0; /* failed, return the invalid size of the tlv length */ - return (gint)tlv_len; + return (int)tlv_len; break; } } @@ -73,7 +73,7 @@ gint init_tlv_info(tlv_info_t *info, tvbuff_t *tvb, gint offset) { info->length_type = 0; info->size_of_length = 0; - info->length = (gint32)tlv_len; + info->length = (int32_t)tlv_len; } /* mark valid tlv */ info->valid = 1; @@ -90,10 +90,10 @@ gint init_tlv_info(tlv_info_t *info, tvbuff_t *tvb, gint offset) /* >=0 - TLV type */ /* =-1 - invalid tlv info */ /*************************************************************/ -gint get_tlv_type(tlv_info_t *info) +int get_tlv_type(tlv_info_t *info) { if(info->valid) - return (gint)info->type; + return (int)info->type; return -1; } @@ -106,10 +106,10 @@ gint get_tlv_type(tlv_info_t *info) /* >=0 - the size of TLV length */ /* =-1 - invalid tlv info */ /**************************************************************/ -gint get_tlv_size_of_length(tlv_info_t *info) +int get_tlv_size_of_length(tlv_info_t *info) { if(info->valid) - return (gint)info->size_of_length; + return (int)info->size_of_length; return -1; } @@ -122,10 +122,10 @@ gint get_tlv_size_of_length(tlv_info_t *info) /* >=0 - TLV length */ /* =-1 - invalid tlv info */ /*************************************************************/ -gint32 get_tlv_length(tlv_info_t *info) +int32_t get_tlv_length(tlv_info_t *info) { if(info->valid) - return (gint32)info->length; + return (int32_t)info->length; return -1; } @@ -138,10 +138,10 @@ gint32 get_tlv_length(tlv_info_t *info) /* >0 - TLV value offset in byte */ /* =-1 - invalid tlv info */ /*************************************************************/ -gint get_tlv_value_offset(tlv_info_t *info) +int get_tlv_value_offset(tlv_info_t *info) { if(info->valid) - return (gint)info->value_offset; + return (int)info->value_offset; return -1; } @@ -154,10 +154,10 @@ gint get_tlv_value_offset(tlv_info_t *info) /* 0 - single byte TLV length */ /* 1 - multiple bytes TLV length */ /*************************************************************/ -gint get_tlv_length_type(tlv_info_t *info) +int get_tlv_length_type(tlv_info_t *info) { if(info->valid) - return (gint)info->length_type; + return (int)info->length_type; return -1; } diff --git a/plugins/epan/wimax/wimax_tlv.h b/plugins/epan/wimax/wimax_tlv.h index 0011c563..2242e960 100644 --- a/plugins/epan/wimax/wimax_tlv.h +++ b/plugins/epan/wimax/wimax_tlv.h @@ -23,23 +23,23 @@ typedef struct { - guint8 valid; /* TLV info status: 0=invalid; 1=valid */ - guint8 type; /* TLV type */ - guint8 length_type; /* length type: 0=single byte; 1=multiple bytes */ - guint8 size_of_length; /* size of the TLV length */ - guint value_offset; /* the offset of TLV value field */ - gint32 length; /* length of TLV value field */ + uint8_t valid; /* TLV info status: 0=invalid; 1=valid */ + uint8_t type; /* TLV type */ + uint8_t length_type; /* length type: 0=single byte; 1=multiple bytes */ + uint8_t size_of_length; /* size of the TLV length */ + unsigned value_offset; /* the offset of TLV value field */ + int32_t length; /* length of TLV value field */ } tlv_info_t; -gint init_tlv_info(tlv_info_t *info, tvbuff_t *tvb, gint offset); -gint valid_tlv_info(tlv_info_t *info); -gint get_tlv_type(tlv_info_t *info); -gint get_tlv_length_type(tlv_info_t *info); -gint get_tlv_size_of_length(tlv_info_t *info); -gint get_tlv_value_offset(tlv_info_t *info); -gint32 get_tlv_length(tlv_info_t *info); -proto_item *add_tlv_subtree(tlv_info_t *info, proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start, const guint encoding); -proto_tree *add_tlv_subtree_no_item(tlv_info_t *info, proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start); -proto_tree *add_protocol_subtree(tlv_info_t *info, gint idx, proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start, gint length, const char *label); +int init_tlv_info(tlv_info_t *info, tvbuff_t *tvb, int offset); +int valid_tlv_info(tlv_info_t *info); +int get_tlv_type(tlv_info_t *info); +int get_tlv_length_type(tlv_info_t *info); +int get_tlv_size_of_length(tlv_info_t *info); +int get_tlv_value_offset(tlv_info_t *info); +int32_t get_tlv_length(tlv_info_t *info); +proto_item *add_tlv_subtree(tlv_info_t *info, proto_tree *tree, int hfindex, tvbuff_t *tvb, int start, const unsigned encoding); +proto_tree *add_tlv_subtree_no_item(tlv_info_t *info, proto_tree *tree, int hfindex, tvbuff_t *tvb, int start); +proto_tree *add_protocol_subtree(tlv_info_t *info, int idx, proto_tree *tree, int hfindex, tvbuff_t *tvb, int start, int length, const char *label); #endif /* WIMAX_TLV_H */ diff --git a/plugins/epan/wimax/wimax_utils.c b/plugins/epan/wimax/wimax_utils.c index 226c536a..329a4dce 100644 --- a/plugins/epan/wimax/wimax_utils.c +++ b/plugins/epan/wimax/wimax_utils.c @@ -20,36 +20,39 @@ #include <epan/packet.h> #include <epan/expert.h> -#include "wimax-int.h" +#include <epan/tfs.h> +#include <epan/unit_strings.h> + +#include <wsutil/array.h> #include "wimax_tlv.h" #include "wimax_mac.h" +#include "wimax_prefs.h" #include "wimax_utils.h" -extern gint proto_mac_mgmt_msg_rng_req_decoder; -extern gint proto_mac_mgmt_msg_reg_req_decoder; - -extern gint mac_sdu_length; /* declared in packet-wmx.c */ -extern gboolean include_cor2_changes; - -static gint proto_wimax_utility_decoders = -1; -static gint ett_wimax_service_flow_encodings = -1; -static gint ett_wimax_cst_encoding_rules = -1; -static gint ett_wimax_error_parameter_set = -1; -static gint ett_wimax_hmac_tuple = -1; -static gint ett_wimax_cmac_tuple = -1; -static gint ett_wimax_short_hmac_tuple = -1; -static gint ett_security_negotiation_parameters = -1; -static gint ett_pkm_tlv_encoded_attributes_decoder = -1; -static gint ett_sa_descriptor_decoder = -1; -static gint ett_cryptographic_suite_list_decoder = -1; -static gint ett_security_capabilities_decoder = -1; -static gint ett_vendor_specific_info_decoder = -1; -static gint ett_vendor_id_encoding_decoder = -1; -static gint ett_ul_service_flow_decoder = -1; -static gint ett_dl_service_flow_decoder = -1; - -static dissector_handle_t eap_handle = NULL; +extern int proto_mac_mgmt_msg_rng_req_decoder; +extern int proto_mac_mgmt_msg_reg_req_decoder; + +extern int mac_sdu_length; /* declared in packet-wmx.c */ + +static int proto_wimax_utility_decoders; +static int ett_wimax_service_flow_encodings; +static int ett_wimax_cst_encoding_rules; +static int ett_wimax_error_parameter_set; +static int ett_wimax_hmac_tuple; +static int ett_wimax_cmac_tuple; +static int ett_wimax_short_hmac_tuple; +static int ett_security_negotiation_parameters; +static int ett_pkm_tlv_encoded_attributes_decoder; +static int ett_sa_descriptor_decoder; +static int ett_cryptographic_suite_list_decoder; +static int ett_security_capabilities_decoder; +static int ett_vendor_specific_info_decoder; +static int ett_vendor_id_encoding_decoder; +static int ett_ul_service_flow_decoder; +static int ett_dl_service_flow_decoder; + +static dissector_handle_t eap_handle; const unit_name_string wimax_units_byte_bytes = { " byte", " bytes" }; const unit_name_string wimax_units_bit_sec = { "bits/s", NULL }; @@ -67,16 +70,16 @@ const unit_name_string wimax_units_ps = { "PS", NULL }; the Grant Management subheader dissector and track whether or not one has been seen. */ -static guint scheduling_service_type = -1; -gint seen_a_service_type = 0; +static unsigned scheduling_service_type = -1; +int seen_a_service_type; /* The following two functions set and access the variables above */ -guint get_service_type( void ) +unsigned get_service_type( void ) { return scheduling_service_type; } -static void set_service_type( guint set_to ) +static void set_service_type( unsigned set_to ) { if( seen_a_service_type == 0 ){ scheduling_service_type = set_to; @@ -85,7 +88,7 @@ static void set_service_type( guint set_to ) } /* Setup protocol subtree array */ -static gint *ett[] = +static int *ett[] = { &ett_wimax_service_flow_encodings, &ett_wimax_cst_encoding_rules, @@ -400,155 +403,155 @@ static const value_string vals_dcd_mac_version[] = }; /* fix fields */ -static gint hf_sfe_unknown_type = -1; -static gint hf_sfe_sf_id = -1; -static gint hf_sfe_cid = -1; -static gint hf_sfe_service_class_name = -1; -static gint hf_sfe_mbs_service = -1; -static gint hf_sfe_qos_params_set = -1; -static gint hf_sfe_set_provisioned = -1; -static gint hf_sfe_set_admitted = -1; -static gint hf_sfe_set_active = -1; -static gint hf_sfe_set_rsvd = -1; -static gint hf_sfe_traffic_priority = -1; -static gint hf_sfe_max_str = -1; -static gint hf_sfe_max_traffic_burst = -1; -static gint hf_sfe_min_rtr = -1; -static gint hf_sfe_reserved_10 = -1; -static gint hf_sfe_ul_grant_scheduling = -1; -static gint hf_sfe_req_tx_policy = -1; -static gint hf_sfe_policy_broadcast_bwr = -1; -static gint hf_sfe_policy_multicast_bwr = -1; -static gint hf_sfe_policy_piggyback = -1; -static gint hf_sfe_policy_fragment = -1; -static gint hf_sfe_policy_headers = -1; -static gint hf_sfe_policy_packing = -1; -static gint hf_sfe_policy_crc = -1; -static gint hf_sfe_policy_rsvd1 = -1; -static gint hf_sfe_jitter = -1; -static gint hf_sfe_max_latency = -1; -static gint hf_sfe_fixed_len_sdu = -1; -static gint hf_sfe_sdu_size = -1; -static gint hf_sfe_target_said = -1; -static gint hf_sfe_cs_specification = -1; -static gint hf_sfe_type_of_data_delivery_services = -1; -static gint hf_sfe_sdu_inter_arrival_interval = -1; -static gint hf_sfe_time_base = -1; -static gint hf_sfe_paging_preference = -1; -static gint hf_sfe_mbs_zone_identifier_assignment = -1; -static gint hf_sfe_sn_feedback_enabled = -1; -static gint hf_sfe_harq_service_flows = -1; -static gint hf_sfe_harq_channel_mapping_index = -1; -static gint hf_sfe_fsn_size = -1; -static gint hf_sfe_unsolicited_grant_interval = -1; -static gint hf_sfe_unsolicited_polling_interval = -1; -/* static gint hf_sfe_harq_channel_mapping = -1; */ -static gint hf_sfe_global_service_class_name = -1; -static gint hf_sfe_reserved_36 = -1; -static gint hf_sfe_reserved_34 = -1; - -static gint hf_sfe_arq_enable = -1; -static gint hf_sfe_arq_transmitter_delay = -1; -static gint hf_sfe_arq_receiver_delay = -1; -static gint hf_sfe_arq_block_lifetime = -1; -static gint hf_sfe_arq_sync_loss_timeout = -1; -static gint hf_sfe_arq_transmitter_delay_cor2 = -1; -static gint hf_sfe_arq_receiver_delay_cor2 = -1; -static gint hf_sfe_arq_block_lifetime_cor2 = -1; -static gint hf_sfe_arq_sync_loss_timeout_cor2 = -1; -static gint hf_sfe_arq_deliver_in_order = -1; -static gint hf_sfe_arq_rx_purge_timeout = -1; -static gint hf_sfe_arq_window_size = -1; -static gint hf_sfe_arq_block_size = -1; -static gint hf_sfe_arq_block_size_cor2 = -1; -static gint hf_sfe_arq_min_block_size = -1; -static gint hf_sfe_arq_max_block_size = -1; - -/* static gint hf_sfe_cid_alloc_for_active_bs = -1; */ -static gint hf_sfe_cid_alloc_for_active_bs_cid = -1; -static gint hf_sfe_pdu_sn_ext_subheader_reorder = -1; -static gint hf_sfe_mbs_contents_ids = -1; -static gint hf_sfe_mbs_contents_ids_id = -1; -static gint hf_sfe_authorization_token = -1; - -static gint hf_cst_classifier_dsc_action = -1; -static gint hf_cst_error_set_errored_param = -1; -static gint hf_cst_error_set_error_code = -1; -static gint hf_cst_error_set_error_msg = -1; - -static gint hf_cst_pkt_class_rule = -1; - -static gint hf_cst_pkt_class_rule_priority = -1; -static gint hf_cst_pkt_class_rule_range_mask = -1; -static gint hf_cst_pkt_class_rule_tos_low = -1; -static gint hf_cst_pkt_class_rule_tos_high = -1; -static gint hf_cst_pkt_class_rule_tos_mask = -1; -static gint hf_cst_pkt_class_rule_protocol = -1; -/*static gint hf_cst_pkt_class_rule_protocol_number = -1;*/ -static gint hf_cst_pkt_class_rule_ip_masked_src_address = -1; -static gint hf_cst_pkt_class_rule_ip_masked_dest_address = -1; -static gint hf_cst_pkt_class_rule_src_ipv4 = -1; -static gint hf_cst_pkt_class_rule_dest_ipv4 = -1; -static gint hf_cst_pkt_class_rule_mask_ipv4 = -1; -static gint hf_cst_pkt_class_rule_src_ipv6 = -1; -static gint hf_cst_pkt_class_rule_dest_ipv6 = -1; -static gint hf_cst_pkt_class_rule_mask_ipv6 = -1; -static gint hf_cst_pkt_class_rule_prot_src_port_range = -1; -static gint hf_cst_pkt_class_rule_src_port_low = -1; -static gint hf_cst_pkt_class_rule_src_port_high = -1; -static gint hf_cst_pkt_class_rule_prot_dest_port_range = -1; -static gint hf_cst_pkt_class_rule_dest_port_low = -1; -static gint hf_cst_pkt_class_rule_dest_port_high = -1; -static gint hf_cst_pkt_class_rule_dest_mac_address = -1; -static gint hf_cst_pkt_class_rule_dest_mac = -1; -static gint hf_cst_pkt_class_rule_src_mac_address = -1; -static gint hf_cst_pkt_class_rule_src_mac = -1; -static gint hf_cst_pkt_class_rule_mask_mac = -1; -static gint hf_cst_pkt_class_rule_ethertype = -1; -static gint hf_cst_pkt_class_rule_etype = -1; -static gint hf_cst_pkt_class_rule_eprot1 = -1; -static gint hf_cst_pkt_class_rule_eprot2 = -1; -static gint hf_cst_pkt_class_rule_user_priority = -1; -static gint hf_cst_pkt_class_rule_pri_low = -1; -static gint hf_cst_pkt_class_rule_pri_high = -1; -static gint hf_cst_pkt_class_rule_vlan_id = -1; -static gint hf_cst_pkt_class_rule_vlan_id1 = -1; -static gint hf_cst_pkt_class_rule_vlan_id2 = -1; -static gint hf_cst_pkt_class_rule_phsi = -1; -static gint hf_cst_pkt_class_rule_index = -1; -static gint hf_cst_pkt_class_rule_ipv6_flow_label = -1; -static gint hf_cst_pkt_class_rule_vendor_spec = -1; -static gint hf_cst_pkt_class_rule_classifier_action_rule = -1; -static gint hf_cst_pkt_class_rule_classifier_action_rule_bit0 = -1; -static gint hf_cst_pkt_class_rule_classifier_action_rule_bit1 = -1; - -static gint hf_cst_large_context_id = -1; -static gint hf_cst_short_format_context_id = -1; - -static gint hf_cst_phs_dsc_action = -1; -static gint hf_cst_phs_rule = -1; -static gint hf_cst_phs_phsi = -1; -static gint hf_cst_phs_phsf = -1; -static gint hf_cst_phs_phsm = -1; -static gint hf_cst_phs_phss = -1; -static gint hf_cst_phs_phsv = -1; -static gint hf_cst_phs_vendor_spec = -1; -static gint hf_cst_invalid_tlv = -1; - -static gint hf_csper_atm_switching_encoding = -1; -static gint hf_csper_atm_classifier = -1; -static gint hf_csper_atm_classifier_vpi = -1; -static gint hf_csper_atm_classifier_vci = -1; -static gint hf_csper_atm_classifier_id = -1; -/*static gint hf_csper_atm_classifier_dsc_action = -1;*/ -static gint hf_csper_unknown_type = -1; - -static gint hf_xmac_tuple_rsvd = -1; -static gint hf_xmac_tuple_key_seq_num = -1; -static gint hf_hmac_tuple_hmac_digest = -1; -static gint hf_packet_number_counter = -1; -static gint hf_cmac_tuple_cmac_value = -1; -static gint hf_cmac_tuple_bsid = -1; +static int hf_sfe_unknown_type; +static int hf_sfe_sf_id; +static int hf_sfe_cid; +static int hf_sfe_service_class_name; +static int hf_sfe_mbs_service; +static int hf_sfe_qos_params_set; +static int hf_sfe_set_provisioned; +static int hf_sfe_set_admitted; +static int hf_sfe_set_active; +static int hf_sfe_set_rsvd; +static int hf_sfe_traffic_priority; +static int hf_sfe_max_str; +static int hf_sfe_max_traffic_burst; +static int hf_sfe_min_rtr; +static int hf_sfe_reserved_10; +static int hf_sfe_ul_grant_scheduling; +static int hf_sfe_req_tx_policy; +static int hf_sfe_policy_broadcast_bwr; +static int hf_sfe_policy_multicast_bwr; +static int hf_sfe_policy_piggyback; +static int hf_sfe_policy_fragment; +static int hf_sfe_policy_headers; +static int hf_sfe_policy_packing; +static int hf_sfe_policy_crc; +static int hf_sfe_policy_rsvd1; +static int hf_sfe_jitter; +static int hf_sfe_max_latency; +static int hf_sfe_fixed_len_sdu; +static int hf_sfe_sdu_size; +static int hf_sfe_target_said; +static int hf_sfe_cs_specification; +static int hf_sfe_type_of_data_delivery_services; +static int hf_sfe_sdu_inter_arrival_interval; +static int hf_sfe_time_base; +static int hf_sfe_paging_preference; +static int hf_sfe_mbs_zone_identifier_assignment; +static int hf_sfe_sn_feedback_enabled; +static int hf_sfe_harq_service_flows; +static int hf_sfe_harq_channel_mapping_index; +static int hf_sfe_fsn_size; +static int hf_sfe_unsolicited_grant_interval; +static int hf_sfe_unsolicited_polling_interval; +/* static int hf_sfe_harq_channel_mapping; */ +static int hf_sfe_global_service_class_name; +static int hf_sfe_reserved_36; +static int hf_sfe_reserved_34; + +static int hf_sfe_arq_enable; +static int hf_sfe_arq_transmitter_delay; +static int hf_sfe_arq_receiver_delay; +static int hf_sfe_arq_block_lifetime; +static int hf_sfe_arq_sync_loss_timeout; +static int hf_sfe_arq_transmitter_delay_cor2; +static int hf_sfe_arq_receiver_delay_cor2; +static int hf_sfe_arq_block_lifetime_cor2; +static int hf_sfe_arq_sync_loss_timeout_cor2; +static int hf_sfe_arq_deliver_in_order; +static int hf_sfe_arq_rx_purge_timeout; +static int hf_sfe_arq_window_size; +static int hf_sfe_arq_block_size; +static int hf_sfe_arq_block_size_cor2; +static int hf_sfe_arq_min_block_size; +static int hf_sfe_arq_max_block_size; + +/* static int hf_sfe_cid_alloc_for_active_bs; */ +static int hf_sfe_cid_alloc_for_active_bs_cid; +static int hf_sfe_pdu_sn_ext_subheader_reorder; +static int hf_sfe_mbs_contents_ids; +static int hf_sfe_mbs_contents_ids_id; +static int hf_sfe_authorization_token; + +static int hf_cst_classifier_dsc_action; +static int hf_cst_error_set_errored_param; +static int hf_cst_error_set_error_code; +static int hf_cst_error_set_error_msg; + +static int hf_cst_pkt_class_rule; + +static int hf_cst_pkt_class_rule_priority; +static int hf_cst_pkt_class_rule_range_mask; +static int hf_cst_pkt_class_rule_tos_low; +static int hf_cst_pkt_class_rule_tos_high; +static int hf_cst_pkt_class_rule_tos_mask; +static int hf_cst_pkt_class_rule_protocol; +/*static int hf_cst_pkt_class_rule_protocol_number;*/ +static int hf_cst_pkt_class_rule_ip_masked_src_address; +static int hf_cst_pkt_class_rule_ip_masked_dest_address; +static int hf_cst_pkt_class_rule_src_ipv4; +static int hf_cst_pkt_class_rule_dest_ipv4; +static int hf_cst_pkt_class_rule_mask_ipv4; +static int hf_cst_pkt_class_rule_src_ipv6; +static int hf_cst_pkt_class_rule_dest_ipv6; +static int hf_cst_pkt_class_rule_mask_ipv6; +static int hf_cst_pkt_class_rule_prot_src_port_range; +static int hf_cst_pkt_class_rule_src_port_low; +static int hf_cst_pkt_class_rule_src_port_high; +static int hf_cst_pkt_class_rule_prot_dest_port_range; +static int hf_cst_pkt_class_rule_dest_port_low; +static int hf_cst_pkt_class_rule_dest_port_high; +static int hf_cst_pkt_class_rule_dest_mac_address; +static int hf_cst_pkt_class_rule_dest_mac; +static int hf_cst_pkt_class_rule_src_mac_address; +static int hf_cst_pkt_class_rule_src_mac; +static int hf_cst_pkt_class_rule_mask_mac; +static int hf_cst_pkt_class_rule_ethertype; +static int hf_cst_pkt_class_rule_etype; +static int hf_cst_pkt_class_rule_eprot1; +static int hf_cst_pkt_class_rule_eprot2; +static int hf_cst_pkt_class_rule_user_priority; +static int hf_cst_pkt_class_rule_pri_low; +static int hf_cst_pkt_class_rule_pri_high; +static int hf_cst_pkt_class_rule_vlan_id; +static int hf_cst_pkt_class_rule_vlan_id1; +static int hf_cst_pkt_class_rule_vlan_id2; +static int hf_cst_pkt_class_rule_phsi; +static int hf_cst_pkt_class_rule_index; +static int hf_cst_pkt_class_rule_ipv6_flow_label; +static int hf_cst_pkt_class_rule_vendor_spec; +static int hf_cst_pkt_class_rule_classifier_action_rule; +static int hf_cst_pkt_class_rule_classifier_action_rule_bit0; +static int hf_cst_pkt_class_rule_classifier_action_rule_bit1; + +static int hf_cst_large_context_id; +static int hf_cst_short_format_context_id; + +static int hf_cst_phs_dsc_action; +static int hf_cst_phs_rule; +static int hf_cst_phs_phsi; +static int hf_cst_phs_phsf; +static int hf_cst_phs_phsm; +static int hf_cst_phs_phss; +static int hf_cst_phs_phsv; +static int hf_cst_phs_vendor_spec; +static int hf_cst_invalid_tlv; + +static int hf_csper_atm_switching_encoding; +static int hf_csper_atm_classifier; +static int hf_csper_atm_classifier_vpi; +static int hf_csper_atm_classifier_vci; +static int hf_csper_atm_classifier_id; +/*static int hf_csper_atm_classifier_dsc_action;*/ +static int hf_csper_unknown_type; + +static int hf_xmac_tuple_rsvd; +static int hf_xmac_tuple_key_seq_num; +static int hf_hmac_tuple_hmac_digest; +static int hf_packet_number_counter; +static int hf_cmac_tuple_cmac_value; +static int hf_cmac_tuple_bsid; /* bit masks */ /* 11.13.4 */ @@ -577,33 +580,33 @@ static gint hf_cmac_tuple_bsid = -1; #define XMAC_TUPLE_KEY_SEQ_NUM 0x0F /* WiMax Security Negotiation Parameters display */ -static gint hf_snp_pkm_version_support = -1; -static gint hf_snp_pkm_version_support_bit0 = -1; -static gint hf_snp_pkm_version_support_bit1 = -1; -static gint hf_snp_pkm_version_support_reserved = -1; -static gint hf_snp_auth_policy_support = -1; -static gint hf_snp_auth_policy_support_bit0 = -1; -static gint hf_snp_auth_policy_support_bit1 = -1; -static gint hf_snp_auth_policy_support_bit2 = -1; -static gint hf_snp_auth_policy_support_bit3 = -1; -static gint hf_snp_auth_policy_support_bit4 = -1; -static gint hf_snp_auth_policy_support_bit5 = -1; -static gint hf_snp_auth_policy_support_bit6 = -1; -static gint hf_snp_auth_policy_support_bit7 = -1; -static gint hf_snp_mac_mode = -1; -static gint hf_snp_mac_mode_bit0 = -1; -static gint hf_snp_mac_mode_bit1 = -1; -static gint hf_snp_mac_mode_bit1_rsvd = -1; -static gint hf_snp_mac_mode_bit2 = -1; -static gint hf_snp_mac_mode_bit3 = -1; -static gint hf_snp_mac_mode_bit4 = -1; -static gint hf_snp_mac_mode_bit5 = -1; -static gint hf_snp_mac_mode_reserved = -1; -static gint hf_snp_mac_mode_reserved1 = -1; -static gint hf_snp_pn_window_size = -1; -static gint hf_snp_max_conc_transactions = -1; -static gint hf_snp_max_suppt_sec_assns = -1; -static gint hf_snp_unknown_type = -1; +static int hf_snp_pkm_version_support; +static int hf_snp_pkm_version_support_bit0; +static int hf_snp_pkm_version_support_bit1; +static int hf_snp_pkm_version_support_reserved; +static int hf_snp_auth_policy_support; +static int hf_snp_auth_policy_support_bit0; +static int hf_snp_auth_policy_support_bit1; +static int hf_snp_auth_policy_support_bit2; +static int hf_snp_auth_policy_support_bit3; +static int hf_snp_auth_policy_support_bit4; +static int hf_snp_auth_policy_support_bit5; +static int hf_snp_auth_policy_support_bit6; +static int hf_snp_auth_policy_support_bit7; +static int hf_snp_mac_mode; +static int hf_snp_mac_mode_bit0; +static int hf_snp_mac_mode_bit1; +static int hf_snp_mac_mode_bit1_rsvd; +static int hf_snp_mac_mode_bit2; +static int hf_snp_mac_mode_bit3; +static int hf_snp_mac_mode_bit4; +static int hf_snp_mac_mode_bit5; +static int hf_snp_mac_mode_reserved; +static int hf_snp_mac_mode_reserved1; +static int hf_snp_pn_window_size; +static int hf_snp_max_conc_transactions; +static int hf_snp_max_suppt_sec_assns; +static int hf_snp_unknown_type; /* bit masks */ /* 11.8.4.1 */ @@ -630,65 +633,65 @@ static gint hf_snp_unknown_type = -1; #define SNP_MAC_MODE_RSV1 0xC0 /* PKM display */ -static gint hf_pkm_msg_unknown_type = -1; -static gint hf_pkm_msg_attr_display = -1; -static gint hf_pkm_config_settings_authorize_waitout = -1; -static gint hf_pkm_config_settings_reauthorize_waitout = -1; -static gint hf_pkm_config_settings_grace_time = -1; -static gint hf_pkm_config_settings_operational_waittime = -1; -static gint hf_pkm_msg_attr_auth_key = -1; -static gint hf_pkm_msg_attr_tek = -1; -static gint hf_pkm_msg_attr_key_life_time = -1; -static gint hf_pkm_msg_attr_key_seq_num = -1; -static gint hf_pkm_msg_attr_hmac_digest = -1; -static gint hf_pkm_msg_attr_said = -1; -static gint hf_pkm_msg_attr_cbc_iv = -1; -static gint hf_pkm_msg_attr_error_code = -1; -static gint hf_pkm_msg_attr_ca_certificate = -1; -static gint hf_pkm_msg_attr_ss_certificate = -1; -static gint hf_pkm_attr_auth_result_code = -1; -static gint hf_pkm_attr_sa_service_type = -1; -static gint hf_pkm_attr_frame_number = -1; -static gint hf_pkm_attr_ss_random = -1; -static gint hf_pkm_attr_bs_random = -1; -static gint hf_pkm_attr_pre_pak = -1; -static gint hf_pkm_attr_bs_certificate = -1; -static gint hf_pkm_attr_sig_bs = -1; -static gint hf_pkm_attr_ms_mac_address = -1; -static gint hf_pkm_attr_cmac_digest = -1; -static gint hf_pkm_attr_cmac_digest_pn = -1; -static gint hf_pkm_attr_cmac_digest_value = -1; -static gint hf_pkm_attr_eap_payload = -1; -static gint hf_pkm_attr_nonce = -1; -static gint hf_pkm_sa_type = -1; -static gint hf_pkm_msg_crypto_suite = -1; -static gint hf_pkm_msg_crypto_suite_msb = -1; -static gint hf_pkm_msg_crypto_suite_middle = -1; -static gint hf_pkm_msg_crypto_suite_lsb = -1; -/*static gint hf_pkm_msg_version = -1;*/ -static gint hf_pkm_attr_push_modes = -1; -static gint hf_pkm_attr_key_push_counter = -1; -static gint hf_pkm_attr_gkek = -1; -static gint hf_pkm_attr_sig_ss = -1; -static gint hf_pkm_attr_akid = -1; -static gint hf_pkm_config_settings_rekey_wait_timeout = -1; -static gint hf_pkm_config_settings_tek_grace_time = -1; -static gint hf_pkm_config_settings_authorize_reject_wait_timeout = -1; - -/* static gint hf_pkm_attr_pak_ak_seq_number = -1; */ -static gint hf_pkm_attr_associated_gkek_seq_number = -1; -/* static gint hf_pkm_attr_gkek_params = -1; */ - -/* static gint hf_common_tlv_unknown_type = -1; */ -static gint hf_common_tlv_mac_version = -1; -static gint hf_common_tlv_vendor_id = -1; -static gint hf_common_tlv_vendor_specific_type = -1; -static gint hf_common_tlv_vendor_specific_length = -1; -static gint hf_common_tlv_vendor_specific_length_size = -1; -static gint hf_common_tlv_vendor_specific_value = -1; -static gint hf_common_current_transmitted_power = -1; - -static expert_field ei_common_tlv_info = EI_INIT; +static int hf_pkm_msg_unknown_type; +static int hf_pkm_msg_attr_display; +static int hf_pkm_config_settings_authorize_waitout; +static int hf_pkm_config_settings_reauthorize_waitout; +static int hf_pkm_config_settings_grace_time; +static int hf_pkm_config_settings_operational_waittime; +static int hf_pkm_msg_attr_auth_key; +static int hf_pkm_msg_attr_tek; +static int hf_pkm_msg_attr_key_life_time; +static int hf_pkm_msg_attr_key_seq_num; +static int hf_pkm_msg_attr_hmac_digest; +static int hf_pkm_msg_attr_said; +static int hf_pkm_msg_attr_cbc_iv; +static int hf_pkm_msg_attr_error_code; +static int hf_pkm_msg_attr_ca_certificate; +static int hf_pkm_msg_attr_ss_certificate; +static int hf_pkm_attr_auth_result_code; +static int hf_pkm_attr_sa_service_type; +static int hf_pkm_attr_frame_number; +static int hf_pkm_attr_ss_random; +static int hf_pkm_attr_bs_random; +static int hf_pkm_attr_pre_pak; +static int hf_pkm_attr_bs_certificate; +static int hf_pkm_attr_sig_bs; +static int hf_pkm_attr_ms_mac_address; +static int hf_pkm_attr_cmac_digest; +static int hf_pkm_attr_cmac_digest_pn; +static int hf_pkm_attr_cmac_digest_value; +static int hf_pkm_attr_eap_payload; +static int hf_pkm_attr_nonce; +static int hf_pkm_sa_type; +static int hf_pkm_msg_crypto_suite; +static int hf_pkm_msg_crypto_suite_msb; +static int hf_pkm_msg_crypto_suite_middle; +static int hf_pkm_msg_crypto_suite_lsb; +/*static int hf_pkm_msg_version;*/ +static int hf_pkm_attr_push_modes; +static int hf_pkm_attr_key_push_counter; +static int hf_pkm_attr_gkek; +static int hf_pkm_attr_sig_ss; +static int hf_pkm_attr_akid; +static int hf_pkm_config_settings_rekey_wait_timeout; +static int hf_pkm_config_settings_tek_grace_time; +static int hf_pkm_config_settings_authorize_reject_wait_timeout; + +/* static int hf_pkm_attr_pak_ak_seq_number; */ +static int hf_pkm_attr_associated_gkek_seq_number; +/* static int hf_pkm_attr_gkek_params; */ + +/* static int hf_common_tlv_unknown_type; */ +static int hf_common_tlv_mac_version; +static int hf_common_tlv_vendor_id; +static int hf_common_tlv_vendor_specific_type; +static int hf_common_tlv_vendor_specific_length; +static int hf_common_tlv_vendor_specific_length_size; +static int hf_common_tlv_vendor_specific_value; +static int hf_common_current_transmitted_power; + +static expert_field ei_common_tlv_info; /* Register WiMax Utility Routines */ void wimax_proto_register_wimax_utility_decoders(void) @@ -738,15 +741,15 @@ void wimax_proto_register_wimax_utility_decoders(void) }, { /* 7 Maximum Sustained Traffic Rate */ &hf_sfe_max_str, - {"Maximum Sustained Traffic Rate", "wmx.sfe.msr", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &wimax_units_bit_sec, 0x0, NULL, HFILL} + {"Maximum Sustained Traffic Rate", "wmx.sfe.msr", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_bit_sec), 0x0, NULL, HFILL} }, { /* 8 Maximum Traffic Burst */ &hf_sfe_max_traffic_burst, - {"Maximum Traffic Burst", "wmx.sfe.max_traffic_burst", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &wimax_units_byte_bytes, 0x0, NULL, HFILL} + {"Maximum Traffic Burst", "wmx.sfe.max_traffic_burst", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_byte_bytes), 0x0, NULL, HFILL} }, { /* 9 Minimum Reserved Traffic Rate */ &hf_sfe_min_rtr, - {"Minimum Reserved Traffic Rate", "wmx.sfe.mrr", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &wimax_units_bit_sec, 0x0, NULL, HFILL} + {"Minimum Reserved Traffic Rate", "wmx.sfe.mrr", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_bit_sec), 0x0, NULL, HFILL} }, { /* 10 Reserved */ @@ -801,11 +804,11 @@ void wimax_proto_register_wimax_utility_decoders(void) }, { /* 13 Tolerated Jitter */ &hf_sfe_jitter, - {"Tolerated Jitter", "wmx.sfe.jitter", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &wimax_units_ms, 0x0, NULL, HFILL} + {"Tolerated Jitter", "wmx.sfe.jitter", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_ms), 0x0, NULL, HFILL} }, { /* 14 Maximum Latency */ &hf_sfe_max_latency, - {"Maximum Latency", "wmx.sfe.max_latency", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &wimax_units_ms, 0x0, NULL, HFILL} + {"Maximum Latency", "wmx.sfe.max_latency", FT_UINT32, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_ms), 0x0, NULL, HFILL} }, { /* 15 Fixed/Variable Length SDU */ &hf_sfe_fixed_len_sdu, @@ -813,7 +816,7 @@ void wimax_proto_register_wimax_utility_decoders(void) }, { /* 16 SDU Size */ &hf_sfe_sdu_size, - {"SDU Size", "wmx.sfe.sdu_size", FT_UINT8, BASE_DEC|BASE_UNIT_STRING, &wimax_units_byte_bytes, 0x0, NULL, HFILL} + {"SDU Size", "wmx.sfe.sdu_size", FT_UINT8, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_byte_bytes), 0x0, NULL, HFILL} }, { /* 17 SAID Onto Which SF Is Mapped */ &hf_sfe_target_said, @@ -898,7 +901,7 @@ void wimax_proto_register_wimax_utility_decoders(void) }, { /* 31 Time Base */ &hf_sfe_time_base, - {"Time Base", "wmx.sfe.time_base", FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &wimax_units_ms, 0x0, NULL, HFILL} + {"Time Base", "wmx.sfe.time_base", FT_UINT16, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_ms), 0x0, NULL, HFILL} }, { /* 32 Paging Preference */ &hf_sfe_paging_preference, @@ -942,11 +945,11 @@ void wimax_proto_register_wimax_utility_decoders(void) }, { /* 40 Unsolicited Grant Interval */ &hf_sfe_unsolicited_grant_interval, - {"Unsolicited Grant Interval", "wmx.sfe.unsolicited_grant_interval", FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &wimax_units_ms, 0x0, NULL, HFILL} + {"Unsolicited Grant Interval", "wmx.sfe.unsolicited_grant_interval", FT_UINT16, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_ms), 0x0, NULL, HFILL} }, { /* 41 Unsolicited Polling Interval */ &hf_sfe_unsolicited_polling_interval, - {"Unsolicited Polling Interval", "wmx.sfe.unsolicited_polling_interval", FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &wimax_units_ms, 0x0, NULL, HFILL} + {"Unsolicited Polling Interval", "wmx.sfe.unsolicited_polling_interval", FT_UINT16, BASE_DEC|BASE_UNIT_STRING, UNS(&wimax_units_ms), 0x0, NULL, HFILL} }, { /* 42 PDU SN extended subheader for HARQ reordering */ &hf_sfe_pdu_sn_ext_subheader_reorder, @@ -1679,7 +1682,7 @@ void wimax_proto_register_wimax_utility_decoders(void) expert_module_t* expert_wimax_utility; - if(proto_wimax_utility_decoders == -1) + if(proto_wimax_utility_decoders <= 0) { proto_wimax_utility_decoders = proto_register_protocol ( "WiMax Sub-TLV Messages", @@ -1712,9 +1715,9 @@ void wimax_proto_register_wimax_utility_decoders(void) /**************************************************************/ void wimax_error_parameter_set_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset; - guint tvb_len, tlv_len; - gint tlv_type; + unsigned offset; + unsigned tvb_len, tlv_len; + int tlv_type; proto_item *ceps_item = NULL; proto_tree *ceps_tree = NULL; tlv_info_t tlv_info; @@ -1780,17 +1783,17 @@ void wimax_error_parameter_set_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ /* pinfo - pointer of Wireshark packet information structure */ /****************************************************************/ /* CS Parameter Encoding Rules handling function */ -void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +void wimax_convengence_service_parameter_encoding_rules_decoder(unsigned sfe_type, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset, tlv_offset; - guint tvb_len, tlv_len, length; - gint tlv_type; + unsigned offset, tlv_offset; + unsigned tvb_len, tlv_len, length; + int tlv_type; proto_item *csper_item; proto_tree *csper_tree; proto_tree *tlv_tree, *ti_tree; proto_item *tlv_item, *ti_item; tlv_info_t tlv_info; - gboolean ipv6 = ((sfe_type == SFE_CSPER_PACKET_IPV6) || (sfe_type == SFE_CSPER_PACKET_IPV6_802_3) || (sfe_type == SFE_CSPER_PACKET_IPV6_802_1Q)); + bool ipv6 = ((sfe_type == SFE_CSPER_PACKET_IPV6) || (sfe_type == SFE_CSPER_PACKET_IPV6_802_3) || (sfe_type == SFE_CSPER_PACKET_IPV6_802_1Q)); /* sanity check */ if((sfe_type < SFE_CSPER_ATM) || (sfe_type > SFE_CSPER_PACKET_IP_802_3_ECRTP_COMPRESSION)) @@ -2129,10 +2132,10 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type, /**************************************************************/ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset, i; - guint tvb_len, tlv_len, tlv_value_offset, tlv_value; - gint tlv_type; - guint value; + unsigned offset, i; + unsigned tvb_len, tlv_len, tlv_value_offset, tlv_value; + int tlv_type; + unsigned value; proto_item *tlv_item = NULL; proto_tree *tlv_tree = NULL; tlv_info_t tlv_info; @@ -2216,7 +2219,7 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro break; case SFE_UL_SCHEDULING: /* TODO: Find a way to get the correct service type from the TLV */ - tlv_value = tvb_get_guint8(tvb, offset); + tlv_value = tvb_get_uint8(tvb, offset); set_service_type( tlv_value ); add_tlv_subtree(&tlv_info, tree, hf_sfe_ul_grant_scheduling, tvb, offset-tlv_value_offset, ENC_BIG_ENDIAN); break; @@ -2244,7 +2247,7 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro break; case SFE_SDU_SIZE: /* save the SDU size */ - mac_sdu_length = tvb_get_guint8(tvb, offset); + mac_sdu_length = tvb_get_uint8(tvb, offset); add_tlv_subtree(&tlv_info, tree, hf_sfe_sdu_size, tvb, offset-tlv_value_offset, ENC_BIG_ENDIAN); break; case SFE_TARGET_SAID: @@ -2308,7 +2311,7 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_item = add_tlv_subtree(&tlv_info, tree, hf_sfe_arq_block_size_cor2, tvb, offset-tlv_value_offset, ENC_BIG_ENDIAN); /* add TLV subtree */ tlv_tree = proto_item_add_subtree(tlv_item, ett_wimax_service_flow_encodings); - value = tvb_get_guint8(tvb, offset); + value = tvb_get_uint8(tvb, offset); tlv_item = proto_tree_add_item(tlv_tree, hf_sfe_arq_min_block_size, tvb, offset, 1, ENC_BIG_ENDIAN); /* Size is 2^((value & 0x0F) + 4)) */ proto_item_append_text(tlv_item, " ( %d bytes )", 0x10 << (value & 0x0F)); @@ -2425,9 +2428,9 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* offset - the HMAC Tuple offset in the tvb */ /* length - length of the HMAC Tuple */ /**************************************************************/ -void wimax_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, guint length) +void wimax_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, unsigned offset, unsigned length) { - guint hmac_offset; + unsigned hmac_offset; proto_item *hmac_item = NULL; proto_tree *hmac_tree = NULL; @@ -2453,9 +2456,9 @@ void wimax_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, gui /* offset - the CMAC Tuple offset in the tvb */ /* length - length of the CMAC Tuple */ /**************************************************************/ -void wimax_cmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, guint length) +void wimax_cmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, unsigned offset, unsigned length) { - guint cmac_offset; + unsigned cmac_offset; proto_item *cmac_item = NULL; proto_tree *cmac_tree = NULL; @@ -2488,9 +2491,9 @@ void wimax_cmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, gui /* offset - the Short-HMAC Tuple offset in the tvb */ /* length - length of the Short-HMAC Tuple */ /******************************************************************/ -void wimax_short_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, guint length) +void wimax_short_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, unsigned offset, unsigned length) { - guint hmac_offset; + unsigned hmac_offset; proto_item *hmac_item = NULL; proto_tree *hmac_tree = NULL; @@ -2519,9 +2522,9 @@ void wimax_short_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offse /******************************************************************/ void wimax_security_negotiation_parameters_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset; - guint tvb_len, tlv_len, tlv_value_offset; - gint tlv_type; + unsigned offset; + unsigned tvb_len, tlv_len, tlv_value_offset; + int tlv_type; proto_tree *tlv_tree; proto_item *tlv_item; tlv_info_t tlv_info; @@ -2636,9 +2639,9 @@ void wimax_security_negotiation_parameters_decoder(tvbuff_t *tvb, packet_info *p /******************************************************************/ void wimax_cryptographic_suite_list_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset; - guint tvb_len, tlv_len, tlv_value_offset; - gint tlv_type; + unsigned offset; + unsigned tvb_len, tlv_len, tlv_value_offset; + int tlv_type; proto_tree *tlv_tree; proto_item *tlv_item; tlv_info_t tlv_info; @@ -2704,9 +2707,9 @@ void wimax_cryptographic_suite_list_decoder(tvbuff_t *tvb, packet_info *pinfo, p /******************************************************************/ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset; - guint tvb_len, tlv_len, tlv_value_offset; - gint tlv_type; + unsigned offset; + unsigned tvb_len, tlv_len, tlv_value_offset; + int tlv_type; proto_tree *tlv_tree; proto_item *tlv_item; tlv_info_t tlv_info; @@ -2803,7 +2806,7 @@ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo, /* add subtree */ wimax_cryptographic_suite_list_decoder(tvb_new_subset_length(tvb, offset, tlv_len), pinfo, tlv_tree); break; -#if 0 /* rserved by IEE 802.16E */ +#if 0 /* reserved by IEE 802.16E */ case PKM_ATTR_VERSION: proto_tree_add_item(tree, hf_pkm_msg_version, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; @@ -2902,9 +2905,9 @@ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo, /******************************************************************/ void wimax_tek_parameters_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset; - guint tvb_len, tlv_len, tlv_value_offset; - gint tlv_type; + unsigned offset; + unsigned tvb_len, tlv_len, tlv_value_offset; + int tlv_type; tlv_info_t tlv_info; /* get the tvb reported length */ @@ -2974,9 +2977,9 @@ void wimax_tek_parameters_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree /******************************************************************/ void wimax_pkm_configuration_settings_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset; - guint tvb_len, tlv_len, tlv_value_offset; - gint tlv_type; + unsigned offset; + unsigned tvb_len, tlv_len, tlv_value_offset; + int tlv_type; tlv_info_t tlv_info; /* get the tvb reported length */ @@ -3052,9 +3055,9 @@ void wimax_pkm_configuration_settings_decoder(tvbuff_t *tvb, packet_info *pinfo, /******************************************************************/ void wimax_sa_descriptor_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset; - guint tvb_len, tlv_len, tlv_value_offset; - gint tlv_type; + unsigned offset; + unsigned tvb_len, tlv_len, tlv_value_offset; + int tlv_type; proto_tree *tlv_tree; proto_item *tlv_item; tlv_info_t tlv_info; @@ -3130,9 +3133,9 @@ void wimax_sa_descriptor_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree * /******************************************************************/ void wimax_security_capabilities_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset; - guint tvb_len, tlv_len, tlv_value_offset; - gint tlv_type; + unsigned offset; + unsigned tvb_len, tlv_len, tlv_value_offset; + int tlv_type; proto_tree *tlv_tree = NULL; tlv_info_t tlv_info; @@ -3193,9 +3196,9 @@ void wimax_security_capabilities_decoder(tvbuff_t *tvb, packet_info *pinfo, prot /******************************************************************/ void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset; - guint tvb_len, tlv_len, tlv_value_offset; - gint tlv_type; + unsigned offset; + unsigned tvb_len, tlv_len, tlv_value_offset; + int tlv_type; tlv_info_t tlv_info; /* get the tvb reported length */ @@ -3272,14 +3275,14 @@ void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo /* tree - pointer of Wireshark display tree */ /* pinfo - pointer of Wireshark packet information structure */ /******************************************************************/ -guint wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +unsigned wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset, value; - guint tvb_len, tlv_len, tlv_value_offset; - gint tlv_type; + unsigned offset, value; + unsigned tvb_len, tlv_len, tlv_value_offset; + int tlv_type; proto_tree *tlv_tree = NULL; tlv_info_t tlv_info; - gfloat current_power; + float current_power; /* get the tvb reported length */ tvb_len = tvb_reported_length(tvb); @@ -3344,8 +3347,8 @@ guint wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto break; case CURRENT_TX_POWER: tlv_tree = add_tlv_subtree_no_item(&tlv_info, tree, hf_common_current_transmitted_power, tvb, offset-tlv_value_offset); - value = tvb_get_guint8(tvb, offset); - current_power = (gfloat)((value - 128) / 2.0); + value = tvb_get_uint8(tvb, offset); + current_power = (float)((value - 128) / 2.0); proto_tree_add_float_format_value(tlv_tree, hf_common_current_transmitted_power, tvb, offset, tvb_len, current_power, "%.2f dBm (Value: 0x%x)", current_power, value); break; case MAC_VERSION_ENCODING: diff --git a/plugins/epan/wimax/wimax_utils.h b/plugins/epan/wimax/wimax_utils.h index 0a78e223..ef41dd3c 100644 --- a/plugins/epan/wimax/wimax_utils.h +++ b/plugins/epan/wimax/wimax_utils.h @@ -15,24 +15,26 @@ #define WIMAX_UTILS_H #include <epan/packet.h> +#include <epan/unit_strings.h> -extern void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb, guint tlv_offset, guint tlv_len, packet_info *pinfo, guint offset, gint proto_registry); -extern void dissect_power_saving_class(proto_tree *rng_req_tree, gint tlv_type, tvbuff_t *tvb, guint compound_tlv_len, packet_info *pinfo, guint offset); -extern gint dissect_ulmap_ie(proto_tree *ie_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb); -extern guint get_service_type(void); +#include <wsutil/array.h> +extern void dissect_extended_tlv(proto_tree *reg_req_tree, int tlv_type, tvbuff_t *tvb, unsigned tlv_offset, unsigned tlv_len, packet_info *pinfo, unsigned offset, int proto_registry); +extern void dissect_power_saving_class(proto_tree *rng_req_tree, int tlv_type, tvbuff_t *tvb, unsigned compound_tlv_len, packet_info *pinfo, unsigned offset); +extern int dissect_ulmap_ie(proto_tree *ie_tree, packet_info* pinfo, int offset, int length, tvbuff_t *tvb); +extern unsigned get_service_type(void); extern void init_wimax_globals(void); /* defined in msg_ulmap.c */ -extern gboolean is_down_link(packet_info *pinfo); -extern gint RCID_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb, gint RCID_Type); +extern bool is_down_link(packet_info *pinfo); +extern int RCID_IE(proto_tree *diuc_tree, int offset, int length, tvbuff_t *tvb, int RCID_Type); extern void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -extern void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -extern gint wimax_decode_ulmapc(proto_tree *base_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb); -extern gint wimax_decode_ulmap_reduced_aas(proto_tree *ie_tree, gint offset, gint length, tvbuff_t *tvb); -extern gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdu_tree); -extern gint wimax_decode_dlmap_reduced_aas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tree); +extern void wimax_convengence_service_parameter_encoding_rules_decoder(unsigned sfe_type, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); +extern int wimax_decode_ulmapc(proto_tree *base_tree, packet_info* pinfo, int offset, int length, tvbuff_t *tvb); +extern int wimax_decode_ulmap_reduced_aas(proto_tree *ie_tree, int offset, int length, tvbuff_t *tvb); +extern int wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdu_tree); +extern int wimax_decode_dlmap_reduced_aas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tree); extern void wimax_error_parameter_set_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -extern void wimax_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, guint length); -extern void wimax_cmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, guint length); -extern void wimax_short_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, guint length); +extern void wimax_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, unsigned offset, unsigned length); +extern void wimax_cmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, unsigned offset, unsigned length); +extern void wimax_short_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, unsigned offset, unsigned length); extern void wimax_security_negotiation_parameters_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); extern void wimax_tek_parameters_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); extern void wimax_pkm_configuration_settings_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); @@ -41,7 +43,7 @@ extern void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info extern void wimax_cryptographic_suite_list_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); extern void wimax_security_capabilities_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); extern void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -extern guint wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); +extern unsigned wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); //Windows can't handle plugins using globals from epan, so copies are necessary extern const unit_name_string wimax_units_byte_bytes; diff --git a/plugins/epan/wimaxasncp/packet-wimaxasncp.c b/plugins/epan/wimaxasncp/packet-wimaxasncp.c index 4de30ff3..e5d6e6bb 100644 --- a/plugins/epan/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/epan/wimaxasncp/packet-wimaxasncp.c @@ -37,71 +37,71 @@ void proto_register_wimaxasncp(void); void proto_reg_handoff_wimaxasncp(void); /* Initialize the protocol and registered fields */ -static int proto_wimaxasncp = -1; -static int hf_wimaxasncp_version = -1; -static int hf_wimaxasncp_flags = -1; -static int hf_wimaxasncp_function_type = -1; -static int hf_wimaxasncp_op_id = -1; -static int hf_wimaxasncp_message_type = -1; -/* static int hf_wimaxasncp_qos_msg = -1; */ -/* static int hf_wimaxasncp_ho_control_msg = -1; */ -/* static int hf_wimaxasncp_data_path_control_msg = -1; */ -/* static int hf_wimaxasncp_context_delivery_msg = -1; */ -/* static int hf_wimaxasncp_r3_mobility_msg = -1; */ -/* static int hf_wimaxasncp_paging_msg = -1; */ -/* static int hf_wimaxasncp_rrm_msg = -1; */ -/* static int hf_wimaxasncp_authentication_msg = -1; */ -/* static int hf_wimaxasncp_ms_state_msg = -1; */ -/* static int hf_wimaxasncp_reauthentication_msg = -1; */ -/* static int hf_wimaxasncp_session_msg = -1; */ -static int hf_wimaxasncp_length = -1; -static int hf_wimaxasncp_msid = -1; -static int hf_wimaxasncp_reserved1 = -1; -static int hf_wimaxasncp_transaction_id = -1; -static int hf_wimaxasncp_reserved2 = -1; -/* static int hf_wimaxasncp_tlv = -1; */ -static int hf_wimaxasncp_tlv_type = -1; -static int hf_wimaxasncp_tlv_length = -1; -static int hf_wimaxasncp_tlv_value_bytes = -1; -static int hf_wimaxasncp_tlv_value_bitflags8 = -1; -static int hf_wimaxasncp_tlv_value_bitflags16 = -1; -static int hf_wimaxasncp_tlv_value_bitflags32 = -1; -/* static int hf_wimaxasncp_tlv_value_protocol = -1; */ -/* static int hf_wimaxasncp_tlv_value_vendor_id = -1; */ +static int proto_wimaxasncp; +static int hf_wimaxasncp_version; +static int hf_wimaxasncp_flags; +static int hf_wimaxasncp_function_type; +static int hf_wimaxasncp_op_id; +static int hf_wimaxasncp_message_type; +/* static int hf_wimaxasncp_qos_msg; */ +/* static int hf_wimaxasncp_ho_control_msg; */ +/* static int hf_wimaxasncp_data_path_control_msg; */ +/* static int hf_wimaxasncp_context_delivery_msg; */ +/* static int hf_wimaxasncp_r3_mobility_msg; */ +/* static int hf_wimaxasncp_paging_msg; */ +/* static int hf_wimaxasncp_rrm_msg; */ +/* static int hf_wimaxasncp_authentication_msg; */ +/* static int hf_wimaxasncp_ms_state_msg; */ +/* static int hf_wimaxasncp_reauthentication_msg; */ +/* static int hf_wimaxasncp_session_msg; */ +static int hf_wimaxasncp_length; +static int hf_wimaxasncp_msid; +static int hf_wimaxasncp_reserved1; +static int hf_wimaxasncp_transaction_id; +static int hf_wimaxasncp_reserved2; +/* static int hf_wimaxasncp_tlv; */ +static int hf_wimaxasncp_tlv_type; +static int hf_wimaxasncp_tlv_length; +static int hf_wimaxasncp_tlv_value_bytes; +static int hf_wimaxasncp_tlv_value_bitflags8; +static int hf_wimaxasncp_tlv_value_bitflags16; +static int hf_wimaxasncp_tlv_value_bitflags32; +/* static int hf_wimaxasncp_tlv_value_protocol; */ +/* static int hf_wimaxasncp_tlv_value_vendor_id; */ /* Preferences */ -static gboolean show_transaction_id_d_bit = FALSE; -static gboolean debug_enabled = FALSE; +static bool show_transaction_id_d_bit; +static bool debug_enabled; /* Default WiMAX ASN control protocol port */ #define WIMAXASNCP_DEF_UDP_PORT 2231 /* Initialize the subtree pointers */ -static gint ett_wimaxasncp = -1; -static gint ett_wimaxasncp_flags = -1; -static gint ett_wimaxasncp_tlv = -1; -static gint ett_wimaxasncp_tlv_value_bitflags8 = -1; -static gint ett_wimaxasncp_tlv_value_bitflags16 = -1; -static gint ett_wimaxasncp_tlv_value_bitflags32 = -1; -static gint ett_wimaxasncp_tlv_protocol_list = -1; -static gint ett_wimaxasncp_tlv_port_range_list = -1; -static gint ett_wimaxasncp_tlv_ip_address_mask_list = -1; -static gint ett_wimaxasncp_tlv_ip_address_mask = -1; -static gint ett_wimaxasncp_tlv_eap = -1; -static gint ett_wimaxasncp_tlv_vendor_specific_information_field = -1; -static gint ett_wimaxasncp_port_range = -1; - -static expert_field ei_wimaxasncp_tlv_type = EI_INIT; -static expert_field ei_wimaxasncp_function_type = EI_INIT; -static expert_field ei_wimaxasncp_op_id = EI_INIT; -static expert_field ei_wimaxasncp_message_type = EI_INIT; -static expert_field ei_wimaxasncp_length_bad = EI_INIT; +static int ett_wimaxasncp; +static int ett_wimaxasncp_flags; +static int ett_wimaxasncp_tlv; +static int ett_wimaxasncp_tlv_value_bitflags8; +static int ett_wimaxasncp_tlv_value_bitflags16; +static int ett_wimaxasncp_tlv_value_bitflags32; +static int ett_wimaxasncp_tlv_protocol_list; +static int ett_wimaxasncp_tlv_port_range_list; +static int ett_wimaxasncp_tlv_ip_address_mask_list; +static int ett_wimaxasncp_tlv_ip_address_mask; +static int ett_wimaxasncp_tlv_eap; +static int ett_wimaxasncp_tlv_vendor_specific_information_field; +static int ett_wimaxasncp_port_range; + +static expert_field ei_wimaxasncp_tlv_type; +static expert_field ei_wimaxasncp_function_type; +static expert_field ei_wimaxasncp_op_id; +static expert_field ei_wimaxasncp_message_type; +static expert_field ei_wimaxasncp_length_bad; /* Header size, up to, but not including, the TLV fields. */ #define WIMAXASNCP_HEADER_SIZE 20 -/* Offset to end of the length field in the headder. */ +/* Offset to end of the length field in the header. */ #define WIMAXASNCP_HEADER_LENGTH_END 6 #define WIMAXASNCP_BIT32(n) (1U << (31 - (n))) @@ -116,7 +116,7 @@ typedef struct { wmem_array_t* ett; } wimaxasncp_build_dict_t; -static wimaxasncp_dict_t *wimaxasncp_dict = NULL; +static wimaxasncp_dict_t *wimaxasncp_dict; wimaxasncp_build_dict_t wimaxasncp_build_dict; @@ -182,7 +182,7 @@ static const value_string wimaxasncp_op_id_vals[] = /* struct to hold a value_string tuple, per version */ typedef struct _ver_value_string { - guint32 since; + uint32_t since; value_string vs; } ver_value_string; @@ -402,7 +402,7 @@ static const ver_value_string wimaxasncp_ms_state_msg_vals[] = /* ------------------------------------------------------------------------- */ -/* note - function type 10-im_operation, was once used for re-authrntication */ +/* note - function type 10-im_operation, was once used for re-authentication */ static const ver_value_string wimaxasncp_im_operations_msg_vals[] = { {0, { 1, "AR_EAP_Start"}}, @@ -450,12 +450,12 @@ static const enum_val_t wimaxasncp_nwg_versions[] = { /* NWG version */ #define WIMAXASNCP_DEF_NWGVER WIMAXASNCP_NWGVER_R10_V121 -static guint global_wimaxasncp_nwg_ver = WIMAXASNCP_DEF_NWGVER; +static unsigned global_wimaxasncp_nwg_ver = WIMAXASNCP_DEF_NWGVER; /* ========================================================================= */ typedef struct { - guint8 function_type; + uint8_t function_type; const ver_value_string *vals; } wimaxasncp_func_msg_t; @@ -479,7 +479,7 @@ static const wimaxasncp_func_msg_t wimaxasncp_func_to_msg_vals_map[] = /* ========================================================================= */ static const wimaxasncp_dict_tlv_t *wimaxasncp_get_tlv_info( - guint16 type) + uint16_t type) { wimaxasncp_dict_tlv_t *res = NULL; @@ -514,9 +514,9 @@ static const wimaxasncp_dict_tlv_t *wimaxasncp_get_tlv_info( /* ========================================================================= */ -static const gchar *wimaxasncp_get_enum_name( +static const char *wimaxasncp_get_enum_name( const wimaxasncp_dict_tlv_t *tlv_info, - guint32 code) + uint32_t code) { if (tlv_info->enum_vs) { @@ -568,14 +568,14 @@ static void wimaxasncp_proto_tree_add_tlv_ipv4_value( tvbuff_t *tvb, proto_tree *tree, proto_item *tlv_item, - guint offset, + unsigned offset, const wimaxasncp_dict_tlv_t *tlv_info) { int hf_value; - guint32 ip; - const gchar *addr_res; + uint32_t ip; + const char *addr_res; - if (tlv_info->hf_ipv4 != -1) + if (tlv_info->hf_ipv4 > 0) { hf_value = tlv_info->hf_ipv4; } @@ -603,14 +603,14 @@ static void wimaxasncp_proto_tree_add_tlv_ipv6_value( tvbuff_t *tvb, proto_tree *tree, proto_item *tlv_item, - guint offset, + unsigned offset, const wimaxasncp_dict_tlv_t *tlv_info) { int hf_value; ws_in6_addr ip; - const gchar *addr_res; + const char *addr_res; - if (tlv_info->hf_ipv4 != -1) + if (tlv_info->hf_ipv4 > 0) { hf_value = tlv_info->hf_ipv6; } @@ -638,15 +638,15 @@ static void wimaxasncp_proto_tree_add_ether_value( tvbuff_t *tvb, proto_tree *tree, proto_item *tlv_item, - guint offset, - guint length, + unsigned offset, + unsigned length, const wimaxasncp_dict_tlv_t *tlv_info) { int hf_value; - const guint8 *p; - const gchar *ether_name; + const uint8_t *p; + const char *ether_name; - if (tlv_info->hf_bsid != -1) + if (tlv_info->hf_bsid > 0) { hf_value = tlv_info->hf_bsid; } @@ -678,10 +678,10 @@ static void wimaxasncp_dissect_tlv_value( proto_item *tlv_item, const wimaxasncp_dict_tlv_t *tlv_info) { - guint offset = 0; - guint length; - const guint max_show_bytes = 24; /* arbitrary */ - static const gchar *hex_note = "[hex]"; + unsigned offset = 0; + unsigned length; + const unsigned max_show_bytes = 24; /* arbitrary */ + static const char *hex_note = "[hex]"; length = tvb_reported_length(tvb); @@ -706,10 +706,10 @@ static void wimaxasncp_dissect_tlv_value( if (tree) { - guint8 value; - const gchar *s; + uint8_t value; + const char *s; - value = tvb_get_guint8(tvb, offset); + value = tvb_get_uint8(tvb, offset); s = wimaxasncp_get_enum_name(tlv_info, value); @@ -742,8 +742,8 @@ static void wimaxasncp_dissect_tlv_value( if (tree) { - guint16 value; - const gchar *s; + uint16_t value; + const char *s; value = tvb_get_ntohs(tvb, offset); @@ -778,8 +778,8 @@ static void wimaxasncp_dissect_tlv_value( if (tree) { - guint32 value; - const gchar *s; + uint32_t value; + const char *s; value = tvb_get_ntohl(tvb, offset); @@ -815,7 +815,7 @@ static void wimaxasncp_dissect_tlv_value( { if (tree) { - const gchar *s = tvb_get_string_enc(pinfo->pool, tvb, offset, length, ENC_ASCII); + const char *s = tvb_get_string_enc(pinfo->pool, tvb, offset, length, ENC_ASCII); proto_tree_add_string_format( tree, tlv_info->hf_value, @@ -855,10 +855,10 @@ static void wimaxasncp_dissect_tlv_value( { proto_tree *flags_tree; proto_item *item; - guint8 value; - guint i; + uint8_t value; + unsigned i; - value = tvb_get_guint8(tvb, offset); + value = tvb_get_uint8(tvb, offset); item = proto_tree_add_item( tree, tlv_info->hf_value, @@ -873,12 +873,12 @@ static void wimaxasncp_dissect_tlv_value( for (i = 0; i < 8; ++i) { - guint8 mask; + uint8_t mask; mask = 1U << (7 - i); if (value & mask) { - const gchar *s; + const char *s; s = wimaxasncp_get_enum_name(tlv_info, value & mask); @@ -910,8 +910,8 @@ static void wimaxasncp_dissect_tlv_value( { proto_tree *flags_tree; proto_item *item; - guint16 value; - guint i; + uint16_t value; + unsigned i; value = tvb_get_ntohs(tvb, offset); @@ -928,12 +928,12 @@ static void wimaxasncp_dissect_tlv_value( for (i = 0; i < 16; ++i) { - guint16 mask; + uint16_t mask; mask = 1U << (15 - i); if (value & mask) { - const gchar *s; + const char *s; s = wimaxasncp_get_enum_name(tlv_info, value & mask); @@ -965,8 +965,8 @@ static void wimaxasncp_dissect_tlv_value( { proto_tree *flags_tree; proto_item *item; - guint32 value; - guint i; + uint32_t value; + unsigned i; value = tvb_get_ntohl(tvb, offset); @@ -983,12 +983,12 @@ static void wimaxasncp_dissect_tlv_value( for (i = 0; i < 32; ++i) { - guint32 mask; + uint32_t mask; mask = 1U << (31 - i); if (value & mask) { - const gchar *s; + const char *s; s = wimaxasncp_get_enum_name(tlv_info, value & mask); proto_tree_add_uint_format( @@ -1049,7 +1049,7 @@ static void wimaxasncp_dissect_tlv_value( tvb, offset, length, ENC_NA); if (length) { - const gchar* format; + const char* format; if (length <= max_show_bytes) { format = " - %s"; @@ -1058,7 +1058,7 @@ static void wimaxasncp_dissect_tlv_value( { format = " - %s..."; } - const gchar* s = tvb_bytes_to_str_punct( + const char* s = tvb_bytes_to_str_punct( pinfo->pool, tvb, offset, MIN(length, max_show_bytes), 0); proto_item_append_text( @@ -1080,9 +1080,9 @@ static void wimaxasncp_dissect_tlv_value( if (tree) { - guint8 value; + uint8_t value; - value = tvb_get_guint8(tvb, offset); + value = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format( tree, tlv_info->hf_value, @@ -1104,7 +1104,7 @@ static void wimaxasncp_dissect_tlv_value( if (tree) { - guint16 value; + uint16_t value; value = tvb_get_ntohs(tvb, offset); @@ -1128,7 +1128,7 @@ static void wimaxasncp_dissect_tlv_value( if (tree) { - guint32 value; + uint32_t value; value = tvb_get_ntohl(tvb, offset); @@ -1152,9 +1152,9 @@ static void wimaxasncp_dissect_tlv_value( if (tree) { - guint8 value; + uint8_t value; - value = tvb_get_guint8(tvb, offset); + value = tvb_get_uint8(tvb, offset); proto_tree_add_uint_format( tree, tlv_info->hf_value, @@ -1176,7 +1176,7 @@ static void wimaxasncp_dissect_tlv_value( if (tree) { - guint16 value; + uint16_t value; value = tvb_get_ntohs(tvb, offset); @@ -1200,7 +1200,7 @@ static void wimaxasncp_dissect_tlv_value( if (tree) { - guint32 value; + uint32_t value; value = tvb_get_ntohl(tvb, offset); @@ -1306,7 +1306,7 @@ static void wimaxasncp_dissect_tlv_value( { proto_tree *protocol_list_tree; proto_item *item; - const guint max_protocols_in_tlv_item = 8; /* arbitrary */ + const unsigned max_protocols_in_tlv_item = 8; /* arbitrary */ protocol_list_tree = proto_tree_add_subtree( tree, tvb, offset, length, @@ -1321,8 +1321,8 @@ static void wimaxasncp_dissect_tlv_value( while (offset < tvb_reported_length(tvb)) { - guint16 protocol; - const gchar *protocol_name; + uint16_t protocol; + const char *protocol_name; protocol = tvb_get_ntohs(tvb, offset); protocol_name = ipprotostr(protocol); @@ -1363,7 +1363,7 @@ static void wimaxasncp_dissect_tlv_value( { proto_tree *port_range_list_tree; proto_item *item; - const guint max_port_ranges_in_tlv_item = 3; /* arbitrary */ + const unsigned max_port_ranges_in_tlv_item = 3; /* arbitrary */ port_range_list_tree = proto_tree_add_subtree( tree, tvb, offset, length, @@ -1378,8 +1378,8 @@ static void wimaxasncp_dissect_tlv_value( while (offset < tvb_reported_length(tvb)) { - guint16 portLow; - guint16 portHigh; + uint16_t portLow; + uint16_t portHigh; proto_tree* range_tree; portLow = tvb_get_ntohs(tvb, offset); @@ -1519,8 +1519,8 @@ static void wimaxasncp_dissect_tlv_value( while (offset < tvb_reported_length(tvb)) { proto_tree *ip_address_mask_tree; - guint32 ip; - const gchar *s; + uint32_t ip; + const char *s; ip_address_mask_tree = proto_tree_add_subtree( ip_address_mask_list_tree, tvb, offset, 8, @@ -1571,15 +1571,15 @@ static void wimaxasncp_dissect_tlv_value( /* * EAP payload, call eap dissector to dissect eap payload */ - guint8 eap_code; - guint8 eap_type = 0; + uint8_t eap_code; + uint8_t eap_type = 0; /* Get code */ - eap_code = tvb_get_guint8(tvb, offset); + eap_code = tvb_get_uint8(tvb, offset); if (eap_code == EAP_REQUEST || eap_code == EAP_RESPONSE) { /* Get type */ - eap_type = tvb_get_guint8(tvb, offset + 4); + eap_type = tvb_get_uint8(tvb, offset + 4); } /* Add code and type to info column */ @@ -1600,7 +1600,7 @@ static void wimaxasncp_dissect_tlv_value( { proto_tree *eap_tree; proto_item *item; - gboolean save_writable; + bool save_writable; tvbuff_t *eap_tvb; /* Create EAP subtree */ @@ -1627,7 +1627,7 @@ static void wimaxasncp_dissect_tlv_value( /* Disable writing to info column while calling eap dissector */ save_writable = col_get_writable(pinfo->cinfo, -1); - col_set_writable(pinfo->cinfo, -1, FALSE); + col_set_writable(pinfo->cinfo, -1, false); /* Call the EAP dissector. */ call_dissector(eap_handle, eap_tvb, pinfo, eap_tree); @@ -1664,8 +1664,8 @@ static void wimaxasncp_dissect_tlv_value( { proto_tree *vsif_tree; proto_item *item; - guint32 vendorId; - const gchar *vendorName; + uint32_t vendorId; + const char *vendorName; vsif_tree = proto_tree_add_subtree( tree, tvb, offset, length, @@ -1790,12 +1790,12 @@ static void wimaxasncp_dissect_tlv_value( /* ========================================================================= */ // NOLINTNEXTLINE(misc-no-recursion) -static guint dissect_wimaxasncp_tlvs( +static unsigned dissect_wimaxasncp_tlvs( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset; + unsigned offset; offset = 0; while (offset < tvb_reported_length(tvb)) @@ -1804,9 +1804,9 @@ static guint dissect_wimaxasncp_tlvs( proto_tree *tlv_tree; proto_item *tlv_item; - guint16 type; - guint16 length; - guint pad; + uint16_t type; + uint16_t length; + unsigned pad; /* -------------------------------------------------------------------- * type and length @@ -1829,8 +1829,8 @@ static guint dissect_wimaxasncp_tlvs( { proto_item *type_item; - gint tree_length = MIN( - (gint)(4 + length + pad), tvb_captured_length_remaining(tvb, offset)); + int tree_length = MIN( + (int)(4 + length + pad), tvb_captured_length_remaining(tvb, offset)); tlv_item = proto_tree_add_item( tree, tlv_info->hf_root, @@ -1931,17 +1931,17 @@ static guint dissect_wimaxasncp_tlvs( /* ========================================================================= */ -static guint dissect_wimaxasncp_backend( +static unsigned dissect_wimaxasncp_backend( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - guint16 ui16; - guint32 ui32; - const guint8 *pmsid; - guint16 tid = 0; - gboolean dbit_show; + unsigned offset = 0; + uint16_t ui16; + uint32_t ui32; + const uint8_t *pmsid; + uint16_t tid = 0; + bool dbit_show; /* ------------------------------------------------------------------------ @@ -1980,12 +1980,12 @@ static guint dissect_wimaxasncp_backend( * ------------------------------------------------------------------------ */ - dbit_show = FALSE; + dbit_show = false; ui16 = tvb_get_ntohs(tvb, offset); if (show_transaction_id_d_bit) { - const guint16 mask = 0x7fff; + const uint16_t mask = 0x7fff; if (ui16 & 0x8000) { @@ -1995,7 +1995,7 @@ static guint dissect_wimaxasncp_backend( "Transaction ID: D + 0x%04x (0x%04x)", mask & ui16, ui16); tid = ui16 & mask; - dbit_show = TRUE; + dbit_show = true; } else { @@ -2064,11 +2064,11 @@ static guint dissect_wimaxasncp_backend( /* ========================================================================= */ -static const gchar* +static const char* match_ver_value_string( - const guint32 val, + const uint32_t val, const ver_value_string* const strings, - const guint32 max_ver) + const uint32_t max_ver) { const ver_value_string* vvs; const ver_value_string* res = NULL; @@ -2095,7 +2095,7 @@ dissect_wimaxasncp( proto_tree *tree, void *data _U_) { - static const gchar unknown[] = "Unknown"; + static const char unknown[] = "Unknown"; /* Set up structures needed to add the protocol subtree and manage it */ proto_item *packet_item = NULL; @@ -2103,17 +2103,17 @@ dissect_wimaxasncp( proto_tree *wimaxasncp_tree = NULL; tvbuff_t *subtree; - guint offset; - guint8 ui8; + unsigned offset; + uint8_t ui8; - guint8 function_type; - const gchar *function_type_name; + uint8_t function_type; + const char *function_type_name; proto_item *function_type_item; - guint16 length; + uint16_t length; const wimaxasncp_func_msg_t *p = NULL; - const gchar *message_name; - gsize i; + const char *message_name; + size_t i; /* ------------------------------------------------------------------------ * First, we do some heuristics to check if the packet cannot be our @@ -2131,7 +2131,7 @@ dissect_wimaxasncp( #endif /* We currently only support version 1. */ - if (tvb_bytes_exist(tvb, 0, 1) && tvb_get_guint8(tvb, 0) != 1) + if (tvb_bytes_exist(tvb, 0, 1) && tvb_get_uint8(tvb, 0) != 1) { return 0; } @@ -2162,7 +2162,7 @@ dissect_wimaxasncp( offset = 0; /* Register protocol fields, etc if haven't done yet. */ - if (hf_wimaxasncp_version == -1) + if (hf_wimaxasncp_version <= 0) { proto_registrar_get_byname("wimaxasncp.version"); } @@ -2196,7 +2196,7 @@ dissect_wimaxasncp( * ------------------------------------------------------------------------ */ - ui8 = tvb_get_guint8(tvb, offset); + ui8 = tvb_get_uint8(tvb, offset); if (tree) { @@ -2211,7 +2211,7 @@ dissect_wimaxasncp( } else { - guint j; + unsigned j; item = proto_tree_add_uint_format( wimaxasncp_tree, hf_wimaxasncp_flags, tvb, offset, 1, ui8, @@ -2239,7 +2239,7 @@ dissect_wimaxasncp( for (j = 0; j < 8; ++j) { - guint8 mask; + uint8_t mask; mask = 1U << (7 - j); /* Only add flags that are set */ @@ -2264,7 +2264,7 @@ dissect_wimaxasncp( * ------------------------------------------------------------------------ */ - function_type = tvb_get_guint8(tvb, offset); + function_type = tvb_get_uint8(tvb, offset); function_type_name = match_ver_value_string(function_type, wimaxasncp_function_type_vals, @@ -2299,7 +2299,7 @@ dissect_wimaxasncp( * ------------------------------------------------------------------------ */ - ui8 = tvb_get_guint8(tvb, offset); + ui8 = tvb_get_uint8(tvb, offset); /* -------------------------------------------------------------------- @@ -2776,10 +2776,10 @@ static void add_tlv_reg_info( static void register_wimaxasncp_fields(const char* unused _U_) { - gboolean debug_parser; - gboolean dump_dict; - gchar *dir; - gchar* dict_error; + bool debug_parser; + bool dump_dict; + char *dir; + char* dict_error; /* ------------------------------------------------------------------------ * List of header fields @@ -2788,16 +2788,16 @@ register_wimaxasncp_fields(const char* unused _U_) static hf_register_info hf_base[] = { { - &hf_wimaxasncp_version, /* ID */ + &hf_wimaxasncp_version, { - "Version", /* FIELDNAME */ - "wimaxasncp.version", /* PROTOABBREV.FIELDABBRE */ - FT_UINT8, /* FIELDTYPE */ - BASE_DEC, /* FIELDBASE */ - NULL, /* FIELDCONVERT */ - 0x0, /* BITMASK */ - NULL, /* FIELDDESCR */ - HFILL /* HFILL */ + "Version", + "wimaxasncp.version", + FT_UINT8, + BASE_DEC, + NULL, + 0x0, + NULL, + HFILL } }, { @@ -3212,7 +3212,7 @@ register_wimaxasncp_fields(const char* unused _U_) * ------------------------------------------------------------------------ */ - static gint *ett_base[] = { + static int *ett_base[] = { &ett_wimaxasncp, &ett_wimaxasncp_flags, &ett_wimaxasncp_tlv, @@ -3278,7 +3278,7 @@ register_wimaxasncp_fields(const char* unused _U_) wimaxasncp_build_dict.hf, hf_base, array_length(hf_base)); wimaxasncp_build_dict.ett = - wmem_array_new(wmem_epan_scope(), sizeof(gint*)); + wmem_array_new(wmem_epan_scope(), sizeof(int*)); wmem_array_append( wimaxasncp_build_dict.ett, ett_base, array_length(ett_base)); @@ -3373,7 +3373,7 @@ register_wimaxasncp_fields(const char* unused _U_) wmem_array_get_count(wimaxasncp_build_dict.hf)); proto_register_subtree_array( - (gint**)wmem_array_get_raw(wimaxasncp_build_dict.ett), + (int**)wmem_array_get_raw(wimaxasncp_build_dict.ett), wmem_array_get_count(wimaxasncp_build_dict.ett)); expert_wimaxasncp = expert_register_protocol(proto_wimaxasncp); @@ -3432,7 +3432,7 @@ proto_register_wimaxasncp(void) "Version of the NWG that the R6 protocol complies with", &global_wimaxasncp_nwg_ver, wimaxasncp_nwg_versions, - FALSE); + false); proto_register_prefix("wimaxasncp", register_wimaxasncp_fields); } diff --git a/plugins/epan/wimaxasncp/wimaxasncp_dict.h b/plugins/epan/wimaxasncp/wimaxasncp_dict.h index 6f136522..fffb9965 100644 --- a/plugins/epan/wimaxasncp/wimaxasncp_dict.h +++ b/plugins/epan/wimaxasncp/wimaxasncp_dict.h @@ -59,19 +59,19 @@ enum * ------------------------------------------------------------------------- */ struct _wimaxasncp_dict_namecode_t { - gchar *name; - guint code; + char *name; + unsigned code; struct _wimaxasncp_dict_namecode_t *next; }; typedef struct _wimaxasncp_dict_namecode_t wimaxasncp_dict_enum_t; typedef struct _wimaxasncp_dict_tlv_t { - guint16 type; - gchar *name; - gchar *description; - gint decoder; - guint since; + uint16_t type; + char *name; + char *description; + int decoder; + unsigned since; int hf_root; int hf_value; int hf_ipv4; @@ -90,9 +90,9 @@ typedef struct _wimaxasncp_dict_tlv_t { } wimaxasncp_dict_tlv_t; typedef struct _wimaxasncp_dict_xmlpi_t { - gchar *name; - gchar *key; - gchar *value; + char *name; + char *key; + char *value; struct _wimaxasncp_dict_xmlpi_t *next; } wimaxasncp_dict_xmlpi_t; @@ -105,8 +105,8 @@ extern void wimaxasncp_dict_print( FILE *fh, wimaxasncp_dict_t *d); extern wimaxasncp_dict_t *wimaxasncp_dict_scan( - const gchar *system_directory, const gchar *filename, int dbg, - gchar **error); + const char *system_directory, const char *filename, int dbg, + char **error); extern void wimaxasncp_dict_free( wimaxasncp_dict_t *d); diff --git a/plugins/epan/wimaxasncp/wimaxasncp_dict.l b/plugins/epan/wimaxasncp/wimaxasncp_dict.l index 05fa2e51..ca8cf99d 100644 --- a/plugins/epan/wimaxasncp/wimaxasncp_dict.l +++ b/plugins/epan/wimaxasncp/wimaxasncp_dict.l @@ -107,8 +107,8 @@ DIAG_OFF_FLEX() typedef struct entity_t { - gchar *name; - gchar *file; + char *name; + char *file; struct entity_t *next; } entity_t; @@ -132,14 +132,14 @@ typedef struct entity_t { typedef struct { GString *dict_error; - const gchar *sys_dir; + const char *sys_dir; - gchar *strbuf; - guint size_strbuf; - guint len_strbuf; + char *strbuf; + unsigned size_strbuf; + unsigned len_strbuf; - gchar *write_ptr; - gchar *read_ptr; + char *write_ptr; + char *read_ptr; wimaxasncp_dict_t *dict; wimaxasncp_dict_tlv_t *tlv; @@ -154,20 +154,20 @@ typedef struct { YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH]; int include_stack_ptr; - size_t (*current_yyinput)(gchar*,size_t,yyscan_t); + size_t (*current_yyinput)(char*,size_t,yyscan_t); - gchar **attr_str; - guint *attr_uint; - gint16 *attr_uint16; + char **attr_str; + unsigned *attr_uint; + int16_t *attr_uint16; int start_state; } WimaxasncpDict_scanner_state_t; -static guint wimaxasncp_bits(guint bits, char *n); -static gint wimaxasncp_decode_type(const gchar *name); -static void wimaxasncp_dict_debug(const gchar *fmt, ...) G_GNUC_PRINTF(1, 2); -static void append_to_buffer(const gchar *txt, int len, WimaxasncpDict_scanner_state_t *state); -static FILE *wimaxasncp_dict_open(const gchar*, const gchar*); +static unsigned wimaxasncp_bits(unsigned bits, char *n); +static int wimaxasncp_decode_type(const char *name); +static void wimaxasncp_dict_debug(const char *fmt, ...) G_GNUC_PRINTF(1, 2); +static void append_to_buffer(const char *txt, int len, WimaxasncpDict_scanner_state_t *state); +static FILE *wimaxasncp_dict_open(const char*, const char*); /* * Sleazy hack to suppress compiler warnings in yy_fatal_error(). @@ -314,7 +314,7 @@ since_attr since=\042 <LOADING>{any} APPEND(yytext,yyleng); <LOADING,IN_DICT>{entity} { - gchar *p = ++yytext, *temp_str; + char *p = ++yytext, *temp_str; entity_t* e; while(*p != ';') p++; @@ -381,14 +381,14 @@ since_attr since=\042 } <GET_UINT_ATTR>{number} { - *yyextra->attr_uint = (guint)strtoul(yytext,NULL,0); + *yyextra->attr_uint = (unsigned)strtoul(yytext,NULL,0); D(("%s\n",yytext);); yyextra->attr_uint = NULL; BEGIN END_ATTR; } <GET_UINT16_ATTR>{number} { - *yyextra->attr_uint16 = (gint16) strtol(yytext,NULL,0); + *yyextra->attr_uint16 = (int16_t) strtol(yytext,NULL,0); D(("%s\n",yytext);); yyextra->attr_uint16 = NULL; BEGIN END_ATTR; @@ -449,18 +449,6 @@ since_attr since=\042 D(("tlv_start\n")); yyextra->tlv = wmem_new0(wmem_epan_scope(), wimaxasncp_dict_tlv_t); - yyextra->tlv->hf_root = -1; - yyextra->tlv->hf_value = -1; - yyextra->tlv->hf_ipv4 = -1; - yyextra->tlv->hf_ipv6 = -1; - yyextra->tlv->hf_bsid = -1; - yyextra->tlv->hf_protocol = -1; - yyextra->tlv->hf_port_low = -1; - yyextra->tlv->hf_port_high = -1; - yyextra->tlv->hf_ipv4_mask = -1; - yyextra->tlv->hf_ipv6_mask = -1; - yyextra->tlv->hf_vendor_id = -1; - yyextra->tlv->hf_vendor_rest_of_info = -1; if (! yyextra->dict->tlvs ) yyextra->last_tlv = yyextra->dict->tlvs = yyextra->tlv; @@ -521,7 +509,7 @@ DIAG_ON_FLEX() static int debugging = 0; -static void wimaxasncp_dict_debug(const gchar *fmt, ...) { +static void wimaxasncp_dict_debug(const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -531,7 +519,7 @@ static void wimaxasncp_dict_debug(const gchar *fmt, ...) { fflush(stderr); } -static guint wimaxasncp_bits(guint bits, char *n) +static unsigned wimaxasncp_bits(unsigned bits, char *n) { return 1u << ((bits - 1) - (strtoul(n, NULL, 10))); } @@ -567,9 +555,9 @@ static const value_string wimaxasncp_decode_type_vals[] = { 0, NULL} }; -static gint wimaxasncp_decode_type(const gchar *name) +static int wimaxasncp_decode_type(const char *name) { - gsize i; + size_t i; for (i = 0; i < array_length(wimaxasncp_decode_type_vals) - 1; ++i) { if (strcmp(name, wimaxasncp_decode_type_vals[i].strptr) == 0) @@ -588,14 +576,14 @@ void wimaxasncp_dict_unused(yyscan_t yyscanner) { yy_top_state(yyscanner); } -static void append_to_buffer(const gchar *txt, int len, WimaxasncpDict_scanner_state_t *state) { +static void append_to_buffer(const char *txt, int len, WimaxasncpDict_scanner_state_t *state) { if (state->strbuf == NULL) { - state->read_ptr = state->write_ptr = state->strbuf = (gchar *)g_malloc(state->size_strbuf); + state->read_ptr = state->write_ptr = state->strbuf = (char *)g_malloc(state->size_strbuf); } if (state->len_strbuf + len >= state->size_strbuf) { - state->read_ptr = state->strbuf = (gchar *)g_realloc(state->strbuf,state->size_strbuf *= 2); + state->read_ptr = state->strbuf = (char *)g_realloc(state->strbuf,state->size_strbuf *= 2); } state->write_ptr = state->strbuf + state->len_strbuf; @@ -603,7 +591,7 @@ static void append_to_buffer(const gchar *txt, int len, WimaxasncpDict_scanner_s state->len_strbuf += len; } -static size_t file_input(gchar *buf, size_t max, yyscan_t scanner) { +static size_t file_input(char *buf, size_t max, yyscan_t scanner) { FILE *in = yyget_in(scanner); size_t read_cnt; @@ -619,7 +607,7 @@ static size_t file_input(gchar *buf, size_t max, yyscan_t scanner) { } -static size_t string_input(gchar *buf, size_t max, yyscan_t scanner) { +static size_t string_input(char *buf, size_t max, yyscan_t scanner) { WimaxasncpDict_scanner_state_t *statep = yyget_extra(scanner); if (statep->read_ptr >= statep->write_ptr ) { @@ -635,11 +623,11 @@ static size_t string_input(gchar *buf, size_t max, yyscan_t scanner) { } static FILE *wimaxasncp_dict_open( - const gchar *system_directory, - const gchar *filename) + const char *system_directory, + const char *filename) { FILE *fh; - gchar *fname; + char *fname; if (system_directory) { fname = ws_strdup_printf("%s%s%s", @@ -661,8 +649,8 @@ static FILE *wimaxasncp_dict_open( } wimaxasncp_dict_t *wimaxasncp_dict_scan( - const gchar *system_directory, const gchar *filename, int dbg, - gchar **error) { + const char *system_directory, const char *filename, int dbg, + char **error) { WimaxasncpDict_scanner_state_t state; FILE *in; @@ -837,8 +825,8 @@ void wimaxasncp_dict_print(FILE *fh, wimaxasncp_dict_t *d) { #ifdef TEST_WIMAXASNCP_DICT_STANDALONE int main(int argc, char **argv) { wimaxasncp_dict_t *d; - gchar *dname = NULL; - gchar *fname; + char *dname = NULL; + char *fname; int i = 1; switch (argc) { diff --git a/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c index 908d50b4..81f55575 100644 --- a/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c +++ b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c @@ -21,274 +21,274 @@ /* Initialize the protocol and registered fields */ static dissector_handle_t wimaxmacphy_handle; -static int proto_wimaxmacphy = -1; -static int hf_wimaxmacphy_hdr_phy_entity_id = -1; -static int hf_wimaxmacphy_hdr_message_segmentation = -1; -static int hf_wimaxmacphy_hdr_message_type = -1; -static int hf_wimaxmacphy_unknown = -1; -static int hf_wimaxmacphy_prim_length_of_txvector = -1; -static int hf_wimaxmacphy_prim_length_of_rxvector = -1; -static int hf_wimaxmacphy_prim_status = -1; -static int hf_wimaxmacphy_prim_txstart_indication_status = -1; -static int hf_wimaxmacphy_prim_reserved1 = -1; -static int hf_wimaxmacphy_prim_reserved2 = -1; -static int hf_wimaxmacphy_prim_reserved3 = -1; -static int hf_wimaxmacphy_prim_reserved4 = -1; -static int hf_wimaxmacphy_prim_reserved5 = -1; -static int hf_wimaxmacphy_prim_next_frame_number = -1; -static int hf_wimaxmacphy_prim_extended_frame_number = -1; -static int hf_wimaxmacphy_prim_current_frame_number_lsn = -1; -static int hf_wimaxmacphy_prim_initial_frame_number = -1; -static int hf_wimaxmacphy_prim_dl_zone_number = -1; -static int hf_wimaxmacphy_prim_sub_burst_burst_split_point = -1; -static int hf_wimaxmacphy_prim_dl_sub_burst_burst_number = -1; -static int hf_wimaxmacphy_prim_phy_sdu = -1; -static int hf_wimaxmacphy_prim_phy_request = -1; -static int hf_wimaxmacphy_prim_requested_aas_calibration_zone_size = -1; -static int hf_wimaxmacphy_prim_requested_aas_calibration_zone_alloc = -1; -static int hf_wimaxmacphy_prim_number_of_consecutive_frames_with_aas = -1; -static int hf_wimaxmacphy_prim_frame_number = -1; -static int hf_wimaxmacphy_prim_issid = -1; -static int hf_wimaxmacphy_prim_integrity = -1; -static int hf_wimaxmacphy_prim_number_of_bytes_received = -1; -static int hf_wimaxmacphy_prim_rssi_per_subcarrier_level = -1; -static int hf_wimaxmacphy_prim_cinr = -1; -static int hf_wimaxmacphy_prim_power_offset = -1; -static int hf_wimaxmacphy_prim_current_frame_number_msn = -1; -static int hf_wimaxmacphy_prim_acid_for_harq_data_bursts = -1; -static int hf_wimaxmacphy_prim_indication_type = -1; -static int hf_wimaxmacphy_prim_zone_permutation_type = -1; -static int hf_wimaxmacphy_prim_update_aas_handle_in_mac = -1; -static int hf_wimaxmacphy_prim_aas_handle = -1; -static int hf_wimaxmacphy_prim_time_deviation = -1; -static int hf_wimaxmacphy_prim_frequency_deviation = -1; -static int hf_wimaxmacphy_prim_phy_aas_report_present = -1; -static int hf_wimaxmacphy_prim_number_of_affected_ss = -1; -static int hf_wimaxmacphy_prim_zonexid = -1; -static int hf_wimaxmacphy_prim_cdma_code = -1; -static int hf_wimaxmacphy_prim_cdma_symbol = -1; -static int hf_wimaxmacphy_prim_cdma_subchannel = -1; -static int hf_wimaxmacphy_prim_harq_ack_issid = -1; -static int hf_wimaxmacphy_prim_harq_ack_acid = -1; -static int hf_wimaxmacphy_prim_harq_ack_reserved1 = -1; -static int hf_wimaxmacphy_prim_harq_ack_ack_valid = -1; -static int hf_wimaxmacphy_prim_harq_ack_unnamed = -1; -static int hf_wimaxmacphy_prim_harq_ack_reserved2 = -1; -static int hf_wimaxmacphy_prim_fast_issid = -1; -static int hf_wimaxmacphy_prim_fast_cqich_id = -1; -static int hf_wimaxmacphy_prim_fast_feedback_type_coding = -1; -static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit0 = -1; -static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit1 = -1; -static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit2 = -1; -static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit3 = -1; -static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit4 = -1; -static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit5 = -1; -static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit6 = -1; -static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit7 = -1; -static int hf_wimaxmacphy_prim_fast_feedback_valid = -1; -static int hf_wimaxmacphy_prim_fast_feedback_sub_type = -1; -static int hf_wimaxmacphy_prim_fast_reserved = -1; -static int hf_wimaxmacphy_prim_fast_feedback_value = -1; -static int hf_wimaxmacphy_subframe_subframe_type = -1; -static int hf_wimaxmacphy_subframe_frame_number = -1; -static int hf_wimaxmacphy_subframe_downlink_reserved1 = -1; -static int hf_wimaxmacphy_subframe_phy_sap_version_number = -1; -static int hf_wimaxmacphy_subframe_downlink_reserved2 = -1; -static int hf_wimaxmacphy_subframe_allocation_start_time = -1; -static int hf_wimaxmacphy_number_of_zone_descriptors = -1; -static int hf_wimaxmacphy_zone_padding = -1; -static int hf_wimaxmacphy_dl_zone_type = -1; -static int hf_wimaxmacphy_ul_zone_type = -1; -static int hf_wimaxmacphy_zone_number = -1; -static int hf_wimaxmacphy_zone_start_symbol_offset = -1; -static int hf_wimaxmacphy_zone_end_symbol_offset = -1; -static int hf_wimaxmacphy_dl_zone_permutation_type = -1; -static int hf_wimaxmacphy_ul_zone_permutation_type = -1; -static int hf_wimaxmacphy_dl_zone_use_all_subchannels_indicator = -1; -static int hf_wimaxmacphy_ul_zone_use_all_subchannels_indicator = -1; -static int hf_wimaxmacphy_ul_zone_disable_pusc_subchannel_rotation = -1; -static int hf_wimaxmacphy_zone_dl_perm_base = -1; -static int hf_wimaxmacphy_zone_ul_perm_base = -1; -static int hf_wimaxmacphy_zone_prbs_id = -1; -static int hf_wimaxmacphy_zone_agc_range_extension = -1; -static int hf_wimaxmacphy_zone_dedicated_pilots = -1; -static int hf_wimaxmacphy_zone_reserved = -1; -static int hf_wimaxmacphy_zone_stc_type = -1; -static int hf_wimaxmacphy_zone_matrix_indicator = -1; -static int hf_wimaxmacphy_zone_midamble_presence = -1; -static int hf_wimaxmacphy_zone_midamble_boosting = -1; -static int hf_wimaxmacphy_zone_preamble_configuration = -1; -static int hf_wimaxmacphy_zone_sdma_supported_indication = -1; -static int hf_wimaxmacphy_zone_preamble_type = -1; -static int hf_wimaxmacphy_dl_zone_aas_reserved = -1; -static int hf_wimaxmacphy_ul_zone_aas_reserved = -1; -static int hf_wimaxmacphy_number_of_burst_descriptors = -1; -static int hf_wimaxmacphy_burst_padding = -1; -static int hf_wimaxmacphy_dl_burst_type = -1; -static int hf_wimaxmacphy_ul_burst_type = -1; -static int hf_wimaxmacphy_burst_type_extension = -1; -static int hf_wimaxmacphy_burst_number = -1; -static int hf_wimaxmacphy_burst_modulation_fec_code_type = -1; -static int hf_wimaxmacphy_burst_data_length = -1; -static int hf_wimaxmacphy_burst_ofdma_symbol_offset = -1; -static int hf_wimaxmacphy_burst_subchannel_offset = -1; -static int hf_wimaxmacphy_burst_boosting = -1; -static int hf_wimaxmacphy_burst_reserved = -1; -static int hf_wimaxmacphy_burst_repetition_coding_indication = -1; -static int hf_wimaxmacphy_burst_issid = -1; -static int hf_wimaxmacphy_burst_aas_handle = -1; -static int hf_wimaxmacphy_dl_burst_map_number_of_slots = -1; -static int hf_wimaxmacphy_dl_burst_map_reserved = -1; -static int hf_wimaxmacphy_dl_burst_normal_number_of_symbols = -1; -static int hf_wimaxmacphy_dl_burst_normal_number_of_subchannels = -1; -static int hf_wimaxmacphy_dl_burst_normal_aas_handle = -1; -static int hf_wimaxmacphy_ul_burst_normal_number_of_slots = -1; -static int hf_wimaxmacphy_ul_burst_normal_reserved = -1; -static int hf_wimaxmacphy_burst_papr_number_of_symbols = -1; -static int hf_wimaxmacphy_burst_papr_number_of_subchannels = -1; -static int hf_wimaxmacphy_burst_papr_reserved = -1; -static int hf_wimaxmacphy_ul_burst_papr_unnamed = -1; -static int hf_wimaxmacphy_ul_burst_harq_ack_number_of_symbols = -1; -static int hf_wimaxmacphy_ul_burst_harq_ack_number_of_subchannels = -1; -static int hf_wimaxmacphy_ul_burst_harq_ack_reserved = -1; -static int hf_wimaxmacphy_ul_burst_fast_number_of_symbols = -1; -static int hf_wimaxmacphy_ul_burst_fast_number_of_subchannels = -1; -static int hf_wimaxmacphy_ul_burst_fast_reserved = -1; -static int hf_wimaxmacphy_ul_burst_initial_number_of_symbols = -1; -static int hf_wimaxmacphy_ul_burst_initial_number_of_subchannels = -1; -static int hf_wimaxmacphy_ul_burst_initial_ranging_method = -1; -static int hf_wimaxmacphy_ul_burst_initial_reserved1 = -1; -static int hf_wimaxmacphy_ul_burst_initial_zone_xid = -1; -static int hf_wimaxmacphy_ul_burst_initial_reserved2 = -1; -static int hf_wimaxmacphy_ul_burst_periodic_number_of_symbols = -1; -static int hf_wimaxmacphy_ul_burst_periodic_number_of_subchannels = -1; -static int hf_wimaxmacphy_ul_burst_periodic_ranging_method = -1; -static int hf_wimaxmacphy_ul_burst_periodic_reserved1 = -1; -static int hf_wimaxmacphy_ul_burst_periodic_zone_xid = -1; -static int hf_wimaxmacphy_ul_burst_periodic_reserved2 = -1; -static int hf_wimaxmacphy_ul_burst_sounding_number_of_symbols = -1; -static int hf_wimaxmacphy_ul_burst_sounding_number_of_subchannels = -1; -static int hf_wimaxmacphy_ul_burst_sounding_type = -1; -static int hf_wimaxmacphy_ul_burst_sounding_separability_type = -1; -static int hf_wimaxmacphy_ul_burst_sounding_max_cyclic_shift_indx = -1; -static int hf_wimaxmacphy_ul_burst_sounding_decimation_value = -1; -static int hf_wimaxmacphy_ul_burst_sounding_decimation_offset_rand = -1; -static int hf_wimaxmacphy_ul_burst_sounding_reserved = -1; -static int hf_wimaxmacphy_ul_burst_noise_number_of_symbols = -1; -static int hf_wimaxmacphy_ul_burst_noise_number_of_subchannels = -1; -static int hf_wimaxmacphy_ul_burst_noise_reserved = -1; -static int hf_wimaxmacphy_burst_opt_aas_preamble_modifier_type = -1; -static int hf_wimaxmacphy_burst_opt_aas_preamble_shift_index = -1; -static int hf_wimaxmacphy_burst_opt_aas_reserved = -1; -static int hf_wimaxmacphy_burst_opt_mimo_matrix_indicator = -1; -static int hf_wimaxmacphy_burst_opt_mimo_layer_index = -1; -static int hf_wimaxmacphy_dl_burst_opt_mimo_reserved = -1; -static int hf_wimaxmacphy_ul_burst_opt_mimo_matrix_indicator = -1; -static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns = -1; -static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit0 = -1; -static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit1 = -1; -static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit2 = -1; -static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit3 = -1; -static int hf_wimaxmacphy_ul_burst_opt_mimo_collaborative = -1; -static int hf_wimaxmacphy_ul_burst_opt_mimo_antenna_unnamed = -1; -static int hf_wimaxmacphy_number_of_sub_burst_descriptors = -1; -static int hf_wimaxmacphy_sub_burst_padding = -1; -static int hf_wimaxmacphy_dl_sub_burst_type = -1; -static int hf_wimaxmacphy_ul_sub_burst_type = -1; -static int hf_wimaxmacphy_sub_burst_number = -1; -static int hf_wimaxmacphy_sub_burst_symbol_offset = -1; -static int hf_wimaxmacphy_sub_burst_subchannel_offset = -1; -static int hf_wimaxmacphy_sub_burst_number_of_slots = -1; -static int hf_wimaxmacphy_sub_burst_reserved1 = -1; -static int hf_wimaxmacphy_sub_burst_reserved2 = -1; -static int hf_wimaxmacphy_sub_burst_modulation_fec_code_type = -1; -static int hf_wimaxmacphy_sub_burst_issid = -1; -static int hf_wimaxmacphy_sub_burst_aas_handle = -1; -static int hf_wimaxmacphy_sub_burst_boosting = -1; -static int hf_wimaxmacphy_sub_burst_repetition_coding_indication = -1; -static int hf_wimaxmacphy_sub_burst_data_length = -1; -static int hf_wimaxmacphy_sub_burst_harq_chase_harq_channel_id = -1; -static int hf_wimaxmacphy_sub_burst_harq_chase_harq_sequence_number = -1; -static int hf_wimaxmacphy_sub_burst_harq_chase_flush_unnamed = -1; -static int hf_wimaxmacphy_sub_burst_harq_chase_reserved = -1; -static int hf_wimaxmacphy_sub_burst_mimo_chase_harq_channel_id = -1; -static int hf_wimaxmacphy_sub_burst_mimo_chase_harq_sequence_number = -1; -static int hf_wimaxmacphy_sub_burst_mimo_chase_flush_unnamed = -1; -static int hf_wimaxmacphy_sub_burst_mimo_chase_layer_index = -1; -static int hf_wimaxmacphy_ul_sub_burst_ctype = -1; -static int hf_wimaxmacphy_ul_sub_burst_mini_subchannel_index = -1; -static int hf_wimaxmacphy_ul_sub_burst_mini_reserved = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit0 = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit1 = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit2 = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit3 = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit4 = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit5 = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit6 = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit7 = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_reserved1 = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_sub_type = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_cqich_id = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_reserved2 = -1; -static int hf_wimaxmacphy_ul_sub_burst_feedback_slot_offset = -1; -static int hf_wimaxmacphy_ul_sub_burst_harq_ack_acid = -1; -static int hf_wimaxmacphy_ul_sub_burst_harq_ack_reserved = -1; -static int hf_wimaxmacphy_ul_sub_burst_sounding_symbol_index = -1; -static int hf_wimaxmacphy_ul_sub_burst_sounding_power_assignment = -1; -static int hf_wimaxmacphy_ul_sub_burst_sounding_power_boost = -1; -static int hf_wimaxmacphy_ul_sub_burst_sounding_allocation_mode = -1; -static int hf_wimaxmacphy_ul_sub_burst_sounding_start_freq_band = -1; -static int hf_wimaxmacphy_ul_sub_burst_sounding_num_freq_bands = -1; -static int hf_wimaxmacphy_ul_sub_burst_sounding_band_bit_map = -1; -static int hf_wimaxmacphy_ul_sub_burst_sounding_cyclic_time_shift = -1; -static int hf_wimaxmacphy_ul_sub_burst_sounding_decimation_offset = -1; -static int hf_wimaxmacphy_ul_sub_burst_sounding_reserved = -1; -static int hf_wimaxmacphy_ul_sub_burst_mimo_chase_matrix = -1; +static int proto_wimaxmacphy; +static int hf_wimaxmacphy_hdr_phy_entity_id; +static int hf_wimaxmacphy_hdr_message_segmentation; +static int hf_wimaxmacphy_hdr_message_type; +static int hf_wimaxmacphy_unknown; +static int hf_wimaxmacphy_prim_length_of_txvector; +static int hf_wimaxmacphy_prim_length_of_rxvector; +static int hf_wimaxmacphy_prim_status; +static int hf_wimaxmacphy_prim_txstart_indication_status; +static int hf_wimaxmacphy_prim_reserved1; +static int hf_wimaxmacphy_prim_reserved2; +static int hf_wimaxmacphy_prim_reserved3; +static int hf_wimaxmacphy_prim_reserved4; +static int hf_wimaxmacphy_prim_reserved5; +static int hf_wimaxmacphy_prim_next_frame_number; +static int hf_wimaxmacphy_prim_extended_frame_number; +static int hf_wimaxmacphy_prim_current_frame_number_lsn; +static int hf_wimaxmacphy_prim_initial_frame_number; +static int hf_wimaxmacphy_prim_dl_zone_number; +static int hf_wimaxmacphy_prim_sub_burst_burst_split_point; +static int hf_wimaxmacphy_prim_dl_sub_burst_burst_number; +static int hf_wimaxmacphy_prim_phy_sdu; +static int hf_wimaxmacphy_prim_phy_request; +static int hf_wimaxmacphy_prim_requested_aas_calibration_zone_size; +static int hf_wimaxmacphy_prim_requested_aas_calibration_zone_alloc; +static int hf_wimaxmacphy_prim_number_of_consecutive_frames_with_aas; +static int hf_wimaxmacphy_prim_frame_number; +static int hf_wimaxmacphy_prim_issid; +static int hf_wimaxmacphy_prim_integrity; +static int hf_wimaxmacphy_prim_number_of_bytes_received; +static int hf_wimaxmacphy_prim_rssi_per_subcarrier_level; +static int hf_wimaxmacphy_prim_cinr; +static int hf_wimaxmacphy_prim_power_offset; +static int hf_wimaxmacphy_prim_current_frame_number_msn; +static int hf_wimaxmacphy_prim_acid_for_harq_data_bursts; +static int hf_wimaxmacphy_prim_indication_type; +static int hf_wimaxmacphy_prim_zone_permutation_type; +static int hf_wimaxmacphy_prim_update_aas_handle_in_mac; +static int hf_wimaxmacphy_prim_aas_handle; +static int hf_wimaxmacphy_prim_time_deviation; +static int hf_wimaxmacphy_prim_frequency_deviation; +static int hf_wimaxmacphy_prim_phy_aas_report_present; +static int hf_wimaxmacphy_prim_number_of_affected_ss; +static int hf_wimaxmacphy_prim_zonexid; +static int hf_wimaxmacphy_prim_cdma_code; +static int hf_wimaxmacphy_prim_cdma_symbol; +static int hf_wimaxmacphy_prim_cdma_subchannel; +static int hf_wimaxmacphy_prim_harq_ack_issid; +static int hf_wimaxmacphy_prim_harq_ack_acid; +static int hf_wimaxmacphy_prim_harq_ack_reserved1; +static int hf_wimaxmacphy_prim_harq_ack_ack_valid; +static int hf_wimaxmacphy_prim_harq_ack_unnamed; +static int hf_wimaxmacphy_prim_harq_ack_reserved2; +static int hf_wimaxmacphy_prim_fast_issid; +static int hf_wimaxmacphy_prim_fast_cqich_id; +static int hf_wimaxmacphy_prim_fast_feedback_type_coding; +static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit0; +static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit1; +static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit2; +static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit3; +static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit4; +static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit5; +static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit6; +static int hf_wimaxmacphy_prim_fast_feedback_type_coding_bit7; +static int hf_wimaxmacphy_prim_fast_feedback_valid; +static int hf_wimaxmacphy_prim_fast_feedback_sub_type; +static int hf_wimaxmacphy_prim_fast_reserved; +static int hf_wimaxmacphy_prim_fast_feedback_value; +static int hf_wimaxmacphy_subframe_subframe_type; +static int hf_wimaxmacphy_subframe_frame_number; +static int hf_wimaxmacphy_subframe_downlink_reserved1; +static int hf_wimaxmacphy_subframe_phy_sap_version_number; +static int hf_wimaxmacphy_subframe_downlink_reserved2; +static int hf_wimaxmacphy_subframe_allocation_start_time; +static int hf_wimaxmacphy_number_of_zone_descriptors; +static int hf_wimaxmacphy_zone_padding; +static int hf_wimaxmacphy_dl_zone_type; +static int hf_wimaxmacphy_ul_zone_type; +static int hf_wimaxmacphy_zone_number; +static int hf_wimaxmacphy_zone_start_symbol_offset; +static int hf_wimaxmacphy_zone_end_symbol_offset; +static int hf_wimaxmacphy_dl_zone_permutation_type; +static int hf_wimaxmacphy_ul_zone_permutation_type; +static int hf_wimaxmacphy_dl_zone_use_all_subchannels_indicator; +static int hf_wimaxmacphy_ul_zone_use_all_subchannels_indicator; +static int hf_wimaxmacphy_ul_zone_disable_pusc_subchannel_rotation; +static int hf_wimaxmacphy_zone_dl_perm_base; +static int hf_wimaxmacphy_zone_ul_perm_base; +static int hf_wimaxmacphy_zone_prbs_id; +static int hf_wimaxmacphy_zone_agc_range_extension; +static int hf_wimaxmacphy_zone_dedicated_pilots; +static int hf_wimaxmacphy_zone_reserved; +static int hf_wimaxmacphy_zone_stc_type; +static int hf_wimaxmacphy_zone_matrix_indicator; +static int hf_wimaxmacphy_zone_midamble_presence; +static int hf_wimaxmacphy_zone_midamble_boosting; +static int hf_wimaxmacphy_zone_preamble_configuration; +static int hf_wimaxmacphy_zone_sdma_supported_indication; +static int hf_wimaxmacphy_zone_preamble_type; +static int hf_wimaxmacphy_dl_zone_aas_reserved; +static int hf_wimaxmacphy_ul_zone_aas_reserved; +static int hf_wimaxmacphy_number_of_burst_descriptors; +static int hf_wimaxmacphy_burst_padding; +static int hf_wimaxmacphy_dl_burst_type; +static int hf_wimaxmacphy_ul_burst_type; +static int hf_wimaxmacphy_burst_type_extension; +static int hf_wimaxmacphy_burst_number; +static int hf_wimaxmacphy_burst_modulation_fec_code_type; +static int hf_wimaxmacphy_burst_data_length; +static int hf_wimaxmacphy_burst_ofdma_symbol_offset; +static int hf_wimaxmacphy_burst_subchannel_offset; +static int hf_wimaxmacphy_burst_boosting; +static int hf_wimaxmacphy_burst_reserved; +static int hf_wimaxmacphy_burst_repetition_coding_indication; +static int hf_wimaxmacphy_burst_issid; +static int hf_wimaxmacphy_burst_aas_handle; +static int hf_wimaxmacphy_dl_burst_map_number_of_slots; +static int hf_wimaxmacphy_dl_burst_map_reserved; +static int hf_wimaxmacphy_dl_burst_normal_number_of_symbols; +static int hf_wimaxmacphy_dl_burst_normal_number_of_subchannels; +static int hf_wimaxmacphy_dl_burst_normal_aas_handle; +static int hf_wimaxmacphy_ul_burst_normal_number_of_slots; +static int hf_wimaxmacphy_ul_burst_normal_reserved; +static int hf_wimaxmacphy_burst_papr_number_of_symbols; +static int hf_wimaxmacphy_burst_papr_number_of_subchannels; +static int hf_wimaxmacphy_burst_papr_reserved; +static int hf_wimaxmacphy_ul_burst_papr_unnamed; +static int hf_wimaxmacphy_ul_burst_harq_ack_number_of_symbols; +static int hf_wimaxmacphy_ul_burst_harq_ack_number_of_subchannels; +static int hf_wimaxmacphy_ul_burst_harq_ack_reserved; +static int hf_wimaxmacphy_ul_burst_fast_number_of_symbols; +static int hf_wimaxmacphy_ul_burst_fast_number_of_subchannels; +static int hf_wimaxmacphy_ul_burst_fast_reserved; +static int hf_wimaxmacphy_ul_burst_initial_number_of_symbols; +static int hf_wimaxmacphy_ul_burst_initial_number_of_subchannels; +static int hf_wimaxmacphy_ul_burst_initial_ranging_method; +static int hf_wimaxmacphy_ul_burst_initial_reserved1; +static int hf_wimaxmacphy_ul_burst_initial_zone_xid; +static int hf_wimaxmacphy_ul_burst_initial_reserved2; +static int hf_wimaxmacphy_ul_burst_periodic_number_of_symbols; +static int hf_wimaxmacphy_ul_burst_periodic_number_of_subchannels; +static int hf_wimaxmacphy_ul_burst_periodic_ranging_method; +static int hf_wimaxmacphy_ul_burst_periodic_reserved1; +static int hf_wimaxmacphy_ul_burst_periodic_zone_xid; +static int hf_wimaxmacphy_ul_burst_periodic_reserved2; +static int hf_wimaxmacphy_ul_burst_sounding_number_of_symbols; +static int hf_wimaxmacphy_ul_burst_sounding_number_of_subchannels; +static int hf_wimaxmacphy_ul_burst_sounding_type; +static int hf_wimaxmacphy_ul_burst_sounding_separability_type; +static int hf_wimaxmacphy_ul_burst_sounding_max_cyclic_shift_indx; +static int hf_wimaxmacphy_ul_burst_sounding_decimation_value; +static int hf_wimaxmacphy_ul_burst_sounding_decimation_offset_rand; +static int hf_wimaxmacphy_ul_burst_sounding_reserved; +static int hf_wimaxmacphy_ul_burst_noise_number_of_symbols; +static int hf_wimaxmacphy_ul_burst_noise_number_of_subchannels; +static int hf_wimaxmacphy_ul_burst_noise_reserved; +static int hf_wimaxmacphy_burst_opt_aas_preamble_modifier_type; +static int hf_wimaxmacphy_burst_opt_aas_preamble_shift_index; +static int hf_wimaxmacphy_burst_opt_aas_reserved; +static int hf_wimaxmacphy_burst_opt_mimo_matrix_indicator; +static int hf_wimaxmacphy_burst_opt_mimo_layer_index; +static int hf_wimaxmacphy_dl_burst_opt_mimo_reserved; +static int hf_wimaxmacphy_ul_burst_opt_mimo_matrix_indicator; +static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns; +static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit0; +static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit1; +static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit2; +static int hf_wimaxmacphy_ul_burst_opt_mimo_pilot_patterns_bit3; +static int hf_wimaxmacphy_ul_burst_opt_mimo_collaborative; +static int hf_wimaxmacphy_ul_burst_opt_mimo_antenna_unnamed; +static int hf_wimaxmacphy_number_of_sub_burst_descriptors; +static int hf_wimaxmacphy_sub_burst_padding; +static int hf_wimaxmacphy_dl_sub_burst_type; +static int hf_wimaxmacphy_ul_sub_burst_type; +static int hf_wimaxmacphy_sub_burst_number; +static int hf_wimaxmacphy_sub_burst_symbol_offset; +static int hf_wimaxmacphy_sub_burst_subchannel_offset; +static int hf_wimaxmacphy_sub_burst_number_of_slots; +static int hf_wimaxmacphy_sub_burst_reserved1; +static int hf_wimaxmacphy_sub_burst_reserved2; +static int hf_wimaxmacphy_sub_burst_modulation_fec_code_type; +static int hf_wimaxmacphy_sub_burst_issid; +static int hf_wimaxmacphy_sub_burst_aas_handle; +static int hf_wimaxmacphy_sub_burst_boosting; +static int hf_wimaxmacphy_sub_burst_repetition_coding_indication; +static int hf_wimaxmacphy_sub_burst_data_length; +static int hf_wimaxmacphy_sub_burst_harq_chase_harq_channel_id; +static int hf_wimaxmacphy_sub_burst_harq_chase_harq_sequence_number; +static int hf_wimaxmacphy_sub_burst_harq_chase_flush_unnamed; +static int hf_wimaxmacphy_sub_burst_harq_chase_reserved; +static int hf_wimaxmacphy_sub_burst_mimo_chase_harq_channel_id; +static int hf_wimaxmacphy_sub_burst_mimo_chase_harq_sequence_number; +static int hf_wimaxmacphy_sub_burst_mimo_chase_flush_unnamed; +static int hf_wimaxmacphy_sub_burst_mimo_chase_layer_index; +static int hf_wimaxmacphy_ul_sub_burst_ctype; +static int hf_wimaxmacphy_ul_sub_burst_mini_subchannel_index; +static int hf_wimaxmacphy_ul_sub_burst_mini_reserved; +static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding; +static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit0; +static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit1; +static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit2; +static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit3; +static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit4; +static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit5; +static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit6; +static int hf_wimaxmacphy_ul_sub_burst_feedback_type_coding_bit7; +static int hf_wimaxmacphy_ul_sub_burst_feedback_reserved1; +static int hf_wimaxmacphy_ul_sub_burst_feedback_sub_type; +static int hf_wimaxmacphy_ul_sub_burst_feedback_cqich_id; +static int hf_wimaxmacphy_ul_sub_burst_feedback_reserved2; +static int hf_wimaxmacphy_ul_sub_burst_feedback_slot_offset; +static int hf_wimaxmacphy_ul_sub_burst_harq_ack_acid; +static int hf_wimaxmacphy_ul_sub_burst_harq_ack_reserved; +static int hf_wimaxmacphy_ul_sub_burst_sounding_symbol_index; +static int hf_wimaxmacphy_ul_sub_burst_sounding_power_assignment; +static int hf_wimaxmacphy_ul_sub_burst_sounding_power_boost; +static int hf_wimaxmacphy_ul_sub_burst_sounding_allocation_mode; +static int hf_wimaxmacphy_ul_sub_burst_sounding_start_freq_band; +static int hf_wimaxmacphy_ul_sub_burst_sounding_num_freq_bands; +static int hf_wimaxmacphy_ul_sub_burst_sounding_band_bit_map; +static int hf_wimaxmacphy_ul_sub_burst_sounding_cyclic_time_shift; +static int hf_wimaxmacphy_ul_sub_burst_sounding_decimation_offset; +static int hf_wimaxmacphy_ul_sub_burst_sounding_reserved; +static int hf_wimaxmacphy_ul_sub_burst_mimo_chase_matrix; /* Initialize the subtree pointers */ -static gint ett_wimaxmacphy = -1; -static gint ett_wimaxmacphy_primitive = -1; -static gint ett_wimaxmacphy_prim_harq_ack = -1; -static gint ett_wimaxmacphy_prim_fast_feedback = -1; -static gint ett_wimaxmacphy_prim_fast_feedback_type_coding = -1; -static gint ett_wimaxmacphy_dl_zone_descriptor = -1; -static gint ett_wimaxmacphy_dl_zone_stc = -1; -static gint ett_wimaxmacphy_dl_zone_aas = -1; -static gint ett_wimaxmacphy_dl_burst_descriptor = -1; -static gint ett_wimaxmacphy_dl_burst_map = -1; -static gint ett_wimaxmacphy_dl_burst_normal = -1; -static gint ett_wimaxmacphy_dl_burst_papr = -1; -static gint ett_wimaxmacphy_dl_sub_burst_descriptor = -1; -static gint ett_wimaxmacphy_dl_sub_burst_harq_chase = -1; -static gint ett_wimaxmacphy_dl_sub_burst_mimo_chase = -1; -static gint ett_wimaxmacphy_dl_burst_opt_aas = -1; -static gint ett_wimaxmacphy_dl_burst_opt_mimo = -1; -static gint ett_wimaxmacphy_ul_zone_descriptor = -1; -static gint ett_wimaxmacphy_ul_zone_aas = -1; -static gint ett_wimaxmacphy_ul_burst_descriptor = -1; -static gint ett_wimaxmacphy_ul_burst_harq_ack = -1; -static gint ett_wimaxmacphy_ul_burst_fast_feedback = -1; -static gint ett_wimaxmacphy_ul_burst_initial_ranging = -1; -static gint ett_wimaxmacphy_ul_burst_periodic_ranging = -1; -static gint ett_wimaxmacphy_ul_burst_papr_safety_zone = -1; -static gint ett_wimaxmacphy_ul_burst_sounding_zone = -1; -static gint ett_wimaxmacphy_ul_burst_noise_floor = -1; -static gint ett_wimaxmacphy_ul_burst_normal_data = -1; -static gint ett_wimaxmacphy_ul_burst_opt_aas = -1; -static gint ett_wimaxmacphy_ul_burst_opt_mimo = -1; -static gint ett_wimaxmacphy_ul_sub_burst_descriptor = -1; -static gint ett_wimaxmacphy_ul_pilot_patterns = -1; -static gint ett_wimaxmacphy_ul_feedback_type_coding = -1; -static gint ett_wimaxmacphy_ul_sub_burst_mini_subchannel = -1; -static gint ett_wimaxmacphy_ul_sub_burst_fast_feedback = -1; -static gint ett_wimaxmacphy_ul_sub_burst_harq_ack = -1; -static gint ett_wimaxmacphy_ul_sub_burst_sounding_signal = -1; -static gint ett_wimaxmacphy_ul_sub_burst_harq_chase = -1; -static gint ett_wimaxmacphy_ul_sub_burst_mimo_chase = -1; -static gint ett_wimaxmacphy_ul_sub_burst_sub_allocation_specific = -1; - -static expert_field ei_wimaxmacphy_unknown = EI_INIT; +static int ett_wimaxmacphy; +static int ett_wimaxmacphy_primitive; +static int ett_wimaxmacphy_prim_harq_ack; +static int ett_wimaxmacphy_prim_fast_feedback; +static int ett_wimaxmacphy_prim_fast_feedback_type_coding; +static int ett_wimaxmacphy_dl_zone_descriptor; +static int ett_wimaxmacphy_dl_zone_stc; +static int ett_wimaxmacphy_dl_zone_aas; +static int ett_wimaxmacphy_dl_burst_descriptor; +static int ett_wimaxmacphy_dl_burst_map; +static int ett_wimaxmacphy_dl_burst_normal; +static int ett_wimaxmacphy_dl_burst_papr; +static int ett_wimaxmacphy_dl_sub_burst_descriptor; +static int ett_wimaxmacphy_dl_sub_burst_harq_chase; +static int ett_wimaxmacphy_dl_sub_burst_mimo_chase; +static int ett_wimaxmacphy_dl_burst_opt_aas; +static int ett_wimaxmacphy_dl_burst_opt_mimo; +static int ett_wimaxmacphy_ul_zone_descriptor; +static int ett_wimaxmacphy_ul_zone_aas; +static int ett_wimaxmacphy_ul_burst_descriptor; +static int ett_wimaxmacphy_ul_burst_harq_ack; +static int ett_wimaxmacphy_ul_burst_fast_feedback; +static int ett_wimaxmacphy_ul_burst_initial_ranging; +static int ett_wimaxmacphy_ul_burst_periodic_ranging; +static int ett_wimaxmacphy_ul_burst_papr_safety_zone; +static int ett_wimaxmacphy_ul_burst_sounding_zone; +static int ett_wimaxmacphy_ul_burst_noise_floor; +static int ett_wimaxmacphy_ul_burst_normal_data; +static int ett_wimaxmacphy_ul_burst_opt_aas; +static int ett_wimaxmacphy_ul_burst_opt_mimo; +static int ett_wimaxmacphy_ul_sub_burst_descriptor; +static int ett_wimaxmacphy_ul_pilot_patterns; +static int ett_wimaxmacphy_ul_feedback_type_coding; +static int ett_wimaxmacphy_ul_sub_burst_mini_subchannel; +static int ett_wimaxmacphy_ul_sub_burst_fast_feedback; +static int ett_wimaxmacphy_ul_sub_burst_harq_ack; +static int ett_wimaxmacphy_ul_sub_burst_sounding_signal; +static int ett_wimaxmacphy_ul_sub_burst_harq_chase; +static int ett_wimaxmacphy_ul_sub_burst_mimo_chase; +static int ett_wimaxmacphy_ul_sub_burst_sub_allocation_specific; + +static expert_field ei_wimaxmacphy_unknown; /* PHY SAP message header size */ #define WIMAXMACPHY_HEADER_SIZE 2 @@ -989,13 +989,13 @@ static const value_string wimaxmacphy_ul_sub_burst_mimo_chase_matrix_vals[]= { 0, NULL} }; -static gint dissect_wimaxmacphy_dl_sub_burst_descriptor(tvbuff_t *tvb, guint offset, packet_info *pinfo _U_, proto_tree *tree) +static int dissect_wimaxmacphy_dl_sub_burst_descriptor(tvbuff_t *tvb, unsigned offset, packet_info *pinfo _U_, proto_tree *tree) { - guint start_offset = offset; - guint8 sub_burst_type; + unsigned start_offset = offset; + uint8_t sub_burst_type; proto_tree *subtree; - sub_burst_type = tvb_get_guint8(tvb, offset); + sub_burst_type = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_dl_sub_burst_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1080,18 +1080,18 @@ static gint dissect_wimaxmacphy_dl_sub_burst_descriptor(tvbuff_t *tvb, guint off return offset - start_offset; } -static guint dissect_wimaxmacphy_dl_burst_descriptor(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) +static unsigned dissect_wimaxmacphy_dl_burst_descriptor(tvbuff_t *tvb, unsigned offset, packet_info *pinfo, proto_tree *tree) { - guint start_offset = offset; - guint8 burst_type, burst_type_extension, sub_burst_descriptor_count, sub_burst; + unsigned start_offset = offset; + uint8_t burst_type, burst_type_extension, sub_burst_descriptor_count, sub_burst; proto_item *item; proto_tree *subtree, *opt_tree; - burst_type = tvb_get_guint8(tvb, offset); + burst_type = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_dl_burst_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - burst_type_extension = tvb_get_guint8(tvb, offset); + burst_type_extension = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_burst_type_extension, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1206,7 +1206,7 @@ static guint dissect_wimaxmacphy_dl_burst_descriptor(tvbuff_t *tvb, guint offset } /* sub-burst portion */ - sub_burst_descriptor_count = tvb_get_guint8(tvb, offset); + sub_burst_descriptor_count = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_number_of_sub_burst_descriptors, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1217,7 +1217,7 @@ static guint dissect_wimaxmacphy_dl_burst_descriptor(tvbuff_t *tvb, guint offset for (sub_burst = 0; sub_burst < sub_burst_descriptor_count; ++sub_burst) { proto_tree *sub_burst_descriptor_tree; - guint sub_burst_descriptor_length; + unsigned sub_burst_descriptor_length; sub_burst_descriptor_tree = proto_tree_add_subtree_format(tree, tvb, offset, 1, ett_wimaxmacphy_dl_sub_burst_descriptor, &item, "Sub-Burst Descriptor %u", sub_burst); @@ -1232,14 +1232,14 @@ static guint dissect_wimaxmacphy_dl_burst_descriptor(tvbuff_t *tvb, guint offset return offset - start_offset; } -static guint dissect_wimaxmacphy_dl_zone_descriptor(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) +static unsigned dissect_wimaxmacphy_dl_zone_descriptor(tvbuff_t *tvb, unsigned offset, packet_info *pinfo, proto_tree *tree) { - guint start_offset = offset; - guint8 zone_type, burst_descriptor_count, burst; + unsigned start_offset = offset; + uint8_t zone_type, burst_descriptor_count, burst; proto_item *item; proto_tree *subtree; - zone_type = tvb_get_guint8(tvb, offset); + zone_type = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_dl_zone_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1312,7 +1312,7 @@ static guint dissect_wimaxmacphy_dl_zone_descriptor(tvbuff_t *tvb, guint offset, } /* burst portion */ - burst_descriptor_count = tvb_get_guint8(tvb, offset); + burst_descriptor_count = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_number_of_burst_descriptors, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1323,7 +1323,7 @@ static guint dissect_wimaxmacphy_dl_zone_descriptor(tvbuff_t *tvb, guint offset, for (burst = 0; burst < burst_descriptor_count; ++burst) { proto_tree *burst_descriptor_tree; - guint burst_descriptor_length; + unsigned burst_descriptor_length; /* note: we'll adjust the length later */ burst_descriptor_tree = proto_tree_add_subtree_format(tree, tvb, offset, 1, @@ -1340,11 +1340,11 @@ static guint dissect_wimaxmacphy_dl_zone_descriptor(tvbuff_t *tvb, guint offset, return offset - start_offset; } -static guint dissect_wimaxmacphy_dl_subframe_descriptor(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) +static unsigned dissect_wimaxmacphy_dl_subframe_descriptor(tvbuff_t *tvb, unsigned offset, packet_info *pinfo, proto_tree *tree) { - guint start_offset = offset; - guint8 zone_descriptor_count; - guint8 zone; + unsigned start_offset = offset; + uint8_t zone_descriptor_count; + uint8_t zone; proto_tree_add_item(tree, hf_wimaxmacphy_subframe_subframe_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1362,7 +1362,7 @@ static guint dissect_wimaxmacphy_dl_subframe_descriptor(tvbuff_t *tvb, guint off offset += 4; /* zone portion */ - zone_descriptor_count = tvb_get_guint8(tvb, offset); + zone_descriptor_count = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_number_of_zone_descriptors, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1374,7 +1374,7 @@ static guint dissect_wimaxmacphy_dl_subframe_descriptor(tvbuff_t *tvb, guint off { proto_item *item; proto_tree *zone_descriptor_tree; - guint zone_descriptor_length; + unsigned zone_descriptor_length; zone_descriptor_tree = proto_tree_add_subtree_format(tree, tvb, offset, 1, ett_wimaxmacphy_dl_zone_descriptor, &item, "Zone Descriptor %u", zone); @@ -1389,10 +1389,10 @@ static guint dissect_wimaxmacphy_dl_subframe_descriptor(tvbuff_t *tvb, guint off return offset - start_offset; } -static gint dissect_wimaxmacphy_ul_sub_burst_sub_allocation_specific_part(tvbuff_t *tvb, guint offset, - packet_info *pinfo _U_, proto_tree *tree, guint8 sub_burst_type) +static int dissect_wimaxmacphy_ul_sub_burst_sub_allocation_specific_part(tvbuff_t *tvb, unsigned offset, + packet_info *pinfo _U_, proto_tree *tree, uint8_t sub_burst_type) { - guint start_offset = offset; + unsigned start_offset = offset; proto_item *item, *opt_item; proto_tree *subtree, *opt_tree; @@ -1466,14 +1466,14 @@ static gint dissect_wimaxmacphy_ul_sub_burst_sub_allocation_specific_part(tvbuff return offset - start_offset; } -static gint dissect_wimaxmacphy_ul_sub_burst_descriptor(tvbuff_t *tvb, guint offset, packet_info *pinfo _U_, proto_tree *tree) +static int dissect_wimaxmacphy_ul_sub_burst_descriptor(tvbuff_t *tvb, unsigned offset, packet_info *pinfo _U_, proto_tree *tree) { - guint8 sub_burst_type; + uint8_t sub_burst_type; proto_item *feedback_item; proto_tree *subtree, *feedback_tree; - guint start_offset = offset; + unsigned start_offset = offset; - sub_burst_type = tvb_get_guint8(tvb, offset); + sub_burst_type = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_ul_sub_burst_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1585,19 +1585,19 @@ static gint dissect_wimaxmacphy_ul_sub_burst_descriptor(tvbuff_t *tvb, guint off return offset - start_offset; } -static guint dissect_wimaxmacphy_ul_burst_descriptor(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) +static unsigned dissect_wimaxmacphy_ul_burst_descriptor(tvbuff_t *tvb, unsigned offset, packet_info *pinfo, proto_tree *tree) { - guint8 burst_type, burst_type_extension; - guint8 sub_burst_descriptor_count, sub_burst; + uint8_t burst_type, burst_type_extension; + uint8_t sub_burst_descriptor_count, sub_burst; proto_item *item, *pilot_patterns_item; proto_tree *subtree, *opt_tree, *pilot_patterns_tree; - guint start_offset = offset; + unsigned start_offset = offset; - burst_type = tvb_get_guint8(tvb, offset); + burst_type = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_ul_burst_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - burst_type_extension = tvb_get_guint8(tvb, offset); + burst_type_extension = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_burst_type_extension, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1833,7 +1833,7 @@ static guint dissect_wimaxmacphy_ul_burst_descriptor(tvbuff_t *tvb, guint offset } /* sub-burst portion */ - sub_burst_descriptor_count = tvb_get_guint8(tvb, offset); + sub_burst_descriptor_count = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_number_of_sub_burst_descriptors, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1844,7 +1844,7 @@ static guint dissect_wimaxmacphy_ul_burst_descriptor(tvbuff_t *tvb, guint offset for (sub_burst = 0; sub_burst < sub_burst_descriptor_count; ++sub_burst) { proto_tree *sub_burst_descriptor_tree; - guint sub_burst_descriptor_length; + unsigned sub_burst_descriptor_length; sub_burst_descriptor_tree = proto_tree_add_subtree_format(tree, tvb, offset, 1, ett_wimaxmacphy_ul_sub_burst_descriptor, &item, "Sub-Burst Descriptor %u", sub_burst); @@ -1859,13 +1859,13 @@ static guint dissect_wimaxmacphy_ul_burst_descriptor(tvbuff_t *tvb, guint offset return offset - start_offset; } -static guint dissect_wimaxmacphy_ul_zone_descriptor(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) +static unsigned dissect_wimaxmacphy_ul_zone_descriptor(tvbuff_t *tvb, unsigned offset, packet_info *pinfo, proto_tree *tree) { - guint start_offset = offset; - guint8 zone_type, burst_descriptor_count, burst; + unsigned start_offset = offset; + uint8_t zone_type, burst_descriptor_count, burst; proto_item *item; - zone_type = tvb_get_guint8(tvb, offset); + zone_type = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_ul_zone_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1921,7 +1921,7 @@ static guint dissect_wimaxmacphy_ul_zone_descriptor(tvbuff_t *tvb, guint offset, } /* burst portion */ - burst_descriptor_count = tvb_get_guint8(tvb, offset); + burst_descriptor_count = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_number_of_burst_descriptors, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1932,7 +1932,7 @@ static guint dissect_wimaxmacphy_ul_zone_descriptor(tvbuff_t *tvb, guint offset, for (burst = 0; burst < burst_descriptor_count; ++burst) { proto_tree *burst_descriptor_tree; - guint burst_descriptor_length; + unsigned burst_descriptor_length; burst_descriptor_tree = proto_tree_add_subtree_format(tree, tvb, offset, 1, ett_wimaxmacphy_ul_burst_descriptor, &item, "Burst Descriptor %u", burst); @@ -1946,11 +1946,11 @@ static guint dissect_wimaxmacphy_ul_zone_descriptor(tvbuff_t *tvb, guint offset, return offset - start_offset; } -static guint dissect_wimaxmacphy_ul_subframe_descriptor(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) +static unsigned dissect_wimaxmacphy_ul_subframe_descriptor(tvbuff_t *tvb, unsigned offset, packet_info *pinfo, proto_tree *tree) { - guint start_offset = offset; - guint8 zone_descriptor_count; - guint8 zone; + unsigned start_offset = offset; + uint8_t zone_descriptor_count; + uint8_t zone; proto_tree_add_item(tree, hf_wimaxmacphy_subframe_subframe_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1967,7 +1967,7 @@ static guint dissect_wimaxmacphy_ul_subframe_descriptor(tvbuff_t *tvb, guint off proto_tree_add_item(tree, hf_wimaxmacphy_subframe_allocation_start_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - zone_descriptor_count = tvb_get_guint8(tvb, offset); + zone_descriptor_count = tvb_get_uint8(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_number_of_zone_descriptors, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1983,7 +1983,7 @@ static guint dissect_wimaxmacphy_ul_subframe_descriptor(tvbuff_t *tvb, guint off { proto_item *item; proto_tree *zone_descriptor_tree; - guint zone_descriptor_length; + unsigned zone_descriptor_length; zone_descriptor_tree = proto_tree_add_subtree_format(tree, tvb, offset, 1, ett_wimaxmacphy_ul_zone_descriptor, &item, "Zone Descriptor %u", zone); @@ -1997,10 +1997,10 @@ static guint dissect_wimaxmacphy_ul_subframe_descriptor(tvbuff_t *tvb, guint off return offset - start_offset; } -static guint dissect_wimaxmacphy_phy_txstart_request(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) +static unsigned dissect_wimaxmacphy_phy_txstart_request(tvbuff_t *tvb, unsigned offset, packet_info *pinfo, proto_tree *tree) { - guint16 txvector_length; - guint subframe_descriptor_length; + uint16_t txvector_length; + unsigned subframe_descriptor_length; txvector_length = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_prim_length_of_txvector, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -2017,7 +2017,7 @@ static guint dissect_wimaxmacphy_phy_txstart_request(tvbuff_t *tvb, guint offset return txvector_length + 2; } -static guint dissect_wimaxmacphy_phy_txstart_confirmation(tvbuff_t *tvb, guint offset, packet_info *pinfo _U_, proto_tree *tree) +static unsigned dissect_wimaxmacphy_phy_txstart_confirmation(tvbuff_t *tvb, unsigned offset, packet_info *pinfo _U_, proto_tree *tree) { proto_tree_add_item(tree, hf_wimaxmacphy_prim_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -2029,7 +2029,7 @@ static guint dissect_wimaxmacphy_phy_txstart_confirmation(tvbuff_t *tvb, guint o return 2; } -static guint dissect_wimaxmacphy_phy_txstart_indication(tvbuff_t *tvb, guint offset, packet_info *pinfo _U_, proto_tree *tree) +static unsigned dissect_wimaxmacphy_phy_txstart_indication(tvbuff_t *tvb, unsigned offset, packet_info *pinfo _U_, proto_tree *tree) { proto_tree_add_item(tree, hf_wimaxmacphy_prim_txstart_indication_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -2047,9 +2047,9 @@ static guint dissect_wimaxmacphy_phy_txstart_indication(tvbuff_t *tvb, guint off return 6; } -static guint dissect_wimaxmacphy_phy_txsdu_request(tvbuff_t *tvb, guint offset, packet_info *pinfo _U_, proto_tree *tree) +static unsigned dissect_wimaxmacphy_phy_txsdu_request(tvbuff_t *tvb, unsigned offset, packet_info *pinfo _U_, proto_tree *tree) { - guint length; + unsigned length; proto_tree_add_item(tree, hf_wimaxmacphy_prim_dl_zone_number, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_wimaxmacphy_prim_sub_burst_burst_split_point, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -2062,7 +2062,7 @@ static guint dissect_wimaxmacphy_phy_txsdu_request(tvbuff_t *tvb, guint offset, return length + 2; } -static guint dissect_wimaxmacphy_phy_txsdu_confirmation(tvbuff_t *tvb, guint offset, packet_info *pinfo _U_, proto_tree *tree) +static unsigned dissect_wimaxmacphy_phy_txsdu_confirmation(tvbuff_t *tvb, unsigned offset, packet_info *pinfo _U_, proto_tree *tree) { proto_tree_add_item(tree, hf_wimaxmacphy_prim_dl_zone_number, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_wimaxmacphy_prim_sub_burst_burst_split_point, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -2082,7 +2082,7 @@ static guint dissect_wimaxmacphy_phy_txsdu_confirmation(tvbuff_t *tvb, guint off return 6; } -static guint dissect_wimaxmacphy_phy_txend_indication(tvbuff_t *tvb, guint offset, packet_info *pinfo _U_, proto_tree *tree) +static unsigned dissect_wimaxmacphy_phy_txend_indication(tvbuff_t *tvb, unsigned offset, packet_info *pinfo _U_, proto_tree *tree) { proto_tree_add_item(tree, hf_wimaxmacphy_prim_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -2104,10 +2104,10 @@ static guint dissect_wimaxmacphy_phy_txend_indication(tvbuff_t *tvb, guint offse return 6; } -static guint dissect_wimaxmacphy_phy_rxstart_request(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) +static unsigned dissect_wimaxmacphy_phy_rxstart_request(tvbuff_t *tvb, unsigned offset, packet_info *pinfo, proto_tree *tree) { - guint16 rxvector_length; - guint subframe_descriptor_length; + uint16_t rxvector_length; + unsigned subframe_descriptor_length; rxvector_length = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_wimaxmacphy_prim_length_of_rxvector, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -2125,7 +2125,7 @@ static guint dissect_wimaxmacphy_phy_rxstart_request(tvbuff_t *tvb, guint offset return rxvector_length + 2; } -static guint dissect_wimaxmacphy_phy_rxstart_confirmation(tvbuff_t *tvb, guint offset, packet_info *pinfo _U_, proto_tree *tree) +static unsigned dissect_wimaxmacphy_phy_rxstart_confirmation(tvbuff_t *tvb, unsigned offset, packet_info *pinfo _U_, proto_tree *tree) { proto_tree_add_item(tree, hf_wimaxmacphy_prim_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -2137,7 +2137,7 @@ static guint dissect_wimaxmacphy_phy_rxstart_confirmation(tvbuff_t *tvb, guint o return 2; } -static guint dissect_wimaxmacphy_phy_rxstart_indication(tvbuff_t *tvb, guint offset, packet_info *pinfo _U_, proto_tree *tree) +static unsigned dissect_wimaxmacphy_phy_rxstart_indication(tvbuff_t *tvb, unsigned offset, packet_info *pinfo _U_, proto_tree *tree) { proto_tree_add_item(tree, hf_wimaxmacphy_prim_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -2149,12 +2149,12 @@ static guint dissect_wimaxmacphy_phy_rxstart_indication(tvbuff_t *tvb, guint off return 2; } -static guint dissect_wimaxmacphy_phy_rxsdu_indication(tvbuff_t *tvb, guint offset, packet_info *pinfo _U_, proto_tree *tree) +static unsigned dissect_wimaxmacphy_phy_rxsdu_indication(tvbuff_t *tvb, unsigned offset, packet_info *pinfo _U_, proto_tree *tree) { - guint8 indication_type; + uint8_t indication_type; proto_item *feedback_item; proto_tree *subtree, *feedback_tree; - guint length, start_offset = offset; + unsigned length, start_offset = offset; proto_tree_add_item(tree, hf_wimaxmacphy_prim_issid, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -2179,7 +2179,7 @@ static guint dissect_wimaxmacphy_phy_rxsdu_indication(tvbuff_t *tvb, guint offse proto_tree_add_item(tree, hf_wimaxmacphy_prim_acid_for_harq_data_bursts, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - indication_type = (tvb_get_guint8(tvb, offset) >> 4) & 0x0F; + indication_type = (tvb_get_uint8(tvb, offset) >> 4) & 0x0F; proto_tree_add_item(tree, hf_wimaxmacphy_prim_indication_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_wimaxmacphy_prim_zone_permutation_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_wimaxmacphy_prim_update_aas_handle_in_mac, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -2258,9 +2258,9 @@ static guint dissect_wimaxmacphy_phy_rxsdu_indication(tvbuff_t *tvb, guint offse return offset - start_offset; } -static guint dissect_wimaxmacphy_phy_rxend_indication(tvbuff_t *tvb, guint offset, packet_info *pinfo _U_, proto_tree *tree) +static unsigned dissect_wimaxmacphy_phy_rxend_indication(tvbuff_t *tvb, unsigned offset, packet_info *pinfo _U_, proto_tree *tree) { - guint start_offset = offset; + unsigned start_offset = offset; proto_tree_add_item(tree, hf_wimaxmacphy_prim_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -2286,9 +2286,9 @@ static guint dissect_wimaxmacphy_phy_rxend_indication(tvbuff_t *tvb, guint offse return offset - start_offset; } -static guint dissect_wimaxmacphy_phy_rxcdma_indication(tvbuff_t *tvb, guint offset, packet_info *pinfo _U_, proto_tree *tree) +static unsigned dissect_wimaxmacphy_phy_rxcdma_indication(tvbuff_t *tvb, unsigned offset, packet_info *pinfo _U_, proto_tree *tree) { - guint start_offset = offset; + unsigned start_offset = offset; proto_tree_add_item(tree, hf_wimaxmacphy_prim_zonexid, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -2340,8 +2340,8 @@ dissect_wimaxmacphy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d proto_tree *wimaxmacphy_tree, *primitive_tree; proto_item *item; - guint offset = 0; - guint8 message_type; + unsigned offset = 0; + uint8_t message_type; /* Ensure minimum size */ if (tvb_reported_length(tvb) < WIMAXMACPHY_HEADER_SIZE) @@ -2359,7 +2359,7 @@ dissect_wimaxmacphy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - message_type = tvb_get_guint8(tvb, offset); + message_type = tvb_get_uint8(tvb, offset); item = proto_tree_add_item(wimaxmacphy_tree, hf_wimaxmacphy_hdr_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -5353,7 +5353,7 @@ proto_register_wimaxmacphy(void) }; /* Protocol subtree array */ - static gint *ett[] = { + static int *ett[] = { &ett_wimaxmacphy, &ett_wimaxmacphy_primitive, &ett_wimaxmacphy_prim_harq_ack, |