]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ospf.c
CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10
[tcpdump] / print-ospf.c
index d3f519c3bb223a351f40fec265bd0e3dfae201f2..38f44745d770b6e731cd423e444ecf8265b4b5e6 100644 (file)
@@ -23,9 +23,7 @@
 
 /* \summary: Open Shortest Path First (OSPF) printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -36,7 +34,6 @@
 
 #include "ospf.h"
 
-
 static const struct tok ospf_option_values[] = {
        { OSPF_OPTION_MT,       "MultiTopology" }, /* draft-ietf-ospf-mt-09 */
        { OSPF_OPTION_E,        "External" },
@@ -59,9 +56,10 @@ static const struct tok ospf_authtype_values[] = {
 static const struct tok ospf_rla_flag_values[] = {
        { RLA_FLAG_B,           "ABR" },
        { RLA_FLAG_E,           "ASBR" },
-       { RLA_FLAG_W1,          "Virtual" },
-       { RLA_FLAG_W2,          "W2" },
+       { RLA_FLAG_V,           "Virtual" },
+       { RLA_FLAG_W,           "Wildcard" },
        { RLA_FLAG_NT,          "Nt" },
+       { RLA_FLAG_H,           "Host" },
        { 0,                    NULL }
 };
 
@@ -100,15 +98,56 @@ static const struct tok lsa_opaque_values[] = {
        { LS_OPAQUE_TYPE_TE,    "Traffic Engineering" },
        { LS_OPAQUE_TYPE_GRACE, "Graceful restart" },
        { LS_OPAQUE_TYPE_RI,    "Router Information" },
+       { LS_OPAQUE_TYPE_EP,    "Extended Prefix" },
+       { LS_OPAQUE_TYPE_EL,    "Extended Link" },
        { 0,                    NULL }
 };
 
+static const struct tok lsa_opaque_ri_sid_subtlv_values[] = {
+       { LS_OPAQUE_RI_SUBTLV_SID_LABEL, "SID/Label" },
+       { 0,                    NULL }
+};
+
 static const struct tok lsa_opaque_te_tlv_values[] = {
        { LS_OPAQUE_TE_TLV_ROUTER, "Router Address" },
        { LS_OPAQUE_TE_TLV_LINK,   "Link" },
        { 0,                    NULL }
 };
 
+static const struct tok lsa_opaque_ep_extd_prefix_subtlv_values[] = {
+       { LS_OPAQUE_EP_SUBTLV_PREFIX_SID, "Prefix-SID" },
+       { 0,                    NULL }
+};
+
+static const struct tok ep_range_tlv_prefix_sid_subtlv_flag_values[] = {
+       { 0x40, "No-PHP"},
+       { 0x20, "Mapping-Server"},
+       { 0x10, "Explicit-NULL"},
+       { 0x08, "Value"},
+       { 0x04, "Local"},
+       { 0,                    NULL}
+};
+
+static const struct tok lsa_opaque_ep_route_type_values[] = {
+       { 0, "Unspecified" },
+       { 1, "Intra-Area" },
+       { 3, "Inter-Area" },
+       { 5, "AS External" },
+       { 7, "NSSA External" },
+       { 0,                    NULL }
+};
+
+static const struct tok lsa_opaque_ep_tlv_values[] = {
+       { LS_OPAQUE_EP_EXTD_PREFIX_TLV,       "Extended Prefix" },
+       { LS_OPAQUE_EP_EXTD_PREFIX_RANGE_TLV, "Extended Prefix Range" },
+       { 0,                    NULL }
+};
+
+static const struct tok ep_tlv_flag_values[] = {
+       { 0x80, "Inter-Area"},
+       { 0,                    NULL}
+};
+
 static const struct tok lsa_opaque_te_link_tlv_subtlv_values[] = {
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE,            "Link Type" },
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID,              "Link ID" },
@@ -150,6 +189,11 @@ static const struct tok lsa_opaque_te_tlv_link_type_sub_tlv_values[] = {
 
 static const struct tok lsa_opaque_ri_tlv_values[] = {
        { LS_OPAQUE_RI_TLV_CAP, "Router Capabilities" },
+       { LS_OPAQUE_RI_TLV_SR_ALGO, "SR-Algorithm" },
+       { LS_OPAQUE_RI_TLV_HOSTNAME, "Hostname" },
+       { LS_OPAQUE_RI_TLV_SID_LABEL_RANGE, "SID/Label Range" },
+       { LS_OPAQUE_RI_TLV_SR_LOCAL_BLOCK, "SR Local Block" },
+       { LS_OPAQUE_RI_TLV_SRMS_PREFERENCE, "SRMS Preference" },
        { 0,                    NULL }
 };
 
@@ -167,6 +211,12 @@ static const struct tok lsa_opaque_ri_tlv_cap_values[] = {
        { 0,                    NULL }
 };
 
+static const struct tok lsa_opaque_ri_tlv_sr_algos[] = {
+       { 0, "Shortest Path First" },
+       { 1, "Strict Shortest Path First" },
+       { 0,                    NULL }
+};
+
 static const struct tok ospf_lls_tlv_values[] = {
        { OSPF_LLS_EO,  "Extended Options" },
        { OSPF_LLS_MD5, "MD5 Authentication" },
@@ -185,8 +235,7 @@ ospf_grace_lsa_print(netdissect_options *ndo,
 {
     u_int tlv_type, tlv_length;
 
-
-    while (ls_length > 0) {
+    while (ls_length != 0) {
         ND_TCHECK_4(tptr);
         if (ls_length < 4) {
             ND_PRINT("\n\t    Remaining LS length %u < 4", ls_length);
@@ -210,6 +259,7 @@ ospf_grace_lsa_print(netdissect_options *ndo,
 
         /* Infinite loop protection. */
         if (tlv_type == 0 || tlv_length ==0) {
+           nd_print_invalid(ndo);
             return -1;
         }
 
@@ -251,14 +301,213 @@ ospf_grace_lsa_print(netdissect_options *ndo,
 
         }
         /* in OSPF everything has to be 32-bit aligned, including TLVs */
-        if (tlv_length%4 != 0)
+        if (tlv_length%4 != 0) {
             tlv_length+=4-(tlv_length%4);
+            if (tlv_length > ls_length) {
+                ND_PRINT("\n\t    Bogus padded length %u > %u", tlv_length,
+                       ls_length);
+                return -1;
+            }
+        }
         ls_length-=tlv_length;
         tptr+=tlv_length;
     }
 
     return 0;
 trunc:
+    nd_print_trunc(ndo);
+    return -1;
+}
+
+static int
+ospf_te_tlv_link_print(netdissect_options *ndo,
+                       const u_char *tptr, u_int tlv_length)
+{
+    u_int subtlv_type, subtlv_length;
+    u_int priority_level, te_class, count_srlg;
+
+    while (tlv_length != 0) {
+        if (tlv_length < 4) {
+            ND_PRINT("\n\t    Remaining TLV length %u < 4",
+                   tlv_length);
+            return -1;
+        }
+        subtlv_type = GET_BE_U_2(tptr);
+        subtlv_length = GET_BE_U_2(tptr + 2);
+        tptr+=4;
+        tlv_length-=4;
+
+        /* Infinite loop protection */
+        if (subtlv_type == 0 || subtlv_length == 0)
+            goto invalid;
+
+        ND_PRINT("\n\t      %s subTLV (%u), length: %u",
+               tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type),
+               subtlv_type,
+               subtlv_length);
+
+        if (tlv_length < subtlv_length) {
+            ND_PRINT("\n\t    Remaining TLV length %u < %u",
+                   tlv_length, subtlv_length);
+            return -1;
+        }
+        ND_TCHECK_LEN(tptr, subtlv_length);
+        switch(subtlv_type) {
+        case LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP:
+            if (subtlv_length != 4) {
+                ND_PRINT(" != 4");
+                goto invalid;
+            }
+            ND_PRINT(", 0x%08x", GET_BE_U_4(tptr));
+            break;
+        case LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID:
+        case LS_OPAQUE_TE_LINK_SUBTLV_LINK_LOCAL_REMOTE_ID:
+            if (subtlv_length != 4 && subtlv_length != 8) {
+                ND_PRINT(" != 4 && != 8");
+                goto invalid;
+            }
+            ND_PRINT(", %s (0x%08x)",
+                   GET_IPADDR_STRING(tptr),
+                   GET_BE_U_4(tptr));
+            if (subtlv_length == 8) /* rfc4203 */
+                ND_PRINT(", %s (0x%08x)",
+                       GET_IPADDR_STRING(tptr+4),
+                       GET_BE_U_4(tptr + 4));
+            break;
+        case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP:
+        case LS_OPAQUE_TE_LINK_SUBTLV_REMOTE_IP:
+            if (subtlv_length != 4) {
+                ND_PRINT(" != 4");
+                goto invalid;
+            }
+            ND_PRINT(", %s", GET_IPADDR_STRING(tptr));
+            break;
+        case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW:
+        case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW:
+            if (subtlv_length != 4) {
+                ND_PRINT(" != 4");
+                goto invalid;
+            }
+            ND_PRINT(", %.3f Mbps", GET_BE_F_4(tptr) * 8 / 1000000);
+            break;
+        case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
+            if (subtlv_length != 32) {
+                ND_PRINT(" != 32");
+                goto invalid;
+            }
+            for (te_class = 0; te_class < 8; te_class++) {
+                ND_PRINT("\n\t\tTE-Class %u: %.3f Mbps",
+                       te_class,
+                       GET_BE_F_4(tptr + te_class * 4) * 8 / 1000000);
+            }
+            break;
+        case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS:
+            if (subtlv_length < 4) {
+                ND_PRINT(" < 4");
+                goto invalid;
+            }
+            /* BC Model Id (1 octet) + Reserved (3 octets) */
+            ND_PRINT("\n\t\tBandwidth Constraints Model ID: %s (%u)",
+                   tok2str(diffserv_te_bc_values, "unknown", GET_U_1(tptr)),
+                   GET_U_1(tptr));
+            if (subtlv_length % 4 != 0) {
+                ND_PRINT("\n\t\tlength %u != N x 4", subtlv_length);
+                goto invalid;
+            }
+            if (subtlv_length > 36) {
+                ND_PRINT("\n\t\tlength %u > 36", subtlv_length);
+                goto invalid;
+            }
+            /* decode BCs until the subTLV ends */
+            for (te_class = 0; te_class < (subtlv_length-4)/4; te_class++) {
+                ND_PRINT("\n\t\t  Bandwidth constraint CT%u: %.3f Mbps",
+                       te_class,
+                       GET_BE_F_4(tptr + 4 + te_class * 4) * 8 / 1000000);
+            }
+            break;
+        case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC:
+            if (subtlv_length != 4) {
+                ND_PRINT(" != 4");
+                goto invalid;
+            }
+            ND_PRINT(", Metric %u", GET_BE_U_4(tptr));
+            break;
+        case LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE:
+            /* Protection Cap (1 octet) + Reserved ((3 octets) */
+            if (subtlv_length != 4) {
+                ND_PRINT(" != 4");
+                goto invalid;
+            }
+            ND_PRINT(", %s",
+                     bittok2str(gmpls_link_prot_values, "none", GET_U_1(tptr)));
+            break;
+        case LS_OPAQUE_TE_LINK_SUBTLV_INTF_SW_CAP_DESCR:
+            if (subtlv_length < 36) {
+                ND_PRINT(" < 36");
+                goto invalid;
+            }
+            /* Switching Cap (1 octet) + Encoding (1) +  Reserved (2) */
+            ND_PRINT("\n\t\tInterface Switching Capability: %s",
+                   tok2str(gmpls_switch_cap_values, "Unknown", GET_U_1((tptr))));
+            ND_PRINT("\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
+                   tok2str(gmpls_encoding_values, "Unknown", GET_U_1((tptr + 1))));
+            for (priority_level = 0; priority_level < 8; priority_level++) {
+                ND_PRINT("\n\t\t  priority level %u: %.3f Mbps",
+                       priority_level,
+                       GET_BE_F_4(tptr + 4 + (priority_level * 4)) * 8 / 1000000);
+            }
+            break;
+        case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE:
+            if (subtlv_length != 1) {
+                ND_PRINT(" != 1");
+                goto invalid;
+            }
+            ND_PRINT(", %s (%u)",
+                   tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",GET_U_1(tptr)),
+                   GET_U_1(tptr));
+            break;
+        case LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP:
+            if (subtlv_length % 4 != 0) {
+                ND_PRINT(" != N x 4");
+                goto invalid;
+            }
+            count_srlg = subtlv_length / 4;
+            if (count_srlg != 0)
+                ND_PRINT("\n\t\t  Shared risk group: ");
+            while (count_srlg != 0) {
+                ND_PRINT("%u", GET_BE_U_4(tptr));
+                tptr+=4;
+                count_srlg--;
+                if (count_srlg > 0)
+                    ND_PRINT(", ");
+            }
+            break;
+        default:
+            if (ndo->ndo_vflag <= 1) {
+                if (!print_unknown_data(ndo, tptr, "\n\t\t", subtlv_length))
+                    return -1;
+            }
+            break;
+        }
+        /* in OSPF everything has to be 32-bit aligned, including subTLVs */
+        if (subtlv_length%4 != 0) {
+            subtlv_length+=4-(subtlv_length%4);
+
+            if (tlv_length < subtlv_length) {
+                ND_PRINT("\n\t    Remaining TLV length %u < %u",
+                        tlv_length, subtlv_length);
+                return -1;
+            }
+        }
+        tlv_length-=subtlv_length;
+        tptr+=subtlv_length;
+    }
+    return 0;
+trunc:
+    nd_print_trunc(ndo);
+    return -1;
+invalid:
+    nd_print_invalid(ndo);
     return -1;
 }
 
@@ -266,12 +515,7 @@ int
 ospf_te_lsa_print(netdissect_options *ndo,
                   const u_char *tptr, u_int ls_length)
 {
-    u_int tlv_type, tlv_length, subtlv_type, subtlv_length;
-    u_int priority_level, te_class, count_srlg;
-    union { /* int to float conversion buffer for several subTLVs */
-        float f;
-        uint32_t i;
-    } bw;
+    u_int tlv_type, tlv_length;
 
     while (ls_length != 0) {
         ND_TCHECK_4(tptr);
@@ -292,205 +536,25 @@ ospf_te_lsa_print(netdissect_options *ndo,
         if (tlv_length > ls_length) {
             ND_PRINT("\n\t    Bogus length %u > %u", tlv_length,
                    ls_length);
-            return -1;
+            goto invalid;
         }
 
         /* Infinite loop protection. */
         if (tlv_type == 0 || tlv_length ==0) {
-            return -1;
+           nd_print_invalid(ndo);
+            goto invalid;
         }
 
         switch(tlv_type) {
         case LS_OPAQUE_TE_TLV_LINK:
-            while (tlv_length != 0) {
-                if (tlv_length < 4) {
-                    ND_PRINT("\n\t    Remaining TLV length %u < 4",
-                           tlv_length);
-                    return -1;
-                }
-                subtlv_type = GET_BE_U_2(tptr);
-                subtlv_length = GET_BE_U_2(tptr + 2);
-                tptr+=4;
-                tlv_length-=4;
-
-               /* Infinite loop protection */
-               if (subtlv_type == 0 || subtlv_length == 0)
-                   goto invalid;
-
-                ND_PRINT("\n\t      %s subTLV (%u), length: %u",
-                       tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type),
-                       subtlv_type,
-                       subtlv_length);
-
-                if (tlv_length < subtlv_length) {
-                    ND_PRINT("\n\t    Remaining TLV length %u < %u",
-                           tlv_length + 4, subtlv_length + 4);
-                    return -1;
-                }
-                ND_TCHECK_LEN(tptr, subtlv_length);
-                switch(subtlv_type) {
-                case LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP:
-                   if (subtlv_length != 4) {
-                       ND_PRINT(" != 4");
-                       goto invalid;
-                   }
-                    ND_PRINT(", 0x%08x", GET_BE_U_4(tptr));
-                    break;
-                case LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID:
-                case LS_OPAQUE_TE_LINK_SUBTLV_LINK_LOCAL_REMOTE_ID:
-                   if (subtlv_length != 4 && subtlv_length != 8) {
-                       ND_PRINT(" != 4 && != 8");
-                       goto invalid;
-                   }
-                    ND_PRINT(", %s (0x%08x)",
-                           GET_IPADDR_STRING(tptr),
-                           GET_BE_U_4(tptr));
-                    if (subtlv_length == 8) /* rfc4203 */
-                        ND_PRINT(", %s (0x%08x)",
-                               GET_IPADDR_STRING(tptr+4),
-                               GET_BE_U_4(tptr + 4));
-                    break;
-                case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP:
-                case LS_OPAQUE_TE_LINK_SUBTLV_REMOTE_IP:
-                   if (subtlv_length != 4) {
-                       ND_PRINT(" != 4");
-                       goto invalid;
-                   }
-                    ND_PRINT(", %s", GET_IPADDR_STRING(tptr));
-                    break;
-                case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW:
-                case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW:
-                   if (subtlv_length != 4) {
-                       ND_PRINT(" != 4");
-                       goto invalid;
-                   }
-                    bw.i = GET_BE_U_4(tptr);
-                    ND_PRINT(", %.3f Mbps", bw.f * 8 / 1000000);
-                    break;
-                case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
-                   if (subtlv_length != 32) {
-                       ND_PRINT(" != 32");
-                       goto invalid;
-                   }
-                    for (te_class = 0; te_class < 8; te_class++) {
-                        bw.i = GET_BE_U_4(tptr + te_class * 4);
-                        ND_PRINT("\n\t\tTE-Class %u: %.3f Mbps",
-                               te_class,
-                               bw.f * 8 / 1000000);
-                    }
-                    break;
-                case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS:
-                   if (subtlv_length < 4) {
-                       ND_PRINT(" < 4");
-                       goto invalid;
-                   }
-                   /* BC Model Id (1 octet) + Reserved (3 octets) */
-                    ND_PRINT("\n\t\tBandwidth Constraints Model ID: %s (%u)",
-                           tok2str(diffserv_te_bc_values, "unknown", GET_U_1(tptr)),
-                           GET_U_1(tptr));
-                   if (subtlv_length % 4 != 0) {
-                       ND_PRINT("\n\t\tlength %u != N x 4", subtlv_length);
-                       goto invalid;
-                   }
-                   if (subtlv_length > 36) {
-                       ND_PRINT("\n\t\tlength %u > 36", subtlv_length);
-                       goto invalid;
-                   }
-                    /* decode BCs until the subTLV ends */
-                    for (te_class = 0; te_class < (subtlv_length-4)/4; te_class++) {
-                        bw.i = GET_BE_U_4(tptr + 4 + te_class * 4);
-                        ND_PRINT("\n\t\t  Bandwidth constraint CT%u: %.3f Mbps",
-                               te_class,
-                               bw.f * 8 / 1000000);
-                    }
-                    break;
-                case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC:
-                   if (subtlv_length != 4) {
-                       ND_PRINT(" != 4");
-                       goto invalid;
-                   }
-                    ND_PRINT(", Metric %u", GET_BE_U_4(tptr));
-                    break;
-                case LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE:
-                   /* Protection Cap (1 octet) + Reserved ((3 octets) */
-                   if (subtlv_length != 4) {
-                       ND_PRINT(" != 4");
-                       goto invalid;
-                   }
-                    ND_PRINT(", %s",
-                             bittok2str(gmpls_link_prot_values, "none", GET_U_1(tptr)));
-                    break;
-                case LS_OPAQUE_TE_LINK_SUBTLV_INTF_SW_CAP_DESCR:
-                   if (subtlv_length < 36) {
-                       ND_PRINT(" < 36");
-                       goto invalid;
-                   }
-                   /* Switching Cap (1 octet) + Encoding (1) +  Reserved (2) */
-                    ND_PRINT("\n\t\tInterface Switching Capability: %s",
-                           tok2str(gmpls_switch_cap_values, "Unknown", GET_U_1((tptr))));
-                    ND_PRINT("\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
-                           tok2str(gmpls_encoding_values, "Unknown", GET_U_1((tptr + 1))));
-                    for (priority_level = 0; priority_level < 8; priority_level++) {
-                        bw.i = GET_BE_U_4(tptr + 4 + (priority_level * 4));
-                        ND_PRINT("\n\t\t  priority level %u: %.3f Mbps",
-                               priority_level,
-                               bw.f * 8 / 1000000);
-                    }
-                    break;
-                case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE:
-                   if (subtlv_length != 1) {
-                       ND_PRINT(" != 1");
-                       goto invalid;
-                   }
-                    ND_PRINT(", %s (%u)",
-                           tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",GET_U_1(tptr)),
-                           GET_U_1(tptr));
-                    break;
-
-                case LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP:
-                   if (subtlv_length % 4 != 0) {
-                       ND_PRINT(" != N x 4");
-                       goto invalid;
-                   }
-                    count_srlg = subtlv_length / 4;
-                    if (count_srlg != 0)
-                        ND_PRINT("\n\t\t  Shared risk group: ");
-                    while (count_srlg > 0) {
-                        bw.i = GET_BE_U_4(tptr);
-                        ND_PRINT("%u", bw.i);
-                        tptr+=4;
-                        count_srlg--;
-                        if (count_srlg > 0)
-                            ND_PRINT(", ");
-                    }
-                    break;
-
-                default:
-                    if (ndo->ndo_vflag <= 1) {
-                        if (!print_unknown_data(ndo, tptr, "\n\t\t", subtlv_length))
-                            return -1;
-                    }
-                    break;
-                }
-                /* in OSPF everything has to be 32-bit aligned, including subTLVs */
-                if (subtlv_length%4 != 0)
-                    subtlv_length+=4-(subtlv_length%4);
-
-                if (tlv_length < subtlv_length) {
-                    ND_PRINT("\n\t    Remaining TLV length %u < %u",
-                           tlv_length + 4, subtlv_length + 4);
-                    return -1;
-                }
-                tlv_length-=subtlv_length;
-                tptr+=subtlv_length;
-
-            }
+            if (ospf_te_tlv_link_print(ndo, tptr, tlv_length) == -1)
+                return -1;
             break;
 
         case LS_OPAQUE_TE_TLV_ROUTER:
             if (tlv_length < 4) {
                 ND_PRINT("\n\t    TLV length %u < 4", tlv_length);
-                return -1;
+                goto invalid;
             }
             ND_PRINT(", %s", GET_IPADDR_STRING(tptr));
             break;
@@ -498,23 +562,25 @@ ospf_te_lsa_print(netdissect_options *ndo,
         default:
             if (ndo->ndo_vflag <= 1) {
                 if (!print_unknown_data(ndo, tptr, "\n\t      ", tlv_length))
-                    return -1;
+                    goto invalid;
             }
             break;
         }
         /* in OSPF everything has to be 32-bit aligned, including TLVs */
-        if (tlv_length%4 != 0)
+        if (tlv_length%4 != 0) {
             tlv_length+=4-(tlv_length%4);
-        if (tlv_length > ls_length) {
-            ND_PRINT("\n\t    Bogus padded length %u > %u", tlv_length,
-                   ls_length);
-            return -1;
+            if (tlv_length > ls_length) {
+                ND_PRINT("\n\t    Bogus padded length %u > %u", tlv_length,
+                       ls_length);
+                goto invalid;
+            }
         }
         ls_length-=tlv_length;
         tptr+=tlv_length;
     }
     return 0;
 trunc:
+    nd_print_trunc(ndo);
     return -1;
 invalid:
     nd_print_invalid(ndo);
@@ -610,6 +676,260 @@ ospf_print_tos_metrics(netdissect_options *ndo,
     }
 }
 
+/*
+ * The SID/Label Range TLV
+ * https://datatracker.ietf.org/doc/html/rfc8665#section-3.2
+ * and the SR Local Block TLV
+ * https://datatracker.ietf.org/doc/html/rfc8665#section-3.3
+ * have the same contents, so this function is used to
+ * print both.
+ */
+static int
+ospf_print_ri_lsa_sid_label_range_tlv(netdissect_options *ndo, const uint8_t *tptr,
+                                     u_int tlv_length)
+{
+    u_int subtlv_type, subtlv_length;
+
+    while (tlv_length >= 4) {
+
+       subtlv_type = GET_BE_U_2(tptr);
+       subtlv_length = GET_BE_U_2(tptr+2);
+       tptr+=4;
+       tlv_length-=4;
+
+       /* Infinite loop protection. */
+       if (subtlv_type == 0 || subtlv_length == 0) {
+           nd_print_invalid(ndo);
+           return -1;
+       }
+
+       ND_PRINT("\n\t      %s subTLV (%u), length: %u, value: ",
+                tok2str(lsa_opaque_ri_sid_subtlv_values,"unknown",subtlv_type),
+                subtlv_type,
+                subtlv_length);
+
+       if (tlv_length < subtlv_length) {
+           ND_PRINT("\n\t    Remaining TLV length %u < %u",
+               tlv_length, subtlv_length);
+           return -1;
+       }
+
+       switch (subtlv_type) {
+       case LS_OPAQUE_RI_SUBTLV_SID_LABEL:
+           if (subtlv_length == 3) {
+               ND_PRINT("\n\t\tLabel: %u", GET_BE_U_3(tptr));
+           } else if (subtlv_length == 4) {
+               ND_PRINT("\n\t\tSID: %u", GET_BE_U_4(tptr));
+           } else {
+               ND_PRINT("\n\t\tBogus subTLV length %u", subtlv_length);
+           }
+           break;
+
+       default:
+           if (ndo->ndo_vflag <= 1) {
+               if (!print_unknown_data(ndo, tptr, "\n\t\t", subtlv_length))
+                   return -1;
+           }
+       }
+
+       /* in OSPF everything has to be 32-bit aligned, including subTLVs */
+       if (subtlv_length % 4) {
+           subtlv_length += (4 - (subtlv_length % 4));
+           if (tlv_length < subtlv_length) {
+               ND_PRINT("\n\t    Remaining TLV length %u < %u",
+                   tlv_length, subtlv_length);
+               return -1;
+           }
+       }
+       tptr+=subtlv_length;
+       tlv_length-=subtlv_length;
+    }
+    return 0;
+}
+
+static int
+ospf_print_ep_lsa_extd_prefix_tlv(netdissect_options *ndo, const uint8_t *tptr,
+                                 u_int tlv_length)
+{
+    u_int subtlv_type, subtlv_length;
+    uint8_t flags, mt_id, algo;
+
+    while (tlv_length >= 4) {
+       subtlv_type = GET_BE_U_2(tptr);
+       subtlv_length = GET_BE_U_2(tptr+2);
+       tptr+=4;
+       tlv_length-=4;
+
+       /* Infinite loop protection. */
+       if (subtlv_type == 0 || subtlv_length == 0) {
+           nd_print_invalid(ndo);
+           return -1;
+       }
+
+       ND_PRINT("\n\t\t%s subTLV (%u), length: %u, value: ",
+                tok2str(lsa_opaque_ep_extd_prefix_subtlv_values,"unknown",subtlv_type),
+                subtlv_type,
+                subtlv_length);
+
+       if (tlv_length < subtlv_length) {
+            ND_PRINT("\n\t    Remaining TLV length %u < %u",
+                tlv_length, subtlv_length);
+           return -1;
+       }
+
+       switch (subtlv_type) {
+       case LS_OPAQUE_EP_SUBTLV_PREFIX_SID:
+           flags = GET_U_1(tptr);
+           mt_id = GET_U_1(tptr+2);
+           algo = GET_U_1(tptr+3);
+
+           if (subtlv_length == 7) {
+               ND_PRINT("\n\t\t  Label: %u", GET_BE_U_3(tptr+4));
+           } else if (subtlv_length == 8) {
+               ND_PRINT("\n\t\t  Index: %u", GET_BE_U_4(tptr+4));
+           } else {
+               ND_PRINT("\n\t\tBogus subTLV length %u", subtlv_length);
+               break;
+           }
+           ND_PRINT( ", MT-ID: %u, Algorithm: %s (%u), Flags [%s]",
+                     mt_id, tok2str(lsa_opaque_ri_tlv_sr_algos, "Unknown", algo), algo,
+                bittok2str(ep_range_tlv_prefix_sid_subtlv_flag_values, "none", flags));
+           break;
+
+       default:
+           if (ndo->ndo_vflag <= 1) {
+               if (!print_unknown_data(ndo, tptr, "\n\t\t", subtlv_length))
+                   return -1;
+           }
+       }
+
+       /* in OSPF everything has to be 32-bit aligned, including subTLVs */
+       if (subtlv_length % 4) {
+           subtlv_length += (4 - (subtlv_length % 4));
+           if (tlv_length < subtlv_length) {
+               ND_PRINT("\n\t    Remaining TLV length %u < %u",
+                   tlv_length, subtlv_length);
+               return -1;
+           }
+       }
+       tptr+=subtlv_length;
+       tlv_length-=subtlv_length;
+    }
+    return 0;
+}
+
+static int
+ospf_ep_lsa_print(netdissect_options *ndo, const uint8_t *tptr, u_int lsa_length)
+{
+    u_int tlv_type, tlv_length;
+    uint16_t range_size;
+    uint8_t af, prefix_length, route_type, flags;
+
+    while (lsa_length >= 4) {
+
+       tlv_type = GET_BE_U_2(tptr);
+       tlv_length = GET_BE_U_2(tptr+2);
+       tptr+=4;
+       lsa_length-=4;
+
+       /* Infinite loop protection. */
+       if (tlv_type == 0 || tlv_length == 0) {
+           nd_print_invalid(ndo);
+           return -1;
+       }
+
+       ND_PRINT("\n\t    %s TLV (%u), length: %u, value: ",
+                tok2str(lsa_opaque_ep_tlv_values,"unknown",tlv_type),
+                tlv_type,
+                tlv_length);
+
+       if (tlv_length > lsa_length) {
+           ND_PRINT("\n\t    Bogus length %u > %u",
+               tlv_length, lsa_length);
+           return -1;
+       }
+
+       switch (tlv_type) {
+       case LS_OPAQUE_EP_EXTD_PREFIX_TLV:
+           prefix_length = GET_U_1(tptr+1);
+           af = GET_U_1(tptr+2);
+           route_type = GET_U_1(tptr);
+           flags = GET_U_1(tptr+3);
+
+           if (af != 0) {
+               ND_PRINT("\n\t      Bogus AF %u", af);
+               return -1;
+           }
+
+           if (prefix_length > 32) {
+               ND_PRINT("\n\t      IPv4 prefix: bad bit length %u", prefix_length);
+               return -1;
+           }
+
+           ND_PRINT("\n\t      IPv4 prefix: %15s/%u, Route Type: %s, Flags [%s]",
+                    GET_IPADDR_STRING(tptr+4), prefix_length,
+                    tok2str(lsa_opaque_ep_route_type_values, "Unknown", route_type),
+                    bittok2str(ep_tlv_flag_values, "none", flags));
+
+           /* subTLVs present ? */
+           if (tlv_length > 12) {
+               if (ospf_print_ep_lsa_extd_prefix_tlv(ndo, tptr+8, tlv_length-8) == -1) {
+                   return -1;
+               }
+           }
+           break;
+
+       case LS_OPAQUE_EP_EXTD_PREFIX_RANGE_TLV:
+           prefix_length = GET_U_1(tptr);
+           af = GET_U_1(tptr+1);
+           range_size = GET_BE_U_2(tptr+2);
+           flags = GET_U_1(tptr+4);
+
+           if (af != 0) {
+               ND_PRINT("\n\t      Bogus AF %u", af);
+               return -1;
+           }
+
+           if (prefix_length > 32) {
+               ND_PRINT("\n\t      IPv4 prefix: bad bit length %u", prefix_length);
+               return -1;
+           }
+
+           ND_PRINT("\n\t      IPv4 prefix: %15s/%u, Range size: %u, Flags [%s]",
+                    GET_IPADDR_STRING(tptr+8), prefix_length,
+                    range_size,
+                    bittok2str(ep_tlv_flag_values, "none", flags));
+
+           /* subTLVs present ? */
+           if (tlv_length > 12) {
+               if (ospf_print_ep_lsa_extd_prefix_tlv(ndo, tptr+12, tlv_length-12) == -1) {
+                   return -1;
+               }
+           }
+           break;
+
+       default:
+           if (ndo->ndo_vflag <= 1) {
+               if (!print_unknown_data(ndo, tptr, "\n\t\t", tlv_length))
+                   return -1;
+           }
+       }
+
+       /* in OSPF everything has to be 32-bit aligned, including TLVs */
+       if (tlv_length % 4) {
+           tlv_length += (4 - (tlv_length % 4));
+           if (tlv_length > lsa_length) {
+               ND_PRINT("\n\t    Bogus padded length %u > %u", tlv_length,
+                   lsa_length);
+               return -1;
+           }
+       }
+       tptr+=tlv_length;
+       lsa_length-=tlv_length;
+    }
+    return 0;
+}
+
 /*
  * Print a single link state advertisement.  If truncated or if LSA length
  * field is less than the length of the LSA header, return NULl, else
@@ -625,7 +945,7 @@ ospf_print_lsa(netdissect_options *ndo,
        const struct aslametric *almp;
        const struct mcla *mcp;
        const uint8_t *lp;
-       u_int tlv_type, tlv_length, rla_count, topology;
+       u_int tlv_type, tlv_length, rla_count, topology, num_tlv;
        int ospf_print_lshdr_ret;
        u_int ls_length;
        const uint8_t *tptr;
@@ -697,8 +1017,7 @@ ospf_print_lsa(netdissect_options *ndo,
                    GET_IPADDR_STRING(lsap->lsa_un.un_nla.nla_mask));
                ap = lsap->lsa_un.un_nla.nla_router;
                while ((const u_char *)ap < ls_end) {
-                       ND_TCHECK_SIZE(ap);
-                       ND_PRINT("\n\t      %s", GET_IPADDR_STRING(*ap));
+                       ND_PRINT("\n\t      %s", GET_IPADDR_STRING(ap));
                        ++ap;
                }
                break;
@@ -836,6 +1155,38 @@ ospf_print_lsa(netdissect_options *ndo,
                         ND_PRINT("Capabilities: %s",
                                bittok2str(lsa_opaque_ri_tlv_cap_values, "Unknown", GET_BE_U_4(tptr)));
                         break;
+
+                    case LS_OPAQUE_RI_TLV_HOSTNAME:
+                        ND_PRINT("\n\t      Hostname: ");
+                        nd_printjnp(ndo, tptr, tlv_length);
+                        break;
+
+                    case LS_OPAQUE_RI_TLV_SR_ALGO:
+                        num_tlv = tlv_length;
+                        while (num_tlv >= 1) {
+                            ND_PRINT("\n\t      %s (%u)",
+                                     tok2str(lsa_opaque_ri_tlv_sr_algos, "Unknown", GET_U_1(tptr+tlv_length-num_tlv)), GET_U_1(tptr+tlv_length-num_tlv));
+                            num_tlv--;
+                        }
+                        break;
+
+                    case LS_OPAQUE_RI_TLV_SID_LABEL_RANGE:
+                    case LS_OPAQUE_RI_TLV_SR_LOCAL_BLOCK:
+                        ND_TCHECK_4(tptr);
+                        ND_PRINT("\n\t      Range size: %u", GET_BE_U_3(tptr));
+                        if (ospf_print_ri_lsa_sid_label_range_tlv(ndo, tptr+4, tlv_length-4) == -1) {
+                            return(ls_end);
+                        }
+                        break;
+
+                    case LS_OPAQUE_RI_TLV_SRMS_PREFERENCE:
+                        if (tlv_length != 4) {
+                            ND_PRINT("\n\t    Bogus SRMS Preference TLV length %u != 4", tlv_length);
+                            return(ls_end);
+                        }
+                        ND_PRINT("\n\t      SRMS Preference: %u", GET_U_1(tptr));
+                        break;
+
                     default:
                         if (ndo->ndo_vflag <= 1) {
                             if (!print_unknown_data(ndo, tptr, "\n\t      ", tlv_length))
@@ -844,6 +1195,16 @@ ospf_print_lsa(netdissect_options *ndo,
                         break;
 
                     }
+
+                    /* in OSPF everything has to be 32-bit aligned, including TLVs */
+                    if (tlv_length % 4) {
+                        tlv_length += (4 - (tlv_length % 4));
+                        if (tlv_length > ls_length_remaining) {
+                            ND_PRINT("\n\t    Bogus padded length %u > %u", tlv_length,
+                                   ls_length_remaining);
+                            return(NULL);
+                        }
+                    }
                     tptr+=tlv_length;
                     ls_length_remaining-=tlv_length;
                 }
@@ -863,6 +1224,13 @@ ospf_print_lsa(netdissect_options *ndo,
                 }
                 break;
 
+            case LS_OPAQUE_TYPE_EP:
+                if (ospf_ep_lsa_print(ndo, (const u_char *)(lsap->lsa_un.un_ep_tlv),
+                                      ls_length) == -1) {
+                    return(ls_end);
+                }
+                break;
+
             default:
                 if (ndo->ndo_vflag <= 1) {
                     if (!print_unknown_data(ndo, (const uint8_t *)lsap->lsa_un.un_unknown,
@@ -882,6 +1250,7 @@ ospf_print_lsa(netdissect_options *ndo,
 
        return (ls_end);
 trunc:
+       nd_print_trunc(ndo);
        return (NULL);
 }
 
@@ -1000,8 +1369,7 @@ ospf_decode_v2(netdissect_options *ndo,
                if ((const u_char *)ap < dataend)
                        ND_PRINT("\n\t  Neighbor List:");
                while ((const u_char *)ap < dataend) {
-                       ND_TCHECK_SIZE(ap);
-                       ND_PRINT("\n\t    %s", GET_IPADDR_STRING(*ap));
+                       ND_PRINT("\n\t    %s", GET_IPADDR_STRING(ap));
                        ++ap;
                }
                break;  /* HELLO */
@@ -1068,7 +1436,8 @@ ospf_decode_v2(netdissect_options *ndo,
 
        case OSPF_TYPE_LS_ACK:
                 lshp = op->ospf_lsa.lsa_lshdr;
-                while (ospf_print_lshdr(ndo, lshp) != -1) {
+                while ((const u_char *)lshp < dataend) {
+                    ospf_print_lshdr(ndo, lshp);
                     ++lshp;
                 }
                 break;