X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/49b23c5a9b0198bb382dcf43c458d46fcf2fa809..00b189d27cd235c958497d9b1aca6d3addd55d43:/print-openflow-1.0.c

diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index ce958430..731f0e38 100644
--- a/print-openflow-1.0.c
+++ b/print-openflow-1.0.c
@@ -123,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"       },
@@ -144,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"  },
@@ -161,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"    },
@@ -183,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"    },
@@ -223,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"     },
@@ -259,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" },
@@ -291,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"  },
@@ -335,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"   },
@@ -346,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"        },
@@ -365,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" },
@@ -376,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"      },
@@ -395,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" },
@@ -431,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" },
@@ -441,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"     },
@@ -457,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"       },
@@ -487,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"         },
@@ -509,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"           },
@@ -525,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" },
@@ -593,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
@@ -762,8 +762,8 @@ of10_bsn_message_print(netdissect_options *ndo,
 	if (len < 4)
 		goto invalid;
 	/* subtype */
-	ND_TCHECK2(*cp, 4);
-	subtype = EXTRACT_32BITS(cp);
+	ND_TCHECK_4(cp);
+	subtype = EXTRACT_BE_U_4(cp);
 	cp += 4;
 	ND_PRINT((ndo, "\n\t subtype %s", tok2str(bsn_subtype_str, "unknown (0x%08x)", subtype)));
 	switch (subtype) {
@@ -783,11 +783,11 @@ of10_bsn_message_print(netdissect_options *ndo,
 		if (len != 12)
 			goto invalid;
 		/* index */
-		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, ", index %u", *cp));
+		ND_TCHECK_1(cp);
+		ND_PRINT((ndo, ", index %u", EXTRACT_U_1(cp)));
 		cp += 1;
 		/* pad */
-		ND_TCHECK2(*cp, 7);
+		ND_TCHECK_7(cp);
 		cp += 7;
 		break;
 	case BSN_SET_IP_MASK:
@@ -807,14 +807,14 @@ of10_bsn_message_print(netdissect_options *ndo,
 		if (len != 12)
 			goto invalid;
 		/* index */
-		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, ", index %u", *cp));
+		ND_TCHECK_1(cp);
+		ND_PRINT((ndo, ", index %u", EXTRACT_U_1(cp)));
 		cp += 1;
 		/* pad */
-		ND_TCHECK2(*cp, 3);
+		ND_TCHECK_3(cp);
 		cp += 3;
 		/* mask */
-		ND_TCHECK2(*cp, 4);
+		ND_TCHECK_4(cp);
 		ND_PRINT((ndo, ", mask %s", ipaddr_string(ndo, cp)));
 		cp += 4;
 		break;
@@ -834,11 +834,11 @@ of10_bsn_message_print(netdissect_options *ndo,
 		if (len != 8)
 			goto invalid;
 		/* report_mirror_ports */
-		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, ", report_mirror_ports %s", tok2str(bsn_onoff_str, "bogus (%u)", *cp)));
+		ND_TCHECK_1(cp);
+		ND_PRINT((ndo, ", report_mirror_ports %s", tok2str(bsn_onoff_str, "bogus (%u)", EXTRACT_U_1(cp))));
 		cp += 1;
 		/* pad */
-		ND_TCHECK2(*cp, 3);
+		ND_TCHECK_3(cp);
 		cp += 3;
 		break;
 	case BSN_GET_INTERFACES_REQUEST:
@@ -871,8 +871,8 @@ of10_bsn_message_print(netdissect_options *ndo,
 		if (len != 8)
 			goto invalid;
 		/* vport_no */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, ", vport_no %u", EXTRACT_32BITS(cp)));
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, ", vport_no %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
 		break;
 	case BSN_SHELL_COMMAND:
@@ -891,8 +891,8 @@ of10_bsn_message_print(netdissect_options *ndo,
 		if (len < 8)
 			goto invalid;
 		/* service */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, ", service %u", EXTRACT_32BITS(cp)));
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, ", service %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
 		/* data */
 		ND_PRINT((ndo, ", data '"));
@@ -938,8 +938,8 @@ of10_bsn_message_print(netdissect_options *ndo,
 		if (len != 8)
 			goto invalid;
 		/* status */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, ", status 0x%08x", EXTRACT_32BITS(cp)));
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, ", status 0x%08x", EXTRACT_BE_U_4(cp)));
 		cp += 4;
 		break;
 	default:
@@ -967,8 +967,8 @@ of10_bsn_actions_print(netdissect_options *ndo,
 	if (len < 4)
 		goto invalid;
 	/* subtype */
-	ND_TCHECK2(*cp, 4);
-	subtype = EXTRACT_32BITS(cp);
+	ND_TCHECK_4(cp);
+	subtype = EXTRACT_BE_U_4(cp);
 	cp += 4;
 	ND_PRINT((ndo, "\n\t  subtype %s", tok2str(bsn_action_subtype_str, "unknown (0x%08x)", subtype)));
 	switch (subtype) {
@@ -990,12 +990,12 @@ of10_bsn_actions_print(netdissect_options *ndo,
 		if (len != 16)
 			goto invalid;
 		/* dest_port */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, ", dest_port %u", EXTRACT_32BITS(cp)));
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, ", dest_port %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
 		/* vlan_tag */
-		ND_TCHECK2(*cp, 4);
-		vlan_tag = EXTRACT_32BITS(cp);
+		ND_TCHECK_4(cp);
+		vlan_tag = EXTRACT_BE_U_4(cp);
 		cp += 4;
 		switch (vlan_tag >> 16) {
 		case 0:
@@ -1008,11 +1008,11 @@ of10_bsn_actions_print(netdissect_options *ndo,
 			ND_PRINT((ndo, ", vlan_tag unknown (0x%04x)", vlan_tag >> 16));
 		}
 		/* copy_stage */
-		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, ", copy_stage %s", tok2str(bsn_mirror_copy_stage_str, "unknown (%u)", *cp)));
+		ND_TCHECK_1(cp);
+		ND_PRINT((ndo, ", copy_stage %s", tok2str(bsn_mirror_copy_stage_str, "unknown (%u)", EXTRACT_U_1(cp))));
 		cp += 1;
 		/* pad */
-		ND_TCHECK2(*cp, 3);
+		ND_TCHECK_3(cp);
 		cp += 3;
 		break;
 	default:
