diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-23 16:48:17 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-24 03:38:21 +0000 |
| commit | e52c95c6c8cdac34eccdba9b49d68a6982685f1a (patch) | |
| tree | fc479aac517dbee8b5a6a82ea33ec40a482cc248 /file.c | |
| parent | 751e078d2bc6adf1179de164291eb743abd8732b (diff) | |
| download | wireshark-e52c95c6c8cdac34eccdba9b49d68a6982685f1a.tar.gz | |
Move UI-only stuff out of libwireshark.
Packet ranges are used only in the UI; move the packet range stuff into
libui.
Don't pass a print_args_t structure to libwireshark packet-printing
routines, just pass the few parameters they need. Move the declaration
of print_args_t into file.h.
Change-Id: Icff5991eea7d7d56f33b4716105895263d275bcf
Reviewed-on: https://code.wireshark.org/review/21308
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -2321,7 +2321,9 @@ print_packet(capture_file *cf, frame_data *fdata, } /* Print the information in that tree. */ - if (!proto_tree_print(args->print_args, &args->edt, NULL, args->print_args->stream)) + if (!proto_tree_print(args->print_args->print_dissections, + args->print_args->print_hex, &args->edt, NULL, + args->print_args->stream)) goto fail; /* Print a blank line if we print anything after this (aka more than one packet). */ @@ -2848,7 +2850,9 @@ write_json_packet(capture_file *cf, frame_data *fdata, epan_dissect_run(&args->edt, cf->cd_t, phdr, frame_tvbuff_new(fdata, pd), fdata, NULL); /* Write out the information in that tree. */ - write_json_proto_tree(NULL, args->print_args, NULL, PF_NONE, &args->edt, args->fh); + write_json_proto_tree(NULL, args->print_args->print_dissections, + args->print_args->print_hex, NULL, PF_NONE, + &args->edt, args->fh); epan_dissect_reset(&args->edt); |