IPv6: Fix inconsistencies in the printing of some option names

1) Hop-by-Hop Options Header

$ ./tcpdump --skip 1 -c1 -tnv -r tests/icmpv6.pcap
Before:
IP6 (hlim 1, next-header Options (0), payload length 36)
  fe80::215:17ff:fecc:e546 > ff02::16: HBH (rtalert: 0x0000) (padn)
  [icmp6 sum ok] ICMP6, [...]

There is "next-header Options" but the next header is printed "HBH".

After:
IP6 (hlim 1, next-header HBH (0), payload length 36)
  fe80::215:17ff:fecc:e546 > ff02::16: HBH (rtalert: 0x0000) (padn)
  [icmp6 sum ok] ICMP6, [...]

2) Destination Options Header

$ ./tcpdump  -tnv -r tests/erspan-type-iii-pb-1.pcap
Before:
IP6 (class 0x30, flowlabel 0x00001, hlim 1, next-header unknown (60),
  payload length 288) 4120:7467:1700:4200:143:100:7f01:400e >
  4591:bfd7:cd87:d7:68:38:101:e800: DSTOPT (padn) [...]

There is "next-header unknown" but next header is printed "DSTOPT".

After:
IP6 (class 0x30, flowlabel 0x00001, hlim 1, next-header DSTOPT (60),
  payload length 288) 4120:7467:1700:4200:143:100:7f01:400e >
  4591:bfd7:cd87:d7:68:38:101:e800: DSTOPT (padn) [...]

Moreover:
Update a ndo_protocol (s/hbhopt/hbh/).
Use nd_print_protocol_caps().

Update some test outputs accordingly.

(backported from commit 803b7028e04b757c5351a300a905e326c7d5a200)