@@ -1041,8 +1041,8 @@ of10_vendor_action_print(netdissect_options *ndo,
 	if (len < 4)
 		goto invalid;
 	/* vendor */
-	ND_TCHECK2(*cp, 4);
-	vendor = EXTRACT_32BITS(cp);
+	ND_TCHECK_4(cp);
+	vendor = EXTRACT_BE_U_4(cp);
 	cp += 4;
 	ND_PRINT((ndo, ", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)));
 	/* data */
@@ -1070,8 +1070,8 @@ of10_vendor_message_print(netdissect_options *ndo,
 	if (len < 4)
 		goto invalid;
 	/* vendor */
-	ND_TCHECK2(*cp, 4);
-	vendor = EXTRACT_32BITS(cp);
+	ND_TCHECK_4(cp);
+	vendor = EXTRACT_BE_U_4(cp);
 	cp += 4;
 	ND_PRINT((ndo, ", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)));
 	/* data */
@@ -1099,8 +1099,8 @@ of10_vendor_data_print(netdissect_options *ndo,
 	if (len < 4)
 		goto invalid;
 	/* vendor */
-	ND_TCHECK2(*cp, 4);
-	vendor = EXTRACT_32BITS(cp);
+	ND_TCHECK_4(cp);
+	vendor = EXTRACT_BE_U_4(cp);
 	cp += 4;
 	ND_PRINT((ndo, ", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)));
 	/* data */
@@ -1149,8 +1149,8 @@ of10_phy_ports_print(netdissect_options *ndo,
 		if (len < OF_PHY_PORT_LEN)
 			goto invalid;
 		/* port_no */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, "\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, "\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 		cp += 2;
 		/* hw_addr */
 		ND_TCHECK2(*cp, ETHER_ADDR_LEN);
@@ -1169,34 +1169,40 @@ of10_phy_ports_print(netdissect_options *ndo,
 			goto next_port;
 		}
 		/* config */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, "\n\t   config 0x%08x", EXTRACT_32BITS(cp)));
-		of10_bitmap_print(ndo, ofppc_bm, EXTRACT_32BITS(cp), OFPPC_U);
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, "\n\t   config 0x%08x", EXTRACT_BE_U_4(cp)));
+		of10_bitmap_print(ndo, ofppc_bm, EXTRACT_BE_U_4(cp),
+				  OFPPC_U);
 		cp += 4;
 		/* state */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, "\n\t   state 0x%08x", EXTRACT_32BITS(cp)));
-		of10_bitmap_print(ndo, ofpps_bm, EXTRACT_32BITS(cp), OFPPS_U);
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, "\n\t   state 0x%08x", EXTRACT_BE_U_4(cp)));
+		of10_bitmap_print(ndo, ofpps_bm, EXTRACT_BE_U_4(cp),
+				  OFPPS_U);
 		cp += 4;
 		/* curr */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, "\n\t   curr 0x%08x", EXTRACT_32BITS(cp)));
-		of10_bitmap_print(ndo, ofppf_bm, EXTRACT_32BITS(cp), OFPPF_U);
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, "\n\t   curr 0x%08x", EXTRACT_BE_U_4(cp)));
+		of10_bitmap_print(ndo, ofppf_bm, EXTRACT_BE_U_4(cp),
+				  OFPPF_U);
 		cp += 4;
 		/* advertised */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, "\n\t   advertised 0x%08x", EXTRACT_32BITS(cp)));
-		of10_bitmap_print(ndo, ofppf_bm, EXTRACT_32BITS(cp), OFPPF_U);
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, "\n\t   advertised 0x%08x", EXTRACT_BE_U_4(cp)));
+		of10_bitmap_print(ndo, ofppf_bm, EXTRACT_BE_U_4(cp),
+				  OFPPF_U);
 		cp += 4;
 		/* supported */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, "\n\t   supported 0x%08x", EXTRACT_32BITS(cp)));
-		of10_bitmap_print(ndo, ofppf_bm, EXTRACT_32BITS(cp), OFPPF_U);
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, "\n\t   supported 0x%08x", EXTRACT_BE_U_4(cp)));
+		of10_bitmap_print(ndo, ofppf_bm, EXTRACT_BE_U_4(cp),
+				  OFPPF_U);
 		cp += 4;
 		/* peer */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, "\n\t   peer 0x%08x", EXTRACT_32BITS(cp)));
-		of10_bitmap_print(ndo, ofppf_bm, EXTRACT_32BITS(cp), OFPPF_U);
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, "\n\t   peer 0x%08x", EXTRACT_BE_U_4(cp)));
+		of10_bitmap_print(ndo, ofppf_bm, EXTRACT_BE_U_4(cp),
+				  OFPPF_U);
 		cp += 4;
 next_port:
 		len -= OF_PHY_PORT_LEN;
