From 4877553530fc356888edb95332b24eaeaadeee80 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <hagbard@physics.rutgers.edu>
Date: Mon, 26 Nov 2001 05:13:14 +0000
Subject: Switched from using CHECK_DISPLAY_AS_DATA to using CHECK_DISPLAY_AS_X
 which also takes a handle as an argument and thus doesn't call dissect_data
 directly.

svn path=/trunk/; revision=4270
---
 epan/proto.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'epan/proto.h')

diff --git a/epan/proto.h b/epan/proto.h
index 9721ba1cc0..60699f413a 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -1,7 +1,7 @@
 /* proto.h
  * Definitions for protocol display
  *
- * $Id: proto.h,v 1.20 2001/11/15 10:58:51 guy Exp $
+ * $Id: proto.h,v 1.21 2001/11/26 05:13:14 hagbard Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -62,6 +62,14 @@ struct value_string;
 	}							\
   }
 
+/* check protocol activation */
+#define CHECK_DISPLAY_AS_X(x_handle,index, tvb, pinfo, tree) {	\
+	if (!proto_is_protocol_enabled(index)) {		\
+		call_dissector(x_handle,tvb, pinfo, tree);	\
+		return;						\
+	}							\
+  }
+
 enum {
 	BASE_NONE,
 	BASE_DEC,
-- 
cgit v1.2.3