X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=packet-cgmp.c;h=433ee1792a2a510f693625f294ce535884fad82a;hb=eab86116e5878e57305dc3cbf175d16e1e5eb236;hp=f07a6908fdac7dc8d1c052b3e32f8a8f27133c34;hpb=440ef004079fdbe25a7b374d505616250f1912c9;p=obnox%2Fwireshark%2Fwip.git

diff --git a/packet-cgmp.c b/packet-cgmp.c
index f07a6908fd..433ee1792a 100644
--- a/packet-cgmp.c
+++ b/packet-cgmp.c
@@ -1,39 +1,34 @@
 /* packet-cgmp.c
  * Routines for the disassembly of the Cisco Group Management Protocol
  *
- * $Id: packet-cgmp.c,v 1.1 2000/02/05 05:54:15 guy Exp $
+ * $Id: packet-cgmp.c,v 1.17 2002/08/28 21:00:08 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 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 "config.h"
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
 
 /*
  * See
@@ -57,47 +52,45 @@ static const value_string type_vals[] = {
 	{ 1, "Leave" },
 	{ 0, NULL },
 };
-	
-void 
-dissect_cgmp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+
+static void
+dissect_cgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	proto_item *ti; 
+	proto_item *ti;
 	proto_tree *cgmp_tree = NULL;
+	int offset = 0;
 	guint8 count;
 
-	if (check_col(fd, COL_PROTOCOL))
-		col_add_str(fd, COL_PROTOCOL, "CGMP");
-	if (check_col(fd, COL_INFO))
-		col_add_str(fd, COL_INFO, "Cisco Group Management Protocol"); 
+	if (check_col(pinfo->cinfo, COL_PROTOCOL))
+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "CGMP");
+	if (check_col(pinfo->cinfo, COL_INFO))
+		col_set_str(pinfo->cinfo, COL_INFO, "Cisco Group Management Protocol");
 
 	if (tree) {
-	        ti = proto_tree_add_item(tree, proto_cgmp, offset, END_OF_FRAME, NULL);
+		ti = proto_tree_add_item(tree, proto_cgmp, tvb, offset, -1,
+		    FALSE);
 		cgmp_tree = proto_item_add_subtree(ti, ett_cgmp);
-	
-		proto_tree_add_item(cgmp_tree, hf_cgmp_version, offset, 1,
-		    pd[offset]);
-		proto_tree_add_item(cgmp_tree, hf_cgmp_type, offset, 1,
-		    pd[offset]);
+
+		proto_tree_add_item(cgmp_tree, hf_cgmp_version, tvb, offset, 1,
+		    FALSE);
+		proto_tree_add_item(cgmp_tree, hf_cgmp_type, tvb, offset, 1,
+		    FALSE);
 		offset += 1;
 
 		offset += 2;	/* skip reserved field */
 
-		count = pd[offset];
-		proto_tree_add_item(cgmp_tree, hf_cgmp_count, offset, 1,
+		count = tvb_get_guint8(tvb, offset);
+		proto_tree_add_uint(cgmp_tree, hf_cgmp_count, tvb, offset, 1,
 		    count);
 		offset += 1;
 
 		while (count != 0) {
-			if (!BYTES_ARE_IN_FRAME(offset, 6))
-				break;
-			proto_tree_add_item(cgmp_tree, hf_cgmp_gda, offset, 6,
-			    &pd[offset]);
+			proto_tree_add_item(cgmp_tree, hf_cgmp_gda, tvb, offset, 6,
+			    FALSE);
 			offset += 6;
 
-			if (!BYTES_ARE_IN_FRAME(offset, 6))
-				break;
-			proto_tree_add_item(cgmp_tree, hf_cgmp_usa, offset, 6,
-			    &pd[offset]);
+			proto_tree_add_item(cgmp_tree, hf_cgmp_usa, tvb, offset, 6,
+			    FALSE);
 			offset += 6;
 
 			count--;
@@ -111,29 +104,40 @@ proto_register_cgmp(void)
 	static hf_register_info hf[] = {
 		{ &hf_cgmp_version,
 		{ "Version",	"cgmp.version",	FT_UINT8, BASE_DEC, NULL, 0xF0,
-			"" }},
+			"", HFILL }},
 
 		{ &hf_cgmp_type,
 		{ "Type",	"cgmp.type",	FT_UINT8, BASE_DEC, VALS(type_vals), 0x0F,
-			"" }},
+			"", HFILL }},
 
 		{ &hf_cgmp_count,
 		{ "Count",	"cgmp.count", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"" }},
+			"", HFILL }},
 
 		{ &hf_cgmp_gda,
 		{ "Group Destination Address",	"cgmp.gda", FT_ETHER, BASE_NONE, NULL, 0x0,
-			"Group Destination Address" }},
+			"Group Destination Address", HFILL }},
 
 		{ &hf_cgmp_usa,
 		{ "Unicast Source Address",	"cgmp.usa", FT_ETHER, BASE_NONE, NULL, 0x0,
-			"Unicast Source Address" }},
+			"Unicast Source Address", HFILL }},
         };
 	static gint *ett[] = {
 		&ett_cgmp,
 	};
 
-        proto_cgmp = proto_register_protocol("Cisco Group Management Protocol", "cgmp");
+        proto_cgmp = proto_register_protocol("Cisco Group Management Protocol",
+	    "CGMP", "cgmp");
         proto_register_field_array(proto_cgmp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
+
+void
+proto_reg_handoff_cgmp(void)
+{
+	dissector_handle_t cgmp_handle;
+
+	cgmp_handle = create_dissector_handle(dissect_cgmp, proto_cgmp);
+	dissector_add("llc.cisco_pid", 0x2001, cgmp_handle);
+	dissector_add("ethertype", 0x2001, cgmp_handle);
+}