As the gtk2 directory is no longer needed (GTK1 and 2 are using the same sources...

[obnox/wireshark/wip.git] / packet-data.c

diff --git a/packet-data.c b/packet-data.c
index 06b9a90c978764180d099eea9beda3661d24c6fe..29c190e524fde0ec691b584a32ce3dc7f7c12e25 100644 (file)
--- a/packet-data.c
+++ b/packet-data.c
@@ -1,24 +1,23 @@
 /* packet-data.c
  * Routines for raw data (default case)
- * Gilbert Ramirez <gram@verdict.uthscsa.edu>
+ * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: packet-data.c,v 1.2 1998/09/16 03:22:02 gerald Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@unicom.net>
+ * 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.
@@ -28,25 +27,45 @@
 # include "config.h"
 #endif
 
-#include <gtk/gtk.h>
-#include <pcap.h>
-
-#include <stdio.h>
+#include <glib.h>
+#include <epan/packet.h>
+#include "packet-data.h"
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+/* proto_data cannot be static because it's referenced in the
+ * print routines
+ */
+int proto_data = -1;
 
-#include "ethereal.h"
-#include "packet.h"
+static void
+dissect_data(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree)
+{
+       int bytes;
 
+       if (tree) {
+               bytes = tvb_length_remaining(tvb, 0);
+               if (bytes > 0) {
+                       proto_tree_add_protocol_format(tree, proto_data, tvb,
+                               0,
+                               bytes, "Data (%d byte%s)", bytes,
+                               plurality(bytes, "", "s"));
+               }
+       }
+}
 
 void
-dissect_data(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) {
+proto_register_data(void)
+{
+       proto_data = proto_register_protocol (
+               "Data",         /* name */
+               "Data",         /* short name */
+               "data"          /* abbrev */
+               );
 
-       if (fd->cap_len > offset && tree) {
-               (void) add_item_to_tree(GTK_WIDGET(tree), offset, fd->cap_len - offset,
-                       "Data");
-       }
-}
+       register_dissector("data", dissect_data, proto_data);
 
+       /*
+        * "Data" is used to dissect something whose normal dissector
+        * is disabled, so it cannot itself be disabled.
+        */
+       proto_set_cant_toggle(proto_data);
+}