From dedd0eadd0d56367946a3fe84585f1892fa91dc0 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 10 May 2012 00:21:40 +0000 Subject: [PATCH] Better fixes for the last commit. svn path=/trunk/; revision=42529 --- plugins/wimax/mac_hd_generic_decoder.c | 8 +++----- plugins/wimax/msg_dlmap.c | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c index 478d2e28b2..11630f87cd 100644 --- a/plugins/wimax/mac_hd_generic_decoder.c +++ b/plugins/wimax/mac_hd_generic_decoder.c @@ -86,9 +86,7 @@ guint cid_broadcast = 0xFFFF; /* forward reference */ static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -#ifdef DEBUG /* for debug only */ static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *parent_item); -#endif /* Static variables */ static GHashTable *payload_frag_table = NULL; @@ -1132,7 +1130,9 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto if (first_arq_fb_payload && arq_fb_payload) { /* decode and display the ARQ feedback payload */ first_arq_fb_payload = FALSE; -#ifdef DEBUG /* for debug only */ +#ifndef DEBUG + arq_feedback_payload_decoder(tvb_new_subset(payload_tvb, payload_offset, new_payload_len, new_payload_len), pinfo, generic_tree, parent_item); +#else ret_length = arq_feedback_payload_decoder(tvb_new_subset(payload_tvb, payload_offset, new_payload_len, new_payload_len), pinfo, generic_tree, parent_item); if (ret_length != new_payload_len) { /* error */ @@ -1375,7 +1375,6 @@ static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ return ext_length; } -#ifdef DEBUG /* for debug only */ static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *parent_item) { gint length, i; @@ -1478,7 +1477,6 @@ static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, prot /* return the offset */ return offset; } -#endif /* DEBUG */ /* Register Wimax Generic Mac Header Protocol and Dissector */ void proto_register_mac_header_generic(void) diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c index f33ae6c432..77f60b8b64 100644 --- a/plugins/wimax/msg_dlmap.c +++ b/plugins/wimax/msg_dlmap.c @@ -2207,7 +2207,7 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Compressed UL-MAP"); /* subtract 8 from lennib (CRC) */ - /* nib += wimax_decode_ulmapc(base_tree, bufptr, nib, lennib - 8, tvb); */ + wimax_decode_ulmapc(base_tree, bufptr, nib, lennib - 8, tvb); } /* CRC is always appended */ -- 2.34.1