@@ -1227,19 +1233,19 @@ of10_queue_props_print(netdissect_options *ndo,
 		if (len < OF_QUEUE_PROP_HEADER_LEN)
 			goto invalid;
 		/* property */
-		ND_TCHECK2(*cp, 2);
-		property = EXTRACT_16BITS(cp);
+		ND_TCHECK_2(cp);
+		property = EXTRACT_BE_U_2(cp);
 		cp += 2;
 		ND_PRINT((ndo, "\n\t   property %s", tok2str(ofpqt_str, "invalid (0x%04x)", property)));
 		/* len */
-		ND_TCHECK2(*cp, 2);
-		plen = EXTRACT_16BITS(cp);
+		ND_TCHECK_2(cp);
+		plen = EXTRACT_BE_U_2(cp);
 		cp += 2;
 		ND_PRINT((ndo, ", len %u", plen));
 		if (plen < OF_QUEUE_PROP_HEADER_LEN || plen > len)
 			goto invalid;
 		/* pad */
-		ND_TCHECK2(*cp, 4);
+		ND_TCHECK_4(cp);
 		cp += 4;
 		/* property-specific constraints and decoding */
 		switch (property) {
@@ -1263,15 +1269,15 @@ of10_queue_props_print(netdissect_options *ndo,
 		}
 		if (property == OFPQT_MIN_RATE) { /* the only case of property decoding */
 			/* rate */
-			ND_TCHECK2(*cp, 2);
-			rate = EXTRACT_16BITS(cp);
+			ND_TCHECK_2(cp);
+			rate = EXTRACT_BE_U_2(cp);
 			cp += 2;
 			if (rate > 1000)
 				ND_PRINT((ndo, ", rate disabled"));
 			else
 				ND_PRINT((ndo, ", rate %u.%u%%", rate / 10, rate % 10));
 			/* pad */
-			ND_TCHECK2(*cp, 6);
+			ND_TCHECK_6(cp);
 			cp += 6;
 		}
 next_property:
@@ -1301,18 +1307,18 @@ of10_queues_print(netdissect_options *ndo,
 		if (len < OF_PACKET_QUEUE_LEN)
 			goto invalid;
 		/* queue_id */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, "\n\t  queue_id %u", EXTRACT_32BITS(cp)));
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, "\n\t  queue_id %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
 		/* len */
-		ND_TCHECK2(*cp, 2);
-		desclen = EXTRACT_16BITS(cp);
+		ND_TCHECK_2(cp);
+		desclen = EXTRACT_BE_U_2(cp);
 		cp += 2;
 		ND_PRINT((ndo, ", len %u", desclen));
 		if (desclen < OF_PACKET_QUEUE_LEN || desclen > len)
 			goto invalid;
 		/* pad */
-		ND_TCHECK2(*cp, 2);
+		ND_TCHECK_2(cp);
 		cp += 2;
 		/* properties */
 		if (ndo->ndo_vflag < 2) {
@@ -1348,15 +1354,15 @@ of10_match_print(netdissect_options *ndo,
 	const char *field_name;
 
 	/* wildcards */
-	ND_TCHECK2(*cp, 4);
-	wildcards = EXTRACT_32BITS(cp);
+	ND_TCHECK_4(cp);
+	wildcards = EXTRACT_BE_U_4(cp);
 	if (wildcards & OFPFW_U)
 		ND_PRINT((ndo, "%swildcards 0x%08x (bogus)", pfx, wildcards));
 	cp += 4;
 	/* in_port */
-	ND_TCHECK2(*cp, 2);
+	ND_TCHECK_2(cp);
 	if (! (wildcards & OFPFW_IN_PORT))
-		ND_PRINT((ndo, "%smatch in_port %s", pfx, tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+		ND_PRINT((ndo, "%smatch in_port %s", pfx, tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 	cp += 2;
 	/* dl_src */
 	ND_TCHECK2(*cp, ETHER_ADDR_LEN);
@@ -1369,31 +1375,31 @@ of10_match_print(netdissect_options *ndo,
 		ND_PRINT((ndo, "%smatch dl_dst %s", pfx, etheraddr_string(ndo, cp)));
 	cp += ETHER_ADDR_LEN;
 	/* dl_vlan */
-	ND_TCHECK2(*cp, 2);
+	ND_TCHECK_2(cp);
 	if (! (wildcards & OFPFW_DL_VLAN))
-		ND_PRINT((ndo, "%smatch dl_vlan %s", pfx, vlan_str(EXTRACT_16BITS(cp))));
+		ND_PRINT((ndo, "%smatch dl_vlan %s", pfx, vlan_str(EXTRACT_BE_U_2(cp))));
 	cp += 2;
 	/* dl_vlan_pcp */
-	ND_TCHECK2(*cp, 1);
+	ND_TCHECK_1(cp);
 	if (! (wildcards & OFPFW_DL_VLAN_PCP))
-		ND_PRINT((ndo, "%smatch dl_vlan_pcp %s", pfx, pcp_str(*cp)));
+		ND_PRINT((ndo, "%smatch dl_vlan_pcp %s", pfx, pcp_str(EXTRACT_U_1(cp))));
 	cp += 1;
 	/* pad1 */
-	ND_TCHECK2(*cp, 1);
+	ND_TCHECK_1(cp);
 	cp += 1;
 	/* dl_type */
-	ND_TCHECK2(*cp, 2);
-	dl_type = EXTRACT_16BITS(cp);
+	ND_TCHECK_2(cp);
+	dl_type = EXTRACT_BE_U_2(cp);
 	cp += 2;
 	if (! (wildcards & OFPFW_DL_TYPE))
 		ND_PRINT((ndo, "%smatch dl_type 0x%04x", pfx, dl_type));
 	/* nw_tos */
-	ND_TCHECK2(*cp, 1);
+	ND_TCHECK_1(cp);
 	if (! (wildcards & OFPFW_NW_TOS))
-		ND_PRINT((ndo, "%smatch nw_tos 0x%02x", pfx, *cp));
+		ND_PRINT((ndo, "%smatch nw_tos 0x%02x", pfx, EXTRACT_U_1(cp)));
 	cp += 1;
 	/* nw_proto */
-	ND_TCHECK2(*cp, 1);
+	ND_TCHECK_1(cp);
 	nw_proto = *cp;
 	cp += 1;
 	if (! (wildcards & OFPFW_NW_PROTO)) {
@@ -1402,36 +1408,36 @@ of10_match_print(netdissect_options *ndo,
 		ND_PRINT((ndo, "%smatch %s %u", pfx, field_name, nw_proto));
 	}
 	/* pad2 */
-	ND_TCHECK2(*cp, 2);
+	ND_TCHECK_2(cp);
 	cp += 2;
 	/* nw_src */
-	ND_TCHECK2(*cp, 4);
+	ND_TCHECK_4(cp);
 	nw_bits = (wildcards & OFPFW_NW_SRC_MASK) >> OFPFW_NW_SRC_SHIFT;
 	if (nw_bits < 32)
 		ND_PRINT((ndo, "%smatch nw_src %s/%u", pfx, ipaddr_string(ndo, cp), 32 - nw_bits));
 	cp += 4;
 	/* nw_dst */
-	ND_TCHECK2(*cp, 4);
+	ND_TCHECK_4(cp);
 	nw_bits = (wildcards & OFPFW_NW_DST_MASK) >> OFPFW_NW_DST_SHIFT;
 	if (nw_bits < 32)
 		ND_PRINT((ndo, "%smatch nw_dst %s/%u", pfx, ipaddr_string(ndo, cp), 32 - nw_bits));
 	cp += 4;
 	/* tp_src */
-	ND_TCHECK2(*cp, 2);
+	ND_TCHECK_2(cp);
 	if (! (wildcards & OFPFW_TP_SRC)) {
 		field_name = ! (wildcards & OFPFW_DL_TYPE) && dl_type == ETHERTYPE_IP
 		  && ! (wildcards & OFPFW_NW_PROTO) && nw_proto == IPPROTO_ICMP
 		  ? "icmp_type" : "tp_src";
-		ND_PRINT((ndo, "%smatch %s %u", pfx, field_name, EXTRACT_16BITS(cp)));
+		ND_PRINT((ndo, "%smatch %s %u", pfx, field_name, EXTRACT_BE_U_2(cp)));
 	}
 	cp += 2;
 	/* tp_dst */
-	ND_TCHECK2(*cp, 2);
+	ND_TCHECK_2(cp);
 	if (! (wildcards & OFPFW_TP_DST)) {
 		field_name = ! (wildcards & OFPFW_DL_TYPE) && dl_type == ETHERTYPE_IP
 		  && ! (wildcards & OFPFW_NW_PROTO) && nw_proto == IPPROTO_ICMP
 		  ? "icmp_code" : "tp_dst";
-		ND_PRINT((ndo, "%smatch %s %u", pfx, field_name, EXTRACT_16BITS(cp)));
+		ND_PRINT((ndo, "%smatch %s %u", pfx, field_name, EXTRACT_BE_U_2(cp)));
 	}
 	return cp + 2;
 
@@ -1456,13 +1462,13 @@ of10_actions_print(netdissect_options *ndo,
 		if (len < OF_ACTION_HEADER_LEN)
 			goto invalid;
 		/* type */
-		ND_TCHECK2(*cp, 2);
-		type = EXTRACT_16BITS(cp);
+		ND_TCHECK_2(cp);
+		type = EXTRACT_BE_U_2(cp);
 		cp += 2;
 		ND_PRINT((ndo, "%saction type %s", pfx, tok2str(ofpat_str, "invalid (0x%04x)", type)));
 		/* length */
-		ND_TCHECK2(*cp, 2);
-		alen = EXTRACT_16BITS(cp);
+		ND_TCHECK_2(cp);
+		alen = EXTRACT_BE_U_2(cp);
 		cp += 2;
 		ND_PRINT((ndo, ", len %u", alen));
 		/* On action size underrun/overrun skip the rest of the action list. */
@@ -1506,32 +1512,32 @@ of10_actions_print(netdissect_options *ndo,
 		switch (type) {
 		case OFPAT_OUTPUT:
 			/* port */
-			ND_TCHECK2(*cp, 2);
-			output_port = EXTRACT_16BITS(cp);
+			ND_TCHECK_2(cp);
+			output_port = EXTRACT_BE_U_2(cp);
 			cp += 2;
 			ND_PRINT((ndo, ", port %s", tok2str(ofpp_str, "%u", output_port)));
 			/* max_len */
-			ND_TCHECK2(*cp, 2);
+			ND_TCHECK_2(cp);
 			if (output_port == OFPP_CONTROLLER)
-				ND_PRINT((ndo, ", max_len %u", EXTRACT_16BITS(cp)));
+				ND_PRINT((ndo, ", max_len %u", EXTRACT_BE_U_2(cp)));
 			cp += 2;
 			break;
 		case OFPAT_SET_VLAN_VID:
 			/* vlan_vid */
-			ND_TCHECK2(*cp, 2);
-			ND_PRINT((ndo, ", vlan_vid %s", vlan_str(EXTRACT_16BITS(cp))));
+			ND_TCHECK_2(cp);
+			ND_PRINT((ndo, ", vlan_vid %s", vlan_str(EXTRACT_BE_U_2(cp))));
 			cp += 2;
 			/* pad */
-			ND_TCHECK2(*cp, 2);
+			ND_TCHECK_2(cp);
 			cp += 2;
 			break;
 		case OFPAT_SET_VLAN_PCP:
 			/* vlan_pcp */
-			ND_TCHECK2(*cp, 1);
-			ND_PRINT((ndo, ", vlan_pcp %s", pcp_str(*cp)));
+			ND_TCHECK_1(cp);
+			ND_PRINT((ndo, ", vlan_pcp %s", pcp_str(EXTRACT_U_1(cp))));
 			cp += 1;
 			/* pad */
-			ND_TCHECK2(*cp, 3);
+			ND_TCHECK_3(cp);
 			cp += 3;
 			break;
 		case OFPAT_SET_DL_SRC:
@@ -1541,46 +1547,46 @@ of10_actions_print(netdissect_options *ndo,
 			ND_PRINT((ndo, ", dl_addr %s", etheraddr_string(ndo, cp)));
 			cp += ETHER_ADDR_LEN;
 			/* pad */
-			ND_TCHECK2(*cp, 6);
+			ND_TCHECK_6(cp);
 			cp += 6;
 			break;
 		case OFPAT_SET_NW_SRC:
 		case OFPAT_SET_NW_DST:
 			/* nw_addr */
-			ND_TCHECK2(*cp, 4);
+			ND_TCHECK_4(cp);
 			ND_PRINT((ndo, ", nw_addr %s", ipaddr_string(ndo, cp)));
 			cp += 4;
 			break;
 		case OFPAT_SET_NW_TOS:
 			/* nw_tos */
-			ND_TCHECK2(*cp, 1);
-			ND_PRINT((ndo, ", nw_tos 0x%02x", *cp));
+			ND_TCHECK_1(cp);
+			ND_PRINT((ndo, ", nw_tos 0x%02x", EXTRACT_U_1(cp)));
 			cp += 1;
 			/* pad */
-			ND_TCHECK2(*cp, 3);
+			ND_TCHECK_3(cp);
 			cp += 3;
 			break;
 		case OFPAT_SET_TP_SRC:
 		case OFPAT_SET_TP_DST:
 			/* nw_tos */
-			ND_TCHECK2(*cp, 2);
-			ND_PRINT((ndo, ", tp_port %u", EXTRACT_16BITS(cp)));
+			ND_TCHECK_2(cp);
+			ND_PRINT((ndo, ", tp_port %u", EXTRACT_BE_U_2(cp)));
 			cp += 2;
 			/* pad */
-			ND_TCHECK2(*cp, 2);
+			ND_TCHECK_2(cp);
 			cp += 2;
 			break;
 		case OFPAT_ENQUEUE:
 			/* port */
-			ND_TCHECK2(*cp, 2);
-			ND_PRINT((ndo, ", port %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+			ND_TCHECK_2(cp);
+			ND_PRINT((ndo, ", port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 			cp += 2;
 			/* pad */
-			ND_TCHECK2(*cp, 6);
+			ND_TCHECK_6(cp);
 			cp += 6;
 			/* queue_id */
-			ND_TCHECK2(*cp, 4);
-			ND_PRINT((ndo, ", queue_id %s", tok2str(ofpq_str, "%u", EXTRACT_32BITS(cp))));
+			ND_TCHECK_4(cp);
+			ND_PRINT((ndo, ", queue_id %s", tok2str(ofpq_str, "%u", EXTRACT_BE_U_4(cp))));
 			cp += 4;
 			break;
 		case OFPAT_VENDOR:
@@ -1589,7 +1595,7 @@ of10_actions_print(netdissect_options *ndo,
 			break;
 		case OFPAT_STRIP_VLAN:
 			/* pad */
-			ND_TCHECK2(*cp, 4);
+			ND_TCHECK_4(cp);
 			cp += 4;
 			break;
 		} /* switch */
@@ -1613,29 +1619,30 @@ of10_features_reply_print(netdissect_options *ndo,
                           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)));
+	ND_TCHECK_8(cp);
+	ND_PRINT((ndo, "\n\t dpid 0x%016" PRIx64, EXTRACT_BE_U_8(cp)));
 	cp += 8;
 	/* n_buffers */
-	ND_TCHECK2(*cp, 4);
-	ND_PRINT((ndo, ", n_buffers %u", EXTRACT_32BITS(cp)));
+	ND_TCHECK_4(cp);
+	ND_PRINT((ndo, ", n_buffers %u", EXTRACT_BE_U_4(cp)));
 	cp += 4;
 	/* n_tables */
-	ND_TCHECK2(*cp, 1);
-	ND_PRINT((ndo, ", n_tables %u", *cp));
+	ND_TCHECK_1(cp);
+	ND_PRINT((ndo, ", n_tables %u", EXTRACT_U_1(cp)));
 	cp += 1;
 	/* pad */
-	ND_TCHECK2(*cp, 3);
+	ND_TCHECK_3(cp);
 	cp += 3;
 	/* capabilities */
-	ND_TCHECK2(*cp, 4);
-	ND_PRINT((ndo, "\n\t capabilities 0x%08x", EXTRACT_32BITS(cp)));
-	of10_bitmap_print(ndo, ofp_capabilities_bm, EXTRACT_32BITS(cp), OFPCAP_U);
+	ND_TCHECK_4(cp);
+	ND_PRINT((ndo, "\n\t capabilities 0x%08x", EXTRACT_BE_U_4(cp)));
+	of10_bitmap_print(ndo, ofp_capabilities_bm, EXTRACT_BE_U_4(cp),
+			  OFPCAP_U);
 	cp += 4;
 	/* actions */
-	ND_TCHECK2(*cp, 4);
-	ND_PRINT((ndo, "\n\t actions 0x%08x", EXTRACT_32BITS(cp)));
-	of10_bitmap_print(ndo, ofpat_bm, EXTRACT_32BITS(cp), OFPAT_U);
+	ND_TCHECK_4(cp);
+	ND_PRINT((ndo, "\n\t actions 0x%08x", EXTRACT_BE_U_4(cp)));
+	of10_bitmap_print(ndo, ofpat_bm, EXTRACT_BE_U_4(cp), OFPAT_U);
 	cp += 4;
 	/* ports */
 	return of10_phy_ports_print(ndo, cp, ep, len - OF_SWITCH_FEATURES_LEN);
@@ -1656,44 +1663,44 @@ of10_flow_mod_print(netdissect_options *ndo,
 	if (ep == (cp = of10_match_print(ndo, "\n\t ", cp, ep)))
 		return ep; /* end of snapshot */
 	/* cookie */
-	ND_TCHECK2(*cp, 8);
-	ND_PRINT((ndo, "\n\t cookie 0x%016" PRIx64, EXTRACT_64BITS(cp)));
+	ND_TCHECK_8(cp);
+	ND_PRINT((ndo, "\n\t cookie 0x%016" PRIx64, EXTRACT_BE_U_8(cp)));
 	cp += 8;
 	/* command */
-	ND_TCHECK2(*cp, 2);
-	command = EXTRACT_16BITS(cp);
+	ND_TCHECK_2(cp);
+	command = EXTRACT_BE_U_2(cp);
 	ND_PRINT((ndo, ", command %s", tok2str(ofpfc_str, "invalid (0x%04x)", command)));
 	cp += 2;
 	/* idle_timeout */
-	ND_TCHECK2(*cp, 2);
-	if (EXTRACT_16BITS(cp))
-		ND_PRINT((ndo, ", idle_timeout %u", EXTRACT_16BITS(cp)));
+	ND_TCHECK_2(cp);
+	if (EXTRACT_BE_U_2(cp))
+		ND_PRINT((ndo, ", idle_timeout %u", EXTRACT_BE_U_2(cp)));
 	cp += 2;
 	/* hard_timeout */
-	ND_TCHECK2(*cp, 2);
-	if (EXTRACT_16BITS(cp))
-		ND_PRINT((ndo, ", hard_timeout %u", EXTRACT_16BITS(cp)));
+	ND_TCHECK_2(cp);
+	if (EXTRACT_BE_U_2(cp))
+		ND_PRINT((ndo, ", hard_timeout %u", EXTRACT_BE_U_2(cp)));
 	cp += 2;
 	/* priority */
-	ND_TCHECK2(*cp, 2);
-	if (EXTRACT_16BITS(cp))
-		ND_PRINT((ndo, ", priority %u", EXTRACT_16BITS(cp)));
+	ND_TCHECK_2(cp);
+	if (EXTRACT_BE_U_2(cp))
+		ND_PRINT((ndo, ", priority %u", EXTRACT_BE_U_2(cp)));
 	cp += 2;
 	/* buffer_id */
-	ND_TCHECK2(*cp, 4);
+	ND_TCHECK_4(cp);
 	if (command == OFPFC_ADD || command == OFPFC_MODIFY ||
 	    command == OFPFC_MODIFY_STRICT)
-		ND_PRINT((ndo, ", buffer_id %s", tok2str(bufferid_str, "0x%08x", EXTRACT_32BITS(cp))));
+		ND_PRINT((ndo, ", buffer_id %s", tok2str(bufferid_str, "0x%08x", EXTRACT_BE_U_4(cp))));
 	cp += 4;
 	/* out_port */
-	ND_TCHECK2(*cp, 2);
+	ND_TCHECK_2(cp);
 	if (command == OFPFC_DELETE || command == OFPFC_DELETE_STRICT)
-		ND_PRINT((ndo, ", out_port %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+		ND_PRINT((ndo, ", out_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 	cp += 2;
 	/* flags */
-	ND_TCHECK2(*cp, 2);
-	ND_PRINT((ndo, ", flags 0x%04x", EXTRACT_16BITS(cp)));
-	of10_bitmap_print(ndo, ofpff_bm, EXTRACT_16BITS(cp), OFPFF_U);
+	ND_TCHECK_2(cp);
+	ND_PRINT((ndo, ", flags 0x%04x", EXTRACT_BE_U_2(cp)));
+	of10_bitmap_print(ndo, ofpff_bm, EXTRACT_BE_U_2(cp), OFPFF_U);
 	cp += 2;
 	/* actions */
 	return of10_actions_print(ndo, "\n\t ", cp, ep, len - OF_FLOW_MOD_LEN);
@@ -1709,30 +1716,30 @@ of10_port_mod_print(netdissect_options *ndo,
                     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))));
+	ND_TCHECK_2(cp);
+	ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 	cp += 2;
 	/* hw_addr */
 	ND_TCHECK2(*cp, ETHER_ADDR_LEN);
 	ND_PRINT((ndo, ", hw_addr %s", etheraddr_string(ndo, cp)));
 	cp += ETHER_ADDR_LEN;
 	/* config */
-	ND_TCHECK2(*cp, 4);
-	ND_PRINT((ndo, "\n\t config 0x%08x", EXTRACT_32BITS(cp)));
-	of10_bitmap_print(ndo, ofppc_bm, EXTRACT_32BITS(cp), OFPPC_U);
+	ND_TCHECK_4(cp);
+	ND_PRINT((ndo, "\n\t config 0x%08x", EXTRACT_BE_U_4(cp)));
+	of10_bitmap_print(ndo, ofppc_bm, EXTRACT_BE_U_4(cp), OFPPC_U);
 	cp += 4;
 	/* mask */
-	ND_TCHECK2(*cp, 4);
-	ND_PRINT((ndo, "\n\t mask 0x%08x", EXTRACT_32BITS(cp)));
-	of10_bitmap_print(ndo, ofppc_bm, EXTRACT_32BITS(cp), OFPPC_U);
+	ND_TCHECK_4(cp);
+	ND_PRINT((ndo, "\n\t mask 0x%08x", EXTRACT_BE_U_4(cp)));
+	of10_bitmap_print(ndo, ofppc_bm, EXTRACT_BE_U_4(cp), OFPPC_U);
 	cp += 4;
 	/* advertise */
-	ND_TCHECK2(*cp, 4);
-	ND_PRINT((ndo, "\n\t advertise 0x%08x", EXTRACT_32BITS(cp)));
-	of10_bitmap_print(ndo, ofppf_bm, EXTRACT_32BITS(cp), OFPPF_U);
+	ND_TCHECK_4(cp);
+	ND_PRINT((ndo, "\n\t advertise 0x%08x", EXTRACT_BE_U_4(cp)));
+	of10_bitmap_print(ndo, ofppf_bm, EXTRACT_BE_U_4(cp), OFPPF_U);
 	cp += 4;
 	/* pad */
-	ND_TCHECK2(*cp, 4);
+	ND_TCHECK_4(cp);
 	return cp + 4;
 
 trunc:
@@ -1750,14 +1757,14 @@ of10_stats_request_print(netdissect_options *ndo,
 	uint16_t type;
 
 	/* type */
-	ND_TCHECK2(*cp, 2);
-	type = EXTRACT_16BITS(cp);
+	ND_TCHECK_2(cp);
+	type = EXTRACT_BE_U_2(cp);
 	cp += 2;
 	ND_PRINT((ndo, "\n\t type %s", tok2str(ofpst_str, "invalid (0x%04x)", type)));
 	/* flags */
-	ND_TCHECK2(*cp, 2);
-	ND_PRINT((ndo, ", flags 0x%04x", EXTRACT_16BITS(cp)));
-	if (EXTRACT_16BITS(cp))
+	ND_TCHECK_2(cp);
+	ND_PRINT((ndo, ", flags 0x%04x", EXTRACT_BE_U_2(cp)));
+	if (EXTRACT_BE_U_2(cp))
 		ND_PRINT((ndo, " (bogus)"));
 	cp += 2;
 	/* type-specific body of one of fixed lengths */
@@ -1776,39 +1783,39 @@ of10_stats_request_print(netdissect_options *ndo,
 		if (ep == (cp = of10_match_print(ndo, "\n\t ", cp, ep)))
 			return ep; /* end of snapshot */
 		/* table_id */
-		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, "\n\t table_id %s", tok2str(tableid_str, "%u", *cp)));
+		ND_TCHECK_1(cp);
+		ND_PRINT((ndo, "\n\t table_id %s", tok2str(tableid_str, "%u", EXTRACT_U_1(cp))));
 		cp += 1;
 		/* pad */
-		ND_TCHECK2(*cp, 1);
+		ND_TCHECK_1(cp);
 		cp += 1;
 		/* out_port */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, ", out_port %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, ", out_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 		return cp + 2;
 	case OFPST_PORT:
 		if (len != OF_PORT_STATS_REQUEST_LEN)
 			goto invalid;
 		/* port_no */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 		cp += 2;
 		/* pad */
-		ND_TCHECK2(*cp, 6);
+		ND_TCHECK_6(cp);
 		return cp + 6;
 	case OFPST_QUEUE:
 		if (len != OF_QUEUE_STATS_REQUEST_LEN)
 			goto invalid;
 		/* port_no */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 		cp += 2;
 		/* pad */
-		ND_TCHECK2(*cp, 2);
+		ND_TCHECK_2(cp);
 		cp += 2;
 		/* queue_id */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, ", queue_id %s", tok2str(ofpq_str, "%u", EXTRACT_32BITS(cp))));
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, ", queue_id %s", tok2str(ofpq_str, "%u", EXTRACT_BE_U_4(cp))));
 		return cp + 4;
 	case OFPST_VENDOR:
 		return of10_vendor_data_print(ndo, cp, ep, len);
@@ -1884,56 +1891,56 @@ of10_flow_stats_reply_print(netdissect_options *ndo,
 		if (len < OF_FLOW_STATS_LEN)
 			goto invalid;
 		/* length */
-		ND_TCHECK2(*cp, 2);
-		entry_len = EXTRACT_16BITS(cp);
+		ND_TCHECK_2(cp);
+		entry_len = EXTRACT_BE_U_2(cp);
 		ND_PRINT((ndo, "\n\t length %u", entry_len));
 		if (entry_len < OF_FLOW_STATS_LEN || entry_len > len)
 			goto invalid;
 		cp += 2;
 		/* table_id */
-		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, ", table_id %s", tok2str(tableid_str, "%u", *cp)));
+		ND_TCHECK_1(cp);
+		ND_PRINT((ndo, ", table_id %s", tok2str(tableid_str, "%u", EXTRACT_U_1(cp))));
 		cp += 1;
 		/* pad */
-		ND_TCHECK2(*cp, 1);
+		ND_TCHECK_1(cp);
 		cp += 1;
 		/* match */
 		if (ep == (cp = of10_match_print(ndo, "\n\t  ", cp, ep)))
 			return ep; /* end of snapshot */
 		/* duration_sec */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, "\n\t  duration_sec %u", EXTRACT_32BITS(cp)));
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, "\n\t  duration_sec %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
 		/* duration_nsec */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, ", duration_nsec %u", EXTRACT_32BITS(cp)));
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, ", duration_nsec %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
 		/* priority */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, ", priority %u", EXTRACT_16BITS(cp)));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, ", priority %u", EXTRACT_BE_U_2(cp)));
 		cp += 2;
 		/* idle_timeout */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, ", idle_timeout %u", EXTRACT_16BITS(cp)));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, ", idle_timeout %u", EXTRACT_BE_U_2(cp)));
 		cp += 2;
 		/* hard_timeout */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, ", hard_timeout %u", EXTRACT_16BITS(cp)));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, ", hard_timeout %u", EXTRACT_BE_U_2(cp)));
 		cp += 2;
 		/* pad2 */
