From Mike Harvey: Support for WiMAX and the WiMAX M2M encapsulation protocol.

Add support for WiMAX and M2M to various makefiles and installer files.  Add
basic support for M2M to randpkt.

svn path=/trunk/; revision=21945

1 files changed, 636 insertions, 0 deletions

diff --git a/plugins/wimax/msg_rng_req.c b/plugins/wimax/msg_rng_req.c
new file mode 100644
index 0000000000..8ff68595d0
--- /dev/null
+++ b/plugins/wimax/msg_rng_req.c
@@ -0,0 +1,636 @@
+/* msg_rng_req.c
+ * WiMax MAC Management RNG-REQ Message decoder
+ *
+ * Copyright (c) 2007 by Intel Corporation.
+ *
+ * Author: John R. Underwood <junderx@yahoo.com>
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1999 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/* Include files */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "moduleinfo.h"
+
+#include <gmodule.h>
+#include <epan/packet.h>
+#include <epan/prefs.h>
+#include "crc.h"
+#include "wimax_tlv.h"
+#include "wimax_mac.h"
+#include "wimax_utils.h"
+
+extern gint proto_wimax;
+extern gboolean include_cor2_changes;
+
+extern gint man_ofdma;
+
+/* Forward reference */
+void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+gint proto_mac_mgmt_msg_rng_req_decoder = -1;
+static gint ett_mac_mgmt_msg_rng_req_decoder = -1;
+
+/* Setup protocol subtree array */
+static gint *ett[] =
+{
+	&ett_mac_mgmt_msg_rng_req_decoder,
+};
+
+/* RNG-REQ fields */
+static gint hf_rng_req_message_type                          = -1;
+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;
+
+/* STRING RESOURCES */
+
+static const true_false_string tfs_rng_req_aas_broadcast = {
+    "SS cannot receive broadcast messages",
+    "SS can receive broadcast messages"
+};
+
+static const value_string vals_rng_req_ranging_purpose_location_update_request[] = {
+	{1,	"MS action of Idle Mode Location Update Process"},
+	{0,	NULL}
+};
+
+static const value_string vals_rng_req_repetition_coding_level[] = {
+	{0,	"No repetition"},
+	{1,	"Repetition coding of 2"},
+	{2,	"Repetition coding of 4"},
+	{3,	"Repetition coding of 6"},
+	{0,	NULL}
+};
+
+static const true_false_string tfs_rng_activate = {
+    "Activate",
+    "Deactivate"
+};
+
+static const true_false_string tfs_rng_max_power = {
+    "SS is already at maximum power",
+    "SS is not at maximum power"
+};
+
+static const true_false_string tfs_rng_min_power = {
+    "SS is already at minimum power",
+    "SS is not at minimum power"
+};
+
+static const true_false_string tfs_rng_timing_adj = {
+    "Sum of commanded timing adjustments is too large",
+    "Sum of commanded timing adjustments is within bounds"
+};
+
+/* RNG-REQ fields display */
+static hf_register_info hf[] =
+{
+	{
+		&hf_rng_activation_of_power_saving_class,
+		{
+			"Activation of Power Saving Class (Types 1 and 2 only)", "wimax.rng.power_save.activate",
+			FT_BOOLEAN, 8, TFS(&tfs_rng_activate), 0x02, "", HFILL
+		}
+	},
+	{
+		&hf_rng_power_saving_class_id,
+		{
+			"Power Saving Class ID", "wimax.rng.power_save.class_id",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_power_saving_class_type,
+		{
+			"Power Saving Class Type", "wimax.rng.power_save.class_type",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_definition_of_power_saving_class_present,
+		{
+			"Definition of Power Saving Class present", "wimax.rng.power_save.definition_present",
+			FT_UINT8, BASE_DEC, NULL, 0x01, "", HFILL
+		}
+	},
+	{
+		&hf_rng_power_saving_final_sleep_window_base,
+		{
+			"Final-sleep window base (measured in frames)", "wimax.rng.power_save.final_sleep_window_base",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_power_saving_final_sleep_window_exp,
+		{
+			"Final-sleep window exponent (measured in frames)", "wimax.rng.power_save.final_sleep_window_exp",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_power_saving_first_sleep_window_frame,
+		{
+			"Start frame number for first sleep window", "wimax.rng.power_save.first_sleep_window_frame",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_power_saving_included_cid,
+		{
+			"CID of connection to be included into the Power Saving Class.", "wimax.rng.power_save.included_cid",
+			FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_power_saving_initial_sleep_window,
+		{
+			"Initial-sleep window", "wimax.rng.power_save.initial_sleep_window",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_power_saving_listening_window,
+		{
+			"Listening window duration (measured in frames)", "wimax.rng.power_save.listening_window",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_power_saving_mgmt_connection_direction,
+		{
+			"Direction for management connection added to Power Saving Class", "wimax.rng.power_save.mgmt_connection_direction",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_power_saving_class_reserved,
+		{
+			"Reserved", "wimax.rng.power_save.reserved",
+			FT_UINT8, BASE_DEC, NULL, 0xF8, "", HFILL
+		}
+	},
+	{
+		&hf_rng_power_saving_slpid,
+		{
+			"SLPID assigned by the BS whenever an MS is instructed to enter sleep mode", "wimax.rng.power_save.slpid",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_trf_ind_required,
+		{
+			"BS shall transmit at least one TRF-IND message during each listening window of the Power Saving Class", "wimax.rng.power_save.trf_ind_required",
+			FT_BOOLEAN, 8, TFS(&tfs_rng_activate), 0x04, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_message_type,
+		{
+			"MAC Management Message Type", "wimax.macmgtmsgtype.rng_req",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_aas_broadcast,
+		{
+			"AAS broadcast capability", "wimax.rng_req.aas_broadcast",
+			FT_BOOLEAN, 8, TFS(&tfs_rng_req_aas_broadcast), 0x00, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_ranging_anomalies_max_power,
+		{
+			"Meaning", "wimax.rng_req.anomalies.max_power",
+			FT_BOOLEAN, 8, TFS(&tfs_rng_max_power), 0x04, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_ranging_anomalies_min_power,
+		{
+			"Meaning", "wimax.rng_req.anomalies.min_power",
+			FT_BOOLEAN, 8, TFS(&tfs_rng_min_power), 0x02, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_ranging_anomalies_timing_adj,
+		{
+			"Meaning", "wimax.rng_req.anomalies.timing_adj",
+			FT_BOOLEAN, 8, TFS(&tfs_rng_timing_adj), 0x01, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_cmac_key_count,
+		{
+			"CMAC Key Count", "wimax.rng_req.cmac_key_count",
+			FT_UINT16, BASE_DEC, NULL, 0x00, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_dl_burst_profile_lsb_ccc,
+		{
+			"LSB of CCC of DCD associated with DIUC", "wimax.rng_req.dl_burst_profile.ccc",
+			FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_dl_burst_profile_diuc,
+		{
+			"DIUC", "wimax.rng_req.dl_burst_profile.diuc",
+			FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
+		}
+	},
+	{
+		&hf_tlv_type,
+		{
+			"Unknown TLV Type", "wimax.rng_req.unknown_tlv_type",
+			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_invalid_tlv,
+		{
+			"Invalid TLV", "wimax.rng_req.invalid_tlv",
+			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_ho_id,
+		{
+			"ID from the target BS for use in initial ranging during MS handover to it", "wimax.rng_req.ho_id",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_power_down_indicator,
+		{
+			"Power down Indicator", "wimax.rng_req.power_down_indicator",
+			FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_ranging_purpose_ho_indication,
+		{
+			"MS HO indication", "wimax.rng_req.ranging_purpose.ho_indication",
+			FT_UINT8, BASE_DEC, NULL, 0x01, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_ranging_purpose_reserved,
+		{
+			"Reserved", "wimax.rng_req.ranging_purpose.reserved",
+			FT_UINT8, BASE_DEC, NULL, 0xFC, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_ranging_purpose_location_update_request,
+		{
+			"Location Update Request", "wimax.rng_req.ranging_purpose.loc_update_req",
+			FT_UINT8, BASE_DEC, VALS(vals_rng_req_ranging_purpose_location_update_request), 0x02, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_repetition_coding_level,
+		{
+			"Repetition coding level", "wimax.rng_req.repetition_coding_level",
+			FT_UINT8, BASE_DEC, VALS(vals_rng_req_repetition_coding_level), 0x03, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_requested_downlink_repetition_coding_level_reserved,
+		{
+			"Reserved", "wimax.rng_req.reserved",
+			FT_UINT8, BASE_DEC, NULL, 0xFC, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_reserved,
+		{
+			"Reserved", "wimax.rng_req.reserved",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_serving_bs_id,
+		{
+			"Former serving BS ID", "wimax.rng_req.serving_bs_id",
+			FT_ETHER, BASE_HEX, NULL, 0x00, "", HFILL
+		}
+	},
+	{
+		&hf_rng_req_ss_mac_address,
+		{
+			"SS MAC Address", "wimax.rng_req.ss_mac_address",
+			FT_ETHER, BASE_HEX, NULL, 0x00, "", HFILL
+		}
+	}
+};
+
+/* 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)
+{
+	proto_item *tlv_item = NULL;
+	proto_tree *tlv_tree = NULL;
+	proto_tree *power_saving_class_tree = NULL;
+	guint tlv_len;
+	guint tlv_offset;
+	tlv_info_t tlv_info;
+
+	/* Add a subtree for the power saving class parameters */
+	tlv_item = proto_tree_add_protocol_format(rng_req_tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, offset, compound_tlv_len, "Power saving class parameters (%u bytes)", compound_tlv_len);
+	power_saving_class_tree = proto_item_add_subtree(tlv_item, ett_mac_mgmt_msg_rng_req_decoder);
+
+	/* Update the compound_tlv_len to include the offset */
+	compound_tlv_len += offset;
+
+	while(offset < compound_tlv_len)
+	{
+		/* Get the TLV data. */
+		init_tlv_info(&tlv_info, tvb, offset);
+		/* get the TLV type */
+		tlv_type = get_tlv_type(&tlv_info);
+		/* get the TLV length */
+		tlv_len = get_tlv_length(&tlv_info);
+		if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
+		{	/* invalid tlv info */
+			if(pinfo->cinfo)
+			{
+				col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-REQ TLV error");
+			}
+			proto_tree_add_item(power_saving_class_tree, hf_rng_invalid_tlv, tvb, offset, (compound_tlv_len - offset), FALSE);
+			break;
+		}
+		/* get the offset to the TLV data */
+		tlv_offset = offset + get_tlv_value_offset(&tlv_info);
+
+		switch (tlv_type) {
+			case RNG_POWER_SAVING_CLASS_FLAGS:
+				/* display Power Saving Class Flags */
+				/* add subtree */
+				tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, tlv_offset, tlv_len, "Power Saving Class (%u byte)", tlv_len);
+				proto_tree_add_item(tlv_tree, hf_rng_definition_of_power_saving_class_present, tvb, tlv_offset, 1, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_activation_of_power_saving_class, tvb, tlv_offset, 1, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_trf_ind_required, tvb, tlv_offset, 1, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_power_saving_class_reserved, tvb, tlv_offset, 1, FALSE);
+				break;
+			case RNG_POWER_SAVING_CLASS_ID:
+				tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_class_id, tvb, tlv_offset, 1, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_power_saving_class_id, tvb, tlv_offset, 1, FALSE);
+				break;
+			case RNG_POWER_SAVING_CLASS_TYPE:
+				tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_class_type, tvb, tlv_offset, 1, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_power_saving_class_type, tvb, tlv_offset, 1, FALSE);
+				break;
+			case RNG_START_FRAME_NUMBER:
+				tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_first_sleep_window_frame, tvb, tlv_offset, 1, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_power_saving_first_sleep_window_frame, tvb, tlv_offset, 1, FALSE);
+				break;
+			case RNG_INITIAL_SLEEP_WINDOW:
+				tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_initial_sleep_window, tvb, tlv_offset, 1, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_power_saving_initial_sleep_window, tvb, tlv_offset, 1, FALSE);
+				break;
+			case RNG_LISTENING_WINDOW:
+				tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_listening_window, tvb, tlv_offset, 1, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_power_saving_listening_window, tvb, tlv_offset, 1, FALSE);
+				break;
+			case RNG_FINAL_SLEEP_WINDOW_BASE:
+				tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_final_sleep_window_base, tvb, tlv_offset, 1, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_power_saving_final_sleep_window_base, tvb, tlv_offset, 1, FALSE);
+				break;
+			case RNG_FINAL_SLEEP_WINDOW_EXPONENT:
+				tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_final_sleep_window_exp, tvb, tlv_offset, 1, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_power_saving_final_sleep_window_exp, tvb, tlv_offset, 1, FALSE);
+				break;
+			case RNG_SLPID:
+				tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_slpid, tvb, tlv_offset, 1, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_power_saving_slpid, tvb, tlv_offset, 1, FALSE);
+				break;
+			case RNG_CID:
+				tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_included_cid, tvb, tlv_offset, 2, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_power_saving_included_cid, tvb, tlv_offset, 2, FALSE);
+				break;
+			case RNG_DIRECTION:
+				tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_mgmt_connection_direction, tvb, tlv_offset, 1, FALSE);
+				proto_tree_add_item(tlv_tree, hf_rng_power_saving_mgmt_connection_direction, tvb, tlv_offset, 1, FALSE);
+				break;
+			default:
+				tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
+				proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
+				break;
+		}
+		/* update the offset */
+		offset = tlv_len + tlv_offset;
+	}	/* end of TLV process while loop */
+}
+
+/* Register Wimax Mac Payload Protocol and Dissector */
+void proto_register_mac_mgmt_msg_rng_req(void)
+{
+	if (proto_mac_mgmt_msg_rng_req_decoder == -1)
+	{
+		proto_mac_mgmt_msg_rng_req_decoder = proto_register_protocol (
+							"WiMax RNG-REQ/RSP Messages", /* name */
+							"WiMax RNG-REQ/RSP (rng)", /* short name */
+							"rng" /* abbrev */
+							);
+
+		proto_register_field_array(proto_mac_mgmt_msg_rng_req_decoder, hf, array_length(hf));
+		proto_register_subtree_array(ett, array_length(ett));
+	}
+}
+
+/* Decode RNG-REQ messages. */
+void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	guint offset = 0;
+	guint tlv_offset;
+	guint tvb_len, payload_type;
+	proto_item *rng_req_item = NULL;
+	proto_tree *rng_req_tree = NULL;
+	proto_tree *tlv_tree = NULL;
+	tlv_info_t tlv_info;
+	gint tlv_type;
+	gint tlv_len;
+
+	/* Ensure the right payload type */
+	payload_type = tvb_get_guint8(tvb, offset);
+	if(payload_type != MAC_MGMT_MSG_RNG_REQ)
+	{
+		return;
+	}
+
+	if (tree)
+	{	/* we are being asked for details */
+
+		/* Get the tvb length */
+		tvb_len =  tvb_length(tvb);
+		/* display MAC payload type RNG-REQ */
+		rng_req_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, offset, tvb_len, "MAC Management Message, RNG-REQ (4)");
+		/* add MAC RNG-REQ subtree */
+		rng_req_tree = proto_item_add_subtree(rng_req_item, ett_mac_mgmt_msg_rng_req_decoder);
+		/* display the Message Type */
+		proto_tree_add_item(rng_req_tree, hf_rng_req_message_type, tvb, offset, 1, FALSE);
+		proto_tree_add_item(rng_req_tree, hf_rng_req_reserved, tvb, 1, 1, FALSE);
+		offset += 2;
+
+		while(offset < tvb_len)
+		{
+			/* Get the TLV data. */
+			init_tlv_info(&tlv_info, tvb, offset);
+			/* get the TLV type */
+			tlv_type = get_tlv_type(&tlv_info);
+			/* get the TLV length */
+			tlv_len = get_tlv_length(&tlv_info);
+			if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
+			{	/* invalid tlv info */
+				if(pinfo->cinfo)
+				{
+					col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-REQ TLV error");
+				}
+				proto_tree_add_item(rng_req_tree, hf_rng_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
+				break;
+			}
+			/* get the offset to the TLV data */
+			tlv_offset = offset + get_tlv_value_offset(&tlv_info);
+
+			switch (tlv_type) {
+				case RNG_REQ_DL_BURST_PROFILE:
+					/* add TLV subtree */
+					tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, tlv_offset, tlv_len, "Requested Downlink Burst Profile 0x%02x", tvb_get_guint8(tvb, tlv_offset));
+					proto_tree_add_item(tlv_tree, hf_rng_req_dl_burst_profile_diuc, tvb, tlv_offset, 1, FALSE);
+					proto_tree_add_item(tlv_tree, hf_rng_req_dl_burst_profile_lsb_ccc, tvb, tlv_offset, 1, FALSE);
+					break;
+				case RNG_REQ_SS_MAC_ADDRESS:
+					tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_rng_req_ss_mac_address, tvb, tlv_offset, 6, FALSE);
+					proto_tree_add_item(tlv_tree, hf_rng_req_ss_mac_address, tvb, tlv_offset, 6, FALSE);
+					break;
+				case RNG_REQ_RANGING_ANOMALIES:
+					/* add TLV subtree */
+					tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, tlv_offset, tlv_len, "Ranging Anomalies %d", tvb_get_guint8(tvb, tlv_offset));
+					proto_tree_add_item(tlv_tree, hf_rng_req_ranging_anomalies_max_power, tvb, tlv_offset, 1, FALSE);
+					proto_tree_add_item(tlv_tree, hf_rng_req_ranging_anomalies_min_power, tvb, tlv_offset, 1, FALSE);
+					proto_tree_add_item(tlv_tree, hf_rng_req_ranging_anomalies_timing_adj, tvb, tlv_offset, 1, FALSE);
+					break;
+				case RNG_REQ_AAS_BROADCAST:
+					tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_rng_req_aas_broadcast, tvb, tlv_offset, 1, FALSE);
+					proto_tree_add_item(tlv_tree, hf_rng_req_aas_broadcast, tvb, tlv_offset, 1, FALSE);
+					break;
+				case RNG_REQ_SERVING_BS_ID:
+					tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_rng_req_serving_bs_id, tvb, tlv_offset, 6, FALSE);
+					proto_tree_add_item(tlv_tree, hf_rng_req_serving_bs_id, tvb, tlv_offset, 6, FALSE);
+					break;
+				case RNG_REQ_RANGING_PURPOSE_INDICATION:
+					/* display the Ranging Purpose Flags */
+					/* add subtree */
+					tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, tlv_offset, tlv_len, "Ranging Purpose Flags (%u byte(s))", tlv_len);
+					proto_tree_add_item(tlv_tree, hf_rng_req_ranging_purpose_ho_indication, tvb, tlv_offset, 1, FALSE);
+					proto_tree_add_item(tlv_tree, hf_rng_req_ranging_purpose_location_update_request, tvb, tlv_offset, 1, FALSE);
+					proto_tree_add_item(tlv_tree, hf_rng_req_ranging_purpose_reserved, tvb, tlv_offset, 1, FALSE);
+					break;
+				case RNG_REQ_HO_ID:
+					tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_rng_req_ho_id, tvb, tlv_offset, 1, FALSE);
+					proto_tree_add_item(tlv_tree, hf_rng_req_ho_id, tvb, tlv_offset, 1, FALSE);
+					break;
+				case RNG_REQ_POWER_DOWN_INDICATOR:
+					tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_rng_req_power_down_indicator, tvb, tlv_offset, 1, FALSE);
+					proto_tree_add_item(tlv_tree, hf_rng_req_power_down_indicator, tvb, tlv_offset, 1, FALSE);
+					break;
+				case RNG_REQ_REQUESTED_DNLK_REP_CODING_LEVEL:
+					/* add subtree */
+					tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, tlv_offset, tlv_len, "Requested downlink repetition coding level (%u byte(s))", tlv_len);
+					proto_tree_add_item(tlv_tree, hf_rng_req_repetition_coding_level, tvb, tlv_offset, 1, FALSE);
+					proto_tree_add_item(tlv_tree, hf_rng_req_requested_downlink_repetition_coding_level_reserved, tvb, tlv_offset, 1, FALSE);
+					break;
+				case RNG_REQ_CMAC_KEY_COUNT:
+					if (include_cor2_changes) {
+						tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_rng_req_cmac_key_count, tvb, tlv_offset, tlv_len, FALSE);
+						proto_tree_add_item(tlv_tree, hf_rng_req_cmac_key_count, tvb, tlv_offset, 2, FALSE);
+					} else {
+						/* Unknown TLV type */
+						tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
+						proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
+					}
+					break;
+				case SHORT_HMAC_TUPLE:
+				case SHORT_HMAC_TUPLE_COR2:
+					if ((!include_cor2_changes && (tlv_type == SHORT_HMAC_TUPLE)) ||
+						(include_cor2_changes && (tlv_type == SHORT_HMAC_TUPLE_COR2))) {
+						/* decode and display the Short HMAC Tuple */
+						tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, tlv_offset, tlv_len, "Short HMAC Tuple (%u byte(s))", tlv_len);
+						wimax_short_hmac_tuple_decoder(tlv_tree, tvb, tlv_offset, tvb_len - offset);
+					} else {
+						/* Unknown TLV Type */
+						tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
+						proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
+					}
+					break;
+				case MAC_VERSION_ENCODING:
+					offset += wimax_common_tlv_encoding_decoder(tvb_new_subset(tvb, offset, (tvb_len - offset), (tvb_len - offset)), pinfo, rng_req_tree);
+					continue;
+					break;
+				case RNG_REQ_POWER_SAVING_CLASS_PARAMETERS:
+					tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, tlv_offset, tlv_len, "Power Saving Class Parameters (%u byte(s))", tlv_len);
+					dissect_power_saving_class(tlv_tree, tlv_type, tvb, tlv_len, pinfo, tlv_offset);
+					break;
+				default:
+					tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
+					proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
+					break;
+			}
+			/* update the offset */
+			offset = tlv_len + tlv_offset;
+		}	/* end of TLV process while loop */
+	}
+}