diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-12-07 20:33:22 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-12-08 04:33:55 +0000 |
| commit | 48e65c4af4e35c90d7cbc9fb789ecc6e740b300b (patch) | |
| tree | 2f6e56d3734bb626584c7bdefeb5c7dce6b066c1 /file_packet_provider.c | |
| parent | 797d2f6a87607b146a2ef62e1ff501031dce8212 (diff) | |
Hand the packet provider functions to epan_new().
Have separate packet_provider_data structures and packet_provider_funcs
structures; the latter holds a table of functions that libwireshark can
call for information about packets, the latter holds the data that those
functions use.
This means we no longer need to expose the structure of an epan_t
outside epan/epan.c; get rid of epan/epan-int.h.
Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4
Reviewed-on: https://code.wireshark.org/review/24732
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'file_packet_provider.c')
| -rw-r--r-- | file_packet_provider.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/file_packet_provider.c b/file_packet_provider.c index e536298a8e..c08d216819 100644 --- a/file_packet_provider.c +++ b/file_packet_provider.c @@ -1,5 +1,5 @@ -/* file_packet_provider.c - * Routines for a packet_provider for packets from a file. +/* file_packet_provider_data.c + * Routines for a packet_provider_data for packets from a file. * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -24,7 +24,7 @@ frame_cmp(gconstpointer a, gconstpointer b, gpointer user_data _U_) } const char * -cap_file_provider_get_interface_name(struct packet_provider *prov, guint32 interface_id) +cap_file_provider_get_interface_name(struct packet_provider_data *prov, guint32 interface_id) { wtapng_iface_descriptions_t *idb_info; wtap_block_t wtapng_if_descr = NULL; @@ -47,7 +47,7 @@ cap_file_provider_get_interface_name(struct packet_provider *prov, guint32 inter } const char * -cap_file_provider_get_interface_description(struct packet_provider *prov, guint32 interface_id) +cap_file_provider_get_interface_description(struct packet_provider_data *prov, guint32 interface_id) { wtapng_iface_descriptions_t *idb_info; wtap_block_t wtapng_if_descr = NULL; @@ -68,7 +68,7 @@ cap_file_provider_get_interface_description(struct packet_provider *prov, guint3 } const char * -cap_file_provider_get_user_comment(struct packet_provider *prov, const frame_data *fd) +cap_file_provider_get_user_comment(struct packet_provider_data *prov, const frame_data *fd) { if (prov->frames_user_comments) return (const char *)g_tree_lookup(prov->frames_user_comments, fd); @@ -78,7 +78,7 @@ cap_file_provider_get_user_comment(struct packet_provider *prov, const frame_dat } void -cap_file_provider_set_user_comment(struct packet_provider *prov, frame_data *fd, const char *new_comment) +cap_file_provider_set_user_comment(struct packet_provider_data *prov, frame_data *fd, const char *new_comment) { if (!prov->frames_user_comments) prov->frames_user_comments = g_tree_new_full(frame_cmp, NULL, NULL, g_free); |