diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-12-03 21:01:18 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-12-04 05:02:18 +0000 |
| commit | 1834dca3654ccec238bae130715871be3d8fa344 (patch) | |
| tree | 5f1de666575b16f58be5a2f7b4e40cc5b93c02dc /epan/epan.c | |
| parent | 02944c412b4d9d7661c0a2b3eb9df44d632878ee (diff) | |
Move the parts of a capture_file used by libwireshark to a new structure.
Embed one of those structures in a capture_file, and have a struct
epan_session point to that structure rather than to a capture_file.
Pass that structure to the routines that fetch data that libwireshark
uses when dissecting.
That separates the stuff that libwireshark expects from the stuff that
it doesn't look at.
Change-Id: Ia3cd28efb9622476437a2ce32204597fae720877
Reviewed-on: https://code.wireshark.org/review/24692
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/epan.c b/epan/epan.c index 0bb62232dd..c82b98f693 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -298,7 +298,7 @@ const char * epan_get_user_comment(const epan_t *session, const frame_data *fd) { if (session->get_user_comment) - return session->get_user_comment(session->cf, fd); + return session->get_user_comment(session->fs, fd); return NULL; } @@ -307,7 +307,7 @@ const char * epan_get_interface_name(const epan_t *session, guint32 interface_id) { if (session->get_interface_name) - return session->get_interface_name(session->cf, interface_id); + return session->get_interface_name(session->fs, interface_id); return NULL; } @@ -316,7 +316,7 @@ const char * epan_get_interface_description(const epan_t *session, guint32 interface_id) { if (session->get_interface_description) - return session->get_interface_description(session->cf, interface_id); + return session->get_interface_description(session->fs, interface_id); return NULL; } @@ -327,7 +327,7 @@ epan_get_frame_ts(const epan_t *session, guint32 frame_num) const nstime_t *abs_ts = NULL; if (session->get_frame_ts) - abs_ts = session->get_frame_ts(session->cf, frame_num); + abs_ts = session->get_frame_ts(session->fs, frame_num); if (!abs_ts) ws_g_warning("!!! couldn't get frame ts for %u !!!\n", frame_num); |