diff options
-rw-r--r-- | plugins/wimax/mac_hd_generic_decoder.c | 1 | ||||
-rw-r--r-- | plugins/wimax/mac_hd_type1_decoder.c | 2 | ||||
-rw-r--r-- | plugins/wimax/mac_hd_type2_decoder.c | 2 | ||||
-rw-r--r-- | plugins/wimax/msg_aas_fbck.c | 4 | ||||
-rw-r--r-- | plugins/wimax/msg_dlmap.c | 10 | ||||
-rw-r--r-- | plugins/wimax/msg_dsc.c | 2 | ||||
-rw-r--r-- | plugins/wimax/msg_reg_req.c | 2 | ||||
-rw-r--r-- | plugins/wimax/msg_rng_req.c | 2 | ||||
-rw-r--r-- | plugins/wimax/msg_ulmap.c | 5 |
9 files changed, 20 insertions, 10 deletions
diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c index 0b779b82ac..8886ec5ba6 100644 --- a/plugins/wimax/mac_hd_generic_decoder.c +++ b/plugins/wimax/mac_hd_generic_decoder.c @@ -48,6 +48,7 @@ void proto_register_mac_header_generic(void); void proto_reg_handoff_mac_header_generic(void); +void wimax_defragment_init(void); extern gint proto_wimax; diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/wimax/mac_hd_type1_decoder.c index 6a141f5350..5b4db92783 100644 --- a/plugins/wimax/mac_hd_type1_decoder.c +++ b/plugins/wimax/mac_hd_type1_decoder.c @@ -207,7 +207,7 @@ static const value_string last_msgs[] = { 0, NULL} }; -void dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static void dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { gint tvb_len, offset = 0; guint first_byte, sub_type; diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/wimax/mac_hd_type2_decoder.c index e69732422a..11db11cb19 100644 --- a/plugins/wimax/mac_hd_type2_decoder.c +++ b/plugins/wimax/mac_hd_type2_decoder.c @@ -380,7 +380,7 @@ static const value_string ai_msgs[] = }; -void dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static void dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { gint tvb_len, offset = 0; guint cii_bit, first_byte, fb_type, mimo_type; diff --git a/plugins/wimax/msg_aas_fbck.c b/plugins/wimax/msg_aas_fbck.c index 01ca475a1e..efddff7602 100644 --- a/plugins/wimax/msg_aas_fbck.c +++ b/plugins/wimax/msg_aas_fbck.c @@ -95,7 +95,7 @@ static int hf_aas_fbck_rssi_value = -1; static int hf_aas_fbck_cinr_value = -1; -void dissect_mac_mgmt_msg_aas_fbck_req_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) +static void dissect_mac_mgmt_msg_aas_fbck_req_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { guint offset = 0; guint data_type; @@ -135,7 +135,7 @@ void dissect_mac_mgmt_msg_aas_fbck_req_decoder(tvbuff_t *tvb, packet_info *pinfo } } -void dissect_mac_mgmt_msg_aas_fbck_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) +static void dissect_mac_mgmt_msg_aas_fbck_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { guint offset = 0; guint tvb_len, data_type; diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c index 16a7fb0832..437ec083cd 100644 --- a/plugins/wimax/msg_dlmap.c +++ b/plugins/wimax/msg_dlmap.c @@ -36,6 +36,10 @@ extern gboolean include_cor2_changes; +extern gboolean is_down_link(packet_info *pinfo); +extern gint wimax_decode_dlmap_reduced_aas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tree); +extern gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdu_tree); + void proto_register_mac_mgmt_msg_dlmap(void); void proto_reg_handoff_mac_mgmt_msg_dlmap(void); @@ -317,7 +321,7 @@ static gint hf_mac_header_compress_dlmap_crc = -1; * DL-MAP Miscellaneous IEs and TLVs *******************************************************************/ -gint RCID_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb, gint RCID_Type_lcl) +static gint RCID_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb, gint RCID_Type_lcl) { /* RCID_IE 8.4.5.3 and 8.4.5.3.20.1 */ /* offset of IE in bits, length is variable */ @@ -2166,7 +2170,8 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre extern gint dissect_ulmap_ie(proto_tree *ie_tree, 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); -gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *base_tree) +#if 0 +static gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo _U_, 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 */ @@ -2247,6 +2252,7 @@ gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre /* return length */ return length; } +#endif gint wimax_decode_dlmap_reduced_aas(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *base_tree) { diff --git a/plugins/wimax/msg_dsc.c b/plugins/wimax/msg_dsc.c index 6551a19c42..ccfbb20dab 100644 --- a/plugins/wimax/msg_dsc.c +++ b/plugins/wimax/msg_dsc.c @@ -100,7 +100,7 @@ static void dissect_mac_mgmt_msg_dsc_rsp_decoder(tvbuff_t *tvb, packet_info *pin } } -void dissect_mac_mgmt_msg_dsc_ack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static void dissect_mac_mgmt_msg_dsc_ack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint offset = 0; proto_item *dsc_item; diff --git a/plugins/wimax/msg_reg_req.c b/plugins/wimax/msg_reg_req.c index 0b1c949ac1..6de454b9a9 100644 --- a/plugins/wimax/msg_reg_req.c +++ b/plugins/wimax/msg_reg_req.c @@ -220,7 +220,7 @@ static const value_string tfs_support[] = { }; /* 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) +static 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) { proto_item *tlv_item; proto_tree *tlv_tree; diff --git a/plugins/wimax/msg_rng_req.c b/plugins/wimax/msg_rng_req.c index e16b51295c..7bc4f5ec01 100644 --- a/plugins/wimax/msg_rng_req.c +++ b/plugins/wimax/msg_rng_req.c @@ -124,7 +124,7 @@ 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) +static 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) { proto_item *tlv_item; proto_tree *tlv_tree; diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c index e82d014901..be27fc2423 100644 --- a/plugins/wimax/msg_ulmap.c +++ b/plugins/wimax/msg_ulmap.c @@ -35,6 +35,9 @@ #include "wimax_bits.h" extern gboolean include_cor2_changes; +extern void init_wimax_globals(void); +extern gint wimax_decode_ulmapc(proto_tree *base_tree, 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); void proto_register_mac_mgmt_msg_ulmap(void); void proto_reg_handoff_mac_mgmt_msg_ulmap(void); @@ -1516,7 +1519,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, gint offset, gint length _U_, tvbuff_t *tvb) +static gint dissect_ulmap_ie( proto_tree *ie_tree, gint offset, gint length _U_, tvbuff_t *tvb) { /* decode a single UL-MAP IE and return the * length of the IE in nibbles |