X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c1c3c77463d592cc576eaa491e604752044ca55a..568927a2bce300035cf25e9cd387986f4a72b10c:/print-openflow-1.0.c

diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index 8cfc00c3..e50c06e6 100644
--- 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
- * 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.
  *
@@ -56,11 +56,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* \summary: OpenFlow protocol version 1.0 printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include "netdissect.h"
 #include "extract.h"
@@ -72,7 +74,6 @@
 #include "openflow.h"
 
 static const char tstr[] = " [|openflow]";
-static const char cstr[] = " (corrupt)";
 
 #define OFPT_HELLO                    0x00
 #define OFPT_ERROR                    0x01
@@ -122,13 +123,13 @@ static const struct tok ofpt_str[] = {
 	{ 0, NULL }
 };
 
-#define OFPPC_PORT_DOWN    (1 << 0)
-#define OFPPC_NO_STP       (1 << 1)
-#define OFPPC_NO_RECV      (1 << 2)
-#define OFPPC_NO_RECV_STP  (1 << 3)
-#define OFPPC_NO_FLOOD     (1 << 4)
-#define OFPPC_NO_FWD       (1 << 5)
-#define OFPPC_NO_PACKET_IN (1 << 6)
+#define OFPPC_PORT_DOWN    (1U <<0)
+#define OFPPC_NO_STP       (1U <<1)
+#define OFPPC_NO_RECV      (1U <<2)
+#define OFPPC_NO_RECV_STP  (1U <<3)
+#define OFPPC_NO_FLOOD     (1U <<4)
+#define OFPPC_NO_FWD       (1U <<5)
+#define OFPPC_NO_PACKET_IN (1U <<6)
 static const struct tok ofppc_bm[] = {
 	{ OFPPC_PORT_DOWN,    "PORT_DOWN"    },
 	{ OFPPC_NO_STP,       "NO_STP"       },
@@ -143,12 +144,12 @@ static const struct tok ofppc_bm[] = {
                    OFPPC_NO_RECV_STP | OFPPC_NO_FLOOD | OFPPC_NO_FWD | \
                    OFPPC_NO_PACKET_IN))
 
-#define OFPPS_LINK_DOWN   (1 << 0)
-#define OFPPS_STP_LISTEN  (0 << 8)
-#define OFPPS_STP_LEARN   (1 << 8)
-#define OFPPS_STP_FORWARD (2 << 8)
-#define OFPPS_STP_BLOCK   (3 << 8)
-#define OFPPS_STP_MASK    (3 << 8)
+#define OFPPS_LINK_DOWN   (1U << 0)
+#define OFPPS_STP_LISTEN  (0U << 8)
+#define OFPPS_STP_LEARN   (1U << 8)
+#define OFPPS_STP_FORWARD (2U << 8)
+#define OFPPS_STP_BLOCK   (3U << 8)
+#define OFPPS_STP_MASK    (3U << 8)
 static const struct tok ofpps_bm[] = {
 	{ OFPPS_LINK_DOWN,   "LINK_DOWN"   },
 	{ OFPPS_STP_LISTEN,  "STP_LISTEN"  },
@@ -160,15 +161,15 @@ static const struct tok ofpps_bm[] = {
 #define OFPPS_U (~(OFPPS_LINK_DOWN | OFPPS_STP_LISTEN | OFPPS_STP_LEARN | \
                    OFPPS_STP_FORWARD | OFPPS_STP_BLOCK))
 
