Have "dissect_xdlc_control()" take a pointer to a structure containing

pointers to hf_ values, so the subfields of the control field are put
into the protocol tree as filterable items.  Change the protocols that
use it appropriately.

Export "dissect_xdlc_control()" to plugins.

svn path=/trunk/; revision=9531

6 files changed, 12 insertions, 2 deletions

diff --git a/plugins/Xass-list b/plugins/Xass-list
index a0052a3661..eb8c51e5eb 100644
--- a/plugins/Xass-list
+++ b/plugins/Xass-list
@@ -72,4 +72,4 @@ dissector_add_string, dissector_delete_string, dissector_change_string,
 dissector_reset_string, dissector_try_string, dissector_get_string_handle,
 get_datafile_path, get_tempfile_path, register_heur_dissector_list,
 dissector_try_heuristic, asn1_id_decode1, col_get_writable, col_set_writable,
-decode_enumerated_bitfield_shifted, 
+decode_enumerated_bitfield_shifted, dissect_xdlc_control, 
diff --git a/plugins/Xplugin_api.c b/plugins/Xplugin_api.c
index 1d14c7c2f0..71d21da36b 100644
--- a/plugins/Xplugin_api.c
+++ b/plugins/Xplugin_api.c
@@ -247,3 +247,4 @@ p_asn1_id_decode1 = pat->p_asn1_id_decode1;
 p_col_get_writable = pat->p_col_get_writable;
 p_col_set_writable = pat->p_col_set_writable;
 p_decode_enumerated_bitfield_shifted = pat->p_decode_enumerated_bitfield_shifted;
+p_dissect_xdlc_control = pat->p_dissect_xdlc_control;
diff --git a/plugins/Xplugin_api.h b/plugins/Xplugin_api.h
index 4b86e4911d..f2cf939263 100644
--- a/plugins/Xplugin_api.h
+++ b/plugins/Xplugin_api.h
@@ -247,3 +247,4 @@
 #define col_get_writable (*p_col_get_writable)
 #define col_set_writable (*p_col_set_writable)
 #define decode_enumerated_bitfield_shifted (*p_decode_enumerated_bitfield_shifted)
+#define dissect_xdlc_control (*p_dissect_xdlc_control)
diff --git a/plugins/Xplugin_api_decls.h b/plugins/Xplugin_api_decls.h
index 2814307964..c865f917cb 100644
--- a/plugins/Xplugin_api_decls.h
+++ b/plugins/Xplugin_api_decls.h
@@ -247,3 +247,4 @@ addr_asn1_id_decode1 p_asn1_id_decode1;
 addr_col_get_writable p_col_get_writable;
 addr_col_set_writable p_col_set_writable;
 addr_decode_enumerated_bitfield_shifted p_decode_enumerated_bitfield_shifted;
+addr_dissect_xdlc_control p_dissect_xdlc_control;
diff --git a/plugins/Xplugin_table.h b/plugins/Xplugin_table.h
index 9d0a8da59c..660808b322 100644
--- a/plugins/Xplugin_table.h
+++ b/plugins/Xplugin_table.h
@@ -247,3 +247,4 @@ typedef int (*addr_asn1_id_decode1) (ASN1_SCK *, guint *);
 typedef gboolean (*addr_col_get_writable) (column_info *);
 typedef void (*addr_col_set_writable) (column_info *, gboolean);
 typedef const char *(*addr_decode_enumerated_bitfield_shifted) (guint32, guint32, int, const value_string *, const char *);
+typedef int (*addr_dissect_xdlc_control) (tvbuff_t *, int, packet_info *, proto_tree *, int, gint, const xdlc_cf_items *, const xdlc_cf_items *, int, int, int);
diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c
index 07e326ea11..70b666efe5 100644
--- a/plugins/plugin_api_list.c
+++ b/plugins/plugin_api_list.c
@@ -1,7 +1,7 @@
 /* plugin_api_list.c
  * Used to generate various included files for plugin API
  *
- * $Id: plugin_api_list.c,v 1.19 2003/12/01 23:41:45 guy Exp $
+ * $Id: plugin_api_list.c,v 1.20 2004/01/03 03:50:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -37,6 +37,7 @@
 #include "packet-tcp.h"
 #include "tap.h"
 #include "asn1.h"
+#include "xdlc.h"
 #include "epan/except.h"
 
 gint check_col(column_info*, gint);
@@ -393,3 +394,8 @@ void col_set_writable(column_info *, gboolean);
 
 const char *decode_enumerated_bitfield_shifted(guint32, guint32, int,
     const value_string *, const char *);
+
+int dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo,
+  proto_tree *xdlc_tree, int hf_xdlc_control, gint ett_xdlc_control,
+  const xdlc_cf_items *cf_items_nonext, const xdlc_cf_items *cf_items_ext,
+  int is_response, int extended, int append_info);