]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ospf.c
Avoid -E and -M options inconsistencies with no libcrypto
[tcpdump] / print-ospf.c
index d0cf573c0676a5fb133ce13fa45f2af93304e103..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" },
@@ -102,6 +99,7 @@ static const struct tok lsa_opaque_values[] = {
        { 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 }
 };
 
@@ -130,7 +128,6 @@ static const struct tok ep_range_tlv_prefix_sid_subtlv_flag_values[] = {
        { 0,                    NULL}
 };
 
-
 static const struct tok lsa_opaque_ep_route_type_values[] = {
        { 0, "Unspecified" },
        { 1, "Intra-Area" },
@@ -192,8 +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 }
 };
 
@@ -211,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" },
@@ -229,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);
@@ -296,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;
 }
 
@@ -311,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);
@@ -337,206 +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) {
            nd_print_invalid(ndo);
-            return -1;
+            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;
@@ -544,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);
@@ -656,6 +676,14 @@ 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)
@@ -680,6 +708,12 @@ ospf_print_ri_lsa_sid_label_range_tlv(netdissect_options *ndo, const uint8_t *tp
                 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) {
@@ -701,6 +735,11 @@ ospf_print_ri_lsa_sid_label_range_tlv(netdissect_options *ndo, const uint8_t *tp
        /* 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;
@@ -732,6 +771,12 @@ ospf_print_ep_lsa_extd_prefix_tlv(netdissect_options *ndo, const uint8_t *tptr,
                 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);
@@ -739,15 +784,16 @@ ospf_print_ep_lsa_extd_prefix_tlv(netdissect_options *ndo, const uint8_t *tptr,
            algo = GET_U_1(tptr+3);
 
            if (subtlv_length == 7) {
-               ND_PRINT("\n\t\t  Label: %u, MT-ID: %u, Algorithm: %u",
-                        GET_BE_U_3(tptr+4), mt_id, algo);
+               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, MT-ID: %u, Algorithm: %u, Flags [%s]",
-                        GET_BE_U_4(tptr+4), mt_id, algo,
-                        bittok2str(ep_range_tlv_prefix_sid_subtlv_flag_values, "none", flags));
+               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:
@@ -760,6 +806,11 @@ ospf_print_ep_lsa_extd_prefix_tlv(netdissect_options *ndo, const uint8_t *tptr,
        /* 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;
@@ -792,6 +843,12 @@ ospf_ep_lsa_print(netdissect_options *ndo, const uint8_t *tptr, u_int lsa_length
                 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);
@@ -861,6 +918,11 @@ ospf_ep_lsa_print(netdissect_options *ndo, const uint8_t *tptr, u_int lsa_length
        /* 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;
@@ -883,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;
@@ -1099,7 +1161,17 @@ ospf_print_lsa(netdissect_options *ndo,
                         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) {
@@ -1107,6 +1179,14 @@ ospf_print_lsa(netdissect_options *ndo,
                         }
                         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))
@@ -1119,6 +1199,11 @@ ospf_print_lsa(netdissect_options *ndo,
                     /* 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;
@@ -1165,6 +1250,7 @@ ospf_print_lsa(netdissect_options *ndo,
 
        return (ls_end);
 trunc:
+       nd_print_trunc(ndo);
        return (NULL);
 }