ForCES: Remove blank lines in output

Update the output of some tests accordingly.

diff --git a/print-forces.c b/print-forces.c
index 2f95b1ee50c7ac4d3b4c0d7b97d3827cb67c7025..b80306adc98c30fff8720d57dacda70805732492 100644 (file)
--- a/print-forces.c
+++ b/print-forces.c
@@ -711,7 +711,7 @@ fdatatlv_print(netdissect_options *ndo,
                char *ib = indent_pr(indent + 2, 1);
                ND_PRINT("%s[", ib + 1);
                hex_print_with_offset(ndo, ib, tdp, rlen, 0);
-               ND_PRINT("\n%s]\n", ib + 1);
+               ND_PRINT("\n%s]", ib + 1);
        }
        return 0;
 
@@ -1768,7 +1768,6 @@ error:
                hex_print_with_offset(ndo, "\n\t ", pptr, len, 0);
                ND_PRINT("\n\t ]");
        }
-       ND_PRINT("\n");
        return;
 
 trunc:

diff --git a/tests/forces1.out b/tests/forces1.out
index cd2f25df845cbe9484897a4d35cd5fb9d197fcef..a7db105e9a3a3e9806d6644e11a9f8580b2518df 100644 (file)
--- a/tests/forces1.out
+++ b/tests/forces1.out
@@ -1,40 +1,30 @@
     1  12:23:04.260400 IP 150.140.254.202.57077 > 211.129.72.8.6704: sctp[ForCES HP] (1) [DATA] (B)(E) [TSN: 1048037094] [SID: 0] [SSEQ 1] [PPID 0x0] 
        ForCES Query Response 
-
     2  12:23:04.726175 IP 211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP] (1) [DATA] (B)(E) [TSN: 18398476] [SID: 0] [SSEQ 0] [PPID 0x0] 
        ForCES HeartBeat 
-
     3  12:23:04.726228 IP 150.140.254.202.48316 > 211.129.72.8.6706: sctp[ForCES LP] (1) [SACK] [cum ack 18398476] [a_rwnd 57320] [#gap acks 0] [#dup tsns 0] 
     4  12:23:04.728649 IP 211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP] (1) [DATA] (B)(E) [TSN: 167996938] [SID: 0] [SSEQ 2] [PPID 0x0] 
        ForCES Query 
-
     5  12:23:04.733639 IP 211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP] (1) [DATA] (B)(E) [TSN: 167996939] [SID: 0] [SSEQ 3] [PPID 0x0] 
        ForCES Config 
-
     6  12:23:04.733672 IP 150.140.254.202.57077 > 211.129.72.8.6704: sctp[ForCES HP] (1) [SACK] [cum ack 167996939] [a_rwnd 57228] [#gap acks 0] [#dup tsns 0] 
     7  12:23:04.734755 IP 211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP] (1) [DATA] (B)(E) [TSN: 167996940] [SID: 0] [SSEQ 4] [PPID 0x0] 
        ForCES Config 
-
     8  12:23:04.736911 IP 211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP] (1) [DATA] (B)(E) [TSN: 167996941] [SID: 0] [SSEQ 5] [PPID 0x0] 
        ForCES Config 
-
     9  12:23:04.736980 IP 150.140.254.202.57077 > 211.129.72.8.6704: sctp[ForCES HP] (1) [SACK] [cum ack 167996941] [a_rwnd 57100] [#gap acks 0] [#dup tsns 0] 
    10  12:23:04.740959 IP 211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP] (1) [DATA] (B)(E) [TSN: 167996942] [SID: 0] [SSEQ 6] [PPID 0x0] 
        ForCES Config 
-
    11  12:24:26.948354 IP 211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP] (1) [SACK] [cum ack 1830592459] [a_rwnd 55272] [#gap acks 0] [#dup tsns 0] 
    12  12:24:26.973201 IP 150.140.254.202.57077 > 211.129.72.8.6704: sctp[ForCES HP] (1) [HB REQ] 
    13  12:24:27.282739 IP 211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP] (1) [HB REQ] 
    14  12:24:27.282783 IP 150.140.254.202.57077 > 211.129.72.8.6704: sctp[ForCES HP] (1) [HB ACK] 
    15  12:24:27.354881 IP 150.140.254.202.48316 > 211.129.72.8.6706: sctp[ForCES LP] (1) [DATA] (B)(E) [TSN: 1830592460] [SID: 0] [SSEQ 30] [PPID 0x0] 
        ForCES HeartBeat 
