LDP: fix Message Type vs. Message ID for status TLV

diff --git a/print-ldp.c b/print-ldp.c
index b75b36199d8db84df4bb1d3bb1199fae7ecadb04..355fac9a151f319fff16723d5ecc12acff1d9260 100644 (file)
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -554,8 +554,7 @@ ldp_tlv_print(netdissect_options *ndo,
            ND_PRINT(", causing Message ID: 0x%08x", ui);
        ui = GET_BE_U_2(tptr);
        if (ui)
-           ND_PRINT(", Message ID: %s", tok2str(ldp_msg_values, "Unknown", ui));
-
+           ND_PRINT(", Message Type: %s", tok2str(ldp_msg_values, "Unknown", ui));
        break;
 
     case LDP_TLV_FT_SESSION:

diff --git a/tests/ldp-common-session.out b/tests/ldp-common-session.out
index e5d3f0ad9acf674745fcdfafb2f04b82484869f5..5b2800527c31a7a4bde818f231ea6cbc6dcc8cdc 100644 (file)
--- a/tests/ldp-common-session.out
+++ b/tests/ldp-common-session.out
@@ -126,7 +126,7 @@
            Generic Label TLV (0x0200), length: 4, Flags: [ignore and don't forward if unknown]
              Label: 20066
            Status TLV (0x0300), length: 10, Flags: [ignore and don't forward if unknown]
-             Status Code: Loop Detected, Flags: [Advisory Notification and don't forward], causing Message ID: 0x0000000f, Message ID: Label Mapping
+             Status Code: Loop Detected, Flags: [Advisory Notification and don't forward], causing Message ID: 0x0000000f, Message Type: Label Mapping
        LDP, Label-Space-ID: 192.168.0.2:0, pdu-length: 48
          Label Release Message (0x0403), length: 38, Message ID: 0x0000000b, Flags: [ignore if unknown]
            FEC TLV (0x0100), length: 8, Flags: [ignore and don't forward if unknown]
@@ -134,7 +134,7 @@
            Generic Label TLV (0x0200), length: 4, Flags: [ignore and don't forward if unknown]
              Label: 20066
            Status TLV (0x0300), length: 10, Flags: [ignore and don't forward if unknown]
-             Status Code: Loop Detected, Flags: [Advisory Notification and don't forward], causing Message ID: 0x00000010, Message ID: Label Mapping
+             Status Code: Loop Detected, Flags: [Advisory Notification and don't forward], causing Message ID: 0x00000010, Message Type: Label Mapping
        LDP, Label-Space-ID: 192.168.0.2:0, pdu-length: 48
          Label Release Message (0x0403), length: 38, Message ID: 0x0000000c, Flags: [ignore if unknown]
            FEC TLV (0x0100), length: 8, Flags: [ignore and don't forward if unknown]
@@ -142,7 +142,7 @@
            Generic Label TLV (0x0200), length: 4, Flags: [ignore and don't forward if unknown]
              Label: 20066
            Status TLV (0x0300), length: 10, Flags: [ignore and don't forward if unknown]
-             Status Code: Loop Detected, Flags: [Advisory Notification and don't forward], causing Message ID: 0x00000011, Message ID: Label Mapping
+             Status Code: Loop Detected, Flags: [Advisory Notification and don't forward], causing Message ID: 0x00000011, Message Type: Label Mapping
        LDP, Label-Space-ID: 192.168.0.2:0, pdu-length: 48
          Label Release Message (0x0403), length: 38, Message ID: 0x0000000d, Flags: [ignore if unknown]
            FEC TLV (0x0100), length: 8, Flags: [ignore and don't forward if unknown]
@@ -150,7 +150,7 @@
            Generic Label TLV (0x0200), length: 4, Flags: [ignore and don't forward if unknown]
              Label: 20066
            Status TLV (0x0300), length: 10, Flags: [ignore and don't forward if unknown]
-             Status Code: Loop Detected, Flags: [Advisory Notification and don't forward], causing Message ID: 0x00000012, Message ID: Label Mapping
+             Status Code: Loop Detected, Flags: [Advisory Notification and don't forward], causing Message ID: 0x00000012, Message Type: Label Mapping
        LDP, Label-Space-ID: 192.168.0.2:0, pdu-length: 48
          Label Release Message (0x0403), length: 38, Message ID: 0x0000000e, Flags: [ignore if unknown]
            FEC TLV (0x0100), length: 8, Flags: [ignore and don't forward if unknown]
@@ -158,7 +158,7 @@
            Generic Label TLV (0x0200), length: 4, Flags: [ignore and don't forward if unknown]
              Label: 20066
            Status TLV (0x0300), length: 10, Flags: [ignore and don't forward if unknown]
-             Status Code: Loop Detected, Flags: [Advisory Notification and don't forward], causing Message ID: 0x00000013, Message ID: Label Mapping
+             Status Code: Loop Detected, Flags: [Advisory Notification and don't forward], causing Message ID: 0x00000013, Message Type: Label Mapping
    13  12:24:12.831754 IP (tos 0xc0, ttl 255, id 1520, offset 0, flags [none], proto TCP (6), length 415)
     192.168.0.2.58321 > 192.168.0.1.646: Flags [P.], cksum 0xef2a (correct), seq 666:1041, ack 813, win 3000, length 375
        LDP, Label-Space-ID: 192.168.0.2:0, pdu-length: 371