diff --git a/ipproto.c b/ipproto.c
index c269058b230a003100c767fc086cdcd926f444c7..b3266e5d05864ed1a4c3561d3fbba4fe6e09de60 100644 (file)
--- a/ipproto.c
+++ b/ipproto.c
@@ -21,7 +21,7 @@
 #include "ipproto.h"
 
 const struct tok ipproto_values[] = {
-    { IPPROTO_HOPOPTS, "Options" },
+    { IPPROTO_HOPOPTS, "HBH" },
     { IPPROTO_ICMP, "ICMP" },
     { IPPROTO_IGMP, "IGMP" },
     { IPPROTO_IPV4, "IPIP" },
@@ -39,6 +39,7 @@ const struct tok ipproto_values[] = {
     { IPPROTO_AH, "AH" },
     { IPPROTO_MOBILE, "Mobile IP" },
     { IPPROTO_ICMPV6, "ICMPv6" },
+    { IPPROTO_DSTOPTS, "DSTOPT" },
     { IPPROTO_MOBILITY_OLD, "Mobile IP (old)" },
     { IPPROTO_EIGRP, "EIGRP" },
     { IPPROTO_OSPF, "OSPF" },

diff --git a/print-ip6opts.c b/print-ip6opts.c
index cbd2d9667310343589121db9d9c67786aae0c59d..ca0006027dd28cca51c8e87cd80172f0c78db394 100644 (file)
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -220,10 +220,11 @@ hbhopt_process(netdissect_options *ndo, const u_char *bp, int *found_jumbo,
     const struct ip6_hbh *dp = (const struct ip6_hbh *)bp;
     u_int hbhlen = 0;
 
-    ndo->ndo_protocol = "hbhopt";
+    ndo->ndo_protocol = "hbh";
     hbhlen = (GET_U_1(dp->ip6h_len) + 1) << 3;
     ND_TCHECK_LEN(dp, hbhlen);
-    ND_PRINT("HBH ");
+    nd_print_protocol_caps(ndo);
+    ND_PRINT(" ");
     if (ip6_opt_process(ndo, (const u_char *)dp + sizeof(*dp),
                        hbhlen - sizeof(*dp), found_jumbo, jumbolen) == -1)
        goto trunc;
@@ -243,7 +244,8 @@ dstopt_process(netdissect_options *ndo, const u_char *bp)
     ndo->ndo_protocol = "dstopt";
     dstoptlen = (GET_U_1(dp->ip6d_len) + 1) << 3;
     ND_TCHECK_LEN(dp, dstoptlen);
-    ND_PRINT("DSTOPT ");
+    nd_print_protocol_caps(ndo);
+    ND_PRINT(" ");
     if (ndo->ndo_vflag) {
        /*
         * The Jumbo Payload option is a hop-by-hop option; we don't

diff --git a/tests/babel1v.out b/tests/babel1v.out
index 72935366ce441c1907a292f8314a153e96dffad9..32479756d40bd867cf8f783e65927fba40d7185a 100644 (file)
--- a/tests/babel1v.out
+++ b/tests/babel1v.out
@@ -64,4 +64,4 @@
    24  2011-04-07 19:45:35.388520 IP6 (hlim 64, next-header UDP (17), payload length 188) fe80::3428:af91:251:d626.5359 > fe80::68d3:1235:d068:1f9e.5359: [udp sum ok] AHCP Version 1
        Hopcount 1, Original Hopcount 1, Nonce 0xcbb83d0d, Source Id 79:40:14:7f:b6:6d:c3:29, Destination Id 02:18:f3:ff:fe:a9:91:4e
        Ack, Length 152
-   25  2011-04-07 19:45:35.537445 IP6 (hlim 1, next-header Options (0), payload length 56) fe80::68d3:1235:d068:1f9e > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 2 group record(s) [gaddr ff02::1:6 to_ex, 0 source(s)] [gaddr ff02::cca6:c0f9:e182:5359 to_ex, 0 source(s)]
+   25  2011-04-07 19:45:35.537445 IP6 (hlim 1, next-header HBH (0), payload length 56) fe80::68d3:1235:d068:1f9e > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 2 group record(s) [gaddr ff02::1:6 to_ex, 0 source(s)] [gaddr ff02::cca6:c0f9:e182:5359 to_ex, 0 source(s)]

diff --git a/tests/cve2015-0261-crash.out b/tests/cve2015-0261-crash.out
index 214ab459cd4268b011800248ea7b04847b499eea..3b31bb7e0e17c929b0272ad5435b6b72456ed77e 100644 (file)
--- a/tests/cve2015-0261-crash.out
+++ b/tests/cve2015-0261-crash.out
@@ -1 +1 @@
-    1  1995-08-15 05:27:12.808464432 IP6 (class 0x03, flowlabel 0x03030, hlim 48, next-header Options (0), payload length 12336) 3030:3030:3030:3030:3030:3030:3030:3030 > 130:3030:3030:3030:3030:3030:3030:3030: HBH  [|hbhopt]
+    1  1995-08-15 05:27:12.808464432 IP6 (class 0x03, flowlabel 0x03030, hlim 48, next-header HBH (0), payload length 12336) 3030:3030:3030:3030:3030:3030:3030:3030 > 130:3030:3030:3030:3030:3030:3030:3030: HBH  [|hbh]

diff --git a/tests/dcb_ets.out b/tests/dcb_ets.out
index 19ebd49d2da0f27717a0840759f12acb8405318e..c11aca4d89c0b84c243430664256b1744e082cd4 100644 (file)
--- a/tests/dcb_ets.out
+++ b/tests/dcb_ets.out
@@ -1,4 +1,4 @@
-    1  2013-08-05 04:02:45.610103 IP6 (hlim 1, next-header Options (0), payload length 36) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::1:ff00:0 to_ex { }]
+    1  2013-08-05 04:02:45.610103 IP6 (hlim 1, next-header HBH (0), payload length 36) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::1:ff00:0 to_ex { }]
     2  2013-08-05 04:02:51.707303 IP (tos 0x10, ttl 128, id 0, offset 0, flags [none], proto UDP (17), length 328)
     0.0.0.0.68 > 255.255.255.255.67: [udp sum ok] BOOTP/DHCP, Request from 08:00:27:46:e8:84, length 300, xid 0xd60c7466, secs 13, Flags [none] (0x0000)
          Client-Ethernet-Address 08:00:27:46:e8:84
@@ -90,7 +90,7 @@
              YS (41), NTP (42), MTU (26), Unknown (119)
              Default-Gateway (3), Classless-Static-Route (121), Classless-Static-Route-Microsoft (249), Unknown (252)
              NTP (42)
-    6  2013-08-05 04:03:25.996519 IP6 (hlim 1, next-header Options (0), payload length 76) :: > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 3 group record(s) [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
+    6  2013-08-05 04:03:25.996519 IP6 (hlim 1, next-header HBH (0), payload length 76) :: > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 3 group record(s) [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
     7  2013-08-05 04:03:26.277614 IP (tos 0x10, ttl 128, id 0, offset 0, flags [none], proto UDP (17), length 328)
     0.0.0.0.68 > 255.255.255.255.67: [udp sum ok] BOOTP/DHCP, Request from 08:00:27:46:e8:84, length 300, xid 0x3c41e764, Flags [none] (0x0000)
          Client-Ethernet-Address 08:00:27:46:e8:84
@@ -107,7 +107,7 @@
     9  2013-08-05 04:03:27.354673 IP6 (hlim 255, next-header ICMPv6 (58), payload length 16) fe80::a00:27ff:fe46:e884 > ff02::2: [icmp6 sum ok] ICMP6, router solicitation, length 16
          source link-address option (1), length 8 (1): 08:00:27:46:e8:84
            0x0000:  0800 2746 e884
-   10  2013-08-05 04:03:27.357124 IP6 (hlim 1, next-header Options (0), payload length 96) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 4 group record(s) [gaddr ff02::1:ff00:0 to_ex { }] [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
+   10  2013-08-05 04:03:27.357124 IP6 (hlim 1, next-header HBH (0), payload length 96) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 4 group record(s) [gaddr ff02::1:ff00:0 to_ex { }] [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
    11  2013-08-05 04:03:28.117735 LLDP, length 135
        Chassis ID TLV (1), length 7
          Subtype MAC address (4): 08:00:27:0d:f1:3c
@@ -163,10 +163,10 @@
          0x0000:  0080 c20a 00f4 11f4 1400 3200 0032 0000
          0x0010:  0000 0200 0002 0000 00
        End TLV (0), length 0
-   12  2013-08-05 04:03:30.897903 IP6 (hlim 1, next-header Options (0), payload length 76) :: > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 3 group record(s) [gaddr ff02::1:ff42:ba59 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
+   12  2013-08-05 04:03:30.897903 IP6 (hlim 1, next-header HBH (0), payload length 76) :: > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 3 group record(s) [gaddr ff02::1:ff42:ba59 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
    13  2013-08-05 04:03:31.314436 IP6 (hlim 255, next-header ICMPv6 (58), payload length 24) :: > ff02::1:ff42:ba59: [icmp6 sum ok] ICMP6, neighbor solicitation, length 24, who has fe80::a00:27ff:fe42:ba59
-   14  2013-08-05 04:03:32.317793 IP6 (hlim 1, next-header Options (0), payload length 96) fe80::a00:27ff:fe42:ba59 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 4 group record(s) [gaddr ff02::1:ff00:0 to_ex { }] [gaddr ff02::1:ff42:ba59 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
-   15  2013-08-05 04:03:32.954128 IP6 (hlim 1, next-header Options (0), payload length 36) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::1:ff00:0 to_ex { }]
+   14  2013-08-05 04:03:32.317793 IP6 (hlim 1, next-header HBH (0), payload length 96) fe80::a00:27ff:fe42:ba59 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 4 group record(s) [gaddr ff02::1:ff00:0 to_ex { }] [gaddr ff02::1:ff42:ba59 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
+   15  2013-08-05 04:03:32.954128 IP6 (hlim 1, next-header HBH (0), payload length 36) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::1:ff00:0 to_ex { }]
    16  2013-08-05 04:03:34.060615 IP (tos 0x10, ttl 128, id 0, offset 0, flags [none], proto UDP (17), length 328)
     0.0.0.0.68 > 255.255.255.255.67: [udp sum ok] BOOTP/DHCP, Request from 08:00:27:46:e8:84, length 300, xid 0x3c41e764, secs 8, Flags [none] (0x0000)
          Client-Ethernet-Address 08:00:27:46:e8:84
@@ -179,7 +179,7 @@
              YS (41), NTP (42), MTU (26), Unknown (119)
              Default-Gateway (3), Classless-Static-Route (121), Classless-Static-Route-Microsoft (249), Unknown (252)
              NTP (42)
-   17  2013-08-05 04:03:35.582218 IP6 (hlim 1, next-header Options (0), payload length 36) fe80::a00:27ff:fe42:ba59 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::1:ff00:0 to_ex { }]
+   17  2013-08-05 04:03:35.582218 IP6 (hlim 1, next-header HBH (0), payload length 36) fe80::a00:27ff:fe42:ba59 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::1:ff00:0 to_ex { }]
    18  2013-08-05 04:03:46.353287 IP (tos 0x10, ttl 128, id 0, offset 0, flags [none], proto UDP (17), length 328)
     0.0.0.0.68 > 255.255.255.255.67: [udp sum ok] BOOTP/DHCP, Request from 08:00:27:46:e8:84, length 300, xid 0x3c41e764, secs 20, Flags [none] (0x0000)
          Client-Ethernet-Address 08:00:27:46:e8:84
@@ -259,7 +259,7 @@
              YS (41), NTP (42), MTU (26), Unknown (119)
              Default-Gateway (3), Classless-Static-Route (121), Classless-Static-Route-Microsoft (249), Unknown (252)
              NTP (42)
-   21  2013-08-05 04:04:15.044685 IP6 (hlim 1, next-header Options (0), payload length 76) :: > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 3 group record(s) [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
+   21  2013-08-05 04:04:15.044685 IP6 (hlim 1, next-header HBH (0), payload length 76) :: > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 3 group record(s) [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
    22  2013-08-05 04:04:15.295367 IP (tos 0x10, ttl 128, id 0, offset 0, flags [none], proto UDP (17), length 328)
     0.0.0.0.68 > 255.255.255.255.67: [udp sum ok] BOOTP/DHCP, Request from 08:00:27:46:e8:84, length 300, xid 0xc1fb0d77, Flags [none] (0x0000)
          Client-Ethernet-Address 08:00:27:46:e8:84
@@ -276,7 +276,7 @@
    24  2013-08-05 04:04:16.833793 IP6 (hlim 255, next-header ICMPv6 (58), payload length 16) fe80::a00:27ff:fe46:e884 > ff02::2: [icmp6 sum ok] ICMP6, router solicitation, length 16
          source link-address option (1), length 8 (1): 08:00:27:46:e8:84
            0x0000:  0800 2746 e884
-   25  2013-08-05 04:04:16.835771 IP6 (hlim 1, next-header Options (0), payload length 96) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 4 group record(s) [gaddr ff02::1:ff00:0 to_ex { }] [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
+   25  2013-08-05 04:04:16.835771 IP6 (hlim 1, next-header HBH (0), payload length 96) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 4 group record(s) [gaddr ff02::1:ff00:0 to_ex { }] [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
    26  2013-08-05 04:04:18.197618 IP (tos 0x10, ttl 128, id 0, offset 0, flags [none], proto UDP (17), length 328)
     0.0.0.0.68 > 255.255.255.255.67: [udp sum ok] BOOTP/DHCP, Request from 08:00:27:46:e8:84, length 300, xid 0xc1fb0d77, secs 3, Flags [none] (0x0000)
          Client-Ethernet-Address 08:00:27:46:e8:84
@@ -289,7 +289,7 @@
              YS (41), NTP (42), MTU (26), Unknown (119)
              Default-Gateway (3), Classless-Static-Route (121), Classless-Static-Route-Microsoft (249), Unknown (252)
              NTP (42)
-   27  2013-08-05 04:04:18.745823 IP6 (hlim 1, next-header Options (0), payload length 36) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::1:ff00:0 to_ex { }]
+   27  2013-08-05 04:04:18.745823 IP6 (hlim 1, next-header HBH (0), payload length 36) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::1:ff00:0 to_ex { }]
    28  2013-08-05 04:04:23.674007 LLDP, length 135
        Chassis ID TLV (1), length 7
          Subtype MAC address (4): 08:00:27:42:ba:59
@@ -766,7 +766,7 @@
          0x0000:  0080 c20a 00f4 11f4 1400 3200 0032 0000
          0x0010:  0000 0200 0002 0000 00
        End TLV (0), length 0
-   39  2013-08-05 04:05:03.015934 IP6 (hlim 1, next-header Options (0), payload length 76) :: > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 3 group record(s) [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
+   39  2013-08-05 04:05:03.015934 IP6 (hlim 1, next-header HBH (0), payload length 76) :: > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 3 group record(s) [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
    40  2013-08-05 04:05:03.279132 IP6 (hlim 255, next-header ICMPv6 (58), payload length 24) :: > ff02::1:ff46:e884: [icmp6 sum ok] ICMP6, neighbor solicitation, length 24, who has fe80::a00:27ff:fe46:e884
    41  2013-08-05 04:05:03.298875 IP (tos 0x10, ttl 128, id 0, offset 0, flags [none], proto UDP (17), length 328)
     0.0.0.0.68 > 255.255.255.255.67: [udp sum ok] BOOTP/DHCP, Request from 08:00:27:46:e8:84, length 300, xid 0xf0059f6c, Flags [none] (0x0000)
@@ -783,8 +783,8 @@
    42  2013-08-05 04:05:04.283851 IP6 (hlim 255, next-header ICMPv6 (58), payload length 16) fe80::a00:27ff:fe46:e884 > ff02::2: [icmp6 sum ok] ICMP6, router solicitation, length 16
          source link-address option (1), length 8 (1): 08:00:27:46:e8:84
            0x0000:  0800 2746 e884
-   43  2013-08-05 04:05:04.285659 IP6 (hlim 1, next-header Options (0), payload length 96) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 4 group record(s) [gaddr ff02::1:ff00:0 to_ex { }] [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
-   44  2013-08-05 04:05:06.521454 IP6 (hlim 1, next-header Options (0), payload length 36) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::1:ff00:0 to_ex { }]
+   43  2013-08-05 04:05:04.285659 IP6 (hlim 1, next-header HBH (0), payload length 96) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 4 group record(s) [gaddr ff02::1:ff00:0 to_ex { }] [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
+   44  2013-08-05 04:05:06.521454 IP6 (hlim 1, next-header HBH (0), payload length 36) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::1:ff00:0 to_ex { }]
    45  2013-08-05 04:05:08.315660 IP (tos 0x10, ttl 128, id 0, offset 0, flags [none], proto UDP (17), length 328)
     0.0.0.0.68 > 255.255.255.255.67: [udp sum ok] BOOTP/DHCP, Request from 08:00:27:46:e8:84, length 300, xid 0xf0059f6c, secs 5, Flags [none] (0x0000)
          Client-Ethernet-Address 08:00:27:46:e8:84

diff --git a/tests/dcb_qcn.out b/tests/dcb_qcn.out
index f53cbed022edbad9c6939044e0a78bdf4c034579..36bad21d81e3d6f3682a91ff5f30b652969e36e0 100644 (file)
--- a/tests/dcb_qcn.out
+++ b/tests/dcb_qcn.out
@@ -188,7 +188,7 @@
              YS (41), NTP (42), MTU (26), Unknown (119)
              Default-Gateway (3), Classless-Static-Route (121), Classless-Static-Route-Microsoft (249), Unknown (252)
              NTP (42)
-    9  2013-08-05 06:05:56.022134 IP6 (hlim 1, next-header Options (0), payload length 76) :: > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 3 group record(s) [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
+    9  2013-08-05 06:05:56.022134 IP6 (hlim 1, next-header HBH (0), payload length 76) :: > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 3 group record(s) [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
    10  2013-08-05 06:05:56.373478 IP (tos 0x10, ttl 128, id 0, offset 0, flags [none], proto UDP (17), length 328)
     0.0.0.0.68 > 255.255.255.255.67: [udp sum ok] BOOTP/DHCP, Request from 08:00:27:46:e8:84, length 300, xid 0xbb58bf40, Flags [none] (0x0000)
          Client-Ethernet-Address 08:00:27:46:e8:84
@@ -205,7 +205,7 @@
    12  2013-08-05 06:05:57.500560 IP6 (hlim 255, next-header ICMPv6 (58), payload length 16) fe80::a00:27ff:fe46:e884 > ff02::2: [icmp6 sum ok] ICMP6, router solicitation, length 16
          source link-address option (1), length 8 (1): 08:00:27:46:e8:84
            0x0000:  0800 2746 e884
-   13  2013-08-05 06:05:57.501813 IP6 (hlim 1, next-header Options (0), payload length 96) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 4 group record(s) [gaddr ff02::1:ff00:0 to_ex { }] [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
+   13  2013-08-05 06:05:57.501813 IP6 (hlim 1, next-header HBH (0), payload length 96) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 4 group record(s) [gaddr ff02::1:ff00:0 to_ex { }] [gaddr ff02::1:ff46:e884 to_ex { }] [gaddr ff02::2 to_ex { }] [gaddr ff02::202 to_ex { }]
    14  2013-08-05 06:06:00.550022 LLDP, length 86
        Chassis ID TLV (1), length 7
          Subtype MAC address (4): 08:00:27:42:ba:59
@@ -280,7 +280,7 @@
              YS (41), NTP (42), MTU (26), Unknown (119)
              Default-Gateway (3), Classless-Static-Route (121), Classless-Static-Route-Microsoft (249), Unknown (252)
              NTP (42)
-   17  2013-08-05 06:06:04.106458 IP6 (hlim 1, next-header Options (0), payload length 36) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::1:ff00:0 to_ex { }]
+   17  2013-08-05 06:06:04.106458 IP6 (hlim 1, next-header HBH (0), payload length 36) fe80::a00:27ff:fe46:e884 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::1:ff00:0 to_ex { }]
    18  2013-08-05 06:06:07.011961 LLDP, length 94
        Chassis ID TLV (1), length 7
          Subtype MAC address (4): 08:00:27:0d:f1:3c

diff --git a/tests/icmpv6.out b/tests/icmpv6.out
index b292afc6efbe8ddbd4c2c8a202d2e564f7cfdddb..d3a96f13b414b1a12ebc760e53ec31b804f92294 100644 (file)
--- a/tests/icmpv6.out
+++ b/tests/icmpv6.out
@@ -20,7 +20,7 @@
            0x0000:  0000 0000 1388
          homeagent information option (8), length 8 (1):  preference 50001, lifetime 15
            0x0000:  0000 c351 000f
-    2  2013-01-19 04:54:07.748985 IP6 (hlim 1, next-header Options (0), payload length 36) fe80::215:17ff:fecc:e546 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::db8:1122:3344 to_ex { }]
-    3  2013-01-19 04:54:23.519360 IP6 (hlim 1, next-header Options (0), payload length 36) fe80::b2a8:6eff:fe0c:d4e8 > ff02::1: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener query v2 [max resp delay=10000] [gaddr :: robustness=2 qqi=60]
-    4  2013-01-19 04:54:26.160995 IP6 (hlim 1, next-header Options (0), payload length 96) fe80::215:17ff:fecc:e546 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 4 group record(s) [gaddr ff02::db8:1122:3344 is_ex { }] [gaddr ff02::1:ffcc:e546 is_ex { }] [gaddr ff02::1:ffa7:10ad is_ex { }] [gaddr ff02::1:ff00:2 is_ex { }]
-    5  2013-01-19 04:54:41.057031 IP6 (hlim 1, next-header Options (0), payload length 36) fe80::215:17ff:fecc:e546 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::db8:1122:3344 to_in { }]
+    2  2013-01-19 04:54:07.748985 IP6 (hlim 1, next-header HBH (0), payload length 36) fe80::215:17ff:fecc:e546 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::db8:1122:3344 to_ex { }]
+    3  2013-01-19 04:54:23.519360 IP6 (hlim 1, next-header HBH (0), payload length 36) fe80::b2a8:6eff:fe0c:d4e8 > ff02::1: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener query v2 [max resp delay=10000] [gaddr :: robustness=2 qqi=60]
+    4  2013-01-19 04:54:26.160995 IP6 (hlim 1, next-header HBH (0), payload length 96) fe80::215:17ff:fecc:e546 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 4 group record(s) [gaddr ff02::db8:1122:3344 is_ex { }] [gaddr ff02::1:ffcc:e546 is_ex { }] [gaddr ff02::1:ffa7:10ad is_ex { }] [gaddr ff02::1:ff00:2 is_ex { }]
+    5  2013-01-19 04:54:41.057031 IP6 (hlim 1, next-header HBH (0), payload length 36) fe80::215:17ff:fecc:e546 > ff02::16: HBH (rtalert: 0x0000) (padn) [icmp6 sum ok] ICMP6, multicast listener report v2, 1 group record(s) [gaddr ff02::db8:1122:3344 to_in { }]

diff --git a/tests/ipv6-next-header-oobr-1.out b/tests/ipv6-next-header-oobr-1.out
index 65de01aebeeecaa7df1aef5a7a673de21224d7e9..b7b78fef4eb79c2828aeffdb3f85a9a788be0f34 100644 (file)
--- a/tests/ipv6-next-header-oobr-1.out
+++ b/tests/ipv6-next-header-oobr-1.out
@@ -1 +1 @@
-    1  1995-08-15 05:27:12.808464432 IP6 3030:3030:3030:3030:3030:3030:3030:3030 > 3030:3030:3030:3030:3030:3030:3030:3030: HBH  [|hbhopt]
+    1  1995-08-15 05:27:12.808464432 IP6 3030:3030:3030:3030:3030:3030:3030:3030 > 3030:3030:3030:3030:3030:3030:3030:3030: HBH  [|hbh]

diff --git a/tests/ipv6-next-header-oobr-2.out b/tests/ipv6-next-header-oobr-2.out
index 65de01aebeeecaa7df1aef5a7a673de21224d7e9..b7b78fef4eb79c2828aeffdb3f85a9a788be0f34 100644 (file)
--- a/tests/ipv6-next-header-oobr-2.out
+++ b/tests/ipv6-next-header-oobr-2.out
@@ -1 +1 @@
-    1  1995-08-15 05:27:12.808464432 IP6 3030:3030:3030:3030:3030:3030:3030:3030 > 3030:3030:3030:3030:3030:3030:3030:3030: HBH  [|hbhopt]
+    1  1995-08-15 05:27:12.808464432 IP6 3030:3030:3030:3030:3030:3030:3030:3030 > 3030:3030:3030:3030:3030:3030:3030:3030: HBH  [|hbh]

diff --git a/tests/ipv6-too-long-jumbo.out b/tests/ipv6-too-long-jumbo.out
index 44849704172a0b84609454b64d3efe09e04f1443..c42198219861a2db198b62dca9732e6e618704ab 100644 (file)
--- a/tests/ipv6-too-long-jumbo.out
+++ b/tests/ipv6-too-long-jumbo.out
@@ -1 +1 @@
-    1  2012-06-06 12:40:23.226395 IP6 (class 0xc0, hlim 0, next-header Options (0), payload length 0) 1:6:1a28:312:d7cb:b318:34e5:d3ea > 2b7f:cd1f:ec3c:fb9c:e731:d16b:a8fe:ba8c: HBH (opt_type 0x1a: len=0)(padn)(opt_type 0x16: len=0)(opt_type 0x64: len=114)(jumbo: 3858694210) (opt_type 0x42: len=3)(opt_type 0xfe: len=6)(pad1)(jumbo: 248 - already seen) (opt_type 0x0e: len=8)(opt_type 0x07: len=4)(opt_type 0xf1: len=60) [header+payload length 3858694250 > length 476] (invalid)  ip-proto-12 3858693802
+    1  2012-06-06 12:40:23.226395 IP6 (class 0xc0, hlim 0, next-header HBH (0), payload length 0) 1:6:1a28:312:d7cb:b318:34e5:d3ea > 2b7f:cd1f:ec3c:fb9c:e731:d16b:a8fe:ba8c: HBH (opt_type 0x1a: len=0)(padn)(opt_type 0x16: len=0)(opt_type 0x64: len=114)(jumbo: 3858694210) (opt_type 0x42: len=3)(opt_type 0xfe: len=6)(pad1)(jumbo: 248 - already seen) (opt_type 0x0e: len=8)(opt_type 0x07: len=4)(opt_type 0xf1: len=60) [header+payload length 3858694250 > length 476] (invalid)  ip-proto-12 3858693802

diff --git a/tests/ipv6_jumbogram_1.out b/tests/ipv6_jumbogram_1.out
index dc493da85d50f2bda27dcf26b593f48636b5aa39..5eade2db4ab50190c9661a5ba853afee83e59246 100644 (file)
--- a/tests/ipv6_jumbogram_1.out
+++ b/tests/ipv6_jumbogram_1.out
@@ -1 +1 @@
-    1  2022-08-01 09:09:55.627421 00:12:3f:ae:22:f7 > 00:13:c4:c7:84:f0, ethertype IPv6 (0x86dd), length 65590: (hlim 227, next-header Options (0), payload length 0) 2200::244:212:3fff:feae:22f7 > 2200::240:2:0:0:4: HBH (jumbo: 65536)  [icmp6 sum ok] ICMP6, echo request, id 4576, seq 51486
+    1  2022-08-01 09:09:55.627421 00:12:3f:ae:22:f7 > 00:13:c4:c7:84:f0, ethertype IPv6 (0x86dd), length 65590: (hlim 227, next-header HBH (0), payload length 0) 2200::244:212:3fff:feae:22f7 > 2200::240:2:0:0:4: HBH (jumbo: 65536)  [icmp6 sum ok] ICMP6, echo request, id 4576, seq 51486

diff --git a/tests/ipv6_jumbogram_invalid_length.out b/tests/ipv6_jumbogram_invalid_length.out
index 05ff753e9b8911b528f9fc0da19b1eeadc2849ae..cfa221067e56b8d1c53dbfd05582520d15525570 100644 (file)
--- a/tests/ipv6_jumbogram_invalid_length.out
+++ b/tests/ipv6_jumbogram_invalid_length.out
@@ -1 +1 @@
-    1  2022-08-01 09:09:55.627421 IP6 (hlim 227, next-header Options (0), payload length 0) 2200::244:212:3fff:feae:22f7 > 2200::240:2:0:0:4: HBH (jumbo: 65537)  [header+payload length 65577 > length 65576] (invalid) ICMP6, echo request, id 4576, seq 51486
+    1  2022-08-01 09:09:55.627421 IP6 (hlim 227, next-header HBH (0), payload length 0) 2200::244:212:3fff:feae:22f7 > 2200::240:2:0:0:4: HBH (jumbo: 65537)  [header+payload length 65577 > length 65576] (invalid) ICMP6, echo request, id 4576, seq 51486

diff --git a/tests/ipv6hdr-heapoverflow-v.out b/tests/ipv6hdr-heapoverflow-v.out
index a2aa8ff95797f6fd15af4750d385d9a01bc2ea78..7b7c97efce5c69ccf2f8dd47b8a4786671d033b9 100644 (file)
--- a/tests/ipv6hdr-heapoverflow-v.out
+++ b/tests/ipv6hdr-heapoverflow-v.out
@@ -1 +1 @@
-    1  1995-08-15 05:27:12.808464432 IP6 (class 0x33, flowlabel 0x03030, hlim 48, next-header Options (0), payload length 12336) 3030:3030:3030:3030:3030:3030:3030:3030 > 3030:3030:3030:3030:3030:3030:3030:3030: HBH  [|hbhopt]
+    1  1995-08-15 05:27:12.808464432 IP6 (class 0x33, flowlabel 0x03030, hlim 48, next-header HBH (0), payload length 12336) 3030:3030:3030:3030:3030:3030:3030:3030 > 3030:3030:3030:3030:3030:3030:3030:3030: HBH  [|hbh]

diff --git a/tests/ipv6hdr-heapoverflow.out b/tests/ipv6hdr-heapoverflow.out
index 65de01aebeeecaa7df1aef5a7a673de21224d7e9..b7b78fef4eb79c2828aeffdb3f85a9a788be0f34 100644 (file)
--- a/tests/ipv6hdr-heapoverflow.out
+++ b/tests/ipv6hdr-heapoverflow.out
@@ -1 +1 @@
-    1  1995-08-15 05:27:12.808464432 IP6 3030:3030:3030:3030:3030:3030:3030:3030 > 3030:3030:3030:3030:3030:3030:3030:3030: HBH  [|hbhopt]
+    1  1995-08-15 05:27:12.808464432 IP6 3030:3030:3030:3030:3030:3030:3030:3030 > 3030:3030:3030:3030:3030:3030:3030:3030: HBH  [|hbh]