Default to first interface from pcap_findalldevs()

[tcpdump] / print-openflow-1.0.c

diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index 6e50803bcd39b0789efa87d1556e3dabe815aafa..bc7fa42bdd93f40fe82a39ce61a940943786f1b6 100644 (file)
--- a/print-openflow-1.0.c
+++ b/print-openflow-1.0.c
@@ -14,7 +14,7 @@
  * * ep -- the pointer to the end of the captured frame
  * They return either the pointer to the next not-yet-decoded part of the frame
  * or the value of ep, which means the current frame processing is over as it
  * * ep -- the pointer to the end of the captured frame
  * They return either the pointer to the next not-yet-decoded part of the frame
  * or the value of ep, which means the current frame processing is over as it

- * has been fully decoded or is malformed or truncated. This way it is possible
+ * has been fully decoded or is invalid or truncated. This way it is possible

  * to chain and nest such functions uniformly to decode an OF1.0 message, which
  * consists of several layers of nested structures.
  *
  * to chain and nest such functions uniformly to decode an OF1.0 message, which
  * consists of several layers of nested structures.
  *


@@ -56,14 +56,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 #include "addrtoname.h"
 #include "ether.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ether.h"


@@ -73,7 +72,7 @@
 #include "openflow.h"
 
 static const char tstr[] = " [|openflow]";
 #include "openflow.h"
 
 static const char tstr[] = " [|openflow]";

-static const char cstr[] = " (corrupt)";
+static const char istr[] = " (invalid)";

 
 #define OFPT_HELLO                    0x00
 #define OFPT_ERROR                    0x01
 
 #define OFPT_HELLO                    0x00
 #define OFPT_ERROR                    0x01


@@ -696,7 +695,8 @@ static const struct tok bsn_onoff_str[] = {
 };
 
 static const char *
 };
 
 static const char *

