Add support for decoding Intel ANS probes. Thanks go to Intel for providing

protocol information.

svn path=/trunk/; revision=7359

3 files changed, 157 insertions, 2 deletions

diff --git a/Makefile.am b/Makefile.am
index 73bb5534b6..f764b9bcb3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.567 2003/03/07 16:52:41 gerald Exp $
+# $Id: Makefile.am,v 1.568 2003/03/23 19:32:17 gerald Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -89,6 +89,7 @@ DISSECTOR_SRC = \
 	packet-afs.c   \
 	packet-aim.c   \
 	packet-ajp13.c		\
+	packet-ans.c   \
 	packet-aodv.c  \
 	packet-aodv6.c \
 	packet-arcnet.c \
diff --git a/Makefile.nmake b/Makefile.nmake
index 6ae27a6340..4d636fe231 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.287 2003/03/07 19:15:48 guy Exp $
+# $Id: Makefile.nmake,v 1.288 2003/03/23 19:32:19 gerald Exp $
 
 include config.nmake
 include <win32.mak>
@@ -30,6 +30,7 @@ DISSECTOR_SRC = \
 	packet-afs.c   \
 	packet-aim.c   \
 	packet-ajp13.c		\
+	packet-ans.c   \
 	packet-aodv.c  \
 	packet-aodv6.c \
 	packet-arcnet.c \
diff --git a/packet-ans.c b/packet-ans.c
new file mode 100644
index 0000000000..e0b992808b
--- /dev/null
+++ b/packet-ans.c
@@ -0,0 +1,153 @@
+/* packet-ans.c
+ * Routines for Intel ANS probe dissection
+ *
+ * $Id: packet-ans.c,v 1.1 2003/03/23 19:32:19 gerald Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 2003 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.
+ *
+ * The following information was graciously provided by Intel:
+ * Offset    Size (bytes)    Contents	
+ * 0         6               Destination Broadcast probes: {FF,FF,FF,FF,FF,FF} 
+ *                           Multicast probes: {01,AA,00,00,00,00}	
+ * 6         6               Source Matches the CurrentMACAddress of the 
+ *                           adapter sending the probe.	
+ * 8         2               Type Network order is 0x886D, Intel's reserved 
+ *                           packet type.
+ * 10 (0)    2               ApplicationID Network order is 0x0001, identifies 
+ *                           it as fault tolerance probe.	
+ * 12 (2)    2               RevID Network order, identifies the revision id 
+ *                           of Teaming software.	
+ * 16 (4)    4               ProbeSequenceNumber Ascending sequence number 
+ *                           that identifies the current probing cycle.	
+ * 20 (8)    2               SenderID Unique ID within a team identifying 
+ *                           the member that originally sent the probe.	
+ * 22 (10)   6               TeamID Unique ID identifying the team in charge 
+ *                           of this probe.	
+ * 28        Padding         Reserved	
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <glib.h>
+
+#include <epan/packet.h>
+#include <epan/proto.h>
+#include <etypes.h>
+
+/* Initialize the protocol and registered fields */
+static int proto_ans        = -1;
+
+static int hf_ans_app_id    = -1;
+static int hf_ans_rev_id    = -1;
+static int hf_ans_seq_num   = -1;
+static int hf_ans_sender_id = -1;
+static int hf_ans_team_id   = -1;
+
+/* Initialize the subtree pointers */
+static gint ett_ans = -1;
+
+/* Code to actually dissect the packets */
+static void
+dissect_ans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	proto_item  *ti;
+	proto_tree  *ans_tree = NULL;
+	guint16      sender_id;
+	guint32      seq_num;
+	gchar        team_id[6];
+
+	if (check_col(pinfo->cinfo, COL_PROTOCOL))
+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "Intel ANS probe");
+
+	if (check_col(pinfo->cinfo, COL_INFO)) {
+		col_clear(pinfo->cinfo, COL_INFO);
+		
+		seq_num = tvb_get_ntohl(tvb, 4);
+		sender_id = tvb_get_ntohs(tvb, 8);
+		tvb_memcpy(tvb, team_id, 10, 6);
+
+		col_append_fstr(pinfo->cinfo, COL_INFO, "Sequence: %u, Sender ID %u, Team ID %s",
+			seq_num, sender_id, ether_to_str(team_id));
+	}
+
+	if (tree) {
+		ti = proto_tree_add_item(tree, proto_ans, tvb, 0, -1, FALSE);
+		ans_tree = proto_item_add_subtree(ti, ett_ans);
+
+		proto_tree_add_item(ans_tree, hf_ans_app_id, tvb, 0, 2, FALSE);
+		proto_tree_add_item(ans_tree, hf_ans_rev_id, tvb, 2, 2, FALSE);
+		proto_tree_add_item(ans_tree, hf_ans_seq_num, tvb, 4, 4, FALSE);
+		proto_tree_add_item(ans_tree, hf_ans_sender_id, tvb, 8, 2, FALSE);
+		proto_tree_add_item(ans_tree, hf_ans_team_id, tvb, 10, 6, FALSE);
+	}
+}
+
+
+void
+proto_register_ans(void)
+{
+	static hf_register_info hf[] = {
+		{ &hf_ans_app_id,
+			{ "Application ID", "ans.app_id",
+				FT_UINT16, BASE_HEX, NULL, 0,
+				"Intel ANS Application ID", HFILL }
+		},
+		{ &hf_ans_rev_id,
+			{ "Revision ID", "ans.rev_id",
+				FT_UINT16, BASE_HEX, NULL, 0,
+				"Intel ANS Revision ID", HFILL }
+		},
+		{ &hf_ans_seq_num,
+			{ "Sequence Number", "ans.seq_num",
+				FT_UINT32, BASE_DEC, NULL, 0,
+				"Intel ANS Sequence Number", HFILL }
+		},
+		{ &hf_ans_sender_id,
+			{ "Sender ID", "ans.sender_id",
+				FT_UINT16, BASE_DEC, NULL, 0,
+				"Intel ANS Sender ID", HFILL }
+		},
+		{ &hf_ans_team_id,
+			{ "Team ID", "ans.team_id",
+				FT_ETHER, BASE_HEX, NULL, 0,
+				"Intel ANS Team ID", HFILL }
+		},
+	};
+
+	static gint *ett[] = {
+		&ett_ans,
+	};
+
+	proto_ans = proto_register_protocol("Intel ANS probe", "ANS", "ans");
+	proto_register_field_array(proto_ans, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+}
+
+
+void
+proto_reg_handoff_ans(void)
+{
+	dissector_handle_t ans_handle;
+
+	ans_handle = create_dissector_handle(dissect_ans, proto_ans);
+	dissector_add("ethertype", ETHERTYPE_INTEL_ANS, ans_handle);
+}