ZeroMQ: Remove blank lines in output

Update the output of some tests accordingly.

diff --git a/print-zeromq.c b/print-zeromq.c
index 59f86b7f07dc690b4b13980f57cda0521ef5280d..ac61056a8db6418b58e93556d1b590dda38a80ce 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -120,7 +120,6 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
                if (body_len_printed > 1) {
                        ND_PRINT(", first %" PRIu64 " byte(s) of body:", body_len_printed - 1);
                        hex_and_ascii_print(ndo, "\n\t ", cp + header_len + 1, body_len_printed - 1);
-                       ND_PRINT("\n");
                }
        }
 
@@ -198,7 +197,6 @@ zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u
                        if (len_printed > 1) {
                                ND_PRINT(", first %"PRIu64" byte(s):", len_printed);
                                hex_and_ascii_print(ndo, "\n\t ", cp, len_printed);
-                               ND_PRINT("\n");
                        }
                }
        }

diff --git a/tests/epgm_zmtp1v.out b/tests/epgm_zmtp1v.out
index e787847f73e396f8a30c4bd7c0981e2a224d77d8..b9237d226faaff7dc5f2eb63ed7c1f9e70109136 100644 (file)
--- a/tests/epgm_zmtp1v.out
+++ b/tests/epgm_zmtp1v.out
@@ -20,10 +20,8 @@
         0x0050:  206d 6573 7361 6765 2061 6e64 2061 2073  .message.and.a.s
         0x0060:  686f 7274 2041 5343 4949 206d 6573 7361  hort.ASCII.messa
         0x0070:  6765 2e                                  ge.
-
         frame flags+body  (8-bit) length 17, flags 0x00 (-|-|-|-|-|-|-|-), first 16 byte(s) of body:
         0x0000:  0001 0203 0405 0607 0809 0a0b 0c0d 0e0f  ................
-
         frame flags+body (64-bit) length 2790 (1282 captured), flags 0x00 (-|-|-|-|-|-|-|-), first 128 byte(s) of body:
         0x0000:  5468 6520 7175 6963 6b20 6272 6f77 6e20  The.quick.brown.
         0x0010:  666f 7820 6a75 6d70 7320 6f76 6572 2074  fox.jumps.over.t
@@ -32,8 +30,7 @@
         0x0040:  206a 756d 7073 206f 7665 7220 7468 6520  .jumps.over.the.
         0x0050:  6c61 7a79 2064 6f67 2e20 5468 6520 7175  lazy.dog..The.qu
         0x0060:  6963 6b20 6272 6f77 6e20 666f 7820 6a75  ick.brown.fox.ju
-        0x0070:  6d70 7320 6f76 6572 2074 6865 206c 617a  mps.over.the.laz
- [|zmtp1]
+        0x0070:  6d70 7320 6f76 6572 2074 6865 206c 617a  mps.over.the.laz [|zmtp1]
     7  17:10:27.456622 IP (tos 0xb8, ttl 16, id 0, offset 0, flags [DF], proto UDP (17), length 1480)
     10.0.0.45.40251 > 239.255.0.16.5563: 39236 > 5563: PGM, length 1428 0x47e3fdad9a9c ODATA trail 0 seq 283 [1452]
         frame offset 0xffff
@@ -46,7 +43,6 @@
         0x0050:  726f 776e 2066 6f78 206a 756d 7073 206f  rown.fox.jumps.o
         0x0060:  7665 7220 7468 6520 6c61 7a79 2064 6f67  ver.the.lazy.dog
         0x0070:  2e20 5468 6520 7175 6963 6b20 6272 6f77  ..The.quick.brow
-
     8  17:10:27.456706 IP (tos 0xb8, ttl 16, id 0, offset 0, flags [DF], proto UDP (17), length 173)
     10.0.0.45.40251 > 239.255.0.16.5563: 39236 > 5563: PGM, length 121 0x47e3fdad9a9c ODATA trail 0 seq 284 [145]
         frame offset 0x0052
@@ -57,12 +53,10 @@
         0x0030:  6272 6f77 6e20 666f 7820 6a75 6d70 7320  brown.fox.jumps.
         0x0040:  6f76 6572 2074 6865 206c 617a 7920 646f  over.the.lazy.do
         0x0050:  672e                                     g.
-
         frame flags+body  (8-bit) length 36, flags 0x00 (-|-|-|-|-|-|-|-), first 35 byte(s) of body:
         0x0000:  5468 6973 2069 7320 7468 6520 7472 6169  This.is.the.trai
         0x0010:  6c69 6e67 2041 5343 4949 206d 6573 7361  ling.ASCII.messa
         0x0020:  6765 2e                                  ge.
-
     9  17:10:27.555956 IP (tos 0xb8, ttl 16, id 0, offset 0, flags [DF], proto UDP (17), length 64)
     10.0.0.45.33280 > 239.255.0.16.5563: 39236 > 5563: PGM, length 0 0x47e3fdad9a9c SPM seq 476 trail 0 lead 284 nla 10.0.0.45 [36]
    10  17:10:27.556043 IP (tos 0xb8, ttl 1, id 0, offset 0, flags [DF], proto UDP (17), length 44)

