RPKI to Router Protocol: Fix Segmentation Faults and other problems

-Fix/add ND_TCHECK2 tests,
-Fix a buffer overflow,
-Remove a debug printf

diff --git a/print-rpki-rtr.c b/print-rpki-rtr.c
index da55dd365f39299a5aa1b3754d5fe4df0a83f438..3dc15d90778b8d2e729f158224cfd7b8f7b2a4d4 100644 (file)
--- a/print-rpki-rtr.c
+++ b/print-rpki-rtr.c
@@ -178,7 +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);
     pdu_header = (rpki_rtr_pdu *)tptr;
     pdu_type = pdu_header->pdu_type;
     pdu_len = EXTRACT_32BITS(pdu_header->length);

-    ND_TCHECK2(tptr, pdu_len);
+    ND_TCHECK2(*tptr, pdu_len);

     hexdump = FALSE;
 
     ND_PRINT((ndo, "%sRPKI-RTRv%u, %s PDU (%u), length: %u",
     hexdump = FALSE;
 
     ND_PRINT((ndo, "%sRPKI-RTRv%u, %s PDU (%u), length: %u",


@@ -255,6 +255,7 @@ rpki_rtr_pdu_print (netdissect_options *ndo, const u_char *tptr, u_int indent)
 
            pdu = (rpki_rtr_pdu_error_report *)tptr;
            encapsulated_pdu_length = EXTRACT_32BITS(pdu->encapsulated_pdu_length);
 
            pdu = (rpki_rtr_pdu_error_report *)tptr;
            encapsulated_pdu_length = EXTRACT_32BITS(pdu->encapsulated_pdu_length);

+           ND_TCHECK2(*tptr, encapsulated_pdu_length);

            tlen = pdu_len;
 
            error_code = EXTRACT_16BITS(pdu->pdu_header.u.error_code);
            tlen = pdu_len;
 
            error_code = EXTRACT_16BITS(pdu->pdu_header.u.error_code);


@@ -287,10 +288,10 @@ rpki_rtr_pdu_print (netdissect_options *ndo, const u_char *tptr, u_int indent)
                tptr += 4;
                tlen -= 4;
            }
                tptr += 4;
                tlen -= 4;
            }

-            printf("text_length: %u tlen %u\n", text_length, tlen);
+           ND_TCHECK2(*tptr, text_length);

            if (text_length && (text_length <= tlen )) {
                memcpy(buf, tptr, min(sizeof(buf)-1, text_length));
            if (text_length && (text_length <= tlen )) {
                memcpy(buf, tptr, min(sizeof(buf)-1, text_length));

-               buf[text_length] = '\0';
+               buf[min(sizeof(buf) - 1, text_length)] = '\0';

                ND_PRINT((ndo, "%sError text: %s", indent_string(indent+2), buf));
            }
        }
                ND_PRINT((ndo, "%sError text: %s", indent_string(indent+2), buf));
            }
        }


@@ -337,13 +338,13 @@ rpki_rtr_print(netdissect_options *ndo, register const u_char *pptr, register u_
        pdu_header = (rpki_rtr_pdu *)tptr;
         pdu_type = pdu_header->pdu_type;
         pdu_len = EXTRACT_32BITS(pdu_header->length);
        pdu_header = (rpki_rtr_pdu *)tptr;
         pdu_type = pdu_header->pdu_type;
         pdu_len = EXTRACT_32BITS(pdu_header->length);

+        ND_TCHECK2(*tptr, pdu_len);

 
         /* infinite loop check */
         if (!pdu_type || !pdu_len) {
             break;
         }
 
 
         /* infinite loop check */
         if (!pdu_type || !pdu_len) {
             break;
         }
 

-        ND_TCHECK2(*tptr, pdu_len);

         if (tlen < pdu_len) {
             goto trunc;
         }
         if (tlen < pdu_len) {
             goto trunc;
         }

diff --git a/tests/kday2.out b/tests/kday2.out
index cf5e34abc0f7411d5a9d59afe561db98614192f4..770fc3b781697425b3786205d1c6b964f728cdc5 100644 (file)
--- a/tests/kday2.out
+++ b/tests/kday2.out
@@ -22,6 +22,13 @@ IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52,
 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)!)
 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 -> 0x8900), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc
+    204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x8900), 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: 21
+         Error code: Unknown (66), Encapsulated PDU length: 37|trunc

        [|RPKI-RTR]
 EXIT CODE 00000100
        [|RPKI-RTR]
 EXIT CODE 00000100

diff --git a/tests/kday3.out b/tests/kday3.out
index 85bb54e42a9732cd4ecfa2994a711f2b77d2fb11..f6fd728482803e41969cb345b8bd23fc50bd51d4 100644 (file)
--- a/tests/kday3.out
+++ b/tests/kday3.out
@@ -7,7 +7,17 @@ IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52,
 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)!)
 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 -> 0x0cf1), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2381534627 ecr 3084508609], length 347|trunc|trunc|trunc