-
    16  12:24:27.372769 IP 211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP] (1) [HB ACK] 
    17  12:24:27.759030 IP 211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP] (1) [DATA] (B)(E) [TSN: 18398553] [SID: 0] [SSEQ 77] [PPID 0x0] 
        ForCES HeartBeat 
-
    18  12:24:44.777986 IP 211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP] (1) [DATA] (B)(E) [TSN: 18398573] [SID: 0] [SSEQ 97] [PPID 0x0] 
        ForCES HeartBeat 
-
    19  12:24:44.963122 IP 211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP] (1) [SACK] [cum ack 1830592477] [a_rwnd 55272] [#gap acks 0] [#dup tsns 0] 
    20  12:24:44.978321 IP 150.140.254.202.48316 > 211.129.72.8.6706: sctp[ForCES LP] (1) [SACK] [cum ack 18398573] [a_rwnd 56144] [#gap acks 0] [#dup tsns 0] 

diff --git a/tests/forces1vvv.out b/tests/forces1vvv.out
index d40f2cd163f97f1265d9f9db962f0388140d8a77..159412081ff687f19927a7a30d9bd02155f81b63 100644 (file)
--- a/tests/forces1vvv.out
+++ b/tests/forces1vvv.out
@@ -35,8 +35,6 @@
                0x0100:  0000 0012 0000 0001 0000 0016 0000 0013
                0x0110:  0000 0001
                ]
-
-
     2  12:23:04.726175 IP (tos 0x0, ttl 46, id 0, offset 0, flags [DF], proto SCTP (132), length 72)
     211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP]
        1) [DATA] (B)(E) [TSN: 18398476] [SID: 0] [SSEQ 0] [PPID 0x0] 
@@ -48,7 +46,6 @@
          Standalone(0x0), StartofTransaction(0x0)
          Extra flags: rsv(b5-7) 0x0 rsv(b13-31) 0x0
 
-
     3  12:23:04.726228 IP (tos 0x2,ECT(0), ttl 64, id 1, offset 0, flags [DF], proto SCTP (132), length 48)
     150.140.254.202.48316 > 211.129.72.8.6706: sctp[ForCES LP]
        1) [SACK] [cum ack 18398476] [a_rwnd 57320] [#gap acks 0] [#dup tsns 0] 
@@ -69,7 +66,6 @@
             Pathdata: Flags 0x0 ID count 1
             ID#01: 1
 
-
     5  12:23:04.733639 IP (tos 0x0, ttl 46, id 4, offset 0, flags [DF], proto SCTP (132), length 112)
     211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP]
        1) [DATA] (B)(E) [TSN: 167996939] [SID: 0] [SSEQ 3] [PPID 0x0] 
@@ -91,8 +87,6 @@
                [
                0x0000:  0000 0001
                ]
-
-
     6  12:23:04.733672 IP (tos 0x2,ECT(0), ttl 64, id 5, offset 0, flags [DF], proto SCTP (132), length 48)
     150.140.254.202.57077 > 211.129.72.8.6704: sctp[ForCES HP]
        1) [SACK] [cum ack 167996939] [a_rwnd 57228] [#gap acks 0] [#dup tsns 0] 
@@ -117,8 +111,6 @@
                [
                0x0000:  0000 0001
                ]
-
-
     8  12:23:04.736911 IP (tos 0x0, ttl 46, id 6, offset 0, flags [DF], proto SCTP (132), length 112)
     211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP]
        1) [DATA] (B)(E) [TSN: 167996941] [SID: 0] [SSEQ 5] [PPID 0x0] 
@@ -140,8 +132,6 @@
                [
                0x0000:  0000 0001
                ]