diff --git a/tests/pgm_zmtp1v.out b/tests/pgm_zmtp1v.out
index 4b1e52515dee222918467829e734e053d28f593d..e5d6a712af0afe1f84f8d2c91c9d02f1f313a3c8 100644 (file)
--- a/tests/pgm_zmtp1v.out
+++ b/tests/pgm_zmtp1v.out
@@ -16,10 +16,8 @@
         0x0050:  206d 6573 7361 6765 2061 6e64 2061 2073  .message.and.a.s
         0x0060:  686f 7274 2041 5343 4949 206d 6573 7361  hort.ASCII.messa
         0x0070:  6765 2e                                  ge.
-
         frame flags+body  (8-bit) length 17, flags 0x00 (-|-|-|-|-|-|-|-), first 16 byte(s) of body:
         0x0000:  0001 0203 0405 0607 0809 0a0b 0c0d 0e0f  ................
-
         frame flags+body (64-bit) length 2790 (1290 captured), flags 0x00 (-|-|-|-|-|-|-|-), first 128 byte(s) of body:
         0x0000:  5468 6520 7175 6963 6b20 6272 6f77 6e20  The.quick.brown.
         0x0010:  666f 7820 6a75 6d70 7320 6f76 6572 2074  fox.jumps.over.t
@@ -28,8 +26,7 @@
         0x0040:  206a 756d 7073 206f 7665 7220 7468 6520  .jumps.over.the.
         0x0050:  6c61 7a79 2064 6f67 2e20 5468 6520 7175  lazy.dog..The.qu
         0x0060:  6963 6b20 6272 6f77 6e20 666f 7820 6a75  ick.brown.fox.ju
-        0x0070:  6d70 7320 6f76 6572 2074 6865 206c 617a  mps.over.the.laz
- [|zmtp1]
+        0x0070:  6d70 7320 6f76 6572 2074 6865 206c 617a  mps.over.the.laz [|zmtp1]
     5  16:21:12.548346 IP (tos 0xb8, ttl 16, id 0, offset 0, flags [DF], proto PGM (113), length 1480)
     10.0.0.45 > 239.255.0.16: 10.0.0.45.13320 > 239.255.0.16.5563: PGM, length 1436 0x3329041eba74 ODATA trail 21619 seq 54952 [1460]
         frame offset 0xffff
@@ -42,7 +39,6 @@
         0x0050:  206a 756d 7073 206f 7665 7220 7468 6520  .jumps.over.the.
         0x0060:  6c61 7a79 2064 6f67 2e20 5468 6520 7175  lazy.dog..The.qu
         0x0070:  6963 6b20 6272 6f77 6e20 666f 7820 6a75  ick.brown.fox.ju
-
     6  16:21:12.548392 IP (tos 0xb8, ttl 16, id 0, offset 0, flags [DF], proto PGM (113), length 149)
     10.0.0.45 > 239.255.0.16: 10.0.0.45.13320 > 239.255.0.16.5563: PGM, length 105 0x3329041eba74 ODATA trail 21620 seq 54953 [129]
         frame offset 0x0042
@@ -52,12 +48,10 @@
         0x0020:  6272 6f77 6e20 666f 7820 6a75 6d70 7320  brown.fox.jumps.
         0x0030:  6f76 6572 2074 6865 206c 617a 7920 646f  over.the.lazy.do
         0x0040:  672e                                     g.
-
         frame flags+body  (8-bit) length 36, flags 0x00 (-|-|-|-|-|-|-|-), first 35 byte(s) of body:
         0x0000:  5468 6973 2069 7320 7468 6520 7472 6169  This.is.the.trai
         0x0010:  6c69 6e67 2041 5343 4949 206d 6573 7361  ling.ASCII.messa
         0x0020:  6765 2e                                  ge.
-
     7  16:21:12.648918 IP (tos 0xb8, ttl 16, id 0, offset 0, flags [DF], proto PGM (113), length 56)
     10.0.0.45 > 239.255.0.16: 10.0.0.45.13320 > 239.255.0.16.5563: PGM, length 0 0x3329041eba74 SPM seq 92193 trail 21621 lead 54953 nla 10.0.0.45 [36]
     8  16:21:12.649033 IP (tos 0xb8, ttl 1, id 0, offset 0, flags [DF], proto PGM (113), length 36)

diff --git a/tests/zmtp1.out b/tests/zmtp1.out
index 17d6d1f349faf1819404f95053ee5136831c88d3..763dd50e0c038e781c2a84f036d2be71e4f9048a 100644 (file)
--- a/tests/zmtp1.out
+++ b/tests/zmtp1.out
@@ -24,27 +24,23 @@
         0x0030:  7420 6269 6e61 7279 206d 6573 7361 6765  t.binary.message
         0x0040:  2061 6e64 2061 206c 6f6e 6765 7220 4153  .and.a.longer.AS
         0x0050:  4349 4920 6d65 7373 6167 652e            CII.message.
