aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/wimax/mac_hd_generic_decoder.c4
-rw-r--r--plugins/wimax/mac_hd_type1_decoder.c2
-rw-r--r--plugins/wimax/mac_hd_type2_decoder.c2
-rw-r--r--plugins/wimax/msg_aas_fbck.c4
-rw-r--r--plugins/wimax/msg_dlmap.c16
-rw-r--r--plugins/wimax/msg_dsc.c2
-rw-r--r--plugins/wimax/msg_reg_rsp.c2
-rw-r--r--plugins/wimax/msg_rng_rsp.c3
-rw-r--r--plugins/wimax/msg_ulmap.c2
-rw-r--r--plugins/wimax/wimax_pdu_decoder.c6
-rw-r--r--plugins/wimax/wimax_utils.h9
11 files changed, 25 insertions, 27 deletions
diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c
index 88bb0f1850..9c53578569 100644
--- a/plugins/wimax/mac_hd_generic_decoder.c
+++ b/plugins/wimax/mac_hd_generic_decoder.c
@@ -59,8 +59,6 @@ extern gint 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 gboolean is_down_link(packet_info *pinfo);/* declared in packet-wmx.c */
-extern void init_wimax_globals(void); /* defined in msg_ulmap.c */
static dissector_handle_t mac_mgmt_msg_decoder_handle = NULL;
static dissector_handle_t mac_ip_handle = NULL;
@@ -599,7 +597,7 @@ static const value_string last_ie_msgs[] =
};
/* Register Wimax defrag table init routine. */
-void wimax_defragment_init(void)
+static void wimax_defragment_init(void)
{
gint i;
diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/wimax/mac_hd_type1_decoder.c
index ac55000959..48f6fb3e51 100644
--- a/plugins/wimax/mac_hd_type1_decoder.c
+++ b/plugins/wimax/mac_hd_type1_decoder.c
@@ -206,7 +206,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 83ce7752f3..f606a70b05 100644
--- a/plugins/wimax/mac_hd_type2_decoder.c
+++ b/plugins/wimax/mac_hd_type2_decoder.c
@@ -379,7 +379,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 3810950f80..cac19fc9e4 100644
--- a/plugins/wimax/msg_aas_fbck.c
+++ b/plugins/wimax/msg_aas_fbck.c
@@ -94,7 +94,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;
@@ -134,7 +134,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 8f8262c4f8..241d7594e6 100644
--- a/plugins/wimax/msg_dlmap.c
+++ b/plugins/wimax/msg_dlmap.c
@@ -33,6 +33,7 @@
#include "wimax_mac.h"
#include "crc.h"
#include "wimax_bits.h"
+#include "wimax_utils.h"
extern gboolean include_cor2_changes;
@@ -294,6 +295,7 @@ static gint hf_dlmapc_opid = -1;
static gint hf_dlmapc_secid = -1;
static gint hf_dlmapc_count = -1;
+#if 0
static gint hf_109x_cmi = -1;
static gint hf_109x_len = -1;
static gint hf_109x_rcid = -1;
@@ -304,6 +306,7 @@ static gint hf_109x_dlie = -1;
static gint hf_109x_symofs = -1;
static gint hf_109x_subofs = -1;
static gint hf_109x_rsv = -1;
+#endif
static gint hf_308a_cmi = -1;
static gint hf_308a_ulmap = -1;
@@ -2035,8 +2038,6 @@ static gint UL_interference_and_noise_level_IE(proto_tree *diuc_tree, gint offse
* DL-MAP Plugin
*******************************************************************/
-extern gint wimax_decode_ulmapc(proto_tree *base_tree, packet_info* pinfo, gint offset, gint length, tvbuff_t *tvb);
-
static gint dissect_dlmap_ie(proto_tree *ie_tree, packet_info *pinfo, gint offset, gint length, tvbuff_t *tvb)
{
/* decode a single DL-MAP IE and return the
@@ -2440,11 +2441,8 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre
return mac_len;
}
-
-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, proto_tree *base_tree)
+#if 0
+static gint 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 */
@@ -2525,6 +2523,7 @@ gint wimax_decode_sub_dl_ul_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *b
/* return length */
return length;
}
+#endif
gint wimax_decode_dlmap_reduced_aas(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *base_tree)
{
@@ -2997,7 +2996,7 @@ void proto_register_mac_mgmt_msg_dlmap(void)
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL
}
},
-#endif
+
{
&hf_109x_cmi,
{
@@ -3070,6 +3069,7 @@ void proto_register_mac_mgmt_msg_dlmap(void)
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL
}
},
+#endif
{
&hf_308a_cmi,
{
diff --git a/plugins/wimax/msg_dsc.c b/plugins/wimax/msg_dsc.c
index 4d7fb1b49c..1767c4c16b 100644
--- a/plugins/wimax/msg_dsc.c
+++ b/plugins/wimax/msg_dsc.c
@@ -99,7 +99,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_rsp.c b/plugins/wimax/msg_reg_rsp.c
index ff758f30cd..9e9499f032 100644
--- a/plugins/wimax/msg_reg_rsp.c
+++ b/plugins/wimax/msg_reg_rsp.c
@@ -42,8 +42,6 @@ void proto_reg_handoff_mac_mgmt_msg_reg_rsp(void);
extern gboolean include_cor2_changes;
-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);
-
static dissector_handle_t dsc_rsp_handle = NULL;
static gint proto_mac_mgmt_msg_reg_rsp_decoder = -1;
diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c
index 84a1cab453..a97fb3109c 100644
--- a/plugins/wimax/msg_rng_rsp.c
+++ b/plugins/wimax/msg_rng_rsp.c
@@ -39,9 +39,6 @@ void proto_reg_handoff_mac_mgmt_msg_rng_rsp(void);
extern gboolean include_cor2_changes;
-/* external reference */
-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);
-
static dissector_handle_t sbc_rsp_handle = NULL;
static dissector_handle_t reg_rsp_handle = NULL;
diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c
index 7499fcb780..5e358fde9c 100644
--- a/plugins/wimax/msg_ulmap.c
+++ b/plugins/wimax/msg_ulmap.c
@@ -33,6 +33,7 @@
#include "crc.h"
#include "wimax_mac.h"
#include "wimax_bits.h"
+#include "wimax_utils.h"
extern gboolean include_cor2_changes;
@@ -66,7 +67,6 @@ extern gint harq;
extern gint ir_type;
extern gint N_layer;
extern gint RCID_Type;
-extern gint RCID_IE(proto_tree *diuc_tree, gint offset, gint length, tvbuff_t *tvb, gint RCID_Type);
static gint proto_mac_mgmt_msg_ulmap_decoder = -1;
diff --git a/plugins/wimax/wimax_pdu_decoder.c b/plugins/wimax/wimax_pdu_decoder.c
index 161bec7003..77ba292b24 100644
--- a/plugins/wimax/wimax_pdu_decoder.c
+++ b/plugins/wimax/wimax_pdu_decoder.c
@@ -30,6 +30,7 @@
#include <epan/packet.h>
#include "crc.h"
+#include "wimax_utils.h"
extern gint proto_wimax;
@@ -41,11 +42,6 @@ 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;
-/* MAC Header dissector prototypes */
-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);
-
#define WIMAX_PDU_PADDING_MASK 0xFF
#define WIMAX_INVALID_PDU_MASK 0xF0
#define WIMAX_MAP_TYPE_MASK 0xE0 /* 0b111 */
diff --git a/plugins/wimax/wimax_utils.h b/plugins/wimax/wimax_utils.h
index 56032e1d4d..cf9e61c29e 100644
--- a/plugins/wimax/wimax_utils.h
+++ b/plugins/wimax/wimax_utils.h
@@ -28,10 +28,19 @@
#include <epan/packet.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);
+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 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_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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 01:56:48 +0000