some patches to deal with kday pcap files

diff --git a/print-isoclns.c b/print-isoclns.c
index bd109ab9ad2eaf9d5f24d460282747363705048c..dc1613ee021dca2e037ef00eb148ea46d113621d 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -2309,6 +2309,10 @@ isis_print(netdissect_options *ndo,
             length=pdu_len;
        }
 
+        if(length > ndo->ndo_snaplen) {
+                goto trunc;
+        }
+
        ND_TCHECK(*header_lsp);
        ND_PRINT((ndo, "\n\t  lsp-id: %s, seq: 0x%08x, lifetime: %5us\n\t  chksum: 0x%04x",
                isis_print_id(header_lsp->lsp_id, LSP_ID_LEN),
@@ -3082,14 +3086,19 @@ osi_print_cksum(netdissect_options *ndo,
         uint16_t calculated_checksum;
 
         /* do not attempt to verify the checksum if it is zero */
-        if (!checksum) {
+        if (!checksum || checksum_offset > length) {
                 ND_PRINT((ndo, "(unverified)"));
         } else {
+                unsigned char *truncated = "trunc";
+                //printf("\nosi_print_cksum: %p %u %u %u\n", pptr, checksum_offset, length, ndo->ndo_snaplen);
+                //ND_TCHECK2(pptr, checksum_offset+length);
                 calculated_checksum = create_osi_cksum(pptr, checksum_offset, length);
                 if (checksum == calculated_checksum) {
                         ND_PRINT((ndo, " (correct)"));
                 } else {
-                        ND_PRINT((ndo, " (incorrect should be 0x%04x)", calculated_checksum));
+                        truncated = "incorrect";
+                        //trunc:
+                        ND_PRINT((ndo, " (%s should be 0x%04x)", truncated, calculated_checksum));
                 }
         }
 }

diff --git a/print-rpki-rtr.c b/print-rpki-rtr.c
index 101e41dafbbe39f532f087cb7d840c7e1e05667e..da55dd365f39299a5aa1b3754d5fe4df0a83f438 100644 (file)
--- a/print-rpki-rtr.c
+++ b/print-rpki-rtr.c
@@ -178,6 +178,7 @@ rpki_rtr_pdu_print (netdissect_options *ndo, const u_char *tptr, u_int indent)
     pdu_header = (rpki_rtr_pdu *)tptr;
     pdu_type = pdu_header->pdu_type;
     pdu_len = EXTRACT_32BITS(pdu_header->length);
+    ND_TCHECK2(tptr, pdu_len);
     hexdump = FALSE;
 
     ND_PRINT((ndo, "%sRPKI-RTRv%u, %s PDU (%u), length: %u",
@@ -286,6 +287,7 @@ rpki_rtr_pdu_print (netdissect_options *ndo, const u_char *tptr, u_int indent)
                tptr += 4;
                tlen -= 4;
            }
+            printf("text_length: %u tlen %u\n", text_length, tlen);
            if (text_length && (text_length <= tlen )) {
                memcpy(buf, tptr, min(sizeof(buf)-1, text_length));
                buf[text_length] = '\0';
@@ -306,6 +308,11 @@ rpki_rtr_pdu_print (netdissect_options *ndo, const u_char *tptr, u_int indent)
     if (ndo->ndo_vflag > 1 || (ndo->ndo_vflag && hexdump)) {
        print_unknown_data(ndo,tptr,"\n\t  ", pdu_len);
     }
+    return;
+
+ trunc:
+    ND_PRINT((ndo, "|trunc"));
+    return;
 }
 
 void

diff --git a/tests/kday1.out b/tests/kday1.out
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5edcddacaf741b95b9b17a64189663cb227cc60a 100644 (file)
--- a/tests/kday1.out
+++ b/tests/kday1.out
@@ -0,0 +1 @@
+EXIT CODE 00000100

diff --git a/tests/kday2.out b/tests/kday2.out
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5edcddacaf741b95b9b17a64189663cb227cc60a 100644 (file)
--- a/tests/kday2.out
+++ b/tests/kday2.out
@@ -0,0 +1 @@
+EXIT CODE 00000100

diff --git a/tests/kday3.out b/tests/kday3.out
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5edcddacaf741b95b9b17a64189663cb227cc60a 100644 (file)
--- a/tests/kday3.out
+++ b/tests/kday3.out
@@ -0,0 +1 @@
+EXIT CODE 00000100

diff --git a/tests/kday4.out b/tests/kday4.out
index 4886940016f9088409b1ca069ea4b672b454cb54..5edcddacaf741b95b9b17a64189663cb227cc60a 100644 (file)
--- a/tests/kday4.out
+++ b/tests/kday4.out
@@ -1,128 +1 @@
-IP (tos 0x10, ttl 64, id 63177, offset 0, flags [none], proto unknown (240), length 168, bad cksum 418f (->80a5)!)
-    204.9.54.80 > 204.9.51.132:  ip-proto-240 148
-IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3da6 (->35a6)!)
-    212.9.51.132.50079 > 204.9.54.80.22: Flags [.], cksum 0x8611 (incorrect -> 0x4811), ack 1819218606, win 17918, options [nop,nop,TS val 941371903 ecr 1340592074], length 0
-84:b5:9c:be:30:48 Unknown SSAP 0x10 > 0c:c4:7a:08:e9:12 Unknown DSAP 0x44 Information, send seq 0, rcv seq 26, Flags [Command], length 52
-IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52)
-    204.9.54.80.55936 > 204.9.55.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x725a), ack 3589495407, win 1040, options [nop,nop,TS val 647770294 ecr 2364779354], length 0
-IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
-    204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xcd5f), seq 3589495407:3589495754, ack 370436242, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
-       RPKI-RTRv177, Unknown PDU (100), length: 60
-         0x0000:  b164 003c 0000 003c 0000 00ff ff1f 1b70
-         0x0010:  f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
-         0x0020:  b36d cc11 3abf 1291 f106 4ede 58f4 6297
-         0x0030:  afc4 39a4 0db9 7aa5 6873 33e8
-       RPKI-RTRv65, Error Report PDU (10), length: 66
-         Error code: Unknown (66), Encapsulated PDU length: 37
-           -----encapsulated PDU-----
-       RPKI-RTRv196, Unknown PDU (122), length: 310687132
-         0x0000:  c47a 08e9 1284 b59c be30 4808 0045 1000
-         0x0010:  34fd 2640 003e 063d a6cc 0933 84cc 0936
-         0x0020:  50c3 9f00 1649 d1c8 546c 6f31 ff4f e7cf
-         0x0030:  caa5 6873 541a 730a 0042 0000 0042 0000
-         0x0040:  000c c47a ff80 1284 b59c be30 4808 0045
-         0x0050:  1000 34f5 c840 003e 0645 04cc 0933 84cc
-         0x0060:  0000 0020 9f00 1649 d1c8 546c ff13 2280
-         0x0070:  100f fc85 1005 9400 0001 0108 0a26 9c30
-         0x0080:  ac2b 269c 30b9 a568 7354 404c 0c00 f702
-         0x0090:  0000 f702 0000 84b5 9cac 3048 0cc4 7a08
-         0x00a0:  e912 0800 4500 02e9 f6cd 4000 4006 3bd4
-         0x00b0:  cc09 3650 cc09 370a da80 01bb 1614 8000
-         0x00c0:  0000 5c05 8042 eccb a291 b8aa 2daa 3e38
-         0x00d0:  9ac7 6b6e 9230 8497 771b 2166 f0e6 f302
-         0x00e0:  a561 4a68 a97f f045 111f 1b70 f857 ee68
-         0x00f0:  4dfd 4d5f d9bd c709 30ac 8176 b36d cc11
-         0x0100:  3abf 1291 f106 4ede 61f4 6297 afc4 39a4
-         0x0110:  0db9 7a
-       RPKI-RTRv115, Error Report PDU (10), length: 66
-         Error code: Unknown (66), Encapsulated PDU length: 12
-           -----encapsulated PDU-----
-       RPKI-RTRv196, Unknown PDU (122), length: 310687132
-         0x0000:  c47a ff80 1284 b59c be30 4808 0045 1000
-         0x0010:  34f5 c840 003e 0645 04cc 0933 84cc 0000
-         0x0020:  0020 9f00 1649 d1c8 546c ff13 2280 100f
-         0x0030:  fc85 1005 9400 0001 0108 0a26 9c30 ac2b
-         0x0040:  269c 30b9 a568 7354 404c 0c00 f702 0000
-         0x0050:  f702 0000 84b5 9cac 3048 0cc4 7a08 e912
-         0x0060:  0800 4500 02e9 f6cd 4000 4006 3bd4 cc09
-         0x0070:  3650 cc09 370a da80 01bb 1614 8000 0000
-         0x0080:  5c05 8042 eccb a291 b8aa 2daa 3e38 9ac7
-         0x0090:  6b6e 9230 8497 771b 2166 f0e6 f302 a561
-         0x00a0:  4a68 a97f f045 111f 1b70 f857 ee68 4dfd
-         0x00b0:  4d5f d9bd c709 30ac 8176 b36d cc11 3abf
-         0x00c0:  1291 f106 4ede 61f4 6297 afc4 39a4 0db9
-         0x00d0:  7a
-       [|RPKI-RTR]
-IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 52)
-    204.9.51.132.50079 > 204.9.54.80.22: Flags [.], cksum 0x8611 (incorrect -> 0xa678), ack 1819218606, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 0
-IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 4504 (->451a)!)
-    204.9.51.132.50079 > 204.243.53.80.22: Flags [.], cksum 0x858b (incorrect -> 0x85a1), ack 1819218722, win 4092, options [nop,nop,TS val 941371913 ecr 1340592084], length 0
-IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!)
-    204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x8d67), ack 3587398274, win 1040, options [nop,nop,TS val 647770294 ecr 2364773722], length 0
-IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
-    204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xfa70), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
-       RPKI-RTRv197, Unknown PDU (100), length: 60
-         0x0000:  c564 003c 0000 003c 0000 00ff ff1f 1b70
-         0x0010:  f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
-         0x0020:  b36d cc11 3abf 1291 f106 4ede 61f4 6297
-         0x0030:  afc4 39a4 0db9 7aa5 6873 33e8
-       RPKI-RTRv65, Error Report PDU (10), length: 66
-         Error code: Unknown (66), Encapsulated PDU length: 37
-           -----encapsulated PDU-----
-       RPKI-RTRv196, Unknown PDU (122), length: 310687132
-         0x0000:  c47a 08e9 1284 b59c be30 4808 0045 1000
-         0x0010:  34fd 2640 003e 063d a6cc 0933 84cc 0936
-         0x0020:  50c3 9f00 1649 d1c8 546c 6f31 ff4f e7cf
-         0x0030:  caa5 6873 541a 730a 0042 0000 0042 0000
-         0x0040:  000c c47a ff80 1284 b59c be30 4808 0045
-         0x0050:  1000 34f5 c840 003e 0645 04cc 0933 84cc
-         0x0060:  0000 0020 9f00 1649 d1c8 546c ff13 2280
-         0x0070:  100f fc85 8b00 0055 0000 0101 080a 8cf3
-         0x0080:  ac2b 269c 30b9 a568 7354 404c 0c00 f702
-         0x0090:  0000 f702 0000 84b5 9cac 3048 0cc4 7a08
-         0x00a0:  e912 0800 4500 02e9 f6cd 4000 4006 3bd4
-         0x00b0:  cc09 3650 cc09 370a da80 01bb 1614 8000
-         0x00c0:  0000 5c05 8042 eccb a291 b8aa 2daa 3e38
-         0x00d0:  9ac7 6b6e 9230 8497 771b 2166 f0e6 f302
-         0x00e0:  a561 4a68 a97f f045 111f 1b70 f857 ee68
-         0x00f0:  4dfd 4d5f d9bd c709 30ac 8176 b36d cc11
-         0x0100:  3abf 1291 f106 4ede 61f4 6297 afc4 39a4
-         0x0110:  0db9 7a
-       RPKI-RTRv115, Error Report PDU (10), length: 66
-         Error code: Unknown (66), Encapsulated PDU length: 12
-           -----encapsulated PDU-----
-       RPKI-RTRv196, Unknown PDU (122), length: 310687132
-         0x0000:  c47a ff80 1284 b59c be30 4808 0045 1000
-         0x0010:  34f5 c840 003e 0645 04cc 0933 84cc 0000
-         0x0020:  0020 9f00 1649 d1c8 546c ff13 2280 100f
-         0x0030:  fc85 8b00 0055 0000 0101 080a 8cf3 ac2b
-         0x0040:  269c 30b9 a568 7354 404c 0c00 f702 0000
-         0x0050:  f702 0000 84b5 9cac 3048 0cc4 7a08 e912
-         0x0060:  0800 4500 02e9 f6cd 4000 4006 3bd4 cc09
-         0x0070:  3650 cc09 370a da80 01bb 1614 8000 0000
-         0x0080:  5c05 8042 eccb a291 b8aa 2daa 3e38 9ac7
-         0x0090:  6b6e 9230 8497 771b 2166 f0e6 f302 a561
-         0x00a0:  4a68 a97f f045 111f 1b70 f857 ee68 4dfd
-         0x00b0:  4d5f d9bd c709 30ac 8176 b36d cc11 3abf
-         0x00c0:  1291 f106 4ede 61f4 6297 afc4 39a4 0db9
-         0x00d0:  7a
-IP truncated-ip - 768 bytes missing! (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 820, bad cksum 3da6 (->3aa6)!)
-    204.9.51.132.50079 > 204.9.54.80.22: Flags [.], seq 0:768, ack 1, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 768
-IP (tos 0x6,ECT(0), ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 4504 (->4524)!)
-    204.9.51.132.50079 > 204.243.53.80.22: Flags [.], cksum 0x858b (incorrect -> 0x85a1), ack 1, win 4092, options [nop,nop,TS val 941371913 ecr 1340592084], length 0
-IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!)
-    204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x8d67), ack 1, win 1040, options [nop,nop,TS val 647770294 ecr 2364773722], length 0
-IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
-    204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x3f28), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
-       RPKI-RTRv177, Unknown PDU (100), length: 60
-         0x0000:  b164 003c 0000 003c 0000 00ff ff1f 1b70
-         0x0010:  f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
-         0x0020:  b36d cc11 3abf 1291 f106 4ede 61f4 6297
-         0x0030:  afc4 39a4 0db9 7aa5 6873 33e8
-       RPKI-RTRv65, Error Report PDU (10), length: 66
-         Error code: Unknown (66), Encapsulated PDU length: 100
-         Error text: 
-       RPKI-RTRv115, Error Report PDU (10), length: 66
-         Error code: Unknown (66), Encapsulated PDU length: 745
-         Error text: h\ e\ 1
-       [|RPKI-RTR]
+EXIT CODE 00000100

