1) Allow for the possibility for both packet summary and packet details to be

printed when either -T is not specified or "-T text" or "-T ps" is selected.

2) Allow for packet hex/ascii to be printed without necessarily requiring that
either packet summary or packet details also be printed.  This just means that
if you want packet summary information, use "-Px" instead of just "-x".

3) Fix bug with order of evaluation of -V and "-T psml".

4) If a packet separator is specified, always use it regardless of the -PVx
options chosen.

5) Don't print 2 lines of separation between packets when only printing
hex/ascii.  Print 1 line of separation as in all other cases.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7782 plus other misc. enhancements.

svn path=/trunk/; revision=45715

1 files changed, 4 insertions, 0 deletions

diff --git a/file.c b/file.c
index d24a431a89..118b2de041 100644
--- a/file.c
+++ b/file.c
@@ -2475,6 +2475,10 @@ print_packet(capture_file *cf, frame_data *fdata,
   }
 
   if (args->print_args->print_hex) {
+    if (args->print_args->print_summary || (args->print_args->print_dissections != print_dissections_none)) {
+      if (!print_line(args->print_args->stream, 0, ""))
+        goto fail;
+    }
     /* Print the full packet data as hex. */
     if (!print_hex_data(args->print_args->stream, &edt))
       goto fail;