-
     9  12:04:12.420352 IP (tos 0x0, ttl 64, id 51306, offset 0, flags [DF], proto TCP (6), length 84)
     127.0.0.1.33000 > 127.0.0.1.55358: Flags [P.], cksum 0xfe48 (incorrect -> 0xc80f), seq 3:35, ack 99, win 256, options [nop,nop,TS val 245537399 ecr 245537399], length 32: ZMTP/1.0
         frame flags+body  (8-bit) length 1, flags 0x01 (-|-|-|-|-|-|-|MORE)
         frame flags+body  (8-bit) length 29, flags 0x00 (-|-|-|-|-|-|-|-), first 28 byte(s) of body:
         0x0000:  5468 6973 2069 7320 6120 7368 6f72 7420  This.is.a.short.
         0x0010:  4153 4349 4920 7265 706c 792e            ASCII.reply.
-
    10  12:04:12.420442 IP (tos 0x0, ttl 64, id 17998, offset 0, flags [DF], proto TCP (6), length 72)
     127.0.0.1.55358 > 127.0.0.1.33000: Flags [P.], cksum 0xfe3c (incorrect -> 0xcef8), seq 99:119, ack 35, win 257, options [nop,nop,TS val 245537399 ecr 245537399], length 20: ZMTP/1.0
         frame flags+body  (8-bit) length 1, flags 0x01 (-|-|-|-|-|-|-|MORE)
         frame flags+body  (8-bit) length 17, flags 0x00 (-|-|-|-|-|-|-|-), first 16 byte(s) of body:
         0x0000:  0001 0203 0405 0607 0809 0a0b 0c0d 0e0f  ................
-
    11  12:04:12.420526 IP (tos 0x0, ttl 64, id 51307, offset 0, flags [DF], proto TCP (6), length 84)
     127.0.0.1.33000 > 127.0.0.1.55358: Flags [P.], cksum 0xfe48 (incorrect -> 0xc7da), seq 35:67, ack 119, win 256, options [nop,nop,TS val 245537400 ecr 245537399], length 32: ZMTP/1.0
         frame flags+body  (8-bit) length 1, flags 0x01 (-|-|-|-|-|-|-|MORE)
         frame flags+body  (8-bit) length 29, flags 0x00 (-|-|-|-|-|-|-|-), first 28 byte(s) of body:
         0x0000:  5468 6973 2069 7320 6120 7368 6f72 7420  This.is.a.short.
         0x0010:  4153 4349 4920 7265 706c 792e            ASCII.reply.
-
    12  12:04:12.420620 IP (tos 0x0, ttl 64, id 17999, offset 0, flags [DF], proto TCP (6), length 603)
     127.0.0.1.55358 > 127.0.0.1.33000: Flags [P.], cksum 0x0050 (incorrect -> 0xafc1), seq 119:670, ack 67, win 257, options [nop,nop,TS val 245537400 ecr 245537400], length 551: ZMTP/1.0
         frame flags+body  (8-bit) length 1, flags 0x01 (-|-|-|-|-|-|-|MORE)
@@ -57,14 +53,12 @@
         0x0050:  6c61 7a79 2064 6f67 2e20 5468 6520 7175  lazy.dog..The.qu
         0x0060:  6963 6b20 6272 6f77 6e20 666f 7820 6a75  ick.brown.fox.ju
         0x0070:  6d70 7320 6f76 6572 2074 6865 206c 617a  mps.over.the.laz
-
    13  12:04:12.420759 IP (tos 0x0, ttl 64, id 51308, offset 0, flags [DF], proto TCP (6), length 84)
     127.0.0.1.33000 > 127.0.0.1.55358: Flags [P.], cksum 0xfe48 (incorrect -> 0xc592), seq 67:99, ack 670, win 256, options [nop,nop,TS val 245537400 ecr 245537400], length 32: ZMTP/1.0
         frame flags+body  (8-bit) length 1, flags 0x01 (-|-|-|-|-|-|-|MORE)
         frame flags+body  (8-bit) length 29, flags 0x00 (-|-|-|-|-|-|-|-), first 28 byte(s) of body:
         0x0000:  5468 6973 2069 7320 6120 7368 6f72 7420  This.is.a.short.
         0x0010:  4153 4349 4920 7265 706c 792e            ASCII.reply.
-
    14  12:04:12.420972 IP (tos 0x0, ttl 64, id 18000, offset 0, flags [DF], proto TCP (6), length 52)
     127.0.0.1.55358 > 127.0.0.1.33000: Flags [F.], cksum 0xfe28 (incorrect -> 0x16d8), seq 670, ack 99, win 257, options [nop,nop,TS val 245537400 ecr 245537400], length 0
    15  12:04:12.421071 IP (tos 0x0, ttl 64, id 51309, offset 0, flags [DF], proto TCP (6), length 52)