diff --git a/tests/kday5.out b/tests/kday5.out
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5edcddacaf741b95b9b17a64189663cb227cc60a 100644 (file)
--- a/tests/kday5.out
+++ b/tests/kday5.out
@@ -0,0 +1 @@
+EXIT CODE 00000100

diff --git a/tests/kday6.out b/tests/kday6.out
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5edcddacaf741b95b9b17a64189663cb227cc60a 100644 (file)
--- a/tests/kday6.out
+++ b/tests/kday6.out
@@ -0,0 +1 @@
+EXIT CODE 00000100

diff --git a/tests/kday7.out b/tests/kday7.out
index 4e9089e56dc910ef9cf1d6a9310b29756ae88657..5edcddacaf741b95b9b17a64189663cb227cc60a 100644 (file)
--- a/tests/kday7.out
+++ b/tests/kday7.out
@@ -1,124 +1 @@
-IP (tos 0x10, ttl 64, id 63177, offset 0, flags [none], proto unknown (240), length 168, bad cksum 418f (->80a5)!)
-    204.9.54.80 > 204.9.51.132:  ip-proto-240 148
-IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3da6 (->35a6)!)
-    212.9.51.132.50079 > 204.9.54.80.22: Flags [.], cksum 0x8611 (incorrect -> 0x4811), ack 1819218606, win 17918, options [nop,nop,TS val 941371903 ecr 1340592074], length 0
-84:b5:9c:be:30:48 Unknown SSAP 0x10 > 0c:c4:7a:08:e9:12 Unknown DSAP 0x44 Information, send seq 0, rcv seq 26, Flags [Command], length 52
-IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52)
-    204.9.54.80.55936 > 204.9.55.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x725a), ack 3589495407, win 1040, options [nop,nop,TS val 647770294 ecr 2364779354], length 0
-IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
-    204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xcd5f), seq 3589495407:3589495754, ack 370436242, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
-       RPKI-RTRv177, Unknown PDU (100), length: 60
-         0x0000:  b164 003c 0000 003c 0000 00ff ff1f 1b70
-         0x0010:  f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
-         0x0020:  b36d cc11 3abf 1291 f106 4ede 58f4 6297
-         0x0030:  afc4 39a4 0db9 7aa5 6873 33e8
-       RPKI-RTRv65, Error Report PDU (10), length: 66
-         Error code: Unknown (66), Encapsulated PDU length: 37
-           -----encapsulated PDU-----
-       RPKI-RTRv196, Unknown PDU (122), length: 310687132
-         0x0000:  c47a 08e9 1284 b59c be30 4808 0045 1000
-         0x0010:  34fd 2640 003e 063d a6cc 0933 84cc 0936
-         0x0020:  50c3 9f00 1649 d1c8 546c 6f31 ff4f e7cf
-         0x0030:  caa5 6873 541a 730a 0042 0000 0042 0000
-         0x0040:  000c c47a ff80 1284 b59c be30 4808 0045
-         0x0050:  1000 34f5 c840 003e 0645 04cc 0933 84cc
-         0x0060:  0000 0020 9f00 1649 d1c8 546c ff13 2280
-         0x0070:  100f fc85 1005 9400 0001 0108 0a26 9c30
-         0x0080:  ac2b 269c 30b9 a568 7354 404c 0c00 f702
-         0x0090:  0000 f702 0000 84b5 9cac 3048 0cc4 7a08
-         0x00a0:  e912 0800 4500 02e9 f6cd 4000 4006 3bd4
-         0x00b0:  cc09 3650 cc09 370a da80 01bb 1614 8000
-         0x00c0:  0000 5c05 8042 eccb a291 b8aa 2daa 3e38
-         0x00d0:  9ac7 6b6e 9230 8497 771b 2166 f0e6 f302
-         0x00e0:  a561 4a68 a97f f045 111f 1b70 f857 ee68
-         0x00f0:  4dfd 4d5f d9bd c709 30ac 8176 b36d cc11
-         0x0100:  3abf 1291 f106 4ede 61f4 6297 afc4 39a4
-         0x0110:  0db9 7a
-       RPKI-RTRv115, Error Report PDU (10), length: 66
-         Error code: Unknown (66), Encapsulated PDU length: 12
-           -----encapsulated PDU-----
-       RPKI-RTRv196, Unknown PDU (122), length: 310687132
-         0x0000:  c47a ff80 1284 b59c be30 4808 0045 1000
-         0x0010:  34f5 c840 003e 0645 04cc 0933 84cc 0000
-         0x0020:  0020 9f00 1649 d1c8 546c ff13 2280 100f
-         0x0030:  fc85 1005 9400 0001 0108 0a26 9c30 ac2b
-         0x0040:  269c 30b9 a568 7354 404c 0c00 f702 0000
-         0x0050:  f702 0000 84b5 9cac 3048 0cc4 7a08 e912
-         0x0060:  0800 4500 02e9 f6cd 4000 4006 3bd4 cc09
-         0x0070:  3650 cc09 370a da80 01bb 1614 8000 0000
-         0x0080:  5c05 8042 eccb a291 b8aa 2daa 3e38 9ac7
-         0x0090:  6b6e 9230 8497 771b 2166 f0e6 f302 a561
-         0x00a0:  4a68 a97f f045 111f 1b70 f857 ee68 4dfd
-         0x00b0:  4d5f d9bd c709 30ac 8176 b36d cc11 3abf
-         0x00c0:  1291 f106 4ede 61f4 6297 afc4 39a4 0db9
-         0x00d0:  7a
-       [|RPKI-RTR]
-IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 52)
-    204.9.51.132.50079 > 204.9.54.80.22: Flags [.], cksum 0x8611 (incorrect -> 0xa678), ack 1819218606, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 0
-IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 4504 (->451a)!)
-    204.9.51.132.50079 > 204.243.53.80.22: Flags [.], cksum 0x858b (incorrect -> 0x85a1), ack 1819218722, win 4092, options [nop,nop,TS val 941371913 ecr 1340592084], length 0
-IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!)
-    204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x8d67), ack 3587398274, win 1040, options [nop,nop,TS val 647770294 ecr 2364773722], length 0
-IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
-    204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xfa86), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
-       RPKI-RTRv197, Unknown PDU (100), length: 60
-         0x0000:  c564 003c 0000 003c 0000 00ff ff1f 1b70
-         0x0010:  f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
-         0x0020:  b36d cc11 3abf 1291 f106 4ede 61f4 6297
-         0x0030:  afc4 39a4 0db9 7aa5 6873 33e8
-       RPKI-RTRv65, Error Report PDU (10), length: 66
-         Error code: Unknown (66), Encapsulated PDU length: 37
-           -----encapsulated PDU-----
-       RPKI-RTRv196, Unknown PDU (122), length: 310687132
-         0x0000:  c47a 08e9 1284 b59c be30 4808 0045 1000
-         0x0010:  34fd 2640 003e 063d a6cc 0933 84cc 0936
-         0x0020:  50c3 9f00 1649 d1c8 546c 6f31 ff4f e7cf
-         0x0030:  caa5 6873 541a 730a 0042 0000 0042 0000
-         0x0040:  000c c47a ff80 1284 b59c be30 4808 0045
-         0x0050:  1000 34f5 c840 003e 0645 04cc 0933 84cc
-         0x0060:  0000 0020 9f00 1649 d1c8 546c ff13 2280
-         0x0070:  100f fc85 8b00 0055 0000 0101 080a 8cf3
-         0x0080:  ac2b 269c 30b9 a568 7354 404c 0c00 f702
-         0x0090:  0000 f702 0000 84b5 9cac 3048 0cc4 7a08
-         0x00a0:  e8fc 0800 4500 02e9 f6cd 4000 4006 3bd4
-         0x00b0:  cc09 3650 cc09 370a da80 01bb 1614 8000
-         0x00c0:  0000 5c05 8042 eccb a291 b8aa 2daa 3e38
-         0x00d0:  9ac7 6b6e 9230 8497 771b 2166 f0e6 f302
-         0x00e0:  a561 4a68 a97f f045 111f 1b70 f857 ee68
-         0x00f0:  4dfd 4d5f d9bd c709 30ac 8176 b36d cc11
-         0x0100:  3abf 1291 f106 4ede 61f4 6297 afc4 39a4
-         0x0110:  0db9 7a
-       RPKI-RTRv115, Error Report PDU (10), length: 66
-         Error code: Unknown (66), Encapsulated PDU length: 12
-           -----encapsulated PDU-----
-       RPKI-RTRv196, Unknown PDU (122), length: 310687132
-         0x0000:  c47a ff80 1284 b59c be30 4808 0045 1000
-         0x0010:  34f5 c840 003e 0645 04cc 0933 84cc 0000
-         0x0020:  0020 9f00 1649 d1c8 546c ff13 2280 100f
-         0x0030:  fc85 8b00 0055 0000 0101 080a 8cf3 ac2b
-         0x0040:  269c 30b9 a568 7354 404c 0c00 f702 0000
-         0x0050:  f702 0000 84b5 9cac 3048 0cc4 7a08 e8fc
-         0x0060:  0800 4500 02e9 f6cd 4000 4006 3bd4 cc09
-         0x0070:  3650 cc09 370a da80 01bb 1614 8000 0000
-         0x0080:  5c05 8042 eccb a291 b8aa 2daa 3e38 9ac7
-         0x0090:  6b6e 9230 8497 771b 2166 f0e6 f302 a561
-         0x00a0:  4a68 a97f f045 111f 1b70 f857 ee68 4dfd
-         0x00b0:  4d5f d9bd c709 30ac 8176 b36d cc11 3abf
-         0x00c0:  1291 f106 4ede 61f4 6297 afc4 39a4 0db9
-         0x00d0:  7a
-IP truncated-ip - 768 bytes missing! (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 820, bad cksum 3da6 (->3aa6)!)
-    204.9.51.132.50079 > 204.9.54.80.22: Flags [.], seq 0:768, ack 1, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 768
-IP (tos 0x6,ECT(0), ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 4504 (->4524)!)
-    204.9.51.132.50079 > 204.243.53.80.22: Flags [.], cksum 0x858b (incorrect -> 0x85a1), ack 1, win 4092, options [nop,nop,TS val 941371913 ecr 1340592084], length 0
-IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!)
-    204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x8d67), ack 1, win 1040, options [nop,nop,TS val 647770294 ecr 2364773722], length 0
-IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
-    204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x4ba9), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
-       RPKI-RTRv177, Unknown PDU (100), length: 60
-         0x0000:  b164 003c 0000 003c 0000 00ff ff1f 1b70
-         0x0010:  f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
-         0x0020:  b36d cc11 3abf 1291 f106 4ede 61f4 6297
-         0x0030:  afc4 39a4 0db9 7aa5 6873 33e8
-       RPKI-RTRv65, Error Report PDU (10), length: 66
-         Error code: Unknown (66), Encapsulated PDU length: 100
-         Error tex
\ No newline at end of file
+EXIT CODE 00000100

