Move the STRING dissector to packet-dcerpc-nt.c and add one more parameter

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

diff --git a/packet-data.c b/packet-data.c
index 9aa97f771a9c5580ac2003646a7c0bb2b1cc8f95..9eb4e9453b68023942ee63853e6a417f09b56196 100644 (file)
--- a/packet-data.c
+++ b/packet-data.c
@@ -1,13 +1,12 @@
 /* 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.7 1999/03/22 03:56:33 guy Exp $
+ * $Id: packet-data.c,v 1.26 2002/01/21 07:36:33 guy Exp $
  *
  * 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
@@ -28,24 +27,49 @@
 # include "config.h"
 #endif
 
-#include <gtk/gtk.h>
-
-#include <stdio.h>
-
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 
-#include "ethereal.h"
-#include "packet.h"
+#include <glib.h>
+#include <epan/packet.h>
 
+/* proto_data cannot be static because it's referenced in the
+ * print routines
+ */
+int proto_data = -1;
 
 void
-dissect_data(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) {
+dissect_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+       int bytes;
 
-       if (fd->cap_len > offset && tree) {
-               (void) add_item_to_tree(GTK_WIDGET(tree), offset, END_OF_FRAME,
-                       "Data (%d bytes)", END_OF_FRAME);
+       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
+proto_register_data(void)
+{
+       proto_data = proto_register_protocol (
+               "Data",         /* name */
+               "Data",         /* short name */
+               "data"          /* abbrev */
+               );
+
+       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_disable(proto_data);
+
+}