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, 250 insertions, 0 deletions

diff --git a/plugins/wimax/msg_dsc.c b/plugins/wimax/msg_dsc.c
new file mode 100644
index 0000000000..2a8c1eb970
--- /dev/null
+++ b/plugins/wimax/msg_dsc.c
@@ -0,0 +1,250 @@
+/* msg_dsc.c
+ * WiMax MAC Management DSC-REQ/RSP/ACK Messages decoder
+ *
+ * Copyright (c) 2007 by Intel Corporation.
+ *
+ * Author: Lu Pan <lu.pan@intel.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
+
+/*
+#define DEBUG
+*/
+
+#include <gmodule.h>
+#include <epan/packet.h>
+#include "wimax_tlv.h"
+#include "wimax_mac.h"
+#include "wimax_utils.h"
+
+extern gint proto_mac_mgmt_msg_dsa_decoder;
+
+/* forward reference */
+void proto_register_mac_mgmt_msg_dsc(void);
+void dissect_mac_mgmt_msg_dsc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+void dissect_mac_mgmt_msg_dsc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+void dissect_mac_mgmt_msg_dsc_ack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+static gint proto_mac_mgmt_msg_dsc_decoder = -1;
+static gint ett_mac_mgmt_msg_dsc_req_decoder = -1;
+static gint ett_mac_mgmt_msg_dsc_rsp_decoder = -1;
+static gint ett_mac_mgmt_msg_dsc_ack_decoder = -1;
+
+/* Setup protocol subtree array */
+static gint *ett[] =
+{
+	&ett_mac_mgmt_msg_dsc_req_decoder,
+	&ett_mac_mgmt_msg_dsc_rsp_decoder,
+	&ett_mac_mgmt_msg_dsc_ack_decoder
+};
+
+static gchar *dsc_msgs[] =
+{
+	"Dynamic Service Change Request (DSC-REQ)",
+	"Dynamic Service Change Response (DSC-RSP)",
+	"Dynamic Service Change Acknowledge (DSC-ACK)"
+};
+
+/* fix fields */
+static gint hf_dsc_req_message_type = -1;
+static gint hf_dsc_transaction_id = -1;
+static gint hf_dsc_rsp_message_type = -1;
+static gint hf_dsc_confirmation_code = -1;
+static gint hf_dsc_ack_message_type = -1;
+
+/* DSx display */
+static hf_register_info hf[] =
+{
+	{
+		&hf_dsc_ack_message_type,
+		{
+			"MAC Management Message Type", "wimax.macmgtmsgtype.dsc_ack",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_dsc_req_message_type,
+		{
+			"MAC Management Message Type", "wimax.macmgtmsgtype.dsc_req",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_dsc_rsp_message_type,
+		{
+			"MAC Management Message Type", "wimax.macmgtmsgtype.dsc_rsp",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_dsc_confirmation_code,
+		{
+			"Confirmation code", "wimax.dsc.confirmation_code",
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_dsc_transaction_id,
+		{
+			"Transaction ID", "wimax.dsc.transaction_id",
+			FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	}
+};
+
+/* Register Wimax Mac Payload Protocol and Dissector */
+void proto_register_mac_mgmt_msg_dsc(void)
+{
+	if (proto_mac_mgmt_msg_dsc_decoder == -1)
+	{
+		proto_mac_mgmt_msg_dsc_decoder = proto_mac_mgmt_msg_dsa_decoder;
+
+		proto_register_field_array(proto_mac_mgmt_msg_dsc_decoder, hf, array_length(hf));
+		proto_register_subtree_array(ett, array_length(ett));
+	}
+}
+
+void dissect_mac_mgmt_msg_dsc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	guint offset = 0;
+	guint tvb_len, payload_type;
+	guint dsc_transaction_id;
+	proto_item *dsc_item = NULL;
+	proto_tree *dsc_tree = NULL;
+
+	if(tree)
+	{	/* we are being asked for details */
+		/* get the message type */
+		payload_type = tvb_get_guint8(tvb, offset);
+		/* ensure the message type is DSC REQ/RSP/ACK */
+		if(payload_type != MAC_MGMT_MSG_DSC_REQ)
+			return;
+		/* Get the tvb length */
+		tvb_len =  tvb_length(tvb);
+		/* display MAC message type */
+		dsc_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_dsc_decoder, tvb, offset, tvb_len, "%s (%u bytes)", dsc_msgs[payload_type - MAC_MGMT_MSG_DSC_REQ], tvb_len);
+		/* add MAC DSx subtree */
+		dsc_tree = proto_item_add_subtree(dsc_item, ett_mac_mgmt_msg_dsc_req_decoder);
+		/* Decode and display the Uplink Channel Descriptor (UCD) */
+		/* display the Message Type */
+		proto_tree_add_item(dsc_tree, hf_dsc_req_message_type, tvb, offset, 1, FALSE);
+		/* move to next field */
+		offset++;
+		/* get the Configuration Change Count */
+		dsc_transaction_id = tvb_get_ntohs(tvb, offset);
+		/* display the Transaction ID */
+		proto_tree_add_item(dsc_tree, hf_dsc_transaction_id, tvb, offset, 2, FALSE);
+		/* move to next field */
+		offset += 2;
+		/* process DSC REQ message TLV Encode Information */
+		wimax_common_tlv_encoding_decoder(tvb_new_subset(tvb, offset, (tvb_len - offset), (tvb_len - offset)), pinfo, dsc_tree);
+	}
+}
+
+void dissect_mac_mgmt_msg_dsc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	guint offset = 0;
+	guint tvb_len, payload_type;
+	guint dsc_transaction_id;
+	proto_item *dsc_item = NULL;
+	proto_tree *dsc_tree = NULL;
+
+	if(tree)
+	{	/* we are being asked for details */
+		/* get the message type */
+		payload_type = tvb_get_guint8(tvb, offset);
+		/* ensure the message type is DSC REQ/RSP/ACK */
+		if(payload_type != MAC_MGMT_MSG_DSC_RSP)
+			return;
+		/* Get the tvb length */
+		tvb_len =  tvb_length(tvb);
+		/* display MAC message type */
+		dsc_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_dsc_decoder, tvb, offset, tvb_len, "%s (%u bytes)", dsc_msgs[payload_type - MAC_MGMT_MSG_DSC_REQ], tvb_len);
+		/* add MAC DSx subtree */
+		dsc_tree = proto_item_add_subtree(dsc_item, ett_mac_mgmt_msg_dsc_rsp_decoder);
+		/* Decode and display the Uplink Channel Descriptor (UCD) */
+		/* display the Message Type */
+		proto_tree_add_item(dsc_tree, hf_dsc_rsp_message_type, tvb, offset, 1, FALSE);
+		/* move to next field */
+		offset++;
+		/* get the Configuration Change Count */
+		dsc_transaction_id = tvb_get_ntohs(tvb, offset);
+		/* display the Transaction ID */
+		proto_tree_add_item(dsc_tree, hf_dsc_transaction_id, tvb, offset, 2, FALSE);
+		/* move to next field */
+		offset += 2;
+		/* display the Confirmation Code */
+		proto_tree_add_item(dsc_tree, hf_dsc_confirmation_code, tvb, offset, 1, FALSE);
+		/* move to next field */
+		offset++;
+		/* process DSC RSP message TLV Encode Information */
+		wimax_common_tlv_encoding_decoder(tvb_new_subset(tvb, offset, (tvb_len - offset), (tvb_len - offset)), pinfo, dsc_tree);
+	}
+}
+
+void dissect_mac_mgmt_msg_dsc_ack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	guint offset = 0;
+	guint tvb_len, payload_type;
+	guint dsc_transaction_id;
+	proto_item *dsc_item = NULL;
+	proto_tree *dsc_tree = NULL;
+
+	if(tree)
+	{	/* we are being asked for details */
+		/* get the message type */
+		payload_type = tvb_get_guint8(tvb, offset);
+		/* ensure the message type is DSC REQ/RSP/ACK */
+		if((payload_type < MAC_MGMT_MSG_DSC_REQ) || (payload_type > MAC_MGMT_MSG_DSC_ACK))
+			return;
+		/* Get the tvb length */
+		tvb_len =  tvb_length(tvb);
+		/* display MAC message type */
+		dsc_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_dsc_decoder, tvb, offset, tvb_len, "%s (%u bytes)", dsc_msgs[payload_type - MAC_MGMT_MSG_DSC_REQ], tvb_len);
+		/* add MAC DSx subtree */
+		dsc_tree = proto_item_add_subtree(dsc_item, ett_mac_mgmt_msg_dsc_ack_decoder);
+		/* Decode and display the Uplink Channel Descriptor (UCD) */
+		/* display the Message Type */
+		proto_tree_add_item(dsc_tree, hf_dsc_ack_message_type, tvb, offset, 1, FALSE);
+		/* move to next field */
+		offset++;
+		/* get the Configuration Change Count */
+		dsc_transaction_id = tvb_get_ntohs(tvb, offset);
+		/* display the Transaction ID */
+		proto_tree_add_item(dsc_tree, hf_dsc_transaction_id, tvb, offset, 2, FALSE);
+		/* move to next field */
+		offset += 2;
+		/* display the Confirmation Code */
+		proto_tree_add_item(dsc_tree, hf_dsc_confirmation_code, tvb, offset, 1, FALSE);
+		/* move to next field */
+		offset++;
+		/* process DSC ACK message TLV Encode Information */
+		wimax_common_tlv_encoding_decoder(tvb_new_subset(tvb, offset, (tvb_len - offset), (tvb_len - offset)), pinfo, dsc_tree);
+	}
+}
+