diff --git a/tests/kday8.out b/tests/kday8.out
index e03833139c7ad6edd60a26d46c50f6f867aabf0d..5edcddacaf741b95b9b17a64189663cb227cc60a 100644 (file)
--- a/tests/kday8.out
+++ b/tests/kday8.out
@@ -1,34 +1 @@
-CFMv0 unknown (204), MD Level 0, length 168
-       First TLV offset 52
-         0x0000:  a300 0000 0080 0000 0000 0000 0000 0000
-         0x0010:  0000 00aa 6873 54d7 060b 003c 0000 003c
-         0x0020:  d4c3 b2a1 0200 1a00 000b 003c 0000 003c
-         0x0030:  d4c3 b2a1 0200 1a00 0000 0000 3620 0a00
-         0x0040:  b600 0000 b600 0000 40b5 9cbe 3048 0cc4
-         0x0050:  ad37 1005 ffff 05cc 0934 9300 0000 0080
-         0x0060:  fffa 0000 0000 3200 0000 0000 00aa 6873
-       Port status TLV (0x02), length 26, Status: Unknown (0)
-       Unknown TLV (0x37), length 4101
-         0x0000:  3710 05ff ff05 cc09 3493 0000 0000 80ff
-         0x0010:  fa00 0000 0032 0000 0000 0000 aa68 7354
-         0x0020:  d706 0b00 3c00 0000 3c00 0000 0080 0000
-         0x0030:  fffd 4d5f d9bd c709 30ac 8176 b36d cc11
-         0x0040:  3abf 1291 f106 4ede 61f4 6297 afc4 39a4
-         0x0050:  0db9 7a
-IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 52)
-    204.9.51.132.50079 > 204.9.54.80.22: Flags [.], cksum 0x8611 (incorrect -> 0xa678), ack 1819218606, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 0
-IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 4504 (->451a)!)
-    204.9.51.132.50079 > 204.243.53.80.22: Flags [.], cksum 0x858b (incorrect -> 0x85a1), ack 1819218722, win 4092, options [nop,nop,TS val 941371913 ecr 1340592084], length 0
-IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!)
-    204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x7767), ack 3587398274, win 1040, options [nop,nop,TS val 647770294 ecr 2364779354], length 0
-IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
-    204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xed9b), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
-       RPKI-RTRv177, Unknown PDU (100), length: 60
-         0x0000:  b164 003c 0000 003c 0000 00ff ff1f 1b70
-         0x0010:  f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
-         0x0020:  b36d cc11 3abf 1291 f106 4ede 61f4 6297
-         0x0030:  afc4 39a4 0db9 7aa5 6873 33e8
-       RPKI-RTRv65, Error Report PDU (10), length: 66
-         Error code: Unknown (66), Encapsulated PDU length: 80
-         Error text: 
-       [|RPKI-RTR]
+EXIT CODE 00000100