-#define OFPP_MAX        0xff00
-#define OFPP_IN_PORT    0xfff8
-#define OFPP_TABLE      0xfff9
-#define OFPP_NORMAL     0xfffa
-#define OFPP_FLOOD      0xfffb
-#define OFPP_ALL        0xfffc
-#define OFPP_CONTROLLER 0xfffd
-#define OFPP_LOCAL      0xfffe
-#define OFPP_NONE       0xffff
+#define OFPP_MAX        0xff00U
+#define OFPP_IN_PORT    0xfff8U
+#define OFPP_TABLE      0xfff9U
+#define OFPP_NORMAL     0xfffaU
+#define OFPP_FLOOD      0xfffbU
+#define OFPP_ALL        0xfffcU
+#define OFPP_CONTROLLER 0xfffdU
+#define OFPP_LOCAL      0xfffeU
+#define OFPP_NONE       0xffffU
 static const struct tok ofpp_str[] = {
 	{ OFPP_MAX,        "MAX"        },
 	{ OFPP_IN_PORT,    "IN_PORT"    },
@@ -182,18 +183,18 @@ static const struct tok ofpp_str[] = {
 	{ 0, NULL }
 };
 
-#define OFPPF_10MB_HD    (1 <<  0)
-#define OFPPF_10MB_FD    (1 <<  1)
-#define OFPPF_100MB_HD   (1 <<  2)
-#define OFPPF_100MB_FD   (1 <<  3)
-#define OFPPF_1GB_HD     (1 <<  4)
-#define OFPPF_1GB_FD     (1 <<  5)
-#define OFPPF_10GB_FD    (1 <<  6)
-#define OFPPF_COPPER     (1 <<  7)
-#define OFPPF_FIBER      (1 <<  8)
-#define OFPPF_AUTONEG    (1 <<  9)
-#define OFPPF_PAUSE      (1 << 10)
-#define OFPPF_PAUSE_ASYM (1 << 11)
+#define OFPPF_10MB_HD    (1U << 0)
+#define OFPPF_10MB_FD    (1U << 1)
+#define OFPPF_100MB_HD   (1U << 2)
+#define OFPPF_100MB_FD   (1U << 3)
+#define OFPPF_1GB_HD     (1U << 4)
+#define OFPPF_1GB_FD     (1U << 5)
+#define OFPPF_10GB_FD    (1U << 6)
+#define OFPPF_COPPER     (1U << 7)
+#define OFPPF_FIBER      (1U << 8)
+#define OFPPF_AUTONEG    (1U << 9)
+#define OFPPF_PAUSE      (1U <<10)
+#define OFPPF_PAUSE_ASYM (1U <<11)
 static const struct tok ofppf_bm[] = {
 	{ OFPPF_10MB_HD,    "10MB_HD"    },
 	{ OFPPF_10MB_FD,    "10MB_FD"    },
@@ -222,23 +223,23 @@ static const struct tok ofpqt_str[] = {
 	{ 0, NULL }
 };
 
-#define OFPFW_IN_PORT      (1 << 0)
-#define OFPFW_DL_VLAN      (1 << 1)
-#define OFPFW_DL_SRC       (1 << 2)
-#define OFPFW_DL_DST       (1 << 3)
-#define OFPFW_DL_TYPE      (1 << 4)
-#define OFPFW_NW_PROTO     (1 << 5)
-#define OFPFW_TP_SRC       (1 << 6)
-#define OFPFW_TP_DST       (1 << 7)
+#define OFPFW_IN_PORT      (1U <<0)
+#define OFPFW_DL_VLAN      (1U <<1)
+#define OFPFW_DL_SRC       (1U <<2)
+#define OFPFW_DL_DST       (1U <<3)
+#define OFPFW_DL_TYPE      (1U <<4)
+#define OFPFW_NW_PROTO     (1U <<5)
+#define OFPFW_TP_SRC       (1U <<6)
+#define OFPFW_TP_DST       (1U <<7)
 #define OFPFW_NW_SRC_SHIFT 8
 #define OFPFW_NW_SRC_BITS  6
-#define OFPFW_NW_SRC_MASK  (((1 << OFPFW_NW_SRC_BITS) - 1) << OFPFW_NW_SRC_SHIFT)
+#define OFPFW_NW_SRC_MASK  (((1U <<OFPFW_NW_SRC_BITS) - 1) << OFPFW_NW_SRC_SHIFT)
 #define OFPFW_NW_DST_SHIFT 14
 #define OFPFW_NW_DST_BITS  6
-#define OFPFW_NW_DST_MASK  (((1 << OFPFW_NW_DST_BITS) - 1) << OFPFW_NW_DST_SHIFT)
-#define OFPFW_DL_VLAN_PCP  (1 << 20)
-#define OFPFW_NW_TOS       (1 << 21)
-#define OFPFW_ALL          ((1 << 22) - 1)
+#define OFPFW_NW_DST_MASK  (((1U <<OFPFW_NW_DST_BITS) - 1) << OFPFW_NW_DST_SHIFT)
+#define OFPFW_DL_VLAN_PCP  (1U <<20)
+#define OFPFW_NW_TOS       (1U <<21)
+#define OFPFW_ALL          ((1U <<22) - 1)
 static const struct tok ofpfw_bm[] = {
 	{ OFPFW_IN_PORT,     "IN_PORT"     },
 	{ OFPFW_DL_VLAN,     "DL_VLAN"     },
@@ -258,19 +259,19 @@ static const struct tok ofpfw_bm[] = {
  * they are not reported as bogus in the decoding. */
 #define OFPFW_U (~(OFPFW_ALL))
 
-#define OFPAT_OUTPUT       0x0000
-#define OFPAT_SET_VLAN_VID 0x0001
-#define OFPAT_SET_VLAN_PCP 0x0002
-#define OFPAT_STRIP_VLAN   0x0003
-#define OFPAT_SET_DL_SRC   0x0004
-#define OFPAT_SET_DL_DST   0x0005
-#define OFPAT_SET_NW_SRC   0x0006
-#define OFPAT_SET_NW_DST   0x0007
-#define OFPAT_SET_NW_TOS   0x0008
-#define OFPAT_SET_TP_SRC   0x0009
-#define OFPAT_SET_TP_DST   0x000a
-#define OFPAT_ENQUEUE      0x000b
-#define OFPAT_VENDOR       0xffff
+#define OFPAT_OUTPUT       0x0000U
+#define OFPAT_SET_VLAN_VID 0x0001U
+#define OFPAT_SET_VLAN_PCP 0x0002U
+#define OFPAT_STRIP_VLAN   0x0003U
+#define OFPAT_SET_DL_SRC   0x0004U
+#define OFPAT_SET_DL_DST   0x0005U
+#define OFPAT_SET_NW_SRC   0x0006U
+#define OFPAT_SET_NW_DST   0x0007U
+#define OFPAT_SET_NW_TOS   0x0008U
+#define OFPAT_SET_TP_SRC   0x0009U
+#define OFPAT_SET_TP_DST   0x000aU
+#define OFPAT_ENQUEUE      0x000bU
+#define OFPAT_VENDOR       0xffffU
 static const struct tok ofpat_str[] = {
 	{ OFPAT_OUTPUT,       "OUTPUT"       },
 	{ OFPAT_SET_VLAN_VID, "SET_VLAN_VID" },
@@ -290,35 +291,35 @@ static const struct tok ofpat_str[] = {
 
 /* bit-shifted, w/o vendor action */
 static const struct tok ofpat_bm[] = {
-	{ 1 << OFPAT_OUTPUT,       "OUTPUT"       },
-	{ 1 << OFPAT_SET_VLAN_VID, "SET_VLAN_VID" },
-	{ 1 << OFPAT_SET_VLAN_PCP, "SET_VLAN_PCP" },
-	{ 1 << OFPAT_STRIP_VLAN,   "STRIP_VLAN"   },
-	{ 1 << OFPAT_SET_DL_SRC,   "SET_DL_SRC"   },
-	{ 1 << OFPAT_SET_DL_DST,   "SET_DL_DST"   },
-	{ 1 << OFPAT_SET_NW_SRC,   "SET_NW_SRC"   },
-	{ 1 << OFPAT_SET_NW_DST,   "SET_NW_DST"   },
-	{ 1 << OFPAT_SET_NW_TOS,   "SET_NW_TOS"   },
-	{ 1 << OFPAT_SET_TP_SRC,   "SET_TP_SRC"   },
-	{ 1 << OFPAT_SET_TP_DST,   "SET_TP_DST"   },
-	{ 1 << OFPAT_ENQUEUE,      "ENQUEUE"      },
+	{ 1U <<OFPAT_OUTPUT,       "OUTPUT"       },
+	{ 1U <<OFPAT_SET_VLAN_VID, "SET_VLAN_VID" },
+	{ 1U <<OFPAT_SET_VLAN_PCP, "SET_VLAN_PCP" },
+	{ 1U <<OFPAT_STRIP_VLAN,   "STRIP_VLAN"   },
+	{ 1U <<OFPAT_SET_DL_SRC,   "SET_DL_SRC"   },
+	{ 1U <<OFPAT_SET_DL_DST,   "SET_DL_DST"   },
+	{ 1U <<OFPAT_SET_NW_SRC,   "SET_NW_SRC"   },
+	{ 1U <<OFPAT_SET_NW_DST,   "SET_NW_DST"   },
+	{ 1U <<OFPAT_SET_NW_TOS,   "SET_NW_TOS"   },
+	{ 1U <<OFPAT_SET_TP_SRC,   "SET_TP_SRC"   },
+	{ 1U <<OFPAT_SET_TP_DST,   "SET_TP_DST"   },
+	{ 1U <<OFPAT_ENQUEUE,      "ENQUEUE"      },
 	{ 0, NULL }
 };
-#define OFPAT_U (~(1 << OFPAT_OUTPUT | 1 << OFPAT_SET_VLAN_VID | \
-                   1 << OFPAT_SET_VLAN_PCP | 1 << OFPAT_STRIP_VLAN | \
-                   1 << OFPAT_SET_DL_SRC | 1 << OFPAT_SET_DL_DST | \
-                   1 << OFPAT_SET_NW_SRC | 1 << OFPAT_SET_NW_DST | \
-                   1 << OFPAT_SET_NW_TOS | 1 << OFPAT_SET_TP_SRC | \
-                   1 << OFPAT_SET_TP_DST | 1 << OFPAT_ENQUEUE))
-
-#define OFPC_FLOW_STATS   (1 << 0)
-#define OFPC_TABLE_STATS  (1 << 1)
-#define OFPC_PORT_STATS   (1 << 2)
-#define OFPC_STP          (1 << 3)
-#define OFPC_RESERVED     (1 << 4)
-#define OFPC_IP_REASM     (1 << 5)
-#define OFPC_QUEUE_STATS  (1 << 6)
-#define OFPC_ARP_MATCH_IP (1 << 7)
+#define OFPAT_U (~(1U <<OFPAT_OUTPUT | 1U <<OFPAT_SET_VLAN_VID | \
+                   1U <<OFPAT_SET_VLAN_PCP | 1U <<OFPAT_STRIP_VLAN | \
+                   1U <<OFPAT_SET_DL_SRC | 1U <<OFPAT_SET_DL_DST | \
+                   1U <<OFPAT_SET_NW_SRC | 1U <<OFPAT_SET_NW_DST | \
+                   1U <<OFPAT_SET_NW_TOS | 1U <<OFPAT_SET_TP_SRC | \
+                   1U <<OFPAT_SET_TP_DST | 1U <<OFPAT_ENQUEUE))
+
+#define OFPC_FLOW_STATS   (1U <<0)
+#define OFPC_TABLE_STATS  (1U <<1)
+#define OFPC_PORT_STATS   (1U <<2)
+#define OFPC_STP          (1U <<3)
+#define OFPC_RESERVED     (1U <<4)
+#define OFPC_IP_REASM     (1U <<5)
+#define OFPC_QUEUE_STATS  (1U <<6)
+#define OFPC_ARP_MATCH_IP (1U <<7)
 static const struct tok ofp_capabilities_bm[] = {
 	{ OFPC_FLOW_STATS,   "FLOW_STATS"   },
 	{ OFPC_TABLE_STATS,  "TABLE_STATS"  },
@@ -334,10 +335,10 @@ static const struct tok ofp_capabilities_bm[] = {
                     OFPC_STP | OFPC_IP_REASM | OFPC_QUEUE_STATS | \
                     OFPC_ARP_MATCH_IP))
 
-#define OFPC_FRAG_NORMAL 0x0000
-#define OFPC_FRAG_DROP   0x0001
-#define OFPC_FRAG_REASM  0x0002
-#define OFPC_FRAG_MASK   0x0003
+#define OFPC_FRAG_NORMAL 0x0000U
+#define OFPC_FRAG_DROP   0x0001U
+#define OFPC_FRAG_REASM  0x0002U
+#define OFPC_FRAG_MASK   0x0003U
 static const struct tok ofp_config_str[] = {
 	{ OFPC_FRAG_NORMAL, "FRAG_NORMAL" },
 	{ OFPC_FRAG_DROP,   "FRAG_DROP"   },
@@ -345,11 +346,11 @@ static const struct tok ofp_config_str[] = {
 	{ 0, NULL }
 };
 
-#define OFPFC_ADD           0x0000
-#define OFPFC_MODIFY        0x0001
-#define OFPFC_MODIFY_STRICT 0x0002
-#define OFPFC_DELETE        0x0003
-#define OFPFC_DELETE_STRICT 0x0004
+#define OFPFC_ADD           0x0000U
+#define OFPFC_MODIFY        0x0001U
+#define OFPFC_MODIFY_STRICT 0x0002U
+#define OFPFC_DELETE        0x0003U
+#define OFPFC_DELETE_STRICT 0x0004U
 static const struct tok ofpfc_str[] = {
 	{ OFPFC_ADD,           "ADD"           },
 	{ OFPFC_MODIFY,        "MODIFY"        },
@@ -364,9 +365,9 @@ static const struct tok bufferid_str[] = {
 	{ 0, NULL }
 };
 
-#define OFPFF_SEND_FLOW_REM (1 << 0)
-#define OFPFF_CHECK_OVERLAP (1 << 1)
-#define OFPFF_EMERG         (1 << 2)
+#define OFPFF_SEND_FLOW_REM (1U <<0)
+#define OFPFF_CHECK_OVERLAP (1U <<1)
+#define OFPFF_EMERG         (1U <<2)
 static const struct tok ofpff_bm[] = {
 	{ OFPFF_SEND_FLOW_REM, "SEND_FLOW_REM" },
 	{ OFPFF_CHECK_OVERLAP, "CHECK_OVERLAP" },
@@ -375,13 +376,13 @@ static const struct tok ofpff_bm[] = {
 };
 #define OFPFF_U (~(OFPFF_SEND_FLOW_REM | OFPFF_CHECK_OVERLAP | OFPFF_EMERG))
 
-#define OFPST_DESC      0x0000
-#define OFPST_FLOW      0x0001
-#define OFPST_AGGREGATE 0x0002
-#define OFPST_TABLE     0x0003
-#define OFPST_PORT      0x0004
-#define OFPST_QUEUE     0x0005
-#define OFPST_VENDOR    0xffff
+#define OFPST_DESC      0x0000U
+#define OFPST_FLOW      0x0001U
+#define OFPST_AGGREGATE 0x0002U
+#define OFPST_TABLE     0x0003U
+#define OFPST_PORT      0x0004U
+#define OFPST_QUEUE     0x0005U
+#define OFPST_VENDOR    0xffffU
 static const struct tok ofpst_str[] = {
 	{ OFPST_DESC,      "DESC"      },
 	{ OFPST_FLOW,      "FLOW"      },
@@ -394,35 +395,35 @@ static const struct tok ofpst_str[] = {
 };
 
 static const struct tok tableid_str[] = {
-	{ 0xfe, "EMERG" },
-	{ 0xff, "ALL"   },
+	{ 0xfeU, "EMERG" },
+	{ 0xffU, "ALL"   },
 	{ 0, NULL }
 };
 
-#define OFPQ_ALL      0xffffffff
+#define OFPQ_ALL      0xffffffffU
 static const struct tok ofpq_str[] = {
 	{ OFPQ_ALL, "ALL" },
 	{ 0, NULL }
 };
 
-#define OFPSF_REPLY_MORE 0x0001
+#define OFPSF_REPLY_MORE 0x0001U
 static const struct tok ofpsf_reply_bm[] = {
 	{ OFPSF_REPLY_MORE, "MORE" },
 	{ 0, NULL }
 };
 #define OFPSF_REPLY_U (~(OFPSF_REPLY_MORE))
 
-#define OFPR_NO_MATCH 0x00
-#define OFPR_ACTION   0x01
+#define OFPR_NO_MATCH 0x00U
+#define OFPR_ACTION   0x01U
 static const struct tok ofpr_str[] = {
 	{ OFPR_NO_MATCH, "NO_MATCH" },
 	{ OFPR_ACTION,   "ACTION"   },
 	{ 0, NULL }
 };
 
-#define OFPRR_IDLE_TIMEOUT 0x00
-#define OFPRR_HARD_TIMEOUT 0x01
-#define OFPRR_DELETE       0x02
+#define OFPRR_IDLE_TIMEOUT 0x00U
+#define OFPRR_HARD_TIMEOUT 0x01U
+#define OFPRR_DELETE       0x02U
 static const struct tok ofprr_str[] = {
 	{ OFPRR_IDLE_TIMEOUT, "IDLE_TIMEOUT" },
 	{ OFPRR_HARD_TIMEOUT, "HARD_TIMEOUT" },
@@ -430,9 +431,9 @@ static const struct tok ofprr_str[] = {
 	{ 0, NULL }
 };
 
-#define OFPPR_ADD    0x00
-#define OFPPR_DELETE 0x01
-#define OFPPR_MODIFY 0x02
+#define OFPPR_ADD    0x00U
+#define OFPPR_DELETE 0x01U
+#define OFPPR_MODIFY 0x02U
 static const struct tok ofppr_str[] = {
 	{ OFPPR_ADD,    "ADD"    },
 	{ OFPPR_DELETE, "DELETE" },
@@ -440,12 +441,12 @@ static const struct tok ofppr_str[] = {
 	{ 0, NULL }
 };
 
-#define OFPET_HELLO_FAILED    0x0000
-#define OFPET_BAD_REQUEST     0x0001
-#define OFPET_BAD_ACTION      0x0002
-#define OFPET_FLOW_MOD_FAILED 0x0003
-#define OFPET_PORT_MOD_FAILED 0x0004
-#define OFPET_QUEUE_OP_FAILED 0x0005
+#define OFPET_HELLO_FAILED    0x0000U
+#define OFPET_BAD_REQUEST     0x0001U
+#define OFPET_BAD_ACTION      0x0002U
+#define OFPET_FLOW_MOD_FAILED 0x0003U
+#define OFPET_PORT_MOD_FAILED 0x0004U
+#define OFPET_QUEUE_OP_FAILED 0x0005U
 static const struct tok ofpet_str[] = {
 	{ OFPET_HELLO_FAILED,    "HELLO_FAILED"    },
 	{ OFPET_BAD_REQUEST,     "BAD_REQUEST"     },
@@ -456,23 +457,23 @@ static const struct tok ofpet_str[] = {
 	{ 0, NULL }
 };
 
-#define OFPHFC_INCOMPATIBLE 0x0000
-#define OFPHFC_EPERM        0x0001
+#define OFPHFC_INCOMPATIBLE 0x0000U
+#define OFPHFC_EPERM        0x0001U
 static const struct tok ofphfc_str[] = {
 	{ OFPHFC_INCOMPATIBLE, "INCOMPATIBLE" },
 	{ OFPHFC_EPERM,        "EPERM"        },
 	{ 0, NULL }
 };
 
-#define OFPBRC_BAD_VERSION    0x0000
-#define OFPBRC_BAD_TYPE       0x0001
-#define OFPBRC_BAD_STAT       0x0002
-#define OFPBRC_BAD_VENDOR     0x0003
-#define OFPBRC_BAD_SUBTYPE    0x0004
-#define OFPBRC_EPERM          0x0005
-#define OFPBRC_BAD_LEN        0x0006
-#define OFPBRC_BUFFER_EMPTY   0x0007
-#define OFPBRC_BUFFER_UNKNOWN 0x0008
+#define OFPBRC_BAD_VERSION    0x0000U
+#define OFPBRC_BAD_TYPE       0x0001U
+#define OFPBRC_BAD_STAT       0x0002U
+#define OFPBRC_BAD_VENDOR     0x0003U
+#define OFPBRC_BAD_SUBTYPE    0x0004U
+#define OFPBRC_EPERM          0x0005U
+#define OFPBRC_BAD_LEN        0x0006U
+#define OFPBRC_BUFFER_EMPTY   0x0007U
+#define OFPBRC_BUFFER_UNKNOWN 0x0008U
 static const struct tok ofpbrc_str[] = {
 	{ OFPBRC_BAD_VERSION,    "BAD_VERSION"    },
 	{ OFPBRC_BAD_TYPE,       "BAD_TYPE"       },
@@ -486,15 +487,15 @@ static const struct tok ofpbrc_str[] = {
 	{ 0, NULL }
 };
 
-#define OFPBAC_BAD_TYPE        0x0000
-#define OFPBAC_BAD_LEN         0x0001
-#define OFPBAC_BAD_VENDOR      0x0002
-#define OFPBAC_BAD_VENDOR_TYPE 0x0003
-#define OFPBAC_BAD_OUT_PORT    0x0004
-#define OFPBAC_BAD_ARGUMENT    0x0005
-#define OFPBAC_EPERM           0x0006
-#define OFPBAC_TOO_MANY        0x0007
-#define OFPBAC_BAD_QUEUE       0x0008
+#define OFPBAC_BAD_TYPE        0x0000U
+#define OFPBAC_BAD_LEN         0x0001U
+#define OFPBAC_BAD_VENDOR      0x0002U
+#define OFPBAC_BAD_VENDOR_TYPE 0x0003U
+#define OFPBAC_BAD_OUT_PORT    0x0004U
+#define OFPBAC_BAD_ARGUMENT    0x0005U
+#define OFPBAC_EPERM           0x0006U
+#define OFPBAC_TOO_MANY        0x0007U
+#define OFPBAC_BAD_QUEUE       0x0008U
 static const struct tok ofpbac_str[] = {
 	{ OFPBAC_BAD_TYPE,        "BAD_TYPE"        },
 	{ OFPBAC_BAD_LEN,         "BAD_LEN"         },
@@ -508,12 +509,12 @@ static const struct tok ofpbac_str[] = {
 	{ 0, NULL }
 };
 
-#define OFPFMFC_ALL_TABLES_FULL   0x0000
-#define OFPFMFC_OVERLAP           0x0001
-#define OFPFMFC_EPERM             0x0002
-#define OFPFMFC_BAD_EMERG_TIMEOUT 0x0003
-#define OFPFMFC_BAD_COMMAND       0x0004
-#define OFPFMFC_UNSUPPORTED       0x0005
+#define OFPFMFC_ALL_TABLES_FULL   0x0000U
+#define OFPFMFC_OVERLAP           0x0001U
+#define OFPFMFC_EPERM             0x0002U
+#define OFPFMFC_BAD_EMERG_TIMEOUT 0x0003U
+#define OFPFMFC_BAD_COMMAND       0x0004U
+#define OFPFMFC_UNSUPPORTED       0x0005U
 static const struct tok ofpfmfc_str[] = {
 	{ OFPFMFC_ALL_TABLES_FULL,   "ALL_TABLES_FULL"   },
 	{ OFPFMFC_OVERLAP,           "OVERLAP"           },
@@ -524,17 +525,17 @@ static const struct tok ofpfmfc_str[] = {
 	{ 0, NULL }
 };
 
-#define OFPPMFC_BAD_PORT    0x0000
-#define OFPPMFC_BAD_HW_ADDR 0x0001
+#define OFPPMFC_BAD_PORT    0x0000U
+#define OFPPMFC_BAD_HW_ADDR 0x0001U
 static const struct tok ofppmfc_str[] = {
 	{ OFPPMFC_BAD_PORT,    "BAD_PORT"    },
 	{ OFPPMFC_BAD_HW_ADDR, "BAD_HW_ADDR" },
 	{ 0, NULL }
 };
 
-#define OFPQOFC_BAD_PORT  0x0000
-#define OFPQOFC_BAD_QUEUE 0x0001
-#define OFPQOFC_EPERM     0x0002
+#define OFPQOFC_BAD_PORT  0x0000U
+#define OFPQOFC_BAD_QUEUE 0x0001U
+#define OFPQOFC_EPERM     0x0002U
 static const struct tok ofpqofc_str[] = {
 	{ OFPQOFC_BAD_PORT,  "BAD_PORT"  },
 	{ OFPQOFC_BAD_QUEUE, "BAD_QUEUE" },
@@ -592,7 +593,7 @@ static const struct tok empty_str[] = {
 #define OFP_MAX_PORT_NAME_LEN      16
 #define DESC_STR_LEN              256
 #define SERIAL_NUM_LEN             32
-#define OFP_VLAN_NONE          0xffff
+#define OFP_VLAN_NONE          0xffffU
 
 /* vendor extensions */
 #define BSN_SET_IP_MASK                    0
@@ -759,7 +760,7 @@ of10_bsn_message_print(netdissect_options *ndo,
 	uint32_t subtype;
 
 	if (len < 4)
-		goto corrupt;
+		goto invalid;
 	/* subtype */
 	ND_TCHECK2(*cp, 4);
 	subtype = EXTRACT_32BITS(cp);
@@ -780,7 +781,7 @@ of10_bsn_message_print(netdissect_options *ndo,
 		 *
 		 */
 		if (len != 12)
-			goto corrupt;
+			goto invalid;
 		/* index */
 		ND_TCHECK2(*cp, 1);
 		ND_PRINT((ndo, ", index %u", *cp));
@@ -804,7 +805,7 @@ of10_bsn_message_print(netdissect_options *ndo,
 		 *
 		 */
 		if (len != 12)
-			goto corrupt;
+			goto invalid;
 		/* index */
 		ND_TCHECK2(*cp, 1);
 		ND_PRINT((ndo, ", index %u", *cp));
@@ -831,7 +832,7 @@ of10_bsn_message_print(netdissect_options *ndo,
 		 *
 		 */
 		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)));
@@ -854,7 +855,7 @@ of10_bsn_message_print(netdissect_options *ndo,
 		 *
 		 */
 		if (len != 4)
-			goto corrupt;
+			goto invalid;
 		break;
 	case BSN_VIRTUAL_PORT_REMOVE_REQUEST:
 		/*
@@ -868,7 +869,7 @@ of10_bsn_message_print(netdissect_options *ndo,
 		 *
 		 */
 		if (len != 8)
-			goto corrupt;
+			goto invalid;
 		/* vport_no */
 		ND_TCHECK2(*cp, 4);
 		ND_PRINT((ndo, ", vport_no %u", EXTRACT_32BITS(cp)));
@@ -888,7 +889,7 @@ of10_bsn_message_print(netdissect_options *ndo,
 		 *
 		 */
 		if (len < 8)
-			goto corrupt;
+			goto invalid;
 		/* service */
 		ND_TCHECK2(*cp, 4);
 		ND_PRINT((ndo, ", service %u", EXTRACT_32BITS(cp)));
@@ -935,7 +936,7 @@ of10_bsn_message_print(netdissect_options *ndo,
 		 *
 		 */
 		if (len != 8)
-			goto corrupt;
+			goto invalid;
 		/* status */
 		ND_TCHECK2(*cp, 4);
 		ND_PRINT((ndo, ", status 0x%08x", EXTRACT_32BITS(cp)));
@@ -947,8 +948,8 @@ of10_bsn_message_print(netdissect_options *ndo,
 	}
 	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:
@@ -964,7 +965,7 @@ of10_bsn_actions_print(netdissect_options *ndo,
 	uint32_t subtype, vlan_tag;
 
 	if (len < 4)
-		goto corrupt;
+		goto invalid;
 	/* subtype */
 	ND_TCHECK2(*cp, 4);
 	subtype = EXTRACT_32BITS(cp);
@@ -987,7 +988,7 @@ of10_bsn_actions_print(netdissect_options *ndo,
 		 *
 		 */
 		if (len != 16)
-			goto corrupt;
+			goto invalid;
 		/* dest_port */
 		ND_TCHECK2(*cp, 4);
 		ND_PRINT((ndo, ", dest_port %u", EXTRACT_32BITS(cp)));
@@ -1021,8 +1022,8 @@ of10_bsn_actions_print(netdissect_options *ndo,
 
 	return cp;
 
-corrupt:
-	ND_PRINT((ndo, "%s", cstr));
+invalid:
+	ND_PRINT((ndo, "%s", istr));
 	ND_TCHECK2(*cp0, len);
 	return cp0 + len;
 trunc:
@@ -1038,7 +1039,7 @@ of10_vendor_action_print(netdissect_options *ndo,
 	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);
@@ -1050,8 +1051,8 @@ of10_vendor_action_print(netdissect_options *ndo,
 		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:
@@ -1067,7 +1068,7 @@ of10_vendor_message_print(netdissect_options *ndo,
 	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);
@@ -1079,8 +1080,8 @@ of10_vendor_message_print(netdissect_options *ndo,
 		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:
@@ -1096,7 +1097,7 @@ of10_vendor_data_print(netdissect_options *ndo,
 	uint32_t vendor;
 
 	if (len < 4)
-		goto corrupt;
+		goto invalid;
 	/* vendor */
 	ND_TCHECK2(*cp, 4);
 	vendor = EXTRACT_32BITS(cp);
@@ -1105,8 +1106,8 @@ of10_vendor_data_print(netdissect_options *ndo,
 	/* 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:
@@ -1146,7 +1147,7 @@ of10_phy_ports_print(netdissect_options *ndo,
 
 	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))));
@@ -1202,8 +1203,8 @@ next_port:
 	} /* 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:
@@ -1224,7 +1225,7 @@ of10_queue_props_print(netdissect_options *ndo,
 		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);
@@ -1236,7 +1237,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)
-			goto corrupt;
+			goto invalid;
 		/* pad */
 		ND_TCHECK2(*cp, 4);
 		cp += 4;
@@ -1278,8 +1279,8 @@ next_property:
 	} /* 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:
@@ -1298,7 +1299,7 @@ of10_queues_print(netdissect_options *ndo,
 
 	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)));
@@ -1309,7 +1310,7 @@ of10_queues_print(netdissect_options *ndo,
 		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;
@@ -1326,8 +1327,8 @@ next_queue:
 	} /* 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:
@@ -1453,7 +1454,7 @@ of10_actions_print(netdissect_options *ndo,
 		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);
@@ -1466,7 +1467,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)
-			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) {
@@ -1597,8 +1598,8 @@ next_action:
 	} /* 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:
@@ -1765,12 +1766,12 @@ of10_stats_request_print(netdissect_options *ndo,
 	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)
-			goto corrupt;
+			goto invalid;
 		/* match */
 		if (ep == (cp = of10_match_print(ndo, "\n\t ", cp, ep)))
 			return ep; /* end of snapshot */
@@ -1787,7 +1788,7 @@ of10_stats_request_print(netdissect_options *ndo,
 		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))));
@@ -1797,7 +1798,7 @@ of10_stats_request_print(netdissect_options *ndo,
 		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))));
@@ -1814,8 +1815,8 @@ of10_stats_request_print(netdissect_options *ndo,
 	}
 	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:
@@ -1829,7 +1830,7 @@ of10_desc_stats_reply_print(netdissect_options *ndo,
                             const u_char *cp, const u_char *ep, const u_int 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 '"));
@@ -1861,8 +1862,8 @@ of10_desc_stats_reply_print(netdissect_options *ndo,
 	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:
@@ -1881,13 +1882,13 @@ of10_flow_stats_reply_print(netdissect_options *ndo,
 
 	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)
-			goto corrupt;
+			goto invalid;
 		cp += 2;
 		/* table_id */
 		ND_TCHECK2(*cp, 1);
@@ -1942,8 +1943,8 @@ of10_flow_stats_reply_print(netdissect_options *ndo,
 	} /* 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:
@@ -1958,7 +1959,7 @@ of10_aggregate_stats_reply_print(netdissect_options *ndo,
                                  const u_int 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)));
@@ -1975,8 +1976,8 @@ of10_aggregate_stats_reply_print(netdissect_options *ndo,
 	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:
@@ -1994,7 +1995,7 @@ of10_table_stats_reply_print(netdissect_options *ndo,
 
 	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)));
@@ -2034,8 +2035,8 @@ of10_table_stats_reply_print(netdissect_options *ndo,
 	} /* 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:
@@ -2053,7 +2054,7 @@ of10_port_stats_reply_print(netdissect_options *ndo,
 
 	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))));
@@ -2119,8 +2120,8 @@ next_port:
 	} /* 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:
@@ -2138,7 +2139,7 @@ of10_queue_stats_reply_print(netdissect_options *ndo,
 
 	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))));
@@ -2167,8 +2168,8 @@ of10_queue_stats_reply_print(netdissect_options *ndo,
 	} /* 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:
@@ -2238,15 +2239,15 @@ of10_packet_out_print(netdissect_options *ndo,
 	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);
 
-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:
@@ -2386,7 +2387,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
-	 * 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",
@@ -2398,14 +2399,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)
-			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)
-			goto corrupt;
+			goto invalid;
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		/* flags */
@@ -2418,13 +2419,13 @@ of10_header_body_print(netdissect_options *ndo,
 		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)
-			goto corrupt;
+			goto invalid;
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		/* port */
@@ -2436,13 +2437,13 @@ of10_header_body_print(netdissect_options *ndo,
 		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)
-			goto corrupt;
+			goto invalid;
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		/* reason */
@@ -2458,7 +2459,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)
-			goto corrupt;
+			goto invalid;
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		return of10_features_reply_print(ndo, cp, ep, len);
@@ -2474,21 +2475,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)
-			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)
-			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)
-			goto corrupt;
+			goto invalid;
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		return of10_packet_in_print(ndo, cp, ep, len);
@@ -2498,7 +2499,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)
-			goto corrupt;
+			goto invalid;
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		return of10_stats_request_print(ndo, cp, ep, len);
@@ -2509,7 +2510,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)
-			goto corrupt;
+			goto invalid;
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		return of10_stats_reply_print(ndo, cp, ep, len);
@@ -2517,7 +2518,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)
-			goto corrupt;
+			goto invalid;
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		return of10_packet_out_print(ndo, cp, ep, len);
@@ -2525,7 +2526,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)
-			goto corrupt;
+			goto invalid;
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		return of10_flow_mod_print(ndo, cp, ep, len);
@@ -2533,7 +2534,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)
-			goto corrupt;
+			goto invalid;
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		/* port */
@@ -2548,8 +2549,8 @@ of10_header_body_print(netdissect_options *ndo,
 	} /* 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;