diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-11-04 03:55:52 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-11-04 03:55:52 +0000 |
| commit | 8cc7d5318347aeae95e8495fc6ca08fff92c2f80 (patch) | |
| tree | b8ec247aba2b00143ab6811206009a8d33d84b23 /epan | |
| parent | d859325753e828eb64adf2b5dfacaf826423e8be (diff) | |
Declare routines exported to plugins through the plugin API table as
extern, so that "plugin_api_defs.h" works on platforms where you have to
use the plugin API table.
svn path=/trunk/; revision=4151
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/conversation.h | 20 | ||||
| -rw-r--r-- | epan/value_string.h | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/epan/conversation.h b/epan/conversation.h index c881eb1852..bf4c6fb13f 100644 --- a/epan/conversation.h +++ b/epan/conversation.h @@ -1,7 +1,7 @@ /* conversation.h * Routines for building lists of packets that are part of a "conversation" * - * $Id: conversation.h,v 1.7 2001/10/31 05:59:19 guy Exp $ + * $Id: conversation.h,v 1.8 2001/11/04 03:55:52 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -64,27 +64,27 @@ typedef struct conversation { extern void conversation_init(void); -conversation_t *conversation_new(address *addr1, address *addr2, +extern conversation_t *conversation_new(address *addr1, address *addr2, port_type ptype, guint32 port1, guint32 port2, guint options); -conversation_t *find_conversation(address *addr_a, address *addr_b, +extern conversation_t *find_conversation(address *addr_a, address *addr_b, port_type ptype, guint32 port_a, guint32 port_b, guint options); -void conversation_add_proto_data(conversation_t *conv, int proto, +extern void conversation_add_proto_data(conversation_t *conv, int proto, void *proto_data); -void *conversation_get_proto_data(conversation_t *conv, int proto); -void conversation_delete_proto_data(conversation_t *conv, int proto); +extern void *conversation_get_proto_data(conversation_t *conv, int proto); +extern void conversation_delete_proto_data(conversation_t *conv, int proto); -void conversation_set_dissector(conversation_t *conversation, +extern void conversation_set_dissector(conversation_t *conversation, dissector_t dissector); -gboolean +extern gboolean try_conversation_dissector(address *addr_a, address *addr_b, port_type ptype, guint32 port_a, guint32 port_b, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); /* These routines are used to set undefined values for a conversation */ -void conversation_set_port2(conversation_t *conv, guint32 port); -void conversation_set_addr2(conversation_t *conv, address *addr); +extern void conversation_set_port2(conversation_t *conv, guint32 port); +extern void conversation_set_addr2(conversation_t *conv, address *addr); #endif /* conversation.h */ diff --git a/epan/value_string.h b/epan/value_string.h index b90d072a14..c5a439d9ee 100644 --- a/epan/value_string.h +++ b/epan/value_string.h @@ -1,7 +1,7 @@ /* value_string.h * Definitions for value_string structures and routines * - * $Id: value_string.h,v 1.1 2001/04/01 03:18:41 hagbard Exp $ + * $Id: value_string.h,v 1.2 2001/11/04 03:55:52 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -35,10 +35,10 @@ typedef struct _value_string { gchar *strptr; } value_string; -gchar* match_strval(guint32, const value_string*); +extern gchar* match_strval(guint32, const value_string*); -gchar* val_to_str(guint32, const value_string *, const char *); -const char *decode_enumerated_bitfield(guint32 val, guint32 mask, int width, - const value_string *tab, const char *fmt); +extern gchar* val_to_str(guint32, const value_string *, const char *); +extern const char *decode_enumerated_bitfield(guint32 val, guint32 mask, + int width, const value_string *tab, const char *fmt); #endif /* __VALUE_STRING_H__ */ |