From feadec85eb9b51b562e6871bd1d97bc33606cd98 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Thu, 12 Jun 2003 10:10:39 +0000
Subject: [PATCH] Export "tvb_get_string()" and "tvb_get_stringz()" to plugins.

svn path=/trunk/; revision=7862
---
 epan/plugins.c             | 5 ++++-
 plugins/plugin_api.c       | 5 ++++-
 plugins/plugin_api.h       | 5 ++++-
 plugins/plugin_api_decls.h | 5 ++++-
 plugins/plugin_table.h     | 5 ++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/epan/plugins.c b/epan/plugins.c
index cd319534c3..9d2ef4b63a 100644
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -1,7 +1,7 @@
 /* plugins.c
  * plugin routines
  *
- * $Id: plugins.c,v 1.72 2003/06/04 00:11:02 guy Exp $
+ * $Id: plugins.c,v 1.73 2003/06/12 10:10:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -563,6 +563,9 @@ init_plugins(const char *plugin_dir)
 	patable.p_except_setup_try		= except_setup_try;
 
 	patable.p_col_set_fence			= col_set_fence;
+
+	patable.p_tvb_get_string		= tvb_get_string;
+	patable.p_tvb_get_stringz		= tvb_get_stringz;
 #endif
 
 #ifdef WIN32
diff --git a/plugins/plugin_api.c b/plugins/plugin_api.c
index 498f1668be..de6f8ddd58 100644
--- a/plugins/plugin_api.c
+++ b/plugins/plugin_api.c
@@ -1,7 +1,7 @@
 /* plugin_api.c
  * Routines for Ethereal plugins.
  *
- * $Id: plugin_api.c,v 1.51 2003/06/03 02:32:55 gerald Exp $
+ * $Id: plugin_api.c,v 1.52 2003/06/12 10:10:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -256,4 +256,7 @@ plugin_address_table_init(plugin_address_table_t *pat)
 	p_except_setup_try			= pat->p_except_setup_try;
 
 	p_col_set_fence				= pat->p_col_set_fence;
+
+	p_tvb_get_string			= pat->p_tvb_get_string;
+	p_tvb_get_stringz			= pat->p_tvb_get_stringz;
 }
diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index 91e9ef169b..21700654f1 100644
--- a/plugins/plugin_api.h
+++ b/plugins/plugin_api.h
@@ -1,7 +1,7 @@
 /* plugin_api.h
  * Routines for Ethereal plugins.
  *
- * $Id: plugin_api.h,v 1.52 2003/06/03 02:32:55 gerald Exp $
+ * $Id: plugin_api.h,v 1.53 2003/06/12 10:10:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -287,6 +287,9 @@
 
 #define col_set_fence			(*p_col_set_fence)
 
+#define tvb_get_string			(*p_tvb_get_string)
+#define tvb_get_stringz			(*p_tvb_get_stringz)
+
 #endif
 
 #include <epan/packet.h>
diff --git a/plugins/plugin_api_decls.h b/plugins/plugin_api_decls.h
index c2bc0fc7f1..b5b508a3f3 100644
--- a/plugins/plugin_api_decls.h
+++ b/plugins/plugin_api_decls.h
@@ -2,7 +2,7 @@
  * Declarations of a list of "p_" names; included in various places
  * to declare them as variables or as function members.
  *
- * $Id: plugin_api_decls.h,v 1.14 2003/06/03 02:32:56 gerald Exp $
+ * $Id: plugin_api_decls.h,v 1.15 2003/06/12 10:10:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -295,3 +295,6 @@ addr_except_pop				p_except_pop;
 addr_except_setup_try			p_except_setup_try;
 
 addr_col_set_fence			p_col_set_fence;
+
+addr_tvb_get_string			p_tvb_get_string;
+addr_tvb_get_stringz			p_tvb_get_stringz;
diff --git a/plugins/plugin_table.h b/plugins/plugin_table.h
index a338644069..51dbe48860 100644
--- a/plugins/plugin_table.h
+++ b/plugins/plugin_table.h
@@ -1,7 +1,7 @@
 /* plugin_table.h
  * Table of exported addresses for Ethereal plugins.
  *
- * $Id: plugin_table.h,v 1.64 2003/06/03 02:32:56 gerald Exp $
+ * $Id: plugin_table.h,v 1.65 2003/06/12 10:10:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -333,6 +333,9 @@ typedef void (*addr_except_setup_try)(struct except_stacknode *, struct except_c
 
 typedef void (*addr_col_set_fence)(column_info*, gint);
 
+typedef gint (*addr_tvb_get_string)(tvbuff_t*, gint, gint);
+typedef gint (*addr_tvb_get_stringz)(tvbuff_t*, gint, gint*);
+
 typedef struct  {
 
 #include "plugin_api_decls.h"