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 /sharkd_session.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 'sharkd_session.c')
| -rw-r--r-- | sharkd_session.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sharkd_session.c b/sharkd_session.c index a5e22c4060..c417108ad6 100644 --- a/sharkd_session.c +++ b/sharkd_session.c @@ -607,9 +607,9 @@ sharkd_session_process_status(void) g_free(name); } - if (cfile.wth) + if (cfile.frame_set_info.wth) { - gint64 file_size = wtap_file_size(cfile.wth, NULL); + gint64 file_size = wtap_file_size(cfile.frame_set_info.wth, NULL); if (file_size > 0) printf(",\"filesize\":%" G_GINT64_FORMAT, file_size); @@ -845,7 +845,7 @@ sharkd_session_process_frames(const char *buf, const jsmntok_t *tokens, int coun printf("["); for (framenum = 1; framenum <= cfile.count; framenum++) { - frame_data *fdata = frame_data_sequence_find(cfile.frames, framenum); + frame_data *fdata = frame_data_sequence_find(cfile.frame_set_info.frames, framenum); if (filter_data && !(filter_data[framenum / 8] & (1 << (framenum % 8)))) continue; @@ -2967,7 +2967,7 @@ sharkd_session_process_intervals(char *buf, const jsmntok_t *tokens, int count) for (framenum = 1; framenum <= cfile.count; framenum++) { - frame_data *fdata = frame_data_sequence_find(cfile.frames, framenum); + frame_data *fdata = frame_data_sequence_find(cfile.frame_set_info.frames, framenum); gint64 msec_rel; gint64 new_idx; |