Move the GSM SMS dissection to a dedicated subdissector (currently still within

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

diff --git a/packet-data.c b/packet-data.c
index fcdbb956e59b1aa0d6fc29c15588235e4477c38f..7583ae3ac2728f352ec5930ac8eb7a91315b2270 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@xiexie.org>
+ * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: packet-data.c,v 1.19 2000/08/07 03:20:27 guy Exp $
+ * $Id: packet-data.c,v 1.33 2003/04/22 13:47:37 tuexen 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.
@@ -28,38 +27,25 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
 #include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
+#include "packet-data.h"
 
 /* proto_data cannot be static because it's referenced in the
  * print routines
  */
 int proto_data = -1;
 
-/* Remove this once all dissectors are converted to use tvbuffs */
-void
-old_dissect_data(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
-{
-       if (IS_DATA_IN_FRAME(offset) && tree) {
-               proto_tree_add_protocol_format(tree, proto_data, NullTVB, offset,
-                       END_OF_FRAME, "Data (%d byte%s)", END_OF_FRAME,
-                       plurality(END_OF_FRAME, "", "s"));
-       }
-}
-
-void
-dissect_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static void
+dissect_data(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree)
 {
        int bytes;
 
        if (tree) {
-               bytes = tvb_length(tvb);
+               bytes = tvb_length_remaining(tvb, 0);
                if (bytes > 0) {
-                       proto_tree_add_protocol_format(tree, proto_data, tvb, 0,
+                       proto_tree_add_protocol_format(tree, proto_data, tvb,
+                               0,
                                bytes, "Data (%d byte%s)", bytes,
                                plurality(bytes, "", "s"));
                }
@@ -70,6 +56,16 @@ void
 proto_register_data(void)
 {
        proto_data = proto_register_protocol (
-               /* name */      "Data",
-               /* abbrev */    "data" );
+               "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);
 }