- "next tvb" list moved from h225 to new file next_tvb.[ch]

- h225 updated and regenerated
- restore calling subdissectors for SNMP variables which was broken with new SNMP

svn path=/trunk/; revision=18451

1 files changed, 65 insertions, 0 deletions

diff --git a/epan/next_tvb.h b/epan/next_tvb.h
new file mode 100644
index 0000000000..cb002ae062
--- /dev/null
+++ b/epan/next_tvb.h
@@ -0,0 +1,65 @@
+/* next_tvb.h
+ * Definitions for "next tvb" list
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * 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.
+ */
+/* The buffers returned by these functions are all allocated with a 
+ * packet lifetime or are static buffers and does not have have to be freed. 
+ * However, take into account that when the packet dissection
+ * completes, these buffers will be automatically reclaimed/freed.
+ * If you need the buffer to remain for a longer scope than packet lifetime
+ * you must copy the content to an se_alloc() buffer.
+ */
+
+#ifndef __NEXT_TVB_H__
+#define __NEXT_TVB_H__
+
+typedef enum {
+  NTVB_HANDLE,
+  NTVB_PORT,
+  NTVB_STRING,
+} next_tvb_call_e;
+
+typedef struct next_tvb_item {
+  struct next_tvb_item *next;
+  struct next_tvb_item *previous;
+  next_tvb_call_e type;
+  dissector_handle_t handle;
+  dissector_table_t table;
+  guint32 port;
+  const gchar *string;
+  tvbuff_t *tvb;
+  proto_tree *tree;
+} next_tvb_item_t;
+
+typedef struct {
+  next_tvb_item_t *first;
+  next_tvb_item_t *last;
+  int count;
+} next_tvb_list_t;
+
+extern void next_tvb_init(next_tvb_list_t *list);
+extern void next_tvb_add_handle(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_handle_t handle);
+extern void next_tvb_add_port(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_table_t table, guint32 port);
+extern void next_tvb_add_string(next_tvb_list_t *list, tvbuff_t *tvb, proto_tree *tree, dissector_table_t table, const gchar *string);
+extern void next_tvb_call(next_tvb_list_t *list, packet_info *pinfo, proto_tree *tree, dissector_handle_t handle, dissector_handle_t data_handle);
+
+#endif /* __NEXT_TVB_H__ */