MPLS: rename the "exp" field to "tc"

RFC5462 (https://tools.ietf.org/html/rfc5462) renamed the
MPLS "EXP" field to "Traffic Class" in 2009.  Use "tc" as an
abbreviation for this field name.

diff --git a/mpls.h b/mpls.h
index 03cb4bf5703267b190c4fbf9bcaca94930a646c4..d7e8fc1449466481dabc6c5ca854b0c0e7d62864 100644 (file)
--- a/mpls.h
+++ b/mpls.h
@@ -28,14 +28,14 @@
 
 #define LABEL_MASK     0xfffff000
 #define LABEL_SHIFT    12
-#define        EXP_MASK        0x00000e00
-#define EXP_SHIFT      9
+#define        TC_MASK         0x00000e00
+#define TC_SHIFT       9
 #define        STACK_MASK      0x00000100
 #define STACK_SHIFT    8
 #define TTL_MASK       0x000000ff
 #define TTL_SHIFT      0
 
 #define MPLS_LABEL(x)  (((x) & LABEL_MASK) >> LABEL_SHIFT)
-#define MPLS_EXP(x)    (((x) & EXP_MASK) >> EXP_SHIFT)
+#define MPLS_TC(x)     (((x) & TC_MASK) >> TC_SHIFT)
 #define MPLS_STACK(x)  (((x) & STACK_MASK) >> STACK_SHIFT)
 #define MPLS_TTL(x)    (((x) & TTL_MASK) >> TTL_SHIFT)

diff --git a/print-icmp.c b/print-icmp.c
index eebb6e3fdf2e15240a0cfe7975e0da7c27043f32..3c6d59f89e4e75587b780f77a68475952de86fad 100644 (file)
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -738,7 +738,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char *
                     switch(obj_ctype) {
                     case 1:
                         raw_label = GET_BE_U_4(obj_tptr);
-                        ND_PRINT("\n\t    label %u, exp %u", MPLS_LABEL(raw_label), MPLS_EXP(raw_label));
+                        ND_PRINT("\n\t    label %u, tc %u", MPLS_LABEL(raw_label), MPLS_TC(raw_label));
                         if (MPLS_STACK(raw_label))
                             ND_PRINT(", [S]");
                         ND_PRINT(", ttl %u", MPLS_TTL(raw_label));

diff --git a/print-mpls.c b/print-mpls.c
index b8820aa9c6ffae631a3db4c55cf49632a14ba044..43ea1511faf71b5e4b22af48448e447d53663dcd 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -80,7 +80,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
                if (ndo->ndo_vflag &&
                    MPLS_LABEL(label_entry) < sizeof(mpls_labelname) / sizeof(mpls_labelname[0]))
                        ND_PRINT(" (%s)", mpls_labelname[MPLS_LABEL(label_entry)]);
-               ND_PRINT(", exp %u", MPLS_EXP(label_entry));
+               ND_PRINT(", tc %u", MPLS_TC(label_entry));
                if (MPLS_STACK(label_entry))
                        ND_PRINT(", [S]");
                ND_PRINT(", ttl %u)", MPLS_TTL(label_entry));

diff --git a/tests/arista_ether-e.out b/tests/arista_ether-e.out
index 62c3a9586c534c2f78e707135ffdac24d2f719ca..45de2f2554d4fc22ed6028635e77781083ccf544 100644 (file)
--- a/tests/arista_ether-e.out
+++ b/tests/arista_ether-e.out
@@ -1,16 +1,16 @@
     1  20:36:40.091512 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:39, 944724424 ns, ethertype IPv4 (0x0800), length 110: 10.136.1.32 > 10.2.23.24:  ip-proto-63 62
     2  20:36:40.579036 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:40, 432245804 ns, ethertype 802.1Q (0x8100), length 110: vlan 100, p 0, ethertype IPv4 (0x0800), 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-    3  20:36:41.063992 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:40, 917204604 ns, ethertype MPLS unicast (0x8847), length 110: MPLS (label 1024, exp 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-    4  20:36:42.247930 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:42, 101121660 ns, ethertype 802.1Q (0x8100), length 110: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, exp 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
+    3  20:36:41.063992 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:40, 917204604 ns, ethertype MPLS unicast (0x8847), length 110: MPLS (label 1024, tc 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
+    4  20:36:42.247930 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:42, 101121660 ns, ethertype 802.1Q (0x8100), length 110: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, tc 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
     5  20:37:16.595961 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:16, 448931747 ns, ethertype IPv4 (0x0800), length 110: 10.136.1.32 > 10.2.23.24:  ip-proto-63 62
     6  20:37:17.083084 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:16, 936057586 ns, ethertype 802.1Q (0x8100), length 110: vlan 100, p 0, ethertype IPv4 (0x0800), 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-    7  20:37:17.567747 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:17, 420710691 ns, ethertype MPLS unicast (0x8847), length 110: MPLS (label 1024, exp 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-    8  20:37:18.749419 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:18, 602381189 ns, ethertype 802.1Q (0x8100), length 110: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, exp 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
+    7  20:37:17.567747 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:17, 420710691 ns, ethertype MPLS unicast (0x8847), length 110: MPLS (label 1024, tc 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
+    8  20:37:18.749419 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:18, 602381189 ns, ethertype 802.1Q (0x8100), length 110: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, tc 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
     9  20:37:41.551225 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60821, Nanoseconds 404038772, ethertype IPv4 (0x0800), length 108: 10.136.1.32 > 10.2.23.24:  ip-proto-63 62
    10  20:37:42.040995 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60821, Nanoseconds 893796872, ethertype 802.1Q (0x8100), length 108: vlan 100, p 0, ethertype IPv4 (0x0800), 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-   11  20:37:42.525213 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60822, Nanoseconds 378011624, ethertype MPLS unicast (0x8847), length 108: MPLS (label 1024, exp 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-   12  20:37:43.556891 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60823, Nanoseconds 409682672, ethertype 802.1Q (0x8100), length 108: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, exp 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
+   11  20:37:42.525213 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60822, Nanoseconds 378011624, ethertype MPLS unicast (0x8847), length 108: MPLS (label 1024, tc 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
+   12  20:37:43.556891 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60823, Nanoseconds 409682672, ethertype 802.1Q (0x8100), length 108: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, tc 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
    13  20:37:53.102297 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60832, Nanoseconds 954995144, ethertype IPv4 (0x0800), length 108: 10.136.1.32 > 10.2.23.24:  ip-proto-63 62
    14  20:37:53.590942 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60833, Nanoseconds 443648960, ethertype 802.1Q (0x8100), length 108: vlan 100, p 0, ethertype IPv4 (0x0800), 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-   15  20:37:54.077234 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60833, Nanoseconds 929943729, ethertype MPLS unicast (0x8847), length 108: MPLS (label 1024, exp 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-   16  20:37:55.188367 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60835, Nanoseconds 41072639, ethertype 802.1Q (0x8100), length 108: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, exp 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
+   15  20:37:54.077234 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60833, Nanoseconds 929943729, ethertype MPLS unicast (0x8847), length 108: MPLS (label 1024, tc 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
+   16  20:37:55.188367 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60835, Nanoseconds 41072639, ethertype 802.1Q (0x8100), length 108: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, tc 0, [S], ttl 64) 10.136.1.32 > 10.2.23.24:  ip-proto-63 54

diff --git a/tests/arista_ether-ev.out b/tests/arista_ether-ev.out
index 892155f323e0d21a4292d7f3ae8d6eb1bda5501c..44d94f9a1e3ee5c5cab5676f7fafc815d216fbff 100644 (file)
--- a/tests/arista_ether-ev.out
+++ b/tests/arista_ether-ev.out
@@ -2,39 +2,39 @@
     10.136.1.32 > 10.2.23.24:  ip-proto-63 62
     2  20:36:40.579036 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:40, 432245804 ns, ethertype 802.1Q (0x8100), length 110: vlan 100, p 0, ethertype IPv4 (0x0800), (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 78)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-    3  20:36:41.063992 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:40, 917204604 ns, ethertype MPLS unicast (0x8847), length 110: MPLS (label 1024, exp 0, [S], ttl 64)
+    3  20:36:41.063992 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:40, 917204604 ns, ethertype MPLS unicast (0x8847), length 110: MPLS (label 1024, tc 0, [S], ttl 64)
        (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 78)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-    4  20:36:42.247930 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:42, 101121660 ns, ethertype 802.1Q (0x8100), length 110: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, exp 0, [S], ttl 64)
+    4  20:36:42.247930 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:42, 101121660 ns, ethertype 802.1Q (0x8100), length 110: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, tc 0, [S], ttl 64)
        (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 74)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 54
     5  20:37:16.595961 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:16, 448931747 ns, ethertype IPv4 (0x0800), length 110: (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 82)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 62
     6  20:37:17.083084 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:16, 936057586 ns, ethertype 802.1Q (0x8100), length 110: vlan 100, p 0, ethertype IPv4 (0x0800), (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 78)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-    7  20:37:17.567747 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:17, 420710691 ns, ethertype MPLS unicast (0x8847), length 110: MPLS (label 1024, exp 0, [S], ttl 64)
+    7  20:37:17.567747 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:17, 420710691 ns, ethertype MPLS unicast (0x8847), length 110: MPLS (label 1024, tc 0, [S], ttl 64)
        (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 78)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-    8  20:37:18.749419 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:18, 602381189 ns, ethertype 802.1Q (0x8100), length 110: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, exp 0, [S], ttl 64)
+    8  20:37:18.749419 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:18, 602381189 ns, ethertype 802.1Q (0x8100), length 110: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, tc 0, [S], ttl 64)
        (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 74)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 54
     9  20:37:41.551225 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60821, Nanoseconds 404038772, ethertype IPv4 (0x0800), length 108: (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 82)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 62
    10  20:37:42.040995 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60821, Nanoseconds 893796872, ethertype 802.1Q (0x8100), length 108: vlan 100, p 0, ethertype IPv4 (0x0800), (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 78)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-   11  20:37:42.525213 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60822, Nanoseconds 378011624, ethertype MPLS unicast (0x8847), length 108: MPLS (label 1024, exp 0, [S], ttl 64)
+   11  20:37:42.525213 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60822, Nanoseconds 378011624, ethertype MPLS unicast (0x8847), length 108: MPLS (label 1024, tc 0, [S], ttl 64)
        (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 78)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-   12  20:37:43.556891 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60823, Nanoseconds 409682672, ethertype 802.1Q (0x8100), length 108: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, exp 0, [S], ttl 64)
+   12  20:37:43.556891 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60823, Nanoseconds 409682672, ethertype 802.1Q (0x8100), length 108: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, tc 0, [S], ttl 64)
        (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 74)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 54
    13  20:37:53.102297 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60832, Nanoseconds 954995144, ethertype IPv4 (0x0800), length 108: (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 82)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 62
    14  20:37:53.590942 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60833, Nanoseconds 443648960, ethertype 802.1Q (0x8100), length 108: vlan 100, p 0, ethertype IPv4 (0x0800), (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 78)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-   15  20:37:54.077234 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60833, Nanoseconds 929943729, ethertype MPLS unicast (0x8847), length 108: MPLS (label 1024, exp 0, [S], ttl 64)
+   15  20:37:54.077234 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60833, Nanoseconds 929943729, ethertype MPLS unicast (0x8847), length 108: MPLS (label 1024, tc 0, [S], ttl 64)
        (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 78)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-   16  20:37:55.188367 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60835, Nanoseconds 41072639, ethertype 802.1Q (0x8100), length 108: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, exp 0, [S], ttl 64)
+   16  20:37:55.188367 00:11:22:33:44:55 > 00:00:00:00:00:01, ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60835, Nanoseconds 41072639, ethertype 802.1Q (0x8100), length 108: vlan 100, p 0, ethertype MPLS unicast (0x8847), MPLS (label 1024, tc 0, [S], ttl 64)
        (tos 0x0, ttl 64, id 0, offset 0, flags [none], proto unknown (63), length 74)
     10.136.1.32 > 10.2.23.24:  ip-proto-63 54

diff --git a/tests/arista_ether.out b/tests/arista_ether.out
index 5efd4efbcf9cf2fab28402afb9508d0e186a1b1f..e865c8a414041dc417ba422fb0b5fa448e6bb568 100644 (file)
--- a/tests/arista_ether.out
+++ b/tests/arista_ether.out
@@ -1,16 +1,16 @@
     1  20:36:40.091512 ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:39, 944724424 ns, IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 62
     2  20:36:40.579036 ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:40, 432245804 ns, IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-    3  20:36:41.063992 ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:40, 917204604 ns, MPLS (label 1024, exp 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-    4  20:36:42.247930 ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:42, 101121660 ns, MPLS (label 1024, exp 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
+    3  20:36:41.063992 ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:40, 917204604 ns, MPLS (label 1024, tc 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
+    4  20:36:42.247930 ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0010, Timestamp TAI(64-bit): 2019-05-29 20:36:42, 101121660 ns, MPLS (label 1024, tc 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
     5  20:37:16.595961 ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:16, 448931747 ns, IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 62
     6  20:37:17.083084 ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:16, 936057586 ns, IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-    7  20:37:17.567747 ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:17, 420710691 ns, MPLS (label 1024, exp 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-    8  20:37:18.749419 ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:18, 602381189 ns, MPLS (label 1024, exp 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
+    7  20:37:17.567747 ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:17, 420710691 ns, MPLS (label 1024, tc 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
+    8  20:37:18.749419 ethertype Arista Vendor Specific Protocol (0xd28b), length 110: SubType: 0x1, Version: 0x0110, Timestamp UTC(64-bit): 2019-05-29 20:37:18, 602381189 ns, MPLS (label 1024, tc 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
     9  20:37:41.551225 ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60821, Nanoseconds 404038772, IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 62
    10  20:37:42.040995 ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60821, Nanoseconds 893796872, IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-   11  20:37:42.525213 ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60822, Nanoseconds 378011624, MPLS (label 1024, exp 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-   12  20:37:43.556891 ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60823, Nanoseconds 409682672, MPLS (label 1024, exp 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
+   11  20:37:42.525213 ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60822, Nanoseconds 378011624, MPLS (label 1024, tc 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
+   12  20:37:43.556891 ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0020, Timestamp TAI(48-bit): Seconds 60823, Nanoseconds 409682672, MPLS (label 1024, tc 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
    13  20:37:53.102297 ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60832, Nanoseconds 954995144, IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 62
    14  20:37:53.590942 ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60833, Nanoseconds 443648960, IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-   15  20:37:54.077234 ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60833, Nanoseconds 929943729, MPLS (label 1024, exp 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
-   16  20:37:55.188367 ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60835, Nanoseconds 41072639, MPLS (label 1024, exp 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 54
+   15  20:37:54.077234 ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60833, Nanoseconds 929943729, MPLS (label 1024, tc 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 58
+   16  20:37:55.188367 ethertype Arista Vendor Specific Protocol (0xd28b), length 108: SubType: 0x1, Version: 0x0120, Timestamp UTC(48-bit): Seconds 60835, Nanoseconds 41072639, MPLS (label 1024, tc 0, [S], ttl 64) IP 10.136.1.32 > 10.2.23.24:  ip-proto-63 54

diff --git a/tests/icmp-cksum-oobr-4.out b/tests/icmp-cksum-oobr-4.out
index 7c18facf53a3b1fb9d3b1f703287e45a3118c144..d6ba88900af8ab2e6dd1e5771f28660057d2e393 100644 (file)
--- a/tests/icmp-cksum-oobr-4.out
+++ b/tests/icmp-cksum-oobr-4.out
@@ -4,4 +4,4 @@
     10.0.12.1.49215 > 10.255.255.4.33435: [udp sum ok] UDP, length 0
        MPLS extension v2
          MPLS Stack Entry Object (1), Class-Type: 1, length 8
-           label 16, exp 0, [S], ttl 1 [|icmp]
+           label 16, tc 0, [S], ttl 1 [|icmp]

diff --git a/tests/lspping-fec-ldp-v.out b/tests/lspping-fec-ldp-v.out
index 6f2f67579329731d0345c415bb6bd46dff2a93a1..5b55bb7dc3a62d94e867ba7231a33d30f13c1f36 100644 (file)
--- a/tests/lspping-fec-ldp-v.out
+++ b/tests/lspping-fec-ldp-v.out
@@ -1,8 +1,8 @@
-    1  10:17:05.850284 MPLS (label 100656, exp 6, [S], ttl 64)
+    1  10:17:05.850284 MPLS (label 100656, tc 6, [S], ttl 64)
        IP (tos 0xc0, ttl 64, id 40719, offset 0, flags [none], proto TCP (6), length 71)
     12.4.4.4.4100 > 12.8.8.8.179: Flags [P.], cksum 0xfd1b (correct), seq 1860641958:1860641977, ack 2969468967, win 16384, options [nop,nop,TS val 84784152 ecr 84770238], length 19: BGP
        Keepalive Message (4), length: 19
-    2  10:17:08.118493 MPLS (label 100688, exp 7, [S], ttl 255)
+    2  10:17:08.118493 MPLS (label 100688, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40723, offset 0, flags [none], proto UDP (17), length 76)
     12.4.4.4.4786 > 127.0.0.1.3503: 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 48
@@ -22,14 +22,14 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 1
          Sender Timestamp: 1087208228.000027564 (1934-06-15T10:17:08Z) Receiver Timestamp: 1087208228.000027928 (1934-06-15T10:17:08Z)
-    4  10:17:08.878375 MPLS (label 100704, exp 6, [S], ttl 64)
+    4  10:17:08.878375 MPLS (label 100704, tc 6, [S], ttl 64)
        IP (tos 0xc0, ttl 64, id 40725, offset 0, flags [none], proto TCP (6), length 71)
     12.4.4.4.2006 > 12.1.1.1.179: Flags [P.], cksum 0x6c0d (correct), seq 399708866:399708885, ack 708613212, win 16384, options [nop,nop,TS val 84784455 ecr 130411], length 19: BGP
        Keepalive Message (4), length: 19
-    5  10:17:08.978295 MPLS (label 100704, exp 6, [S], ttl 64)
+    5  10:17:08.978295 MPLS (label 100704, tc 6, [S], ttl 64)
        IP (tos 0xc0, ttl 64, id 40726, offset 0, flags [none], proto TCP (6), length 52)
     12.4.4.4.2006 > 12.1.1.1.179: Flags [.], cksum 0x6451 (correct), ack 20, win 16384, options [nop,nop,TS val 84784465 ecr 133413], length 0
-    6  10:17:09.128397 MPLS (label 100688, exp 7, [S], ttl 255)
+    6  10:17:09.128397 MPLS (label 100688, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40727, offset 0, flags [none], proto UDP (17), length 76)
     12.4.4.4.4786 > 127.0.0.1.3503: 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 48
@@ -49,7 +49,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 2
          Sender Timestamp: 1087208229.000029880 (1934-06-15T10:17:09Z) Receiver Timestamp: 1087208229.000030186 (1934-06-15T10:17:09Z)
-    8  10:17:10.128607 MPLS (label 100688, exp 7, [S], ttl 255)
+    8  10:17:10.128607 MPLS (label 100688, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40729, offset 0, flags [none], proto UDP (17), length 76)
     12.4.4.4.4786 > 127.0.0.1.3503: 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 48
@@ -69,7 +69,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 3
          Sender Timestamp: 1087208230.000029928 (1934-06-15T10:17:10Z) Receiver Timestamp: 1087208230.000030250 (1934-06-15T10:17:10Z)
-   10  10:17:11.128577 MPLS (label 100688, exp 7, [S], ttl 255)
+   10  10:17:11.128577 MPLS (label 100688, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40731, offset 0, flags [none], proto UDP (17), length 76)
     12.4.4.4.4786 > 127.0.0.1.3503: 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 48
@@ -89,7 +89,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 4
          Sender Timestamp: 1087208231.000029918 (1934-06-15T10:17:11Z) Receiver Timestamp: 1087208231.000030237 (1934-06-15T10:17:11Z)
-   12  10:17:12.128655 MPLS (label 100688, exp 7, [S], ttl 255)
+   12  10:17:12.128655 MPLS (label 100688, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40733, offset 0, flags [none], proto UDP (17), length 76)
     12.4.4.4.4786 > 127.0.0.1.3503: 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 48

diff --git a/tests/lspping-fec-ldp-vv.out b/tests/lspping-fec-ldp-vv.out
index 41d8d5eb5ac16cbbcc258b0c1030d79068cebf13..6b9d787a22d2e229dad9f7059f655ff3c3ee6dca 100644 (file)
--- a/tests/lspping-fec-ldp-vv.out
+++ b/tests/lspping-fec-ldp-vv.out
@@ -1,8 +1,8 @@
-    1  10:17:05.850284 MPLS (label 100656, exp 6, [S], ttl 64)
+    1  10:17:05.850284 MPLS (label 100656, tc 6, [S], ttl 64)
        IP (tos 0xc0, ttl 64, id 40719, offset 0, flags [none], proto TCP (6), length 71)
     12.4.4.4.4100 > 12.8.8.8.179: Flags [P.], cksum 0xfd1b (correct), seq 1860641958:1860641977, ack 2969468967, win 16384, options [nop,nop,TS val 84784152 ecr 84770238], length 19: BGP
        Keepalive Message (4), length: 19
-    2  10:17:08.118493 MPLS (label 100688, exp 7, [S], ttl 255)
+    2  10:17:08.118493 MPLS (label 100688, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40723, offset 0, flags [none], proto UDP (17), length 76)
     12.4.4.4.4786 > 127.0.0.1.3503: [udp sum ok] 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 48
@@ -24,14 +24,14 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 1
          Sender Timestamp: 1087208228.000027564 (1934-06-15T10:17:08Z) Receiver Timestamp: 1087208228.000027928 (1934-06-15T10:17:08Z)
-    4  10:17:08.878375 MPLS (label 100704, exp 6, [S], ttl 64)
+    4  10:17:08.878375 MPLS (label 100704, tc 6, [S], ttl 64)
        IP (tos 0xc0, ttl 64, id 40725, offset 0, flags [none], proto TCP (6), length 71)
     12.4.4.4.2006 > 12.1.1.1.179: Flags [P.], cksum 0x6c0d (correct), seq 399708866:399708885, ack 708613212, win 16384, options [nop,nop,TS val 84784455 ecr 130411], length 19: BGP
        Keepalive Message (4), length: 19
-    5  10:17:08.978295 MPLS (label 100704, exp 6, [S], ttl 64)
+    5  10:17:08.978295 MPLS (label 100704, tc 6, [S], ttl 64)
        IP (tos 0xc0, ttl 64, id 40726, offset 0, flags [none], proto TCP (6), length 52)
     12.4.4.4.2006 > 12.1.1.1.179: Flags [.], cksum 0x6451 (correct), seq 19, ack 20, win 16384, options [nop,nop,TS val 84784465 ecr 133413], length 0
-    6  10:17:09.128397 MPLS (label 100688, exp 7, [S], ttl 255)
+    6  10:17:09.128397 MPLS (label 100688, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40727, offset 0, flags [none], proto UDP (17), length 76)
     12.4.4.4.4786 > 127.0.0.1.3503: [udp sum ok] 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 48
@@ -53,7 +53,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 2
          Sender Timestamp: 1087208229.000029880 (1934-06-15T10:17:09Z) Receiver Timestamp: 1087208229.000030186 (1934-06-15T10:17:09Z)
-    8  10:17:10.128607 MPLS (label 100688, exp 7, [S], ttl 255)
+    8  10:17:10.128607 MPLS (label 100688, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40729, offset 0, flags [none], proto UDP (17), length 76)
     12.4.4.4.4786 > 127.0.0.1.3503: [udp sum ok] 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 48
@@ -75,7 +75,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 3
          Sender Timestamp: 1087208230.000029928 (1934-06-15T10:17:10Z) Receiver Timestamp: 1087208230.000030250 (1934-06-15T10:17:10Z)
-   10  10:17:11.128577 MPLS (label 100688, exp 7, [S], ttl 255)
+   10  10:17:11.128577 MPLS (label 100688, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40731, offset 0, flags [none], proto UDP (17), length 76)
     12.4.4.4.4786 > 127.0.0.1.3503: [udp sum ok] 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 48
@@ -97,7 +97,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 4
          Sender Timestamp: 1087208231.000029918 (1934-06-15T10:17:11Z) Receiver Timestamp: 1087208231.000030237 (1934-06-15T10:17:11Z)
-   12  10:17:12.128655 MPLS (label 100688, exp 7, [S], ttl 255)
+   12  10:17:12.128655 MPLS (label 100688, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40733, offset 0, flags [none], proto UDP (17), length 76)
     12.4.4.4.4786 > 127.0.0.1.3503: [udp sum ok] 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 48

diff --git a/tests/lspping-fec-ldp.out b/tests/lspping-fec-ldp.out
index 92800c96559ecce9c6a7cb414f87895e8ab2aa9d..e6ff801d1c602fb3642fc5fff2e39fad5ba4fd1d 100644 (file)
--- a/tests/lspping-fec-ldp.out
+++ b/tests/lspping-fec-ldp.out
@@ -1,13 +1,13 @@
-    1  10:17:05.850284 MPLS (label 100656, exp 6, [S], ttl 64) IP 12.4.4.4.4100 > 12.8.8.8.179: Flags [P.], seq 1860641958:1860641977, ack 2969468967, win 16384, options [nop,nop,TS val 84784152 ecr 84770238], length 19: BGP
-    2  10:17:08.118493 MPLS (label 100688, exp 7, [S], ttl 255) IP 12.4.4.4.4786 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 1, length: 48
+    1  10:17:05.850284 MPLS (label 100656, tc 6, [S], ttl 64) IP 12.4.4.4.4100 > 12.8.8.8.179: Flags [P.], seq 1860641958:1860641977, ack 2969468967, win 16384, options [nop,nop,TS val 84784152 ecr 84770238], length 19: BGP
+    2  10:17:08.118493 MPLS (label 100688, tc 7, [S], ttl 255) IP 12.4.4.4.4786 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 1, length: 48
     3  10:17:08.119504 IP 10.20.0.1.3503 > 12.4.4.4.4786: LSP-PINGv1, MPLS Echo Reply, seq 1, length: 32
-    4  10:17:08.878375 MPLS (label 100704, exp 6, [S], ttl 64) IP 12.4.4.4.2006 > 12.1.1.1.179: Flags [P.], seq 399708866:399708885, ack 708613212, win 16384, options [nop,nop,TS val 84784455 ecr 130411], length 19: BGP
-    5  10:17:08.978295 MPLS (label 100704, exp 6, [S], ttl 64) IP 12.4.4.4.2006 > 12.1.1.1.179: Flags [.], ack 20, win 16384, options [nop,nop,TS val 84784465 ecr 133413], length 0
-    6  10:17:09.128397 MPLS (label 100688, exp 7, [S], ttl 255) IP 12.4.4.4.4786 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 2, length: 48
+    4  10:17:08.878375 MPLS (label 100704, tc 6, [S], ttl 64) IP 12.4.4.4.2006 > 12.1.1.1.179: Flags [P.], seq 399708866:399708885, ack 708613212, win 16384, options [nop,nop,TS val 84784455 ecr 130411], length 19: BGP
+    5  10:17:08.978295 MPLS (label 100704, tc 6, [S], ttl 64) IP 12.4.4.4.2006 > 12.1.1.1.179: Flags [.], ack 20, win 16384, options [nop,nop,TS val 84784465 ecr 133413], length 0
+    6  10:17:09.128397 MPLS (label 100688, tc 7, [S], ttl 255) IP 12.4.4.4.4786 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 2, length: 48
     7  10:17:09.129192 IP 10.20.0.1.3503 > 12.4.4.4.4786: LSP-PINGv1, MPLS Echo Reply, seq 2, length: 32
-    8  10:17:10.128607 MPLS (label 100688, exp 7, [S], ttl 255) IP 12.4.4.4.4786 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 3, length: 48
+    8  10:17:10.128607 MPLS (label 100688, tc 7, [S], ttl 255) IP 12.4.4.4.4786 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 3, length: 48
     9  10:17:10.129475 IP 10.20.0.1.3503 > 12.4.4.4.4786: LSP-PINGv1, MPLS Echo Reply, seq 3, length: 32
-   10  10:17:11.128577 MPLS (label 100688, exp 7, [S], ttl 255) IP 12.4.4.4.4786 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 4, length: 48
+   10  10:17:11.128577 MPLS (label 100688, tc 7, [S], ttl 255) IP 12.4.4.4.4786 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 4, length: 48
    11  10:17:11.129418 IP 10.20.0.1.3503 > 12.4.4.4.4786: LSP-PINGv1, MPLS Echo Reply, seq 4, length: 32
-   12  10:17:12.128655 MPLS (label 100688, exp 7, [S], ttl 255) IP 12.4.4.4.4786 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 5, length: 48
+   12  10:17:12.128655 MPLS (label 100688, tc 7, [S], ttl 255) IP 12.4.4.4.4786 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 5, length: 48
    13  10:17:12.129573 IP 10.20.0.1.3503 > 12.4.4.4.4786: LSP-PINGv1, MPLS Echo Reply, seq 5, length: 32

diff --git a/tests/lspping-fec-rsvp-v.out b/tests/lspping-fec-rsvp-v.out
index 41127511812d52fb1b51a75ced954569fc0a966f..cd9da3047cf969619b16dc1ab8226267b2eb0257 100644 (file)
--- a/tests/lspping-fec-rsvp-v.out
+++ b/tests/lspping-fec-rsvp-v.out
@@ -1,4 +1,4 @@
-    1  10:13:57.562886 MPLS (label 100704, exp 7, [S], ttl 255)
+    1  10:13:57.562886 MPLS (label 100704, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40269, offset 0, flags [none], proto UDP (17), length 88)
     12.4.4.4.4529 > 127.0.0.1.3503: 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 60
@@ -19,7 +19,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 1
          Sender Timestamp: 1087208037.000131030 (1934-06-15T10:13:57Z) Receiver Timestamp: 1087208037.000131348 (1934-06-15T10:13:57Z)
-    3  10:13:58.572787 MPLS (label 100704, exp 7, [S], ttl 255)
+    3  10:13:58.572787 MPLS (label 100704, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40271, offset 0, flags [none], proto UDP (17), length 88)
     12.4.4.4.4529 > 127.0.0.1.3503: 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 60
@@ -40,7 +40,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 2
          Sender Timestamp: 1087208038.000133345 (1934-06-15T10:13:58Z) Receiver Timestamp: 1087208038.000136480 (1934-06-15T10:13:58Z)
-    5  10:13:59.572866 MPLS (label 100704, exp 7, [S], ttl 255)
+    5  10:13:59.572866 MPLS (label 100704, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40273, offset 0, flags [none], proto UDP (17), length 88)
     12.4.4.4.4529 > 127.0.0.1.3503: 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 60
@@ -61,7 +61,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 3
          Sender Timestamp: 1087208039.000133363 (1934-06-15T10:13:59Z) Receiver Timestamp: 1087208039.000133684 (1934-06-15T10:13:59Z)
-    7  10:14:00.572959 MPLS (label 100704, exp 7, [S], ttl 255)
+    7  10:14:00.572959 MPLS (label 100704, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40275, offset 0, flags [none], proto UDP (17), length 88)
     12.4.4.4.4529 > 127.0.0.1.3503: 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 60
@@ -82,7 +82,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 4
          Sender Timestamp: 1087208040.000133384 (1934-06-15T10:14:00Z) Receiver Timestamp: 1087208040.000133697 (1934-06-15T10:14:00Z)
-    9  10:14:01.573010 MPLS (label 100704, exp 7, [S], ttl 255)
+    9  10:14:01.573010 MPLS (label 100704, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40278, offset 0, flags [none], proto UDP (17), length 88)
     12.4.4.4.4529 > 127.0.0.1.3503: 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 60

diff --git a/tests/lspping-fec-rsvp-vv.out b/tests/lspping-fec-rsvp-vv.out
index ce7eac619abceeb4b73f3c96c5664f07d334f491..72183fc570c2aa01e7435c8daa77fac59499a8b1 100644 (file)
--- a/tests/lspping-fec-rsvp-vv.out
+++ b/tests/lspping-fec-rsvp-vv.out
@@ -1,4 +1,4 @@
-    1  10:13:57.562886 MPLS (label 100704, exp 7, [S], ttl 255)
+    1  10:13:57.562886 MPLS (label 100704, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40269, offset 0, flags [none], proto UDP (17), length 88)
     12.4.4.4.4529 > 127.0.0.1.3503: [udp sum ok] 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 60
@@ -23,7 +23,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 1
          Sender Timestamp: 1087208037.000131030 (1934-06-15T10:13:57Z) Receiver Timestamp: 1087208037.000131348 (1934-06-15T10:13:57Z)
-    3  10:13:58.572787 MPLS (label 100704, exp 7, [S], ttl 255)
+    3  10:13:58.572787 MPLS (label 100704, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40271, offset 0, flags [none], proto UDP (17), length 88)
     12.4.4.4.4529 > 127.0.0.1.3503: [udp sum ok] 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 60
@@ -48,7 +48,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 2
          Sender Timestamp: 1087208038.000133345 (1934-06-15T10:13:58Z) Receiver Timestamp: 1087208038.000136480 (1934-06-15T10:13:58Z)
-    5  10:13:59.572866 MPLS (label 100704, exp 7, [S], ttl 255)
+    5  10:13:59.572866 MPLS (label 100704, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40273, offset 0, flags [none], proto UDP (17), length 88)
     12.4.4.4.4529 > 127.0.0.1.3503: [udp sum ok] 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 60
@@ -73,7 +73,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 3
          Sender Timestamp: 1087208039.000133363 (1934-06-15T10:13:59Z) Receiver Timestamp: 1087208039.000133684 (1934-06-15T10:13:59Z)
-    7  10:14:00.572959 MPLS (label 100704, exp 7, [S], ttl 255)
+    7  10:14:00.572959 MPLS (label 100704, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40275, offset 0, flags [none], proto UDP (17), length 88)
     12.4.4.4.4529 > 127.0.0.1.3503: [udp sum ok] 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 60
@@ -98,7 +98,7 @@
          Return Subcode: (0)
          Sender Handle: 0x00000000, Sequence: 4
          Sender Timestamp: 1087208040.000133384 (1934-06-15T10:14:00Z) Receiver Timestamp: 1087208040.000133697 (1934-06-15T10:14:00Z)
-    9  10:14:01.573010 MPLS (label 100704, exp 7, [S], ttl 255)
+    9  10:14:01.573010 MPLS (label 100704, tc 7, [S], ttl 255)
        IP (tos 0x0, ttl 64, id 40278, offset 0, flags [none], proto UDP (17), length 88)
     12.4.4.4.4529 > 127.0.0.1.3503: [udp sum ok] 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 60

diff --git a/tests/lspping-fec-rsvp.out b/tests/lspping-fec-rsvp.out
index 339ba61e5e86e1d6bdc0776410d53c0d0cc336b4..fe1bebcf4809faf00ee4516cd05b6e648d50cb91 100644 (file)
--- a/tests/lspping-fec-rsvp.out
+++ b/tests/lspping-fec-rsvp.out
@@ -1,10 +1,10 @@
-    1  10:13:57.562886 MPLS (label 100704, exp 7, [S], ttl 255) IP 12.4.4.4.4529 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 1, length: 60
+    1  10:13:57.562886 MPLS (label 100704, tc 7, [S], ttl 255) IP 12.4.4.4.4529 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 1, length: 60
     2  10:13:57.563663 IP 10.20.0.1.3503 > 12.4.4.4.4529: LSP-PINGv1, MPLS Echo Reply, seq 1, length: 32
-    3  10:13:58.572787 MPLS (label 100704, exp 7, [S], ttl 255) IP 12.4.4.4.4529 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 2, length: 60
+    3  10:13:58.572787 MPLS (label 100704, tc 7, [S], ttl 255) IP 12.4.4.4.4529 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 2, length: 60
     4  10:13:58.585727 IP 10.20.0.1.3503 > 12.4.4.4.4529: LSP-PINGv1, MPLS Echo Reply, seq 2, length: 32
-    5  10:13:59.572866 MPLS (label 100704, exp 7, [S], ttl 255) IP 12.4.4.4.4529 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 3, length: 60
+    5  10:13:59.572866 MPLS (label 100704, tc 7, [S], ttl 255) IP 12.4.4.4.4529 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 3, length: 60
     6  10:13:59.573713 IP 10.20.0.1.3503 > 12.4.4.4.4529: LSP-PINGv1, MPLS Echo Reply, seq 3, length: 32
-    7  10:14:00.572959 MPLS (label 100704, exp 7, [S], ttl 255) IP 12.4.4.4.4529 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 4, length: 60
+    7  10:14:00.572959 MPLS (label 100704, tc 7, [S], ttl 255) IP 12.4.4.4.4529 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 4, length: 60
     8  10:14:00.573746 IP 10.20.0.1.3503 > 12.4.4.4.4529: LSP-PINGv1, MPLS Echo Reply, seq 4, length: 32
-    9  10:14:01.573010 MPLS (label 100704, exp 7, [S], ttl 255) IP 12.4.4.4.4529 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 5, length: 60
+    9  10:14:01.573010 MPLS (label 100704, tc 7, [S], ttl 255) IP 12.4.4.4.4529 > 127.0.0.1.3503: LSP-PINGv1, MPLS Echo Request, seq 5, length: 60
    10  10:14:01.573838 IP 10.20.0.1.3503 > 12.4.4.4.4529: LSP-PINGv1, MPLS Echo Reply, seq 5, length: 32

diff --git a/tests/mpls-label-heapoverflow.out b/tests/mpls-label-heapoverflow.out
index a63189dd11fda46a6ca32f6843dc413b192f68fb..60d3a00c1681847e1990610d4eb47f3d4a0561b9 100644 (file)
--- a/tests/mpls-label-heapoverflow.out
+++ b/tests/mpls-label-heapoverflow.out
@@ -1,2 +1,2 @@
-    1  05:27:12.808464432 MPLS (label 197379, exp 0, ttl 48)
-       (label 197387, exp 5, [S], ttl 48) [|mpls]
+    1  05:27:12.808464432 MPLS (label 197379, tc 0, ttl 48)
+       (label 197387, tc 5, [S], ttl 48) [|mpls]

diff --git a/tests/mpls-over-udp-v.out b/tests/mpls-over-udp-v.out
index 595aa53e1231d9a1c5056cd9ee5bb593e95a40d2..684a7dcbfb44c52ace6696b2fbdca0683fb86a8a 100644 (file)
--- a/tests/mpls-over-udp-v.out
+++ b/tests/mpls-over-udp-v.out
@@ -1,8 +1,8 @@
     1  19:10:12.233047 IP (tos 0x0, ttl 64, id 26479, offset 0, flags [none], proto UDP (17), length 116)
-    10.100.12.170.58699 > 10.100.13.157.6635: MPLS (label 21, exp 0, [S], ttl 63)
+    10.100.12.170.58699 > 10.100.13.157.6635: MPLS (label 21, tc 0, [S], ttl 63)
        IP (tos 0x0, ttl 63, id 26479, offset 0, flags [DF], proto ICMP (1), length 84)
     10.3.0.10 > 10.1.0.10: ICMP echo request, id 42731, seq 16, length 64
     2  19:10:12.233101 IP (tos 0x0, ttl 64, id 46612, offset 0, flags [none], proto UDP (17), length 116)
-    10.100.13.157.51348 > 10.100.12.170.6635: MPLS (label 46, exp 0, [S], ttl 63)
+    10.100.13.157.51348 > 10.100.12.170.6635: MPLS (label 46, tc 0, [S], ttl 63)
        IP (tos 0x0, ttl 63, id 46612, offset 0, flags [none], proto ICMP (1), length 84)
     10.1.0.10 > 10.3.0.10: ICMP echo reply, id 42731, seq 16, length 64

diff --git a/tests/mpls-over-udp.out b/tests/mpls-over-udp.out
index d52589809b6c7fdbbe3c66445713b3fea8591ad7..6bb5d6f49be03a7d3a141c0cc07812eca6f85fa0 100644 (file)
--- a/tests/mpls-over-udp.out
+++ b/tests/mpls-over-udp.out
@@ -1,2 +1,2 @@
-    1  19:10:12.233047 IP 10.100.12.170.58699 > 10.100.13.157.6635: MPLS (label 21, exp 0, [S], ttl 63) IP 10.3.0.10 > 10.1.0.10: ICMP echo request, id 42731, seq 16, length 64
-    2  19:10:12.233101 IP 10.100.13.157.51348 > 10.100.12.170.6635: MPLS (label 46, exp 0, [S], ttl 63) IP 10.1.0.10 > 10.3.0.10: ICMP echo reply, id 42731, seq 16, length 64
+    1  19:10:12.233047 IP 10.100.12.170.58699 > 10.100.13.157.6635: MPLS (label 21, tc 0, [S], ttl 63) IP 10.3.0.10 > 10.1.0.10: ICMP echo request, id 42731, seq 16, length 64
+    2  19:10:12.233101 IP 10.100.13.157.51348 > 10.100.12.170.6635: MPLS (label 46, tc 0, [S], ttl 63) IP 10.1.0.10 > 10.3.0.10: ICMP echo reply, id 42731, seq 16, length 64

diff --git a/tests/mpls-traceroute-v.out b/tests/mpls-traceroute-v.out
index 437d277fa8bcf743dc49cba6f114dcedb58aea54..d92fa5a696d7ad167f0e4c3d92f75f452bcb065c 100644 (file)
--- a/tests/mpls-traceroute-v.out
+++ b/tests/mpls-traceroute-v.out
@@ -1,4 +1,4 @@
-    1  10:13:29.315598 MPLS (label 100704, exp 0, [S], ttl 1)
+    1  10:13:29.315598 MPLS (label 100704, tc 0, [S], ttl 1)
        IP (tos 0x0, ttl 1, id 42316, offset 0, flags [none], proto UDP (17), length 40)
     12.4.4.4.42315 > 12.1.1.1.33435: UDP, length 12
     2  10:13:29.316413 IP (tos 0x0, ttl 255, id 5014, offset 0, flags [DF], proto ICMP (1), length 168)
@@ -7,8 +7,8 @@
     12.4.4.4.42315 > 12.1.1.1.33435: UDP, length 12
        MPLS extension v2, checksum 0xc55f (correct), length 12
          MPLS Stack Entry Object (1), Class-Type: 1, length 8
-           label 100704, exp 0, [S], ttl 1
-    3  10:13:29.319182 MPLS (label 100704, exp 0, [S], ttl 1)
+           label 100704, tc 0, [S], ttl 1
+    3  10:13:29.319182 MPLS (label 100704, tc 0, [S], ttl 1)
        IP (tos 0x0, ttl 1, id 42317, offset 0, flags [none], proto UDP (17), length 40)
     12.4.4.4.42315 > 12.1.1.1.33436: UDP, length 12
     4  10:13:29.326330 IP (tos 0x0, ttl 255, id 5015, offset 0, flags [DF], proto ICMP (1), length 168)
@@ -17,8 +17,8 @@
     12.4.4.4.42315 > 12.1.1.1.33436: UDP, length 12
        MPLS extension v2, checksum 0xc55f (correct), length 12
          MPLS Stack Entry Object (1), Class-Type: 1, length 8
-           label 100704, exp 0, [S], ttl 1
-    5  10:13:29.326697 MPLS (label 100704, exp 0, [S], ttl 1)
+           label 100704, tc 0, [S], ttl 1
+    5  10:13:29.326697 MPLS (label 100704, tc 0, [S], ttl 1)
        IP (tos 0x0, ttl 1, id 42318, offset 0, flags [none], proto UDP (17), length 40)
     12.4.4.4.42315 > 12.1.1.1.33437: UDP, length 12
     6  10:13:29.327328 IP (tos 0x0, ttl 255, id 5016, offset 0, flags [DF], proto ICMP (1), length 168)
@@ -27,8 +27,8 @@
     12.4.4.4.42315 > 12.1.1.1.33437: UDP, length 12
        MPLS extension v2, checksum 0xc55f (correct), length 12
          MPLS Stack Entry Object (1), Class-Type: 1, length 8
-           label 100704, exp 0, [S], ttl 1
-    7  10:13:29.327769 MPLS (label 100704, exp 0, [S], ttl 2)
+           label 100704, tc 0, [S], ttl 1
+    7  10:13:29.327769 MPLS (label 100704, tc 0, [S], ttl 2)
        IP (tos 0x0, ttl 2, id 42319, offset 0, flags [none], proto UDP (17), length 40)
     12.4.4.4.42315 > 12.1.1.1.33438: UDP, length 12
     8  10:13:29.328510 IP (tos 0x0, ttl 254, id 59166, offset 0, flags [DF], proto ICMP (1), length 168)
@@ -37,8 +37,8 @@
     12.4.4.4.42315 > 12.1.1.1.33438: UDP, length 12
        MPLS extension v2, checksum 0xc4e4 (correct), length 12
          MPLS Stack Entry Object (1), Class-Type: 1, length 8
-           label 102672, exp 0, [S], ttl 1
-    9  10:13:29.330110 MPLS (label 100704, exp 0, [S], ttl 2)
+           label 102672, tc 0, [S], ttl 1
+    9  10:13:29.330110 MPLS (label 100704, tc 0, [S], ttl 2)
        IP (tos 0x0, ttl 2, id 42320, offset 0, flags [none], proto UDP (17), length 40)
     12.4.4.4.42315 > 12.1.1.1.33439: UDP, length 12
    10  10:13:29.330735 IP (tos 0x0, ttl 254, id 59167, offset 0, flags [DF], proto ICMP (1), length 168)
@@ -47,8 +47,8 @@
     12.4.4.4.42315 > 12.1.1.1.33439: UDP, length 12
        MPLS extension v2, checksum 0xc4e4 (correct), length 12
          MPLS Stack Entry Object (1), Class-Type: 1, length 8
-           label 102672, exp 0, [S], ttl 1
-   11  10:13:29.331066 MPLS (label 100704, exp 0, [S], ttl 2)
+           label 102672, tc 0, [S], ttl 1
+   11  10:13:29.331066 MPLS (label 100704, tc 0, [S], ttl 2)
        IP (tos 0x0, ttl 2, id 42321, offset 0, flags [none], proto UDP (17), length 40)
     12.4.4.4.42315 > 12.1.1.1.33440: UDP, length 12
    12  10:13:29.331681 IP (tos 0x0, ttl 254, id 59168, offset 0, flags [DF], proto ICMP (1), length 168)
@@ -57,22 +57,22 @@
     12.4.4.4.42315 > 12.1.1.1.33440: UDP, length 12
        MPLS extension v2, checksum 0xc4e4 (correct), length 12
          MPLS Stack Entry Object (1), Class-Type: 1, length 8
-           label 102672, exp 0, [S], ttl 1
-   13  10:13:29.332494 MPLS (label 100704, exp 0, [S], ttl 3)
+           label 102672, tc 0, [S], ttl 1
+   13  10:13:29.332494 MPLS (label 100704, tc 0, [S], ttl 3)
        IP (tos 0x0, ttl 3, id 42322, offset 0, flags [none], proto UDP (17), length 40)
     12.4.4.4.42315 > 12.1.1.1.33441: UDP, length 12
    14  10:13:29.333151 IP (tos 0x0, ttl 253, id 50599, offset 0, flags [DF], proto ICMP (1), length 56)
     12.1.1.1 > 12.4.4.4: ICMP 12.1.1.1 udp port 33441 unreachable, length 36
        IP (tos 0x0, ttl 1, id 42322, offset 0, flags [none], proto UDP (17), length 40)
     12.4.4.4.42315 > 12.1.1.1.33441: UDP, length 12
-   15  10:13:29.609602 MPLS (label 100704, exp 0, [S], ttl 3)
+   15  10:13:29.609602 MPLS (label 100704, tc 0, [S], ttl 3)
        IP (tos 0x0, ttl 3, id 42323, offset 0, flags [none], proto UDP (17), length 40)
     12.4.4.4.42315 > 12.1.1.1.33442: UDP, length 12
    16  10:13:29.610234 IP (tos 0x0, ttl 253, id 50600, offset 0, flags [DF], proto ICMP (1), length 56)
     12.1.1.1 > 12.4.4.4: ICMP 12.1.1.1 udp port 33442 unreachable, length 36
        IP (tos 0x0, ttl 1, id 42323, offset 0, flags [none], proto UDP (17), length 40)
     12.4.4.4.42315 > 12.1.1.1.33442: UDP, length 12
-   17  10:13:29.610710 MPLS (label 100704, exp 0, [S], ttl 3)
+   17  10:13:29.610710 MPLS (label 100704, tc 0, [S], ttl 3)
        IP (tos 0x0, ttl 3, id 42324, offset 0, flags [none], proto UDP (17), length 40)
     12.4.4.4.42315 > 12.1.1.1.33443: UDP, length 12
    18  10:13:29.611307 IP (tos 0x0, ttl 253, id 50601, offset 0, flags [DF], proto ICMP (1), length 56)

diff --git a/tests/mpls-traceroute.out b/tests/mpls-traceroute.out
index 253cfc6fbab227973cdbf26c35e42dc253763bf1..30128c7b3b2c1ae4f3addfb1921a22ffc2b968ac 100644 (file)
--- a/tests/mpls-traceroute.out
+++ b/tests/mpls-traceroute.out
@@ -1,18 +1,18 @@
-    1  10:13:29.315598 MPLS (label 100704, exp 0, [S], ttl 1) IP 12.4.4.4.42315 > 12.1.1.1.33435: UDP, length 12
+    1  10:13:29.315598 MPLS (label 100704, tc 0, [S], ttl 1) IP 12.4.4.4.42315 > 12.1.1.1.33435: UDP, length 12
     2  10:13:29.316413 IP 10.5.0.1 > 12.4.4.4: ICMP time exceeded in-transit, length 148
-    3  10:13:29.319182 MPLS (label 100704, exp 0, [S], ttl 1) IP 12.4.4.4.42315 > 12.1.1.1.33436: UDP, length 12
+    3  10:13:29.319182 MPLS (label 100704, tc 0, [S], ttl 1) IP 12.4.4.4.42315 > 12.1.1.1.33436: UDP, length 12
     4  10:13:29.326330 IP 10.5.0.1 > 12.4.4.4: ICMP time exceeded in-transit, length 148
-    5  10:13:29.326697 MPLS (label 100704, exp 0, [S], ttl 1) IP 12.4.4.4.42315 > 12.1.1.1.33437: UDP, length 12
+    5  10:13:29.326697 MPLS (label 100704, tc 0, [S], ttl 1) IP 12.4.4.4.42315 > 12.1.1.1.33437: UDP, length 12
     6  10:13:29.327328 IP 10.5.0.1 > 12.4.4.4: ICMP time exceeded in-transit, length 148
-    7  10:13:29.327769 MPLS (label 100704, exp 0, [S], ttl 2) IP 12.4.4.4.42315 > 12.1.1.1.33438: UDP, length 12
+    7  10:13:29.327769 MPLS (label 100704, tc 0, [S], ttl 2) IP 12.4.4.4.42315 > 12.1.1.1.33438: UDP, length 12
     8  10:13:29.328510 IP 10.4.0.2 > 12.4.4.4: ICMP time exceeded in-transit, length 148
-    9  10:13:29.330110 MPLS (label 100704, exp 0, [S], ttl 2) IP 12.4.4.4.42315 > 12.1.1.1.33439: UDP, length 12
+    9  10:13:29.330110 MPLS (label 100704, tc 0, [S], ttl 2) IP 12.4.4.4.42315 > 12.1.1.1.33439: UDP, length 12
    10  10:13:29.330735 IP 10.4.0.2 > 12.4.4.4: ICMP time exceeded in-transit, length 148
-   11  10:13:29.331066 MPLS (label 100704, exp 0, [S], ttl 2) IP 12.4.4.4.42315 > 12.1.1.1.33440: UDP, length 12
+   11  10:13:29.331066 MPLS (label 100704, tc 0, [S], ttl 2) IP 12.4.4.4.42315 > 12.1.1.1.33440: UDP, length 12
    12  10:13:29.331681 IP 10.4.0.2 > 12.4.4.4: ICMP time exceeded in-transit, length 148
-   13  10:13:29.332494 MPLS (label 100704, exp 0, [S], ttl 3) IP 12.4.4.4.42315 > 12.1.1.1.33441: UDP, length 12
+   13  10:13:29.332494 MPLS (label 100704, tc 0, [S], ttl 3) IP 12.4.4.4.42315 > 12.1.1.1.33441: UDP, length 12
    14  10:13:29.333151 IP 12.1.1.1 > 12.4.4.4: ICMP 12.1.1.1 udp port 33441 unreachable, length 36
-   15  10:13:29.609602 MPLS (label 100704, exp 0, [S], ttl 3) IP 12.4.4.4.42315 > 12.1.1.1.33442: UDP, length 12
+   15  10:13:29.609602 MPLS (label 100704, tc 0, [S], ttl 3) IP 12.4.4.4.42315 > 12.1.1.1.33442: UDP, length 12
    16  10:13:29.610234 IP 12.1.1.1 > 12.4.4.4: ICMP 12.1.1.1 udp port 33442 unreachable, length 36
-   17  10:13:29.610710 MPLS (label 100704, exp 0, [S], ttl 3) IP 12.4.4.4.42315 > 12.1.1.1.33443: UDP, length 12
+   17  10:13:29.610710 MPLS (label 100704, tc 0, [S], ttl 3) IP 12.4.4.4.42315 > 12.1.1.1.33443: UDP, length 12
    18  10:13:29.611307 IP 12.1.1.1 > 12.4.4.4: ICMP 12.1.1.1 udp port 33443 unreachable, length 36

diff --git a/tests/tok2str-oobr-2.out b/tests/tok2str-oobr-2.out
index b9de261c7a2f8aa7399102346855cc1ec3fc8d63..9cbd0025ab5a035f113bab99d103ff0f9e7549e6 100644 (file)
--- a/tests/tok2str-oobr-2.out
+++ b/tests/tok2str-oobr-2.out
@@ -1,4 +1,4 @@
-    1  04:38:13.000000 01:01:01:01:01:01 > 02:02:02:02:02:02, ethertype MPLS unicast (0x8847), length 130: MPLS (label 16006, exp 0, [S], ttl 255)
+    1  04:38:13.000000 01:01:01:01:01:01 > 02:02:02:02:02:02, ethertype MPLS unicast (0x8847), length 130: MPLS (label 16006, tc 0, [S], ttl 255)
        (tos 0x0, ttl 1, id 32770, offset 0, flags [DF, rsvd], proto UDP (17), length 112, options (RA), bad cksum a4cc (->a4cb)!)
     192.168.0.1.3503 > 127.0.0.1.3503: [bad udp cksum 0x8397 -> 0x3f6d!] 
        LSP-PINGv1, msg-type: MPLS Echo Request (1), length: 80

diff --git a/tests/wb-oobr.out b/tests/wb-oobr.out
index b2f02a7207530375f0fa73d9b1ef28b31b79bd55..9766e5d3a9216ae1110e3b82440fa1ea23b0496a 100644 (file)
--- a/tests/wb-oobr.out
+++ b/tests/wb-oobr.out
@@ -1,14 +1,14 @@
-    1  05:27:12.808464432 MPLS (label 197376, exp 7, [S], ttl 48)
+    1  05:27:12.808464432 MPLS (label 197376, tc 7, [S], ttl 48)
        IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 3030 (->7754)!)
     48.4.4.4.4400 > 127.0.0.1.3503:  [|lspping]
     2  05:27:12.808464432 IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 3030 (->699d)!)
     48.48.48.48.3503 > 48.48.48.48.4567: * wb-prep: [|wb]
-    3  05:27:12.808464432 MPLS (label 197376, exp 7, [S], ttl 48)
+    3  05:27:12.808464432 MPLS (label 197376, tc 7, [S], ttl 48)
        IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 3030 (->699d)!)
     48.48.48.48.4400 > 48.48.48.48.3503:  [|lspping]
     4  05:27:12.808464432 IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 3030 (->c624)!)
     48.48.0.1.3503 > 48.4.4.4.4567: * wb-prep: [|wb]
-    5  05:27:12.808464432 MPLS (label 197376, exp 7, [S], ttl 48)
+    5  05:27:12.808464432 MPLS (label 197376, tc 7, [S], ttl 48)
        IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 3030 (->7754)!)
     48.4.4.4.4400 > 127.0.0.1.3503:  [|lspping]
     6  05:27:12.808464432 IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto UDP (17), length 12336, bad cksum 3030 (->c624)!)