+    204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x0cf1), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2381534627 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|trunc
+       RPKI-RTRv115, Error Report PDU (10), length: 66
+         Error code: Unknown (66), Encapsulated PDU length: 12
+           -----encapsulated PDU-----|trunc|trunc
+       [|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 0, 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)!)
 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 0, 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)!)


@@ -15,6 +25,17 @@ IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52,
 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)!)
 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 -> 0xa6b3), seq 0:347, ack 1, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc|trunc
+    204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xa6b3), seq 0:347, ack 1, 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: 37
+           -----encapsulated PDU-----|trunc|trunc
+       RPKI-RTRv9, Unknown PDU (51), length: 32
+         0x0000:  0933 84cc 0000 0020 9f00 1649 d1c8 546c
+         0x0010:  ff13 1980 100f fc85 8b00 0055 0000 0101

        [|RPKI-RTR]
 EXIT CODE 00000100
        [|RPKI-RTR]
 EXIT CODE 00000100

diff --git a/tests/kday4.out b/tests/kday4.out
index ee3228e314b1eb906fac28016c0f28a4913e7b7e..0eb6080ac82b6e29be26e2692bf0ef732225dbac 100644 (file)
--- a/tests/kday4.out
+++ b/tests/kday4.out
@@ -6,7 +6,18 @@ IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), 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)!)
 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|trunc|trunc|trunc
+    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-----|trunc|trunc
+       RPKI-RTRv115, Error Report PDU (10), length: 66
+         Error code: Unknown (66), Encapsulated PDU length: 12
+           -----encapsulated PDU-----|trunc|trunc

        [|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
        [|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


@@ -15,7 +26,19 @@ IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52,
 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)!)
 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|trunc|trunc|trunc
+    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-----|trunc|trunc
+       RPKI-RTRv115, Error Report PDU (10), length: 66
+         Error code: Unknown (66), Encapsulated PDU length: 12
+           -----encapsulated PDU-----|trunc|trunc
+       [|RPKI-RTR]

 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)!)
 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)!)


@@ -23,6 +46,15 @@ IP (tos 0x6,ECT(0), ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), lengt
 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)!)
 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|trunc|trunc|trunc
+    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|trunc

        [|RPKI-RTR]
 EXIT CODE 00000100
        [|RPKI-RTR]
 EXIT CODE 00000100

diff --git a/tests/kday5.out b/tests/kday5.out
index 9f0fb80b1494de18191cb51dd97ea9caa70fa274..446ffa309f7e2f25425f81f5afd0b54c6f6ae8ce 100644 (file)
--- a/tests/kday5.out
+++ b/tests/kday5.out
@@ -22,6 +22,22 @@ IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52,
 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)!)
 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 -> 0x183a), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2351322531 ecr 3084508609], length 347|trunc|trunc
+    204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x183a), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2351322531 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
        [|RPKI-RTR]
 EXIT CODE 00000100

diff --git a/tests/kday7.out b/tests/kday7.out
index 79b70a6dfd4501b723e261a5fb1703f10b0770a1..94e8b6513cb8f4837a44e21fd07c81ad89ec68cc 100644 (file)
--- a/tests/kday7.out
+++ b/tests/kday7.out
@@ -6,7 +6,18 @@ IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), 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)!)
 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|trunc|trunc|trunc
+    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-----|trunc|trunc
+       RPKI-RTRv115, Error Report PDU (10), length: 66
+         Error code: Unknown (66), Encapsulated PDU length: 12
+           -----encapsulated PDU-----|trunc|trunc

        [|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
        [|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


@@ -15,7 +26,19 @@ IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52,
 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)!)
 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|trunc|trunc|trunc
+    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-----|trunc|trunc
+       RPKI-RTRv115, Error Report PDU (10), length: 66
+         Error code: Unknown (66), Encapsulated PDU length: 12
+           -----encapsulated PDU-----|trunc|trunc
+       [|RPKI-RTR]

 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)!)
 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)!)


@@ -23,6 +46,14 @@ IP (tos 0x6,ECT(0), ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), lengt
 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)!)
 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|trunc|trunc|trunc
+    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|trunc
+       RPKI-RTRv115, Error Report PDU (10), length: 66|trunc

        [|RPKI-RTR]
 EXIT CODE 00000100
        [|RPKI-RTR]
 EXIT CODE 00000100

diff --git a/tests/kday8.out b/tests/kday8.out
index fa84bf3b6ed3e1bfda8961f9eb124a7bf3660218..2d84b724b381bbb3b216c2a37e9fbb0d4875a5cd 100644 (file)
--- a/tests/kday8.out
+++ b/tests/kday8.out
@@ -22,6 +22,13 @@ IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52,
 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)!)
 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|trunc|trunc
+    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|trunc

        [|RPKI-RTR]
 EXIT CODE 00000100
        [|RPKI-RTR]
 EXIT CODE 00000100