PIM: Fix some length checks

[tcpdump] / print-openflow-1.0.c

diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index d1cafc5dae8e3a8a7400b93c395c7e7c0375cb13..4cf766bc6cb6f14c615be0d47626a8fb09e6f516 100644 (file)
--- a/print-openflow-1.0.c
+++ b/print-openflow-1.0.c
@@ -700,7 +700,7 @@ vlan_str(const uint16_t vid)
 
        if (vid == OFP_VLAN_NONE)
                return "NONE";
-       nd_snprintf(buf, sizeof(buf), "%u%s", vid,
+       snprintf(buf, sizeof(buf), "%u%s", vid,
            (vid > 0 && vid < 0x0fff) ? "" : " (bogus)");
        return buf;
 }
@@ -709,7 +709,7 @@ static const char *
 pcp_str(const uint8_t pcp)
 {
        static char buf[sizeof("255 (bogus)")];
-       nd_snprintf(buf, sizeof(buf), "%u%s", pcp,
+       snprintf(buf, sizeof(buf), "%u%s", pcp,
            pcp <= 7 ? "" : " (bogus)");
        return buf;
 }
@@ -1128,7 +1128,7 @@ of10_packet_data_print(netdissect_options *ndo,
        ND_TCHECK_LEN(cp, len);
        ndo->ndo_vflag -= 3;
        ND_PRINT(", frame decoding below\n");
-       ether_print(ndo, cp, len, ndo->ndo_snapend - cp, NULL, NULL);
+       ether_print(ndo, cp, len, ND_BYTES_AVAILABLE_AFTER(cp), NULL, NULL);
        ndo->ndo_vflag += 3;
        return cp + len;