-		ND_TCHECK2(*cp, 6);
+		ND_TCHECK_6(cp);
 		cp += 6;
 		/* cookie */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", cookie 0x%016" PRIx64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", cookie 0x%016" PRIx64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* packet_count */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", packet_count %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", packet_count %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* byte_count */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", byte_count %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", byte_count %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* actions */
 		if (ep == (cp = of10_actions_print(ndo, "\n\t  ", cp, ep, entry_len - OF_FLOW_STATS_LEN)))
@@ -1961,19 +1968,19 @@ of10_aggregate_stats_reply_print(netdissect_options *ndo,
 	if (len != OF_AGGREGATE_STATS_REPLY_LEN)
 		goto invalid;
 	/* packet_count */
-	ND_TCHECK2(*cp, 8);
-	ND_PRINT((ndo, "\n\t packet_count %" PRIu64, EXTRACT_64BITS(cp)));
+	ND_TCHECK_8(cp);
+	ND_PRINT((ndo, "\n\t packet_count %" PRIu64, EXTRACT_BE_U_8(cp)));
 	cp += 8;
 	/* byte_count */
-	ND_TCHECK2(*cp, 8);
-	ND_PRINT((ndo, ", byte_count %" PRIu64, EXTRACT_64BITS(cp)));
+	ND_TCHECK_8(cp);
+	ND_PRINT((ndo, ", byte_count %" PRIu64, EXTRACT_BE_U_8(cp)));
 	cp += 8;
 	/* flow_count */
-	ND_TCHECK2(*cp, 4);
-	ND_PRINT((ndo, ", flow_count %u", EXTRACT_32BITS(cp)));
+	ND_TCHECK_4(cp);
+	ND_PRINT((ndo, ", flow_count %u", EXTRACT_BE_U_4(cp)));
 	cp += 4;
 	/* pad */
-	ND_TCHECK2(*cp, 4);
+	ND_TCHECK_4(cp);
 	return cp + 4;
 
 invalid: /* skip the message body */
@@ -1997,11 +2004,11 @@ of10_table_stats_reply_print(netdissect_options *ndo,
 		if (len < OF_TABLE_STATS_LEN)
 			goto invalid;
 		/* table_id */
-		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, "\n\t table_id %s", tok2str(tableid_str, "%u", *cp)));
+		ND_TCHECK_1(cp);
+		ND_PRINT((ndo, "\n\t table_id %s", tok2str(tableid_str, "%u", EXTRACT_U_1(cp))));
 		cp += 1;
 		/* pad */
