osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

In "plugin_api_defs.h", just do 

addr_XXX p_XXX;

for all the declarations, to simplify things, as per Tomas Kukosa's
suggestion.

Fix a couple of comments.

svn path=/trunk/; revision=4149
This commit is contained in:
Guy Harris 2001-11-04 03:16:47 +00:00
parent cc7347ebf6
commit 8789943142
2 changed files with 119 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

250
plugins/plugin_api_defs.h
View File

@ -1,7 +1,7 @@
/* plugin_api_defs.h
* Define the variables that hold pointers to plugin API functions
*
* $Id: plugin_api_defs.h,v 1.2 2001/11/01 09:53:13 guy Exp $
* $Id: plugin_api_defs.h,v 1.3 2001/11/04 03:16:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@xiexie.org>
@ -23,171 +23,155 @@
#ifdef PLUGINS_NEED_ADDRESS_TABLE
gint (*p_check_col)(frame_data*, gint);
void (*p_col_clear)(frame_data*, gint);
void (*p_col_add_fstr)(frame_data*, gint, gchar*, ...);
void (*p_col_append_fstr)(frame_data*, gint, gchar*, ...);
void (*p_col_add_str)(frame_data*, gint, const gchar*);
void (*p_col_append_str)(frame_data*, gint, gchar*);
void (*p_col_set_str)(frame_data*, gint, gchar*);
addr_check_col p_check_col;
addr_col_clear p_col_clear;
addr_col_add_fstr p_col_add_fstr;
addr_col_append_fstr p_col_append_fstr;
addr_col_add_str p_col_add_str;
addr_col_append_str p_col_append_str;
addr_col_set_str p_col_set_str;
int (*p_proto_register_protocol)(char*, char*, char*);
void (*p_proto_register_field_array)(int, hf_register_info*, int);
void (*p_proto_register_subtree_array)(int**, int);
addr_proto_register_protocol p_proto_register_protocol;
addr_proto_register_field_array p_proto_register_field_array;
addr_proto_register_subtree_array p_proto_register_subtree_array;
void (*p_dissector_add)(const char *, guint32, dissector_t, int);
void (*p_dissector_delete)(const char *, guint32, dissector_t);
addr_dissector_add p_dissector_add;
addr_dissector_delete p_dissector_delete;
void (*p_heur_dissector_add)(const char *, heur_dissector_t, int);
addr_heur_dissector_add p_heur_dissector_add;
void (*p_register_dissector)(const char *, dissector_t, int);
dissector_handle_t (*p_find_dissector)(const char *);
void (*p_call_dissector)(dissector_handle_t, tvbuff_t *,
packet_info *, proto_tree *);
addr_register_dissector p_register_dissector;
addr_find_dissector p_find_dissector;
addr_call_dissector p_call_dissector;
void (*p_dissect_data)(tvbuff_t *, int, packet_info *, proto_tree *);
addr_dissect_data p_dissect_data;
gboolean (*p_proto_is_protocol_enabled)(int);
addr_proto_is_protocol_enabled p_proto_is_protocol_enabled;
int (*p_proto_item_get_len)(proto_item*);
void (*p_proto_item_set_len)(proto_item*, gint);
void (*p_proto_item_set_text)(proto_item*, const char*, ...);
void (*p_proto_item_append_text)(proto_item*, const char*, ...);
proto_tree* (*p_proto_item_add_subtree)(proto_item*, gint);
proto_item* (*p_proto_tree_add_item)(proto_tree*, int, tvbuff_t*, gint, gint, gboolean);
proto_item* (*p_proto_tree_add_item_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, gboolean);
proto_item* (*p_proto_tree_add_protocol_format)(proto_tree*, int, tvbuff_t*, gint, gint, const char*, ...);
addr_proto_item_get_len p_proto_item_get_len;
addr_proto_item_set_len p_proto_item_set_len;
addr_proto_item_set_text p_proto_item_set_text;
addr_proto_item_append_text p_proto_item_append_text;
addr_proto_item_add_subtree p_proto_item_add_subtree;
addr_proto_tree_add_item p_proto_tree_add_item;
addr_proto_tree_add_item_hidden p_proto_tree_add_item_hidden;
addr_proto_tree_add_protocol_format p_proto_tree_add_protocol_format;
proto_item* (*p_proto_tree_add_bytes)(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*);
proto_item* (*p_proto_tree_add_bytes_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*);
proto_item* (*p_proto_tree_add_bytes_format)(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*, const char*, ...);
addr_proto_tree_add_bytes p_proto_tree_add_bytes;
addr_proto_tree_add_bytes_hidden p_proto_tree_add_bytes_hidden;
addr_proto_tree_add_bytes_format p_proto_tree_add_bytes_format;
proto_item* (*p_proto_tree_add_time)(proto_tree*, int, tvbuff_t*, gint, gint, nstime_t*);
proto_item* (*p_proto_tree_add_time_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, nstime_t*);
proto_item* (*p_proto_tree_add_time_format)(proto_tree*, int, tvbuff_t*, gint, gint, nstime_t*, const char*, ...);
addr_proto_tree_add_time p_proto_tree_add_time;
addr_proto_tree_add_time_hidden p_proto_tree_add_time_hidden;
addr_proto_tree_add_time_format p_proto_tree_add_time_format;
proto_item* (*p_proto_tree_add_ipxnet)(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
proto_item* (*p_proto_tree_add_ipxnet_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
proto_item* (*p_proto_tree_add_ipxnet_format)(proto_tree*, int, tvbuff_t*, gint, gint, guint32, const char*, ...);
addr_proto_tree_add_ipxnet p_proto_tree_add_ipxnet;
addr_proto_tree_add_ipxnet_hidden p_proto_tree_add_ipxnet_hidden;
addr_proto_tree_add_ipxnet_format p_proto_tree_add_ipxnet_format;
proto_item* (*p_proto_tree_add_ipv4)(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
proto_item* (*p_proto_tree_add_ipv4_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
proto_item* (*p_proto_tree_add_ipv4_format)(proto_tree*, int, tvbuff_t*, gint, gint, guint32, const char*, ...);
addr_proto_tree_add_ipv4 p_proto_tree_add_ipv4;
addr_proto_tree_add_ipv4_hidden p_proto_tree_add_ipv4_hidden;
addr_proto_tree_add_ipv4_format p_proto_tree_add_ipv4_format;
proto_item* (*p_proto_tree_add_ipv6)(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*);
proto_item* (*p_proto_tree_add_ipv6_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*);
proto_item* (*p_proto_tree_add_ipv6_format)(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*, const char*, ...);
addr_proto_tree_add_ipv6 p_proto_tree_add_ipv6;
addr_proto_tree_add_ipv6_hidden p_proto_tree_add_ipv6_hidden;
addr_proto_tree_add_ipv6_format p_proto_tree_add_ipv6_format;
proto_item* (*p_proto_tree_add_ether)(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*);
proto_item* (*p_proto_tree_add_ether_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*);
proto_item* (*p_proto_tree_add_ether_format)(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*, const char*, ...);
addr_proto_tree_add_ether p_proto_tree_add_ether;
addr_proto_tree_add_ether_hidden p_proto_tree_add_ether_hidden;
addr_proto_tree_add_ether_format p_proto_tree_add_ether_format;
proto_item* (*p_proto_tree_add_string)(proto_tree*, int, tvbuff_t*, gint, gint, const char*);
proto_item* (*p_proto_tree_add_string_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, const char*);
proto_item* (*p_proto_tree_add_string_format)(proto_tree*, int, tvbuff_t*, gint, gint, const char*, const char*, ...);
addr_proto_tree_add_string p_proto_tree_add_string;
addr_proto_tree_add_string_hidden p_proto_tree_add_string_hidden;
addr_proto_tree_add_string_format p_proto_tree_add_string_format;
proto_item* (*p_proto_tree_add_boolean)(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
proto_item* (*p_proto_tree_add_boolean_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
proto_item* (*p_proto_tree_add_boolean_format)(proto_tree*, int, tvbuff_t*, gint, gint, guint32, const char*, ...);
addr_proto_tree_add_boolean p_proto_tree_add_boolean;
addr_proto_tree_add_boolean_hidden p_proto_tree_add_boolean_hidden;
addr_proto_tree_add_boolean_format p_proto_tree_add_boolean_format;
proto_item* (*p_proto_tree_add_double)(proto_tree*, int, tvbuff_t*, gint, gint, double);
proto_item* (*p_proto_tree_add_double_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, double);
proto_item* (*p_proto_tree_add_double_format)(proto_tree*, int, tvbuff_t*, gint, gint, double, const char*, ...);
addr_proto_tree_add_double p_proto_tree_add_double;
addr_proto_tree_add_double_hidden p_proto_tree_add_double_hidden;
addr_proto_tree_add_double_format p_proto_tree_add_double_format;
proto_item* (*p_proto_tree_add_uint)(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
proto_item* (*p_proto_tree_add_uint_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
proto_item* (*p_proto_tree_add_uint_format)(proto_tree*, int, tvbuff_t*, gint, gint, guint32, const char*, ...);
addr_proto_tree_add_uint p_proto_tree_add_uint;
addr_proto_tree_add_uint_hidden p_proto_tree_add_uint_hidden;
addr_proto_tree_add_uint_format p_proto_tree_add_uint_format;
proto_item* (*p_proto_tree_add_int)(proto_tree*, int, tvbuff_t*, gint, gint, gint32);
proto_item* (*p_proto_tree_add_int_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, gint32);
proto_item* (*p_proto_tree_add_int_format)(proto_tree*, int, tvbuff_t*, gint, gint, gint32, const char*, ...);
addr_proto_tree_add_int p_proto_tree_add_int;
addr_proto_tree_add_int_hidden p_proto_tree_add_int_hidden;
addr_proto_tree_add_int_format p_proto_tree_add_int_format;
proto_item* (*p_proto_tree_add_text)(proto_tree*, tvbuff_t*, gint, gint, const char*, ...);
addr_proto_tree_add_text p_proto_tree_add_text;
tvbuff_t* (*p_tvb_new_subset)(tvbuff_t*, gint, gint, gint);
addr_tvb_new_subset p_tvb_new_subset;
guint (*p_tvb_length)(tvbuff_t*);
gint (*p_tvb_length_remaining)(tvbuff_t*, gint);
gboolean (*p_tvb_bytes_exist)(tvbuff_t*, gint, gint);
gboolean (*p_tvb_offset_exists)(tvbuff_t*, gint);
guint (*p_tvb_reported_length)(tvbuff_t*);
gint (*p_tvb_reported_length_remaining)(tvbuff_t*, gint);
addr_tvb_length p_tvb_length;
addr_tvb_length_remaining p_tvb_length_remaining;
addr_tvb_bytes_exist p_tvb_bytes_exist;
addr_tvb_offset_exists p_tvb_offset_exists;
addr_tvb_reported_length p_tvb_reported_length;
addr_tvb_reported_length_remaining p_tvb_reported_length_remaining;
guint8 (*p_tvb_get_guint8)(tvbuff_t*, gint);
addr_tvb_get_guint8 p_tvb_get_guint8;
guint16 (*p_tvb_get_ntohs)(tvbuff_t*, gint);
guint32 (*p_tvb_get_ntoh24)(tvbuff_t*, gint);
guint32 (*p_tvb_get_ntohl)(tvbuff_t*, gint);
addr_tvb_get_ntohs p_tvb_get_ntohs;
addr_tvb_get_ntoh24 p_tvb_get_ntoh24;
addr_tvb_get_ntohl p_tvb_get_ntohl;
guint16 (*p_tvb_get_letohs)(tvbuff_t*, gint);
guint32 (*p_tvb_get_letoh24)(tvbuff_t*, gint);
guint32 (*p_tvb_get_letohl)(tvbuff_t*, gint);
addr_tvb_get_letohs p_tvb_get_letohs;
addr_tvb_get_letoh24 p_tvb_get_letoh24;
addr_tvb_get_letohl p_tvb_get_letohl;
guint8* (*p_tvb_memcpy)(tvbuff_t*, guint8* target, gint, gint);
guint8* (*p_tvb_memdup)(tvbuff_t*, gint, gint);
addr_tvb_memcpy p_tvb_memcpy;
addr_tvb_memdup p_tvb_memdup;
const guint8* (*p_tvb_get_ptr)(tvbuff_t*, gint, gint);
addr_tvb_get_ptr p_tvb_get_ptr;
gint (*p_tvb_find_guint8)(tvbuff_t*, gint, gint, guint8);
gint (*p_tvb_pbrk_guint8)(tvbuff_t *, gint, gint, guint8 *);
addr_tvb_find_guint8 p_tvb_find_guint8;
addr_tvb_pbrk_guint8 p_tvb_pbrk_guint8;
gint (*p_tvb_strnlen)(tvbuff_t*, gint, guint);
addr_tvb_strnlen p_tvb_strnlen;
guint8 * (*p_tvb_format_text)(tvbuff_t*, gint, gint);
addr_tvb_format_text p_tvb_format_text;
gint (*p_tvb_get_nstringz)(tvbuff_t*, gint, guint, guint8*);
gint (*p_tvb_get_nstringz0)(tvbuff_t*, gint, guint, guint8*);
addr_tvb_get_nstringz p_tvb_get_nstringz;
addr_tvb_get_nstringz0 p_tvb_get_nstringz0;
gint (*p_tvb_find_line_end)(tvbuff_t*, gint, int, gint *);
gint (*p_tvb_find_line_end_unquoted)(tvbuff_t*, gint, int, gint *);
addr_tvb_find_line_end p_tvb_find_line_end;
addr_tvb_find_line_end_unquoted p_tvb_find_line_end_unquoted;
gint (*p_tvb_strneql)(tvbuff_t*, gint, const guint8 *, gint);
gint (*p_tvb_strncaseeql)(tvbuff_t*, gint, const guint8 *, gint);
addr_tvb_strneql p_tvb_strneql;
addr_tvb_strncaseeql p_tvb_strncaseeql;
gchar *(*p_tvb_bytes_to_str)(tvbuff_t*, gint, gint len);
addr_tvb_bytes_to_str p_tvb_bytes_to_str;
struct pref_module *(*p_prefs_register_protocol)(int,
void (*)(void));
void (*p_prefs_register_uint_preference)(struct pref_module *,
const char *, const char *, const char *, guint, guint *);
void (*p_prefs_register_bool_preference)(struct pref_module *,
const char *, const char *, const char *, gboolean *);
void (*p_prefs_register_enum_preference)(struct pref_module *,
const char *, const char *, const char *, gint *, const enum_val_t *,
gboolean);
void (*p_prefs_register_string_preference)(struct pref_module *,
const char *, const char *, const char *, char**);
addr_prefs_register_protocol p_prefs_register_protocol;
addr_prefs_register_uint_preference p_prefs_register_uint_preference;
addr_prefs_register_bool_preference p_prefs_register_bool_preference;
addr_prefs_register_enum_preference p_prefs_register_enum_preference;
addr_prefs_register_string_preference p_prefs_register_string_preference;
void (*p_register_giop_user)(giop_sub_dissector_t *, gchar *, int);
gboolean (*p_is_big_endian)(MessageHeader *);
guint32 (*p_get_CDR_encap_info)(tvbuff_t *, proto_tree *, gint *,
gboolean, guint32, gboolean *, guint32 *);
void (*p_get_CDR_any)(tvbuff_t *, proto_tree *, gint *,
gboolean, int, MessageHeader *);
gboolean (*p_get_CDR_boolean)(tvbuff_t *, int *);
guint8 (*p_get_CDR_char)(tvbuff_t *, int *);
gdouble (*p_get_CDR_double)(tvbuff_t *, int *, gboolean, int);
guint32 (*p_get_CDR_enum)(tvbuff_t *, int *, gboolean, int);
void (*p_get_CDR_fixed)(tvbuff_t *, gchar **, gint *, guint32,
gint32);
gfloat (*p_get_CDR_float)(tvbuff_t *, int *, gboolean, int);
void (*p_get_CDR_interface)(tvbuff_t *, packet_info *, proto_tree *,
int *, gboolean, int);
gint32 (*p_get_CDR_long)(tvbuff_t *, int *, gboolean, int);
void (*p_get_CDR_object)(tvbuff_t *, packet_info *, proto_tree *,
int *, gboolean, int);
guint8 (*p_get_CDR_octet)(tvbuff_t *, int *);
void (*p_get_CDR_octet_seq)(tvbuff_t *, gchar **, int *, int);
gint16 (*p_get_CDR_short)(tvbuff_t *, int *, gboolean, int);
guint32 (*p_get_CDR_string)(tvbuff_t *, gchar **, int *, gboolean,
int);
guint32 (*p_get_CDR_typeCode)(tvbuff_t *, proto_tree *, gint *,
gboolean, int, MessageHeader *);
guint32 (*p_get_CDR_ulong)(tvbuff_t *, int *, gboolean, int);
guint16 (*p_get_CDR_ushort)(tvbuff_t *, int *, gboolean, int);
gint8 (*p_get_CDR_wchar)(tvbuff_t *, gchar **, int *,
MessageHeader *);
guint32 (*p_get_CDR_wstring)(tvbuff_t *, gchar **, int *, gboolean,
int, MessageHeader *);
addr_register_giop_user p_register_giop_user;
addr_is_big_endian p_is_big_endian;
addr_get_CDR_encap_info p_get_CDR_encap_info;
addr_get_CDR_any p_get_CDR_any;
addr_get_CDR_boolean p_get_CDR_boolean;
addr_get_CDR_char p_get_CDR_char;
addr_get_CDR_double p_get_CDR_double;
addr_get_CDR_enum p_get_CDR_enum;
addr_get_CDR_fixed p_get_CDR_fixed;
addr_get_CDR_float p_get_CDR_float;
addr_get_CDR_interface p_get_CDR_interface;
addr_get_CDR_long p_get_CDR_long;
addr_get_CDR_object p_get_CDR_object;
addr_get_CDR_octet p_get_CDR_octet;
addr_get_CDR_octet_seq p_get_CDR_octet_seq;
addr_get_CDR_short p_get_CDR_short;
addr_get_CDR_string p_get_CDR_string;
addr_get_CDR_typeCode p_get_CDR_typeCode;
addr_get_CDR_ulong p_get_CDR_ulong;
addr_get_CDR_ushort p_get_CDR_ushort;
addr_get_CDR_wchar p_get_CDR_wchar;
addr_get_CDR_wstring p_get_CDR_wstring;
#endif /* PLUGINS_NEED_ACCESS_TABLE */
#endif /* PLUGINS_NEED_ADDRESS_TABLE */

4
plugins/plugin_table.h
View File

@ -1,7 +1,7 @@
/* plugin_table.h
* Table of exported addresses for Ethereal plugins.
*
* $Id: plugin_table.h,v 1.28 2001/11/01 09:53:13 guy Exp $
* $Id: plugin_table.h,v 1.29 2001/11/04 03:16:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@xiexie.org>
@ -345,7 +345,7 @@ typedef struct {
} plugin_address_table_t;
#else /* ! PLUGINS_NEED_ACCESS_TABLE */
#else /* ! PLUGINS_NEED_ADDRESS_TABLE */
typedef void plugin_address_table_t;