-
-
     9  12:23:04.736980 IP (tos 0x2,ECT(0), ttl 64, id 6, offset 0, flags [DF], proto SCTP (132), length 48)
     150.140.254.202.57077 > 211.129.72.8.6704: sctp[ForCES HP]
        1) [SACK] [cum ack 167996941] [a_rwnd 57100] [#gap acks 0] [#dup tsns 0] 
@@ -166,8 +156,6 @@
                [
                0x0000:  0000 0001
                ]
-
-
    11  12:24:26.948354 IP (tos 0x0, ttl 46, id 110, offset 0, flags [DF], proto SCTP (132), length 48)
     211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP]
        1) [SACK] [cum ack 1830592459] [a_rwnd 55272] [#gap acks 0] [#dup tsns 0] 
@@ -191,7 +179,6 @@
          Standalone(0x0), StartofTransaction(0x0)
          Extra flags: rsv(b5-7) 0x0 rsv(b13-31) 0x0
 
-
    16  12:24:27.372769 IP (tos 0x0, ttl 46, id 112, offset 0, flags [DF], proto SCTP (132), length 80)
     211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP]
        1) [HB ACK] 
@@ -206,7 +193,6 @@
          Standalone(0x0), StartofTransaction(0x0)
          Extra flags: rsv(b5-7) 0x0 rsv(b13-31) 0x0
 
-
    18  12:24:44.777986 IP (tos 0x0, ttl 46, id 148, offset 0, flags [DF], proto SCTP (132), length 72)
     211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP]
        1) [DATA] (B)(E) [TSN: 18398573] [SID: 0] [SSEQ 97] [PPID 0x0] 
@@ -218,7 +204,6 @@
          Standalone(0x0), StartofTransaction(0x0)
          Extra flags: rsv(b5-7) 0x0 rsv(b13-31) 0x0
 
-
    19  12:24:44.963122 IP (tos 0x0, ttl 46, id 149, offset 0, flags [DF], proto SCTP (132), length 48)
     211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP]
        1) [SACK] [cum ack 1830592477] [a_rwnd 55272] [#gap acks 0] [#dup tsns 0] 

diff --git a/tests/forces1vvvv.out b/tests/forces1vvvv.out
index 6b3897be7f865597d2804a5fbf6f5d1404b147c9..63463ff28989812746480f38608e927ff66b2052 100644 (file)
--- a/tests/forces1vvvv.out
+++ b/tests/forces1vvvv.out
@@ -35,7 +35,6 @@
                0x0100:  0000 0012 0000 0001 0000 0016 0000 0013
                0x0110:  0000 0001
                ]
-
          Raw ForCES message
         [
         0x0000:  1014 0053 0000 0002 4000 0001 0000 0000
@@ -60,7 +59,6 @@
         0x0130:  0000 0001 0000 0015 0000 0012 0000 0001
         0x0140:  0000 0016 0000 0013 0000 0001
         ]
-
     2  12:23:04.726175 IP (tos 0x0, ttl 46, id 0, offset 0, flags [DF], proto SCTP (132), length 72)
     211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP]
        1) [DATA] (B)(E) [TSN: 18398476] [SID: 0] [SSEQ 0] [PPID 0x0] 
@@ -77,7 +75,6 @@
         0x0000:  100f 0006 4000 0001 0000 0002 0000 0000
         0x0010:  0000 0002 c040 0000
         ]
-
     3  12:23:04.726228 IP (tos 0x2,ECT(0), ttl 64, id 1, offset 0, flags [DF], proto SCTP (132), length 48)
     150.140.254.202.48316 > 211.129.72.8.6706: sctp[ForCES LP]
        1) [SACK] [cum ack 18398476] [a_rwnd 57320] [#gap acks 0] [#dup tsns 0] 
@@ -105,7 +102,6 @@
         0x0020:  0000 0001 0007 0010 0110 000c 0000 0001
         0x0030:  0000 0001
         ]
-
     5  12:23:04.733639 IP (tos 0x0, ttl 46, id 4, offset 0, flags [DF], proto SCTP (132), length 112)
     211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP]
        1) [DATA] (B)(E) [TSN: 167996939] [SID: 0] [SSEQ 3] [PPID 0x0] 
@@ -127,7 +123,6 @@
                [
                0x0000:  0000 0001
                ]
-
          Raw ForCES message
         [
         0x0000:  1003 0010 4000 0001 0000 0002 0000 0000
@@ -135,7 +130,6 @@
         0x0020:  0000 0001 0002 001c 0110 0018 0000 0002
         0x0030:  0000 003c 0000 0001 0112 0008 0000 0001
         ]