-vlan_str(const uint16_t vid) {
+vlan_str(const uint16_t vid)
+{

        static char buf[sizeof("65535 (bogus)")];
        const char *fmt;
 
        static char buf[sizeof("65535 (bogus)")];
        const char *fmt;
 


@@ -708,7 +708,8 @@ vlan_str(const uint16_t vid) {
 }
 
 static const char *
 }
 
 static const char *

-pcp_str(const uint8_t pcp) {
+pcp_str(const uint8_t pcp)
+{

        static char buf[sizeof("255 (bogus)")];
        snprintf(buf, sizeof(buf), pcp <= 7 ? "%u" : "%u (bogus)", pcp);
        return buf;
        static char buf[sizeof("255 (bogus)")];
        snprintf(buf, sizeof(buf), pcp <= 7 ? "%u" : "%u (bogus)", pcp);
        return buf;


@@ -716,7 +717,8 @@ pcp_str(const uint8_t pcp) {
 
 static void
 of10_bitmap_print(netdissect_options *ndo,
 
 static void
 of10_bitmap_print(netdissect_options *ndo,

-                  const struct tok *t, const uint32_t v, const uint32_t u) {
+                  const struct tok *t, const uint32_t v, const uint32_t u)
+{

        const char *sep = " (";
 
        if (v == 0)
        const char *sep = " (";
 
        if (v == 0)


@@ -733,7 +735,8 @@ of10_bitmap_print(netdissect_options *ndo,
 
 static const u_char *
 of10_data_print(netdissect_options *ndo,
 
 static const u_char *
 of10_data_print(netdissect_options *ndo,

-                const u_char *cp, const u_char *ep, const u_int len) {
+                const u_char *cp, const u_char *ep, const u_int len)
+{

        if (len == 0)
                return cp;
        /* data */
        if (len == 0)
                return cp;
        /* data */


@@ -750,12 +753,13 @@ trunc:
 
 static const u_char *
 of10_bsn_message_print(netdissect_options *ndo,
 
 static const u_char *
 of10_bsn_message_print(netdissect_options *ndo,

-                       const u_char *cp, const u_char *ep, const u_int len) {
+                       const u_char *cp, const u_char *ep, const u_int len)
+{

        const u_char *cp0 = cp;
        uint32_t subtype;
 
        if (len < 4)
        const u_char *cp0 = cp;
        uint32_t subtype;
 
        if (len < 4)

-               goto corrupt;
+               goto invalid;

        /* subtype */
        ND_TCHECK2(*cp, 4);
        subtype = EXTRACT_32BITS(cp);
        /* subtype */
        ND_TCHECK2(*cp, 4);
        subtype = EXTRACT_32BITS(cp);


@@ -776,7 +780,7 @@ of10_bsn_message_print(netdissect_options *ndo,
                 *
                 */
                if (len != 12)
                 *
                 */
                if (len != 12)

-                       goto corrupt;
+                       goto invalid;

                /* index */
                ND_TCHECK2(*cp, 1);
                ND_PRINT((ndo, ", index %u", *cp));
                /* index */
                ND_TCHECK2(*cp, 1);
                ND_PRINT((ndo, ", index %u", *cp));


@@ -800,7 +804,7 @@ of10_bsn_message_print(netdissect_options *ndo,
                 *
                 */
                if (len != 12)
                 *
                 */
                if (len != 12)

-                       goto corrupt;
+                       goto invalid;

                /* index */
                ND_TCHECK2(*cp, 1);
                ND_PRINT((ndo, ", index %u", *cp));
                /* index */
                ND_TCHECK2(*cp, 1);
                ND_PRINT((ndo, ", index %u", *cp));


@@ -827,7 +831,7 @@ of10_bsn_message_print(netdissect_options *ndo,
                 *
                 */
                if (len != 8)
                 *
                 */
                if (len != 8)

-                       goto corrupt;
+                       goto invalid;

                /* report_mirror_ports */
                ND_TCHECK2(*cp, 1);
                ND_PRINT((ndo, ", report_mirror_ports %s", tok2str(bsn_onoff_str, "bogus (%u)", *cp)));
                /* report_mirror_ports */
                ND_TCHECK2(*cp, 1);
                ND_PRINT((ndo, ", report_mirror_ports %s", tok2str(bsn_onoff_str, "bogus (%u)", *cp)));


@@ -850,7 +854,7 @@ of10_bsn_message_print(netdissect_options *ndo,
                 *
                 */
                if (len != 4)
                 *
                 */
                if (len != 4)

-                       goto corrupt;
+                       goto invalid;

                break;
        case BSN_VIRTUAL_PORT_REMOVE_REQUEST:
                /*
                break;
        case BSN_VIRTUAL_PORT_REMOVE_REQUEST:
                /*


@@ -864,7 +868,7 @@ of10_bsn_message_print(netdissect_options *ndo,
                 *
                 */
                if (len != 8)
                 *
                 */
                if (len != 8)

-                       goto corrupt;
+                       goto invalid;

                /* vport_no */
                ND_TCHECK2(*cp, 4);
                ND_PRINT((ndo, ", vport_no %u", EXTRACT_32BITS(cp)));
                /* vport_no */
                ND_TCHECK2(*cp, 4);
                ND_PRINT((ndo, ", vport_no %u", EXTRACT_32BITS(cp)));


@@ -884,7 +888,7 @@ of10_bsn_message_print(netdissect_options *ndo,
                 *
                 */
                if (len < 8)
                 *
                 */
                if (len < 8)

-                       goto corrupt;
+                       goto invalid;

                /* service */
                ND_TCHECK2(*cp, 4);
                ND_PRINT((ndo, ", service %u", EXTRACT_32BITS(cp)));
                /* service */
                ND_TCHECK2(*cp, 4);
                ND_PRINT((ndo, ", service %u", EXTRACT_32BITS(cp)));


@@ -909,8 +913,7 @@ of10_bsn_message_print(netdissect_options *ndo,
                 * +---------------+---------------+--------
                 *
                 */
                 * +---------------+---------------+--------
                 *
                 */

-               if (len < 4)
-                       goto corrupt;
+               /* already checked that len >= 4 */

                /* data */
                ND_PRINT((ndo, ", data '"));
                if (fn_printn(ndo, cp, len - 4, ep)) {
                /* data */
                ND_PRINT((ndo, ", data '"));
                if (fn_printn(ndo, cp, len - 4, ep)) {


@@ -932,7 +935,7 @@ of10_bsn_message_print(netdissect_options *ndo,
                 *
                 */
                if (len != 8)
                 *
                 */
                if (len != 8)

-                       goto corrupt;
+                       goto invalid;

                /* status */
                ND_TCHECK2(*cp, 4);
                ND_PRINT((ndo, ", status 0x%08x", EXTRACT_32BITS(cp)));
                /* status */
                ND_TCHECK2(*cp, 4);
                ND_PRINT((ndo, ", status 0x%08x", EXTRACT_32BITS(cp)));


@@ -944,8 +947,8 @@ of10_bsn_message_print(netdissect_options *ndo,
        }
        return cp;
 
        }
        return cp;
 

-corrupt: /* skip the undersized data */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the undersized data */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp0, len);
        return cp0 + len;
 trunc:
        ND_TCHECK2(*cp0, len);
        return cp0 + len;
 trunc:


@@ -955,12 +958,13 @@ trunc:
 
 static const u_char *
 of10_bsn_actions_print(netdissect_options *ndo,
 
 static const u_char *
 of10_bsn_actions_print(netdissect_options *ndo,

-                       const u_char *cp, const u_char *ep, const u_int len) {
+                       const u_char *cp, const u_char *ep, const u_int len)
+{

        const u_char *cp0 = cp;
        uint32_t subtype, vlan_tag;
 
        if (len < 4)
        const u_char *cp0 = cp;
        uint32_t subtype, vlan_tag;
 
        if (len < 4)

-               goto corrupt;
+               goto invalid;

        /* subtype */
        ND_TCHECK2(*cp, 4);
        subtype = EXTRACT_32BITS(cp);
        /* subtype */
        ND_TCHECK2(*cp, 4);
        subtype = EXTRACT_32BITS(cp);


@@ -983,7 +987,7 @@ of10_bsn_actions_print(netdissect_options *ndo,
                 *
                 */
                if (len != 16)
                 *
                 */
                if (len != 16)

-                       goto corrupt;
+                       goto invalid;

                /* dest_port */
                ND_TCHECK2(*cp, 4);
                ND_PRINT((ndo, ", dest_port %u", EXTRACT_32BITS(cp)));
                /* dest_port */
                ND_TCHECK2(*cp, 4);
                ND_PRINT((ndo, ", dest_port %u", EXTRACT_32BITS(cp)));


@@ -1017,8 +1021,8 @@ of10_bsn_actions_print(netdissect_options *ndo,
 
        return cp;
 
 
        return cp;
 

-corrupt:
-       ND_PRINT((ndo, "%s", cstr));
+invalid:
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp0, len);
        return cp0 + len;
 trunc:
        ND_TCHECK2(*cp0, len);
        return cp0 + len;
 trunc:


@@ -1028,12 +1032,13 @@ trunc:
 
 static const u_char *
 of10_vendor_action_print(netdissect_options *ndo,
 
 static const u_char *
 of10_vendor_action_print(netdissect_options *ndo,

-                         const u_char *cp, const u_char *ep, const u_int len) {
+                         const u_char *cp, const u_char *ep, const u_int len)
+{

        uint32_t vendor;
        const u_char *(*decoder)(netdissect_options *, const u_char *, const u_char *, const u_int);
 
        if (len < 4)
        uint32_t vendor;
        const u_char *(*decoder)(netdissect_options *, const u_char *, const u_char *, const u_int);
 
        if (len < 4)

-               goto corrupt;
+               goto invalid;

        /* vendor */
        ND_TCHECK2(*cp, 4);
        vendor = EXTRACT_32BITS(cp);
        /* vendor */
        ND_TCHECK2(*cp, 4);
        vendor = EXTRACT_32BITS(cp);


@@ -1045,8 +1050,8 @@ of10_vendor_action_print(netdissect_options *ndo,
                of10_data_print;
        return decoder(ndo, cp, ep, len - 4);
 
                of10_data_print;
        return decoder(ndo, cp, ep, len - 4);
 

-corrupt: /* skip the undersized data */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the undersized data */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp, len);
        return cp + len;
 trunc:
        ND_TCHECK2(*cp, len);
        return cp + len;
 trunc:


@@ -1056,12 +1061,13 @@ trunc:
 
 static const u_char *
 of10_vendor_message_print(netdissect_options *ndo,
 
 static const u_char *
 of10_vendor_message_print(netdissect_options *ndo,

-                          const u_char *cp, const u_char *ep, const u_int len) {
+                          const u_char *cp, const u_char *ep, const u_int len)
+{

        uint32_t vendor;
        const u_char *(*decoder)(netdissect_options *, const u_char *, const u_char *, u_int);
 
        if (len < 4)
        uint32_t vendor;
        const u_char *(*decoder)(netdissect_options *, const u_char *, const u_char *, u_int);
 
        if (len < 4)

-               goto corrupt;
+               goto invalid;

        /* vendor */
        ND_TCHECK2(*cp, 4);
        vendor = EXTRACT_32BITS(cp);
        /* vendor */
        ND_TCHECK2(*cp, 4);
        vendor = EXTRACT_32BITS(cp);


@@ -1073,8 +1079,8 @@ of10_vendor_message_print(netdissect_options *ndo,
                of10_data_print;
        return decoder(ndo, cp, ep, len - 4);
 
                of10_data_print;
        return decoder(ndo, cp, ep, len - 4);
 

-corrupt: /* skip the undersized data */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the undersized data */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp, len);
        return cp + len;
 trunc:
        ND_TCHECK2(*cp, len);
        return cp + len;
 trunc:


@@ -1085,11 +1091,12 @@ trunc:
 /* Vendor ID is mandatory, data is optional. */
 static const u_char *
 of10_vendor_data_print(netdissect_options *ndo,
 /* Vendor ID is mandatory, data is optional. */
 static const u_char *
 of10_vendor_data_print(netdissect_options *ndo,

-                       const u_char *cp, const u_char *ep, const u_int len) {
+                       const u_char *cp, const u_char *ep, const u_int len)
+{

        uint32_t vendor;
 
        if (len < 4)
        uint32_t vendor;
 
        if (len < 4)

-               goto corrupt;
+               goto invalid;

        /* vendor */
        ND_TCHECK2(*cp, 4);
        vendor = EXTRACT_32BITS(cp);
        /* vendor */
        ND_TCHECK2(*cp, 4);
        vendor = EXTRACT_32BITS(cp);


@@ -1098,8 +1105,8 @@ of10_vendor_data_print(netdissect_options *ndo,
        /* data */
        return of10_data_print(ndo, cp, ep, len - 4);
 
        /* data */
        return of10_data_print(ndo, cp, ep, len - 4);
 

-corrupt: /* skip the undersized data */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the undersized data */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp, len);
        return cp + len;
 trunc:
        ND_TCHECK2(*cp, len);
        return cp + len;
 trunc:


@@ -1109,7 +1116,8 @@ trunc:
 
 static const u_char *
 of10_packet_data_print(netdissect_options *ndo,
 
 static const u_char *
 of10_packet_data_print(netdissect_options *ndo,

-                       const u_char *cp, const u_char *ep, const u_int len) {
+                       const u_char *cp, const u_char *ep, const u_int len)
+{

        if (len == 0)
                return cp;
        /* data */
        if (len == 0)
                return cp;
        /* data */


@@ -1131,13 +1139,14 @@ trunc:
 /* [OF10] Section 5.2.1 */
 static const u_char *
 of10_phy_ports_print(netdissect_options *ndo,
 /* [OF10] Section 5.2.1 */
 static const u_char *
 of10_phy_ports_print(netdissect_options *ndo,

-                     const u_char *cp, const u_char *ep, u_int len) {
+                     const u_char *cp, const u_char *ep, u_int len)
+{

        const u_char *cp0 = cp;
        const u_int len0 = len;
 
        while (len) {
                if (len < OF_PHY_PORT_LEN)
        const u_char *cp0 = cp;
        const u_int len0 = len;
 
        while (len) {
                if (len < OF_PHY_PORT_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* port_no */
                ND_TCHECK2(*cp, 2);
                ND_PRINT((ndo, "\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
                /* port_no */
                ND_TCHECK2(*cp, 2);
                ND_PRINT((ndo, "\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));


@@ -1193,8 +1202,8 @@ next_port:
        } /* while */
        return cp;
 
        } /* while */
        return cp;
 

-corrupt: /* skip the undersized trailing data */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the undersized trailing data */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:


@@ -1205,7 +1214,8 @@ trunc:
 /* [OF10] Section 5.2.2 */
 static const u_char *
 of10_queue_props_print(netdissect_options *ndo,
 /* [OF10] Section 5.2.2 */
 static const u_char *
 of10_queue_props_print(netdissect_options *ndo,

-                       const u_char *cp, const u_char *ep, u_int len) {
+                       const u_char *cp, const u_char *ep, u_int len)
+{

        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t property, plen, rate;
        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t property, plen, rate;


@@ -1214,7 +1224,7 @@ of10_queue_props_print(netdissect_options *ndo,
                u_char plen_bogus = 0, skip = 0;
 
                if (len < OF_QUEUE_PROP_HEADER_LEN)
                u_char plen_bogus = 0, skip = 0;
 
                if (len < OF_QUEUE_PROP_HEADER_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* property */
                ND_TCHECK2(*cp, 2);
                property = EXTRACT_16BITS(cp);
                /* property */
                ND_TCHECK2(*cp, 2);
                property = EXTRACT_16BITS(cp);


@@ -1226,7 +1236,7 @@ of10_queue_props_print(netdissect_options *ndo,
                cp += 2;
                ND_PRINT((ndo, ", len %u", plen));
                if (plen < OF_QUEUE_PROP_HEADER_LEN || plen > len)
                cp += 2;
                ND_PRINT((ndo, ", len %u", plen));
                if (plen < OF_QUEUE_PROP_HEADER_LEN || plen > len)

-                       goto corrupt;
+                       goto invalid;

                /* pad */
                ND_TCHECK2(*cp, 4);
                cp += 4;
                /* pad */
                ND_TCHECK2(*cp, 4);
                cp += 4;


@@ -1268,8 +1278,8 @@ next_property:
        } /* while */
        return cp;
 
        } /* while */
        return cp;
 

-corrupt: /* skip the rest of queue properties */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the rest of queue properties */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:


@@ -1280,14 +1290,15 @@ trunc:
 /* ibid */
 static const u_char *
 of10_queues_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_queues_print(netdissect_options *ndo,

-                  const u_char *cp, const u_char *ep, u_int len) {
+                  const u_char *cp, const u_char *ep, u_int len)
+{

        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t desclen;
 
        while (len) {
                if (len < OF_PACKET_QUEUE_LEN)
        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t desclen;
 
        while (len) {
                if (len < OF_PACKET_QUEUE_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* queue_id */
                ND_TCHECK2(*cp, 4);
                ND_PRINT((ndo, "\n\t  queue_id %u", EXTRACT_32BITS(cp)));
                /* queue_id */
                ND_TCHECK2(*cp, 4);
                ND_PRINT((ndo, "\n\t  queue_id %u", EXTRACT_32BITS(cp)));


@@ -1298,7 +1309,7 @@ of10_queues_print(netdissect_options *ndo,
                cp += 2;
                ND_PRINT((ndo, ", len %u", desclen));
                if (desclen < OF_PACKET_QUEUE_LEN || desclen > len)
                cp += 2;
                ND_PRINT((ndo, ", len %u", desclen));
                if (desclen < OF_PACKET_QUEUE_LEN || desclen > len)

-                       goto corrupt;
+                       goto invalid;

                /* pad */
                ND_TCHECK2(*cp, 2);
                cp += 2;
                /* pad */
                ND_TCHECK2(*cp, 2);
                cp += 2;


@@ -1315,8 +1326,8 @@ next_queue:
        } /* while */
        return cp;
 
        } /* while */
        return cp;
 

-corrupt: /* skip the rest of queues */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the rest of queues */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:


@@ -1327,7 +1338,8 @@ trunc:
 /* [OF10] Section 5.2.3 */
 static const u_char *
 of10_match_print(netdissect_options *ndo,
 /* [OF10] Section 5.2.3 */
 static const u_char *
 of10_match_print(netdissect_options *ndo,

-                 const char *pfx, const u_char *cp, const u_char *ep) {
+                 const char *pfx, const u_char *cp, const u_char *ep)
+{

        uint32_t wildcards;
        uint16_t dl_type;
        uint8_t nw_proto;
        uint32_t wildcards;
        uint16_t dl_type;
        uint8_t nw_proto;


@@ -1431,7 +1443,8 @@ trunc:
 static const u_char *
 of10_actions_print(netdissect_options *ndo,
                    const char *pfx, const u_char *cp, const u_char *ep,
 static const u_char *
 of10_actions_print(netdissect_options *ndo,
                    const char *pfx, const u_char *cp, const u_char *ep,

-                   u_int len) {
+                   u_int len)
+{

        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t type, alen, output_port;
        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t type, alen, output_port;


@@ -1440,7 +1453,7 @@ of10_actions_print(netdissect_options *ndo,
                u_char alen_bogus = 0, skip = 0;
 
                if (len < OF_ACTION_HEADER_LEN)
                u_char alen_bogus = 0, skip = 0;
 
                if (len < OF_ACTION_HEADER_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* type */
                ND_TCHECK2(*cp, 2);
                type = EXTRACT_16BITS(cp);
                /* type */
                ND_TCHECK2(*cp, 2);
                type = EXTRACT_16BITS(cp);


@@ -1453,7 +1466,7 @@ of10_actions_print(netdissect_options *ndo,
                ND_PRINT((ndo, ", len %u", alen));
                /* On action size underrun/overrun skip the rest of the action list. */
                if (alen < OF_ACTION_HEADER_LEN || alen > len)
                ND_PRINT((ndo, ", len %u", alen));
                /* On action size underrun/overrun skip the rest of the action list. */
                if (alen < OF_ACTION_HEADER_LEN || alen > len)

-                       goto corrupt;
+                       goto invalid;

                /* On action size inappropriate for the given type or invalid type just skip
                 * the current action, as the basic length constraint has been met. */
                switch (type) {
                /* On action size inappropriate for the given type or invalid type just skip
                 * the current action, as the basic length constraint has been met. */
                switch (type) {


@@ -1584,8 +1597,8 @@ next_action:
        } /* while */
        return cp;
 
        } /* while */
        return cp;
 

-corrupt: /* skip the rest of actions */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the rest of actions */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:


@@ -1596,7 +1609,8 @@ trunc:
 /* [OF10] Section 5.3.1 */
 static const u_char *
 of10_features_reply_print(netdissect_options *ndo,
 /* [OF10] Section 5.3.1 */
 static const u_char *
 of10_features_reply_print(netdissect_options *ndo,

-                          const u_char *cp, const u_char *ep, const u_int len) {
+                          const u_char *cp, const u_char *ep, const u_int len)
+{

        /* datapath_id */
        ND_TCHECK2(*cp, 8);
        ND_PRINT((ndo, "\n\t dpid 0x%016" PRIx64, EXTRACT_64BITS(cp)));
        /* datapath_id */
        ND_TCHECK2(*cp, 8);
        ND_PRINT((ndo, "\n\t dpid 0x%016" PRIx64, EXTRACT_64BITS(cp)));


@@ -1633,7 +1647,8 @@ trunc:
 /* [OF10] Section 5.3.3 */
 static const u_char *
 of10_flow_mod_print(netdissect_options *ndo,
 /* [OF10] Section 5.3.3 */
 static const u_char *
 of10_flow_mod_print(netdissect_options *ndo,

-                    const u_char *cp, const u_char *ep, const u_int len) {
+                    const u_char *cp, const u_char *ep, const u_int len)
+{

        uint16_t command;
 
        /* match */
        uint16_t command;
 
        /* match */


@@ -1690,7 +1705,8 @@ trunc:
 /* ibid */
 static const u_char *
 of10_port_mod_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_port_mod_print(netdissect_options *ndo,

-                    const u_char *cp, const u_char *ep) {
+                    const u_char *cp, const u_char *ep)
+{

        /* port_no */
        ND_TCHECK2(*cp, 2);
        ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
        /* port_no */
        ND_TCHECK2(*cp, 2);
        ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));


@@ -1726,7 +1742,8 @@ trunc:
 /* [OF10] Section 5.3.5 */
 static const u_char *
 of10_stats_request_print(netdissect_options *ndo,
 /* [OF10] Section 5.3.5 */
 static const u_char *
 of10_stats_request_print(netdissect_options *ndo,

-                         const u_char *cp, const u_char *ep, u_int len) {
+                         const u_char *cp, const u_char *ep, u_int len)
+{

        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t type;
        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t type;


@@ -1748,12 +1765,12 @@ of10_stats_request_print(netdissect_options *ndo,
        case OFPST_DESC:
        case OFPST_TABLE:
                if (len)
        case OFPST_DESC:
        case OFPST_TABLE:
                if (len)

-                       goto corrupt;
+                       goto invalid;

                return cp;
        case OFPST_FLOW:
        case OFPST_AGGREGATE:
                if (len != OF_FLOW_STATS_REQUEST_LEN)
                return cp;
        case OFPST_FLOW:
        case OFPST_AGGREGATE:
                if (len != OF_FLOW_STATS_REQUEST_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* match */
                if (ep == (cp = of10_match_print(ndo, "\n\t ", cp, ep)))
                        return ep; /* end of snapshot */
                /* match */
                if (ep == (cp = of10_match_print(ndo, "\n\t ", cp, ep)))
                        return ep; /* end of snapshot */


@@ -1770,7 +1787,7 @@ of10_stats_request_print(netdissect_options *ndo,
                return cp + 2;
        case OFPST_PORT:
                if (len != OF_PORT_STATS_REQUEST_LEN)
                return cp + 2;
        case OFPST_PORT:
                if (len != OF_PORT_STATS_REQUEST_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* port_no */
                ND_TCHECK2(*cp, 2);
                ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
                /* port_no */
                ND_TCHECK2(*cp, 2);
                ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));


@@ -1780,7 +1797,7 @@ of10_stats_request_print(netdissect_options *ndo,
                return cp + 6;
        case OFPST_QUEUE:
                if (len != OF_QUEUE_STATS_REQUEST_LEN)
                return cp + 6;
        case OFPST_QUEUE:
                if (len != OF_QUEUE_STATS_REQUEST_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* port_no */
                ND_TCHECK2(*cp, 2);
                ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
                /* port_no */
                ND_TCHECK2(*cp, 2);
                ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));


@@ -1797,8 +1814,8 @@ of10_stats_request_print(netdissect_options *ndo,
        }
        return cp;
 
        }
        return cp;
 

-corrupt: /* skip the message body */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the message body */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:


@@ -1809,9 +1826,10 @@ trunc:
 /* ibid */
 static const u_char *
 of10_desc_stats_reply_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_desc_stats_reply_print(netdissect_options *ndo,

-                            const u_char *cp, const u_char *ep, const u_int len) {
+                            const u_char *cp, const u_char *ep, const u_int len)
+{

        if (len != OF_DESC_STATS_LEN)
        if (len != OF_DESC_STATS_LEN)

-               goto corrupt;
+               goto invalid;

        /* mfr_desc */
        ND_TCHECK2(*cp, DESC_STR_LEN);
        ND_PRINT((ndo, "\n\t  mfr_desc '"));
        /* mfr_desc */
        ND_TCHECK2(*cp, DESC_STR_LEN);
        ND_PRINT((ndo, "\n\t  mfr_desc '"));


@@ -1843,8 +1861,8 @@ of10_desc_stats_reply_print(netdissect_options *ndo,
        ND_PRINT((ndo, "'"));
        return cp + DESC_STR_LEN;
 
        ND_PRINT((ndo, "'"));
        return cp + DESC_STR_LEN;
 

-corrupt: /* skip the message body */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the message body */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp, len);
        return cp + len;
 trunc:
        ND_TCHECK2(*cp, len);
        return cp + len;
 trunc:


@@ -1855,20 +1873,21 @@ trunc:
 /* ibid */
 static const u_char *
 of10_flow_stats_reply_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_flow_stats_reply_print(netdissect_options *ndo,

-                            const u_char *cp, const u_char *ep, u_int len) {
+                            const u_char *cp, const u_char *ep, u_int len)
+{

        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t entry_len;
 
        while (len) {
                if (len < OF_FLOW_STATS_LEN)
        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t entry_len;
 
        while (len) {
                if (len < OF_FLOW_STATS_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* length */
                ND_TCHECK2(*cp, 2);
                entry_len = EXTRACT_16BITS(cp);
                ND_PRINT((ndo, "\n\t length %u", entry_len));
                if (entry_len < OF_FLOW_STATS_LEN || entry_len > len)
                /* length */
                ND_TCHECK2(*cp, 2);
                entry_len = EXTRACT_16BITS(cp);
                ND_PRINT((ndo, "\n\t length %u", entry_len));
                if (entry_len < OF_FLOW_STATS_LEN || entry_len > len)

-                       goto corrupt;
+                       goto invalid;

                cp += 2;
                /* table_id */
                ND_TCHECK2(*cp, 1);
                cp += 2;
                /* table_id */
                ND_TCHECK2(*cp, 1);


@@ -1923,8 +1942,8 @@ of10_flow_stats_reply_print(netdissect_options *ndo,
        } /* while */
        return cp;
 
        } /* while */
        return cp;
 

-corrupt: /* skip the rest of flow statistics entries */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the rest of flow statistics entries */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:


@@ -1936,9 +1955,10 @@ trunc:
 static const u_char *
 of10_aggregate_stats_reply_print(netdissect_options *ndo,
                                  const u_char *cp, const u_char *ep,
 static const u_char *
 of10_aggregate_stats_reply_print(netdissect_options *ndo,
                                  const u_char *cp, const u_char *ep,

-                                 const u_int len) {
+                                 const u_int len)
+{

        if (len != OF_AGGREGATE_STATS_REPLY_LEN)
        if (len != OF_AGGREGATE_STATS_REPLY_LEN)

-               goto corrupt;
+               goto invalid;

        /* packet_count */
        ND_TCHECK2(*cp, 8);
        ND_PRINT((ndo, "\n\t packet_count %" PRIu64, EXTRACT_64BITS(cp)));
        /* packet_count */
        ND_TCHECK2(*cp, 8);
        ND_PRINT((ndo, "\n\t packet_count %" PRIu64, EXTRACT_64BITS(cp)));


@@ -1955,8 +1975,8 @@ of10_aggregate_stats_reply_print(netdissect_options *ndo,
        ND_TCHECK2(*cp, 4);
        return cp + 4;
 
        ND_TCHECK2(*cp, 4);
        return cp + 4;
 

-corrupt: /* skip the message body */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the message body */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp, len);
        return cp + len;
 trunc:
        ND_TCHECK2(*cp, len);
        return cp + len;
 trunc:


@@ -1967,13 +1987,14 @@ trunc:
 /* ibid */
 static const u_char *
 of10_table_stats_reply_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_table_stats_reply_print(netdissect_options *ndo,

-                             const u_char *cp, const u_char *ep, u_int len) {
+                             const u_char *cp, const u_char *ep, u_int len)
+{

        const u_char *cp0 = cp;
        const u_int len0 = len;
 
        while (len) {
                if (len < OF_TABLE_STATS_LEN)
        const u_char *cp0 = cp;
        const u_int len0 = len;
 
        while (len) {
                if (len < OF_TABLE_STATS_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* table_id */
                ND_TCHECK2(*cp, 1);
                ND_PRINT((ndo, "\n\t table_id %s", tok2str(tableid_str, "%u", *cp)));
                /* table_id */
                ND_TCHECK2(*cp, 1);
                ND_PRINT((ndo, "\n\t table_id %s", tok2str(tableid_str, "%u", *cp)));


@@ -2013,8 +2034,8 @@ of10_table_stats_reply_print(netdissect_options *ndo,
        } /* while */
        return cp;
 
        } /* while */
        return cp;
 

-corrupt: /* skip the undersized trailing data */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the undersized trailing data */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:


@@ -2025,13 +2046,14 @@ trunc:
 /* ibid */
 static const u_char *
 of10_port_stats_reply_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_port_stats_reply_print(netdissect_options *ndo,

-                            const u_char *cp, const u_char *ep, u_int len) {
+                            const u_char *cp, const u_char *ep, u_int len)
+{

        const u_char *cp0 = cp;
        const u_int len0 = len;
 
        while (len) {
                if (len < OF_PORT_STATS_LEN)
        const u_char *cp0 = cp;
        const u_int len0 = len;
 
        while (len) {
                if (len < OF_PORT_STATS_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* port_no */
                ND_TCHECK2(*cp, 2);
                ND_PRINT((ndo, "\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
                /* port_no */
                ND_TCHECK2(*cp, 2);
                ND_PRINT((ndo, "\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));


@@ -2097,8 +2119,8 @@ next_port:
        } /* while */
        return cp;
 
        } /* while */
        return cp;
 

-corrupt: /* skip the undersized trailing data */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the undersized trailing data */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:


@@ -2109,13 +2131,14 @@ trunc:
 /* ibid */
 static const u_char *
 of10_queue_stats_reply_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_queue_stats_reply_print(netdissect_options *ndo,

-                             const u_char *cp, const u_char *ep, u_int len) {
+                             const u_char *cp, const u_char *ep, u_int len)
+{

        const u_char *cp0 = cp;
        const u_int len0 = len;
 
        while (len) {
                if (len < OF_QUEUE_STATS_LEN)
        const u_char *cp0 = cp;
        const u_int len0 = len;
 
        while (len) {
                if (len < OF_QUEUE_STATS_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* port_no */
                ND_TCHECK2(*cp, 2);
                ND_PRINT((ndo, "\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
                /* port_no */
                ND_TCHECK2(*cp, 2);
                ND_PRINT((ndo, "\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));


@@ -2144,8 +2167,8 @@ of10_queue_stats_reply_print(netdissect_options *ndo,
        } /* while */
        return cp;
 
        } /* while */
        return cp;
 

-corrupt: /* skip the undersized trailing data */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the undersized trailing data */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:


@@ -2156,7 +2179,8 @@ trunc:
 /* ibid */
 static const u_char *
 of10_stats_reply_print(netdissect_options *ndo,
 /* ibid */
 static const u_char *
 of10_stats_reply_print(netdissect_options *ndo,

-                       const u_char *cp, const u_char *ep, const u_int len) {
+                       const u_char *cp, const u_char *ep, const u_int len)
+{

        const u_char *cp0 = cp;
        uint16_t type;
 
        const u_char *cp0 = cp;
        uint16_t type;
 


@@ -2195,7 +2219,8 @@ trunc:
 /* [OF10] Section 5.3.6 */
 static const u_char *
 of10_packet_out_print(netdissect_options *ndo,
 /* [OF10] Section 5.3.6 */
 static const u_char *
 of10_packet_out_print(netdissect_options *ndo,

-                      const u_char *cp, const u_char *ep, const u_int len) {
+                      const u_char *cp, const u_char *ep, const u_int len)
+{

        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t actions_len;
        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t actions_len;


@@ -2213,15 +2238,15 @@ of10_packet_out_print(netdissect_options *ndo,
        actions_len = EXTRACT_16BITS(cp);
        cp += 2;
        if (actions_len > len - OF_PACKET_OUT_LEN)
        actions_len = EXTRACT_16BITS(cp);
        cp += 2;
        if (actions_len > len - OF_PACKET_OUT_LEN)

-               goto corrupt;
+               goto invalid;

        /* actions */
        if (ep == (cp = of10_actions_print(ndo, "\n\t ", cp, ep, actions_len)))
                return ep; /* end of snapshot */
        /* data */
        return of10_packet_data_print(ndo, cp, ep, len - OF_PACKET_OUT_LEN - actions_len);
 
        /* actions */
        if (ep == (cp = of10_actions_print(ndo, "\n\t ", cp, ep, actions_len)))
                return ep; /* end of snapshot */
        /* data */
        return of10_packet_data_print(ndo, cp, ep, len - OF_PACKET_OUT_LEN - actions_len);
 

-corrupt: /* skip the rest of the message body */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the rest of the message body */
+       ND_PRINT((ndo, "%s", istr));

        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:
        ND_TCHECK2(*cp0, len0);
        return cp0 + len0;
 trunc:


@@ -2232,7 +2257,8 @@ trunc:
 /* [OF10] Section 5.4.1 */
 static const u_char *
 of10_packet_in_print(netdissect_options *ndo,
 /* [OF10] Section 5.4.1 */
 static const u_char *
 of10_packet_in_print(netdissect_options *ndo,

-                     const u_char *cp, const u_char *ep, const u_int len) {
+                     const u_char *cp, const u_char *ep, const u_int len)
+{

        /* buffer_id */
        ND_TCHECK2(*cp, 4);
        ND_PRINT((ndo, "\n\t buffer_id %s", tok2str(bufferid_str, "0x%08x", EXTRACT_32BITS(cp))));
        /* buffer_id */
        ND_TCHECK2(*cp, 4);
        ND_PRINT((ndo, "\n\t buffer_id %s", tok2str(bufferid_str, "0x%08x", EXTRACT_32BITS(cp))));


@@ -2264,7 +2290,8 @@ trunc:
 /* [OF10] Section 5.4.2 */
 static const u_char *
 of10_flow_removed_print(netdissect_options *ndo,
 /* [OF10] Section 5.4.2 */
 static const u_char *
 of10_flow_removed_print(netdissect_options *ndo,

-                        const u_char *cp, const u_char *ep) {
+                        const u_char *cp, const u_char *ep)
+{

        /* match */
        if (ep == (cp = of10_match_print(ndo, "\n\t ", cp, ep)))
                return ep; /* end of snapshot */
        /* match */
        if (ep == (cp = of10_match_print(ndo, "\n\t ", cp, ep)))
                return ep; /* end of snapshot */


@@ -2317,7 +2344,8 @@ trunc:
 /* [OF10] Section 5.4.4 */
 static const u_char *
 of10_error_print(netdissect_options *ndo,
 /* [OF10] Section 5.4.4 */
 static const u_char *
 of10_error_print(netdissect_options *ndo,

-                 const u_char *cp, const u_char *ep, const u_int len) {
+                 const u_char *cp, const u_char *ep, const u_int len)
+{

        uint16_t type;
        const struct tok *code_str;
 
        uint16_t type;
        const struct tok *code_str;
 


@@ -2349,7 +2377,8 @@ trunc:
 const u_char *
 of10_header_body_print(netdissect_options *ndo,
                        const u_char *cp, const u_char *ep, const uint8_t type,
 const u_char *
 of10_header_body_print(netdissect_options *ndo,
                        const u_char *cp, const u_char *ep, const uint8_t type,

-                       const uint16_t len, const uint32_t xid) {
+                       const uint16_t len, const uint32_t xid)
+{

        const u_char *cp0 = cp;
        const u_int len0 = len;
        /* Thus far message length is not less than the basic header size, but most
        const u_char *cp0 = cp;
        const u_int len0 = len;
        /* Thus far message length is not less than the basic header size, but most


@@ -2357,7 +2386,7 @@ of10_header_body_print(netdissect_options *ndo,
         * possible, check that message length meets the constraint, in remaining
         * cases check that the length is OK to begin decoding and leave any final
         * verification up to a lower-layer function. When the current message is
         * possible, check that message length meets the constraint, in remaining
         * cases check that the length is OK to begin decoding and leave any final
         * verification up to a lower-layer function. When the current message is

-        * corrupt, proceed to the next message. */
+        * invalid, proceed to the next message. */

 
        /* [OF10] Section 5.1 */
        ND_PRINT((ndo, "\n\tversion 1.0, type %s, length %u, xid 0x%08x",
 
        /* [OF10] Section 5.1 */
        ND_PRINT((ndo, "\n\tversion 1.0, type %s, length %u, xid 0x%08x",


@@ -2369,14 +2398,14 @@ of10_header_body_print(netdissect_options *ndo,
        case OFPT_BARRIER_REQUEST: /* [OF10] Section 5.3.7 */
        case OFPT_BARRIER_REPLY: /* ibid */
                if (len != OF_HEADER_LEN)
        case OFPT_BARRIER_REQUEST: /* [OF10] Section 5.3.7 */
        case OFPT_BARRIER_REPLY: /* ibid */
                if (len != OF_HEADER_LEN)

-                       goto corrupt;
+                       goto invalid;

                break;
 
        /* OpenFlow header and fixed-size message body. */
        case OFPT_SET_CONFIG: /* [OF10] Section 5.3.2 */
        case OFPT_GET_CONFIG_REPLY: /* ibid */
                if (len != OF_SWITCH_CONFIG_LEN)
                break;
 
        /* OpenFlow header and fixed-size message body. */
        case OFPT_SET_CONFIG: /* [OF10] Section 5.3.2 */
        case OFPT_GET_CONFIG_REPLY: /* ibid */
                if (len != OF_SWITCH_CONFIG_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                /* flags */
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                /* flags */


@@ -2389,13 +2418,13 @@ of10_header_body_print(netdissect_options *ndo,
                return cp + 2;
        case OFPT_PORT_MOD:
                if (len != OF_PORT_MOD_LEN)
                return cp + 2;
        case OFPT_PORT_MOD:
                if (len != OF_PORT_MOD_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_port_mod_print(ndo, cp, ep);
        case OFPT_QUEUE_GET_CONFIG_REQUEST: /* [OF10] Section 5.3.4 */
                if (len != OF_QUEUE_GET_CONFIG_REQUEST_LEN)
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_port_mod_print(ndo, cp, ep);
        case OFPT_QUEUE_GET_CONFIG_REQUEST: /* [OF10] Section 5.3.4 */
                if (len != OF_QUEUE_GET_CONFIG_REQUEST_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                /* port */
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                /* port */


@@ -2407,13 +2436,13 @@ of10_header_body_print(netdissect_options *ndo,
                return cp + 2;
        case OFPT_FLOW_REMOVED:
                if (len != OF_FLOW_REMOVED_LEN)
                return cp + 2;
        case OFPT_FLOW_REMOVED:
                if (len != OF_FLOW_REMOVED_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_flow_removed_print(ndo, cp, ep);
        case OFPT_PORT_STATUS: /* [OF10] Section 5.4.3 */
                if (len != OF_PORT_STATUS_LEN)
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_flow_removed_print(ndo, cp, ep);
        case OFPT_PORT_STATUS: /* [OF10] Section 5.4.3 */
                if (len != OF_PORT_STATUS_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                /* reason */
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                /* reason */


@@ -2429,7 +2458,7 @@ of10_header_body_print(netdissect_options *ndo,
        /* OpenFlow header, fixed-size message body and n * fixed-size data units. */
        case OFPT_FEATURES_REPLY:
                if (len < OF_SWITCH_FEATURES_LEN)
        /* OpenFlow header, fixed-size message body and n * fixed-size data units. */
        case OFPT_FEATURES_REPLY:
                if (len < OF_SWITCH_FEATURES_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_features_reply_print(ndo, cp, ep, len);
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_features_reply_print(ndo, cp, ep, len);


@@ -2445,21 +2474,21 @@ of10_header_body_print(netdissect_options *ndo,
        /* OpenFlow header, fixed-size message body and variable-size data. */
        case OFPT_ERROR:
                if (len < OF_ERROR_MSG_LEN)
        /* OpenFlow header, fixed-size message body and variable-size data. */
        case OFPT_ERROR:
                if (len < OF_ERROR_MSG_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_error_print(ndo, cp, ep, len);
        case OFPT_VENDOR:
          /* [OF10] Section 5.5.4 */
                if (len < OF_VENDOR_HEADER_LEN)
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_error_print(ndo, cp, ep, len);
        case OFPT_VENDOR:
          /* [OF10] Section 5.5.4 */
                if (len < OF_VENDOR_HEADER_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_vendor_message_print(ndo, cp, ep, len - OF_HEADER_LEN);
        case OFPT_PACKET_IN:
                /* 2 mock octets count in OF_PACKET_IN_LEN but not in len */
                if (len < OF_PACKET_IN_LEN - 2)
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_vendor_message_print(ndo, cp, ep, len - OF_HEADER_LEN);
        case OFPT_PACKET_IN:
                /* 2 mock octets count in OF_PACKET_IN_LEN but not in len */
                if (len < OF_PACKET_IN_LEN - 2)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_packet_in_print(ndo, cp, ep, len);
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_packet_in_print(ndo, cp, ep, len);


@@ -2469,7 +2498,7 @@ of10_header_body_print(netdissect_options *ndo,
        /* c. OpenFlow header, fixed-size message body and variable-size data. */
        case OFPT_STATS_REQUEST:
                if (len < OF_STATS_REQUEST_LEN)
        /* c. OpenFlow header, fixed-size message body and variable-size data. */
        case OFPT_STATS_REQUEST:
                if (len < OF_STATS_REQUEST_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_stats_request_print(ndo, cp, ep, len);
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_stats_request_print(ndo, cp, ep, len);


@@ -2480,7 +2509,7 @@ of10_header_body_print(netdissect_options *ndo,
        /* d. OpenFlow header, fixed-size message body and variable-size data. */
        case OFPT_STATS_REPLY:
                if (len < OF_STATS_REPLY_LEN)
        /* d. OpenFlow header, fixed-size message body and variable-size data. */
        case OFPT_STATS_REPLY:
                if (len < OF_STATS_REPLY_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_stats_reply_print(ndo, cp, ep, len);
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_stats_reply_print(ndo, cp, ep, len);


@@ -2488,7 +2517,7 @@ of10_header_body_print(netdissect_options *ndo,
        /* OpenFlow header and n * variable-size data units and variable-size data. */
        case OFPT_PACKET_OUT:
                if (len < OF_PACKET_OUT_LEN)
        /* OpenFlow header and n * variable-size data units and variable-size data. */
        case OFPT_PACKET_OUT:
                if (len < OF_PACKET_OUT_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_packet_out_print(ndo, cp, ep, len);
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_packet_out_print(ndo, cp, ep, len);


@@ -2496,7 +2525,7 @@ of10_header_body_print(netdissect_options *ndo,
        /* OpenFlow header, fixed-size message body and n * variable-size data units. */
        case OFPT_FLOW_MOD:
                if (len < OF_FLOW_MOD_LEN)
        /* OpenFlow header, fixed-size message body and n * variable-size data units. */
        case OFPT_FLOW_MOD:
                if (len < OF_FLOW_MOD_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_flow_mod_print(ndo, cp, ep, len);
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                return of10_flow_mod_print(ndo, cp, ep, len);


@@ -2504,7 +2533,7 @@ of10_header_body_print(netdissect_options *ndo,
        /* OpenFlow header, fixed-size message body and n * variable-size data units. */
        case OFPT_QUEUE_GET_CONFIG_REPLY: /* [OF10] Section 5.3.4 */
                if (len < OF_QUEUE_GET_CONFIG_REPLY_LEN)
        /* OpenFlow header, fixed-size message body and n * variable-size data units. */
        case OFPT_QUEUE_GET_CONFIG_REPLY: /* [OF10] Section 5.3.4 */
                if (len < OF_QUEUE_GET_CONFIG_REPLY_LEN)

-                       goto corrupt;
+                       goto invalid;

                if (ndo->ndo_vflag < 1)
                        goto next_message;
                /* port */
                if (ndo->ndo_vflag < 1)
                        goto next_message;
                /* port */


@@ -2519,8 +2548,8 @@ of10_header_body_print(netdissect_options *ndo,
        } /* switch (type) */
        goto next_message;
 
        } /* switch (type) */
        goto next_message;
 

-corrupt: /* skip the message body */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* skip the message body */
+       ND_PRINT((ndo, "%s", istr));

 next_message:
        ND_TCHECK2(*cp0, len0 - OF_HEADER_LEN);
        return cp0 + len0 - OF_HEADER_LEN;
 next_message:
        ND_TCHECK2(*cp0, len0 - OF_HEADER_LEN);
        return cp0 + len0 - OF_HEADER_LEN;