-		ND_TCHECK2(*cp, 3);
+		ND_TCHECK_3(cp);
 		cp += 3;
 		/* name */
 		ND_TCHECK2(*cp, OFP_MAX_TABLE_NAME_LEN);
@@ -2010,25 +2017,26 @@ of10_table_stats_reply_print(netdissect_options *ndo,
 		ND_PRINT((ndo, "'"));
 		cp += OFP_MAX_TABLE_NAME_LEN;
 		/* wildcards */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, "\n\t  wildcards 0x%08x", EXTRACT_32BITS(cp)));
-		of10_bitmap_print(ndo, ofpfw_bm, EXTRACT_32BITS(cp), OFPFW_U);
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, "\n\t  wildcards 0x%08x", EXTRACT_BE_U_4(cp)));
+		of10_bitmap_print(ndo, ofpfw_bm, EXTRACT_BE_U_4(cp),
+				  OFPFW_U);
 		cp += 4;
 		/* max_entries */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, "\n\t  max_entries %u", EXTRACT_32BITS(cp)));
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, "\n\t  max_entries %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
 		/* active_count */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, ", active_count %u", EXTRACT_32BITS(cp)));
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, ", active_count %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
 		/* lookup_count */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", lookup_count %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", lookup_count %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* matched_count */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", matched_count %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", matched_count %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 
 		len -= OF_TABLE_STATS_LEN;