-
     6  12:23:04.733672 IP (tos 0x2,ECT(0), ttl 64, id 5, offset 0, flags [DF], proto SCTP (132), length 48)
     150.140.254.202.57077 > 211.129.72.8.6704: sctp[ForCES HP]
        1) [SACK] [cum ack 167996939] [a_rwnd 57228] [#gap acks 0] [#dup tsns 0] 
@@ -160,7 +154,6 @@
                [
                0x0000:  0000 0001
                ]
-
          Raw ForCES message
         [
         0x0000:  1003 0010 4000 0001 0000 0002 0000 0000
@@ -168,7 +161,6 @@
         0x0020:  0000 0001 0002 001c 0110 0018 0000 0002
         0x0030:  0000 003c 0000 0002 0112 0008 0000 0001
         ]
-
     8  12:23:04.736911 IP (tos 0x0, ttl 46, id 6, offset 0, flags [DF], proto SCTP (132), length 112)
     211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP]
        1) [DATA] (B)(E) [TSN: 167996941] [SID: 0] [SSEQ 5] [PPID 0x0] 
@@ -190,7 +182,6 @@
                [
                0x0000:  0000 0001
                ]
-
          Raw ForCES message
         [
         0x0000:  1003 0010 4000 0001 0000 0002 0000 0000
@@ -198,7 +189,6 @@
         0x0020:  0000 0001 0002 001c 0110 0018 0000 0002
         0x0030:  0000 003c 0000 0003 0112 0008 0000 0001
         ]
-
     9  12:23:04.736980 IP (tos 0x2,ECT(0), ttl 64, id 6, offset 0, flags [DF], proto SCTP (132), length 48)
     150.140.254.202.57077 > 211.129.72.8.6704: sctp[ForCES HP]
        1) [SACK] [cum ack 167996941] [a_rwnd 57100] [#gap acks 0] [#dup tsns 0] 
@@ -223,7 +213,6 @@
                [
                0x0000:  0000 0001
                ]
-
          Raw ForCES message
         [
         0x0000:  1003 0010 4000 0001 0000 0002 0000 0000
@@ -231,7 +220,6 @@
         0x0020:  0000 0002 0002 001c 0110 0018 0000 0002
         0x0030:  0000 003c 0000 0001 0112 0008 0000 0001
         ]
-
    11  12:24:26.948354 IP (tos 0x0, ttl 46, id 110, offset 0, flags [DF], proto SCTP (132), length 48)
     211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP]
        1) [SACK] [cum ack 1830592459] [a_rwnd 55272] [#gap acks 0] [#dup tsns 0] 
@@ -260,7 +248,6 @@
         0x0000:  100f 0006 0000 0002 4000 0001 0000 0000
         0x0010:  0000 0053 0000 0000
         ]
-
    16  12:24:27.372769 IP (tos 0x0, ttl 46, id 112, offset 0, flags [DF], proto SCTP (132), length 80)
     211.129.72.8.6704 > 150.140.254.202.57077: sctp[ForCES HP]
        1) [HB ACK] 
@@ -280,7 +267,6 @@
         0x0000:  100f 0006 4000 0001 0000 0002 0000 0000
         0x0010:  0000 0083 c040 0000
         ]
-
    18  12:24:44.777986 IP (tos 0x0, ttl 46, id 148, offset 0, flags [DF], proto SCTP (132), length 72)
     211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP]
        1) [DATA] (B)(E) [TSN: 18398573] [SID: 0] [SSEQ 97] [PPID 0x0] 
@@ -297,7 +283,6 @@
         0x0000:  100f 0006 4000 0001 0000 0002 0000 0000
         0x0010:  0000 0097 c040 0000
         ]
-
    19  12:24:44.963122 IP (tos 0x0, ttl 46, id 149, offset 0, flags [DF], proto SCTP (132), length 48)
     211.129.72.8.6706 > 150.140.254.202.48316: sctp[ForCES LP]
        1) [SACK] [cum ack 1830592477] [a_rwnd 55272] [#gap acks 0] [#dup tsns 0]