diff options
Diffstat (limited to 'plugins/epan/wimax/msg_arq.c')
-rw-r--r-- | plugins/epan/wimax/msg_arq.c | 82 |
1 files changed, 41 insertions, 41 deletions
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); |