@@ -2056,8 +2064,8 @@ of10_port_stats_reply_print(netdissect_options *ndo,
 		if (len < OF_PORT_STATS_LEN)
 			goto invalid;
 		/* port_no */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, "\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, "\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 		cp += 2;
 		if (ndo->ndo_vflag < 2) {
 			ND_TCHECK2(*cp, OF_PORT_STATS_LEN - 2);
@@ -2065,55 +2073,55 @@ of10_port_stats_reply_print(netdissect_options *ndo,
 			goto next_port;
 		}
 		/* pad */
-		ND_TCHECK2(*cp, 6);
+		ND_TCHECK_6(cp);
 		cp += 6;
 		/* rx_packets */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", rx_packets %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", rx_packets %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* tx_packets */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", tx_packets %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", tx_packets %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* rx_bytes */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", rx_bytes %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", rx_bytes %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* tx_bytes */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", tx_bytes %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", tx_bytes %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* rx_dropped */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", rx_dropped %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", rx_dropped %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* tx_dropped */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", tx_dropped %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", tx_dropped %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* rx_errors */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", rx_errors %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", rx_errors %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* tx_errors */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", tx_errors %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", tx_errors %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* rx_frame_err */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", rx_frame_err %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", rx_frame_err %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* rx_over_err */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", rx_over_err %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", rx_over_err %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* rx_crc_err */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", rx_crc_err %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", rx_crc_err %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* collisions */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", collisions %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", collisions %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 next_port:
 		len -= OF_PORT_STATS_LEN;
@@ -2141,27 +2149,27 @@ of10_queue_stats_reply_print(netdissect_options *ndo,
 		if (len < OF_QUEUE_STATS_LEN)
 			goto invalid;
 		/* port_no */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, "\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, "\n\t  port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 		cp += 2;
 		/* pad */
-		ND_TCHECK2(*cp, 2);
+		ND_TCHECK_2(cp);
 		cp += 2;
 		/* queue_id */
-		ND_TCHECK2(*cp, 4);
-		ND_PRINT((ndo, ", queue_id %u", EXTRACT_32BITS(cp)));
+		ND_TCHECK_4(cp);
+		ND_PRINT((ndo, ", queue_id %u", EXTRACT_BE_U_4(cp)));
 		cp += 4;
 		/* tx_bytes */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", tx_bytes %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", tx_bytes %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* tx_packets */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", tx_packets %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", tx_packets %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 		/* tx_errors */
-		ND_TCHECK2(*cp, 8);
-		ND_PRINT((ndo, ", tx_errors %" PRIu64, EXTRACT_64BITS(cp)));
+		ND_TCHECK_8(cp);
+		ND_PRINT((ndo, ", tx_errors %" PRIu64, EXTRACT_BE_U_8(cp)));
 		cp += 8;
 
 		len -= OF_QUEUE_STATS_LEN;
@@ -2186,14 +2194,15 @@ of10_stats_reply_print(netdissect_options *ndo,
 	uint16_t type;
 
 	/* type */
-	ND_TCHECK2(*cp, 2);
-	type = EXTRACT_16BITS(cp);
+	ND_TCHECK_2(cp);
+	type = EXTRACT_BE_U_2(cp);
 	ND_PRINT((ndo, "\n\t type %s", tok2str(ofpst_str, "invalid (0x%04x)", type)));
 	cp += 2;
 	/* flags */
-	ND_TCHECK2(*cp, 2);
-	ND_PRINT((ndo, ", flags 0x%04x", EXTRACT_16BITS(cp)));
-	of10_bitmap_print(ndo, ofpsf_reply_bm, EXTRACT_16BITS(cp), OFPSF_REPLY_U);
+	ND_TCHECK_2(cp);
+	ND_PRINT((ndo, ", flags 0x%04x", EXTRACT_BE_U_2(cp)));
+	of10_bitmap_print(ndo, ofpsf_reply_bm, EXTRACT_BE_U_2(cp),
+			  OFPSF_REPLY_U);
 	cp += 2;
 
 	if (ndo->ndo_vflag > 0) {
@@ -2227,16 +2236,16 @@ of10_packet_out_print(netdissect_options *ndo,
 	uint16_t actions_len;
 
 	/* buffer_id */
-	ND_TCHECK2(*cp, 4);
-	ND_PRINT((ndo, "\n\t buffer_id 0x%08x", EXTRACT_32BITS(cp)));
+	ND_TCHECK_4(cp);
+	ND_PRINT((ndo, "\n\t buffer_id 0x%08x", EXTRACT_BE_U_4(cp)));
 	cp += 4;
 	/* in_port */
-	ND_TCHECK2(*cp, 2);
-	ND_PRINT((ndo, ", in_port %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+	ND_TCHECK_2(cp);
+	ND_PRINT((ndo, ", in_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 	cp += 2;
 	/* actions_len */
-	ND_TCHECK2(*cp, 2);
-	actions_len = EXTRACT_16BITS(cp);
+	ND_TCHECK_2(cp);
+	actions_len = EXTRACT_BE_U_2(cp);
 	cp += 2;
 	if (actions_len > len - OF_PACKET_OUT_LEN)
 		goto invalid;
@@ -2261,23 +2270,23 @@ of10_packet_in_print(netdissect_options *ndo,
                      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))));
+	ND_TCHECK_4(cp);
+	ND_PRINT((ndo, "\n\t buffer_id %s", tok2str(bufferid_str, "0x%08x", EXTRACT_BE_U_4(cp))));
 	cp += 4;
 	/* total_len */
-	ND_TCHECK2(*cp, 2);
-	ND_PRINT((ndo, ", total_len %u", EXTRACT_16BITS(cp)));
+	ND_TCHECK_2(cp);
+	ND_PRINT((ndo, ", total_len %u", EXTRACT_BE_U_2(cp)));
 	cp += 2;
 	/* in_port */
-	ND_TCHECK2(*cp, 2);
-	ND_PRINT((ndo, ", in_port %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+	ND_TCHECK_2(cp);
+	ND_PRINT((ndo, ", in_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 	cp += 2;
 	/* reason */
-	ND_TCHECK2(*cp, 1);
-	ND_PRINT((ndo, ", reason %s", tok2str(ofpr_str, "invalid (0x%02x)", *cp)));
+	ND_TCHECK_1(cp);
+	ND_PRINT((ndo, ", reason %s", tok2str(ofpr_str, "invalid (0x%02x)", EXTRACT_U_1(cp))));
 	cp += 1;
 	/* pad */
-	ND_TCHECK2(*cp, 1);
+	ND_TCHECK_1(cp);
 	cp += 1;
 	/* data */
 	/* 2 mock octets count in OF_PACKET_IN_LEN but not in len */
@@ -2297,44 +2306,44 @@ of10_flow_removed_print(netdissect_options *ndo,
 	if (ep == (cp = of10_match_print(ndo, "\n\t ", cp, ep)))
 		return ep; /* end of snapshot */
 	/* cookie */
-	ND_TCHECK2(*cp, 8);
-	ND_PRINT((ndo, "\n\t cookie 0x%016" PRIx64, EXTRACT_64BITS(cp)));
+	ND_TCHECK_8(cp);
+	ND_PRINT((ndo, "\n\t cookie 0x%016" PRIx64, EXTRACT_BE_U_8(cp)));
 	cp += 8;
 	/* priority */
-	ND_TCHECK2(*cp, 2);
-	if (EXTRACT_16BITS(cp))
-		ND_PRINT((ndo, ", priority %u", EXTRACT_16BITS(cp)));
+	ND_TCHECK_2(cp);
+	if (EXTRACT_BE_U_2(cp))
+		ND_PRINT((ndo, ", priority %u", EXTRACT_BE_U_2(cp)));
 	cp += 2;
 	/* reason */
-	ND_TCHECK2(*cp, 1);
-	ND_PRINT((ndo, ", reason %s", tok2str(ofprr_str, "unknown (0x%02x)", *cp)));
+	ND_TCHECK_1(cp);
+	ND_PRINT((ndo, ", reason %s", tok2str(ofprr_str, "unknown (0x%02x)", EXTRACT_U_1(cp))));
 	cp += 1;
 	/* pad */
-	ND_TCHECK2(*cp, 1);
+	ND_TCHECK_1(cp);
 	cp += 1;
 	/* duration_sec */
-	ND_TCHECK2(*cp, 4);
-	ND_PRINT((ndo, ", duration_sec %u", EXTRACT_32BITS(cp)));
+	ND_TCHECK_4(cp);
+	ND_PRINT((ndo, ", duration_sec %u", EXTRACT_BE_U_4(cp)));
 	cp += 4;
 	/* duration_nsec */
-	ND_TCHECK2(*cp, 4);
-	ND_PRINT((ndo, ", duration_nsec %u", EXTRACT_32BITS(cp)));
+	ND_TCHECK_4(cp);
+	ND_PRINT((ndo, ", duration_nsec %u", EXTRACT_BE_U_4(cp)));
 	cp += 4;
 	/* idle_timeout */
-	ND_TCHECK2(*cp, 2);
-	if (EXTRACT_16BITS(cp))
-		ND_PRINT((ndo, ", idle_timeout %u", EXTRACT_16BITS(cp)));
+	ND_TCHECK_2(cp);
+	if (EXTRACT_BE_U_2(cp))
+		ND_PRINT((ndo, ", idle_timeout %u", EXTRACT_BE_U_2(cp)));
 	cp += 2;
 	/* pad2 */
-	ND_TCHECK2(*cp, 2);
+	ND_TCHECK_2(cp);
 	cp += 2;
 	/* packet_count */
-	ND_TCHECK2(*cp, 8);
-	ND_PRINT((ndo, ", packet_count %" PRIu64, EXTRACT_64BITS(cp)));
+	ND_TCHECK_8(cp);
+	ND_PRINT((ndo, ", packet_count %" PRIu64, EXTRACT_BE_U_8(cp)));
 	cp += 8;
 	/* byte_count */
-	ND_TCHECK2(*cp, 8);
-	ND_PRINT((ndo, ", byte_count %" PRIu64, EXTRACT_64BITS(cp)));
+	ND_TCHECK_8(cp);
+	ND_PRINT((ndo, ", byte_count %" PRIu64, EXTRACT_BE_U_8(cp)));
 	return cp + 8;
 
 trunc:
@@ -2351,12 +2360,12 @@ of10_error_print(netdissect_options *ndo,
 	const struct tok *code_str;
 
 	/* type */
-	ND_TCHECK2(*cp, 2);
-	type = EXTRACT_16BITS(cp);
+	ND_TCHECK_2(cp);
+	type = EXTRACT_BE_U_2(cp);
 	cp += 2;
 	ND_PRINT((ndo, "\n\t type %s", tok2str(ofpet_str, "invalid (0x%04x)", type)));
 	/* code */
-	ND_TCHECK2(*cp, 2);
+	ND_TCHECK_2(cp);
 	code_str =
 		type == OFPET_HELLO_FAILED    ? ofphfc_str  :
 		type == OFPET_BAD_REQUEST     ? ofpbrc_str  :
@@ -2365,7 +2374,7 @@ of10_error_print(netdissect_options *ndo,
 		type == OFPET_PORT_MOD_FAILED ? ofppmfc_str :
 		type == OFPET_QUEUE_OP_FAILED ? ofpqofc_str :
 		empty_str;
-	ND_PRINT((ndo, ", code %s", tok2str(code_str, "invalid (0x%04x)", EXTRACT_16BITS(cp))));
+	ND_PRINT((ndo, ", code %s", tok2str(code_str, "invalid (0x%04x)", EXTRACT_BE_U_2(cp))));
 	cp += 2;
 	/* data */
 	return of10_data_print(ndo, cp, ep, len - OF_ERROR_MSG_LEN);
@@ -2410,12 +2419,12 @@ of10_header_body_print(netdissect_options *ndo,
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		/* flags */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, "\n\t flags %s", tok2str(ofp_config_str, "invalid (0x%04x)", EXTRACT_16BITS(cp))));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, "\n\t flags %s", tok2str(ofp_config_str, "invalid (0x%04x)", EXTRACT_BE_U_2(cp))));
 		cp += 2;
 		/* miss_send_len */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, ", miss_send_len %u", EXTRACT_16BITS(cp)));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, ", miss_send_len %u", EXTRACT_BE_U_2(cp)));
 		return cp + 2;
 	case OFPT_PORT_MOD:
 		if (len != OF_PORT_MOD_LEN)
@@ -2429,11 +2438,11 @@ of10_header_body_print(netdissect_options *ndo,
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		/* port */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 		cp += 2;
 		/* pad */
-		ND_TCHECK2(*cp, 2);
+		ND_TCHECK_2(cp);
 		return cp + 2;
 	case OFPT_FLOW_REMOVED:
 		if (len != OF_FLOW_REMOVED_LEN)
@@ -2447,11 +2456,11 @@ of10_header_body_print(netdissect_options *ndo,
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		/* reason */
-		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, "\n\t reason %s", tok2str(ofppr_str, "invalid (0x%02x)", *cp)));
+		ND_TCHECK_1(cp);
+		ND_PRINT((ndo, "\n\t reason %s", tok2str(ofppr_str, "invalid (0x%02x)", EXTRACT_U_1(cp))));
 		cp += 1;
 		/* pad */
-		ND_TCHECK2(*cp, 7);
+		ND_TCHECK_7(cp);
 		cp += 7;
 		/* desc */
 		return of10_phy_ports_print(ndo, cp, ep, OF_PHY_PORT_LEN);
@@ -2538,11 +2547,11 @@ of10_header_body_print(netdissect_options *ndo,
 		if (ndo->ndo_vflag < 1)
 			goto next_message;
 		/* port */
-		ND_TCHECK2(*cp, 2);
-		ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+		ND_TCHECK_2(cp);
+		ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))));
 		cp += 2;
 		/* pad */
-		ND_TCHECK2(*cp, 6);
+		ND_TCHECK_6(cp);
 		cp += 6;
 		/* queues */
 		return of10_queues_print(ndo, cp, ep, len - OF_QUEUE_GET_CONFIG_REPLY_LEN);