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

diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c
new file mode 100644
index 0000000000..db698b2b86
--- /dev/null
+++ b/plugins/wimax/msg_dsd.c
@@ -0,0 +1,308 @@
+/* msg_dsd.c
+ * WiMax MAC Management DSD-REQ/RSP 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_dsd(void);
+void dissect_mac_mgmt_msg_dsd_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+void dissect_mac_mgmt_msg_dsd_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+gint proto_mac_mgmt_msg_dsd_decoder = -1;
+static gint ett_mac_mgmt_msg_dsd_req_decoder = -1;
+static gint ett_mac_mgmt_msg_dsd_rsp_decoder = -1;
+static gint ett_dsd_ul_sfe_decoder = -1;
+static gint ett_dsd_dl_sfe_decoder = -1;
+static gint ett_dsd_hmac_tuple = -1;
+static gint ett_dsd_cmac_tuple = -1;
+
+/* Setup protocol subtree array */
+static gint *ett[] =
+{
+	&ett_mac_mgmt_msg_dsd_req_decoder,
+	&ett_mac_mgmt_msg_dsd_rsp_decoder,
+	&ett_dsd_ul_sfe_decoder,
+	&ett_dsd_dl_sfe_decoder,
+	&ett_dsd_hmac_tuple,
+	&ett_dsd_cmac_tuple,
+};
+
+static gchar *dsd_msgs[] =
+{
+	"Dynamic Service Deletion Request (DSD-REQ)",
+	"Dynamic Service Deletion Response (DSD-RSP)"
+};
+
+/* fix fields */
+static gint hf_dsd_req_message_type = -1;
+static gint hf_dsd_transaction_id = -1;
+static gint hf_dsd_service_flow_id = -1;
+static gint hf_dsd_rsp_message_type = -1;
+static gint hf_dsd_confirmation_code = -1;
+static gint hf_dsd_invalid_tlv = -1;
+static gint hf_dsd_unknown_type = -1;
+
+/* DSx display */
+static hf_register_info hf[] =
+{
+	{
+		&hf_dsd_req_message_type,
+		{
+			"MAC Management Message Type", "wimax.macmgtmsgtype.dsd_req", 
+			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_dsd_rsp_message_type,
+		{
+			"MAC Management Message Type", "wimax.macmgtmsgtype.dsd_rsp", 
+			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
+		}
+	},
+	{
+		&hf_dsd_confirmation_code,
+		{
+			"Confirmation code", "wimax.dsd.confirmation_code", 
+			FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_dsd_service_flow_id,
+		{
+			"Service Flow ID", "wimax.dsd.service_flow_id", 
+			FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL
+		}
+	},
+	{
+		&hf_dsd_transaction_id,
+		{
+			"Transaction ID", "wimax.dsd.transaction_id", 
+			FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL
+		}
+	}
+};
+
+/* Register Wimax Mac Payload Protocol and Dissector */
+void proto_register_mac_mgmt_msg_dsd(void)
+{
+	if (proto_mac_mgmt_msg_dsd_decoder == -1)
+	{
+		proto_mac_mgmt_msg_dsd_decoder = proto_mac_mgmt_msg_dsa_decoder;
+
+		proto_register_field_array(proto_mac_mgmt_msg_dsd_decoder, hf, array_length(hf));
+		proto_register_subtree_array(ett, array_length(ett));
+	}
+}
+
+void dissect_mac_mgmt_msg_dsd_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	guint offset = 0;
+	guint tvb_len, payload_type, tlv_len, tlv_value_offset;
+	gint  tlv_type;
+	proto_item *dsd_item = NULL;
+	proto_tree *dsd_tree = NULL;
+	proto_tree *tlv_tree = NULL;
+	tlv_info_t tlv_info;
+
+	if(tree)
+	{	/* we are being asked for details */
+		/* get the message type */
+		payload_type = tvb_get_guint8(tvb, offset);
+		/* ensure the message type is DSD REQ/RSP/ACK */
+		if(payload_type != MAC_MGMT_MSG_DSD_REQ)
+			return;
+		/* Get the tvb length */
+		tvb_len =  tvb_length(tvb);
+		/* display MAC message type */
+		dsd_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_dsd_decoder, tvb, offset, tvb_len, "%s (%u bytes)", dsd_msgs[payload_type - MAC_MGMT_MSG_DSD_REQ], tvb_len);
+		/* add MAC DSx subtree */
+		dsd_tree = proto_item_add_subtree(dsd_item, ett_mac_mgmt_msg_dsd_req_decoder);
+		/* Decode and display the DSD message */
+		/* display the Message Type */
+		proto_tree_add_item(dsd_tree, hf_dsd_req_message_type, tvb, offset, 1, FALSE);
+		/* move to next field */
+		offset++;
+		/* display the Transaction ID */
+		proto_tree_add_item(dsd_tree, hf_dsd_transaction_id, tvb, offset, 2, FALSE);
+		/* move to next field */
+		offset += 2;
+		/* display the Service Flow ID */
+		proto_tree_add_item(dsd_tree, hf_dsd_service_flow_id, tvb, offset, 4, FALSE);
+		/* move to next field */
+		offset += 4;
+		/* process DSD REQ message TLV Encode Information */
+		while(offset < tvb_len)
+		{	/* get the TLV information */
+			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, "DSD-REQ TLV error");
+				}
+				proto_tree_add_item(dsd_tree, hf_dsd_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
+				break;
+			}
+			/* get the TLV value offset */
+			tlv_value_offset = get_tlv_value_offset(&tlv_info);
+#ifdef DEBUG /* for debug only */
+			proto_tree_add_protocol_format(dsd_tree, proto_mac_mgmt_msg_dsd_decoder, tvb, offset, tlv_len + tlv_value_offset, "DSD-REQ TLV Type: %u (%u bytes, offset=%u, tvb_len=%u)", tlv_type, tlv_len + tlv_value_offset, offset, tvb_len);
+#endif
+			/* update the offset */
+			offset += tlv_value_offset;
+			/* process TLV */
+			switch (tlv_type)
+			{
+				case HMAC_TUPLE:	/* Table 348d */
+					/* decode and display the HMAC Tuple */
+					tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dsd_req_decoder, dsd_tree, proto_mac_mgmt_msg_dsd_decoder, tvb, offset, tlv_len, "HMAC Tuple (%u byte(s))", tlv_len);
+					wimax_hmac_tuple_decoder(tlv_tree, tvb, offset, tlv_len);
+					break;
+				case CMAC_TUPLE:	/* Table 348b */
+					/* decode and display the CMAC Tuple */
+					tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dsd_req_decoder, dsd_tree, proto_mac_mgmt_msg_dsd_decoder, tvb, offset, tlv_len, "CMAC Tuple (%u byte(s))", tlv_len);
+					wimax_cmac_tuple_decoder(tlv_tree, tvb, offset, tlv_len);
+					break;
+				default:
+					/* display the unknown tlv in hex */
+					tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dsd_req_decoder, dsd_tree, proto_mac_mgmt_msg_dsd_decoder, tvb, offset, tlv_len, "Unknown TLV (%u byte(s))", tlv_len);
+					proto_tree_add_item(tlv_tree, hf_dsd_unknown_type, tvb, (offset - tlv_value_offset), (tlv_len + tlv_value_offset), FALSE);
+					break;
+			}
+			offset += tlv_len;
+		}	/* end of while loop */
+	}
+}
+
+void dissect_mac_mgmt_msg_dsd_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	guint offset = 0;
+	guint tvb_len, payload_type, tlv_len, tlv_value_offset;
+	gint  tlv_type;
+	proto_item *dsd_item = NULL;
+	proto_tree *dsd_tree = NULL;
+	proto_tree *tlv_tree = NULL;
+	tlv_info_t tlv_info;
+
+	if(tree)
+	{	/* we are being asked for details */
+		/* get the message type */
+		payload_type = tvb_get_guint8(tvb, offset);
+		/* ensure the message type is DSD REQ/RSP/ACK */
+		if(payload_type != MAC_MGMT_MSG_DSD_RSP)
+			return;
+		/* Get the tvb length */
+		tvb_len =  tvb_length(tvb);
+		/* display MAC message type */
+		dsd_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_dsd_decoder, tvb, offset, tvb_len, "%s (%u bytes)", dsd_msgs[payload_type - MAC_MGMT_MSG_DSD_REQ], tvb_len);
+		/* add MAC DSx subtree */
+		dsd_tree = proto_item_add_subtree(dsd_item, ett_mac_mgmt_msg_dsd_rsp_decoder);
+		/* Decode and display the DSD message */
+		/* display the Message Type */
+		proto_tree_add_item(dsd_tree, hf_dsd_rsp_message_type, tvb, offset, 1, FALSE);
+		/* move to next field */
+		offset++;
+		/* display the Transaction ID */
+		proto_tree_add_item(dsd_tree, hf_dsd_transaction_id, tvb, offset, 2, FALSE);
+		/* move to next field */
+		offset += 2;
+		/* display the Confirmation Code */
+		proto_tree_add_item(dsd_tree, hf_dsd_confirmation_code, tvb, offset, 1, FALSE);
+		/* move to next field */
+		offset++;
+		/* display the Service Flow ID */
+		proto_tree_add_item(dsd_tree, hf_dsd_service_flow_id, tvb, offset, 4, FALSE);
+		/* move to next field */
+		offset += 4;
+		/* process DSD RSP message TLV Encode Information */
+		while(offset < tvb_len)
+		{	/* get the TLV information */
+			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, "DSD RSP TLV error");
+				}
+				proto_tree_add_item(dsd_tree, hf_dsd_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
+				break;
+			}
+			/* get the TLV value offset */
+			tlv_value_offset = get_tlv_value_offset(&tlv_info);
+#ifdef DEBUG /* for debug only */
+			proto_tree_add_protocol_format(dsd_tree, proto_mac_mgmt_msg_dsd_decoder, tvb, offset, tlv_len + tlv_value_offset, "DSD-RSP TLV Type: %u (%u bytes, offset=%u, tvb_len=%u)", tlv_type, tlv_len + tlv_value_offset, offset, tvb_len);
+#endif
+			/* update the offset */
+			offset += tlv_value_offset;
+			/* process TLV */
+			switch (tlv_type)
+			{
+				case HMAC_TUPLE:	/* Table 348d */
+					/* decode and display the HMAC Tuple */
+					tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dsd_req_decoder, dsd_tree, proto_mac_mgmt_msg_dsd_decoder, tvb, offset, tlv_len, "HMAC Tuple (%u byte(s))", tlv_len);
+					wimax_hmac_tuple_decoder(tlv_tree, tvb, offset, tlv_len);
+					break;
+				case CMAC_TUPLE:	/* Table 348b */
+					/* decode and display the CMAC Tuple */
+					tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dsd_req_decoder, dsd_tree, proto_mac_mgmt_msg_dsd_decoder, tvb, offset, tlv_len, "CMAC Tuple (%u byte(s))", tlv_len);
+					wimax_cmac_tuple_decoder(tlv_tree, tvb, offset, tlv_len);
+					break;
+				default:
+					/* display the unknown tlv in hex */
+					tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dsd_req_decoder, dsd_tree, proto_mac_mgmt_msg_dsd_decoder, tvb, offset, tlv_len, "Unknown TLV (%u byte(s))", tlv_len);
+					proto_tree_add_item(tlv_tree, hf_dsd_unknown_type, tvb, (offset - tlv_value_offset), (tlv_len + tlv_value_offset), FALSE);
+					break;
+			}
+			offset += tlv_len;
+		}	/* end of while loop */
+	}
+}