Rework "Update more link-layer dissectors to void functions"

[tcpdump] / print-openflow-1.0.c

diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index c6ba6a93e5eb5c367f3c011b62c611ad37de36eb..71d8a7c1f215a3a508879b61cf31496120fe35ab 100644 (file)
--- a/print-openflow-1.0.c
+++ b/print-openflow-1.0.c
@@ -6,7 +6,17 @@
  * up bogus values of selected message fields and decodes partially captured
  * messages up to the snapshot end. It is based on the specification below:
  *
  * up bogus values of selected message fields and decodes partially captured
  * messages up to the snapshot end. It is based on the specification below:
  *

- * [OF10] http://www.openflow.org/documents/openflow-spec-v1.0.0.pdf
+ * [OF10] https://web.archive.org/web/20160402132157/http://archive.openflow.org/documents/openflow-spec-v1.0.0.pdf
+ *
+ * Most functions in this file take 3 arguments into account:
+ * * cp -- the pointer to the first octet to decode
+ * * len -- the length of the current structure as declared on the wire
+ * * 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 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.

  *
  * Decoding of Ethernet frames nested in OFPT_PACKET_IN and OFPT_PACKET_OUT
  * messages is done only when the verbosity level set by command-line argument
  *
  * Decoding of Ethernet frames nested in OFPT_PACKET_IN and OFPT_PACKET_OUT
  * messages is done only when the verbosity level set by command-line argument


@@ -16,7 +26,8 @@
  * the nested frames.
  *
  * Partial decoding of Big Switch Networks vendor extensions is done after the
  * the nested frames.
  *
  * Partial decoding of Big Switch Networks vendor extensions is done after the

- * oftest (OpenFlow Testing Framework) source code.
+ * oftest (OpenFlow Testing Framework) and Loxigen (library generator) source
+ * code.

  *
  *
  * Copyright (c) 2013 The TCPDUMP project
  *
  *
  * Copyright (c) 2013 The TCPDUMP project


@@ -45,24 +56,22 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED
+/* \summary: OpenFlow protocol version 1.0 printer */
+

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

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

 
 

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

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

-#include "ether.h"

 #include "ethertype.h"
 #include "ipproto.h"
 #include "oui.h"
 #include "openflow.h"
 
 #include "ethertype.h"
 #include "ipproto.h"
 #include "oui.h"
 #include "openflow.h"
 

-static const char tstr[] = " [|openflow]";
-static const char cstr[] = " (corrupt)";

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


@@ -112,13 +121,13 @@ static const struct tok ofpt_str[] = {
        { 0, NULL }
 };
 
        { 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"       },
 static const struct tok ofppc_bm[] = {
        { OFPPC_PORT_DOWN,    "PORT_DOWN"    },
        { OFPPC_NO_STP,       "NO_STP"       },


@@ -133,12 +142,12 @@ static const struct tok ofppc_bm[] = {
                    OFPPC_NO_RECV_STP | OFPPC_NO_FLOOD | OFPPC_NO_FWD | \
                    OFPPC_NO_PACKET_IN))
 
                    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"  },
 static const struct tok ofpps_bm[] = {
        { OFPPS_LINK_DOWN,   "LINK_DOWN"   },
        { OFPPS_STP_LISTEN,  "STP_LISTEN"  },


@@ -150,15 +159,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 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"    },
 static const struct tok ofpp_str[] = {
        { OFPP_MAX,        "MAX"        },
        { OFPP_IN_PORT,    "IN_PORT"    },


@@ -172,18 +181,18 @@ static const struct tok ofpp_str[] = {
        { 0, NULL }
 };
 
        { 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"    },
 static const struct tok ofppf_bm[] = {
        { OFPPF_10MB_HD,    "10MB_HD"    },
        { OFPPF_10MB_FD,    "10MB_FD"    },


@@ -212,23 +221,23 @@ static const struct tok ofpqt_str[] = {
        { 0, NULL }
 };
 
        { 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_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_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"     },
 static const struct tok ofpfw_bm[] = {
        { OFPFW_IN_PORT,     "IN_PORT"     },
        { OFPFW_DL_VLAN,     "DL_VLAN"     },


@@ -248,19 +257,19 @@ static const struct tok ofpfw_bm[] = {
  * they are not reported as bogus in the decoding. */
 #define OFPFW_U (~(OFPFW_ALL))
 
  * 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" },
 static const struct tok ofpat_str[] = {
        { OFPAT_OUTPUT,       "OUTPUT"       },
        { OFPAT_SET_VLAN_VID, "SET_VLAN_VID" },


@@ -280,35 +289,35 @@ static const struct tok ofpat_str[] = {
 
 /* bit-shifted, w/o vendor action */
 static const struct tok ofpat_bm[] = {
 
 /* 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 }
 };
        { 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"  },
 static const struct tok ofp_capabilities_bm[] = {
        { OFPC_FLOW_STATS,   "FLOW_STATS"   },
        { OFPC_TABLE_STATS,  "TABLE_STATS"  },


@@ -324,10 +333,10 @@ static const struct tok ofp_capabilities_bm[] = {
                     OFPC_STP | OFPC_IP_REASM | OFPC_QUEUE_STATS | \
                     OFPC_ARP_MATCH_IP))
 
                     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"   },
 static const struct tok ofp_config_str[] = {
        { OFPC_FRAG_NORMAL, "FRAG_NORMAL" },
        { OFPC_FRAG_DROP,   "FRAG_DROP"   },


@@ -335,11 +344,11 @@ static const struct tok ofp_config_str[] = {
        { 0, NULL }
 };
 
        { 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"        },
 static const struct tok ofpfc_str[] = {
        { OFPFC_ADD,           "ADD"           },
        { OFPFC_MODIFY,        "MODIFY"        },


@@ -354,9 +363,9 @@ static const struct tok bufferid_str[] = {
        { 0, NULL }
 };
 
        { 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" },
 static const struct tok ofpff_bm[] = {
        { OFPFF_SEND_FLOW_REM, "SEND_FLOW_REM" },
        { OFPFF_CHECK_OVERLAP, "CHECK_OVERLAP" },


@@ -365,13 +374,13 @@ static const struct tok ofpff_bm[] = {
 };
 #define OFPFF_U (~(OFPFF_SEND_FLOW_REM | OFPFF_CHECK_OVERLAP | OFPFF_EMERG))
 
 };
 #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"      },
 static const struct tok ofpst_str[] = {
        { OFPST_DESC,      "DESC"      },
        { OFPST_FLOW,      "FLOW"      },


@@ -384,35 +393,35 @@ static const struct tok ofpst_str[] = {
 };
 
 static const struct tok tableid_str[] = {
 };
 
 static const struct tok tableid_str[] = {

-       { 0xfe, "EMERG" },
-       { 0xff, "ALL"   },
+       { 0xfeU, "EMERG" },
+       { 0xffU, "ALL"   },

        { 0, NULL }
 };
 
        { 0, NULL }
 };
 

-#define OFPQ_ALL      0xffffffff
+#define OFPQ_ALL      0xffffffffU

 static const struct tok ofpq_str[] = {
        { OFPQ_ALL, "ALL" },
        { 0, NULL }
 };
 
 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))
 
 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 }
 };
 
 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" },
 static const struct tok ofprr_str[] = {
        { OFPRR_IDLE_TIMEOUT, "IDLE_TIMEOUT" },
        { OFPRR_HARD_TIMEOUT, "HARD_TIMEOUT" },


@@ -420,9 +429,9 @@ static const struct tok ofprr_str[] = {
        { 0, NULL }
 };
 
        { 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" },
 static const struct tok ofppr_str[] = {
        { OFPPR_ADD,    "ADD"    },
        { OFPPR_DELETE, "DELETE" },


@@ -430,12 +439,12 @@ static const struct tok ofppr_str[] = {
        { 0, NULL }
 };
 
        { 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"     },
 static const struct tok ofpet_str[] = {
        { OFPET_HELLO_FAILED,    "HELLO_FAILED"    },
        { OFPET_BAD_REQUEST,     "BAD_REQUEST"     },


@@ -446,23 +455,23 @@ static const struct tok ofpet_str[] = {
        { 0, NULL }
 };
 
        { 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 }
 };
 
 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"       },
 static const struct tok ofpbrc_str[] = {
        { OFPBRC_BAD_VERSION,    "BAD_VERSION"    },
        { OFPBRC_BAD_TYPE,       "BAD_TYPE"       },


@@ -476,15 +485,15 @@ static const struct tok ofpbrc_str[] = {
        { 0, NULL }
 };
 
        { 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"         },
 static const struct tok ofpbac_str[] = {
        { OFPBAC_BAD_TYPE,        "BAD_TYPE"        },
        { OFPBAC_BAD_LEN,         "BAD_LEN"         },


@@ -498,12 +507,12 @@ static const struct tok ofpbac_str[] = {
        { 0, NULL }
 };
 
        { 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"           },
 static const struct tok ofpfmfc_str[] = {
        { OFPFMFC_ALL_TABLES_FULL,   "ALL_TABLES_FULL"   },
        { OFPFMFC_OVERLAP,           "OVERLAP"           },


@@ -514,17 +523,17 @@ static const struct tok ofpfmfc_str[] = {
        { 0, NULL }
 };
 
        { 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 }
 };
 
 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" },
 static const struct tok ofpqofc_str[] = {
        { OFPQOFC_BAD_PORT,  "BAD_PORT"  },
        { OFPQOFC_BAD_QUEUE, "BAD_QUEUE" },


@@ -582,7 +591,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_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
 
 /* vendor extensions */
 #define BSN_SET_IP_MASK                    0


@@ -629,6 +638,9 @@ static const struct tok bsn_subtype_str[] = {
        { BSN_SET_MIRRORING,                 "SET_MIRRORING"                 },
        { BSN_GET_MIRRORING_REQUEST,         "GET_MIRRORING_REQUEST"         },
        { BSN_GET_MIRRORING_REPLY,           "GET_MIRRORING_REPLY"           },
        { BSN_SET_MIRRORING,                 "SET_MIRRORING"                 },
        { BSN_GET_MIRRORING_REQUEST,         "GET_MIRRORING_REQUEST"         },
        { BSN_GET_MIRRORING_REPLY,           "GET_MIRRORING_REPLY"           },

+       { BSN_SHELL_COMMAND,                 "SHELL_COMMAND"                 },
+       { BSN_SHELL_OUTPUT,                  "SHELL_OUTPUT"                  },
+       { BSN_SHELL_STATUS,                  "SHELL_STATUS"                  },

        { BSN_GET_INTERFACES_REQUEST,        "GET_INTERFACES_REQUEST"        },
        { BSN_GET_INTERFACES_REPLY,          "GET_INTERFACES_REPLY"          },
        { BSN_SET_PKTIN_SUPPRESSION_REQUEST, "SET_PKTIN_SUPPRESSION_REQUEST" },
        { BSN_GET_INTERFACES_REQUEST,        "GET_INTERFACES_REQUEST"        },
        { BSN_GET_INTERFACES_REPLY,          "GET_INTERFACES_REPLY"          },
        { BSN_SET_PKTIN_SUPPRESSION_REQUEST, "SET_PKTIN_SUPPRESSION_REQUEST" },


@@ -657,29 +669,55 @@ static const struct tok bsn_subtype_str[] = {
        { 0, NULL }
 };
 
        { 0, NULL }
 };
 

+#define BSN_ACTION_MIRROR                  1
+#define BSN_ACTION_SET_TUNNEL_DST          2
+                                        /* 3 */
+#define BSN_ACTION_CHECKSUM                4
+
+static const struct tok bsn_action_subtype_str[] = {
+       { BSN_ACTION_MIRROR,                 "MIRROR"                        },
+       { BSN_ACTION_SET_TUNNEL_DST,         "SET_TUNNEL_DST"                },
+       { BSN_ACTION_CHECKSUM,               "CHECKSUM"                      },
+       { 0, NULL }
+};
+
+static const struct tok bsn_mirror_copy_stage_str[] = {
+       { 0, "INGRESS" },
+       { 1, "EGRESS"  },
+       { 0, NULL },
+};
+
+static const struct tok bsn_onoff_str[] = {
+       { 0, "OFF" },
+       { 1, "ON"  },
+       { 0, NULL },
+};

 
 static const char *
 
 static const char *

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

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

-       const char *fmt;

 
        if (vid == OFP_VLAN_NONE)
                return "NONE";
 
        if (vid == OFP_VLAN_NONE)
                return "NONE";

-       fmt = (vid > 0 && vid < 0x0fff) ? "%u" : "%u (bogus)";
-       snprintf(buf, sizeof(buf), fmt, vid);
+       snprintf(buf, sizeof(buf), "%u%s", vid,
+           (vid > 0 && vid < 0x0fff) ? "" : " (bogus)");

        return buf;
 }
 
 static const char *
        return buf;
 }
 
 static const char *

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

        static char buf[sizeof("255 (bogus)")];
        static char buf[sizeof("255 (bogus)")];

-       snprintf(buf, sizeof(buf), pcp <= 7 ? "%u" : "%u (bogus)", pcp);
+       snprintf(buf, sizeof(buf), "%u%s", pcp,
+           pcp <= 7 ? "" : " (bogus)");

        return buf;
 }
 
 static void
 of10_bitmap_print(netdissect_options *ndo,
        return buf;
 }
 
 static void
 of10_bitmap_print(netdissect_options *ndo,

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

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


@@ -687,43 +725,45 @@ of10_bitmap_print(netdissect_options *ndo,
        /* assigned bits */
        for (; t->s != NULL; t++)
                if (v & t->v) {
        /* assigned bits */
        for (; t->s != NULL; t++)
                if (v & t->v) {

-                       ND_PRINT((ndo, "%s%s", sep, t->s));
+                       ND_PRINT("%s%s", sep, t->s);

                        sep = ", ";
                }
        /* unassigned bits? */
                        sep = ", ";
                }
        /* unassigned bits? */

-       ND_PRINT((ndo, v & u ? ") (bogus)" : ")"));
+       ND_PRINT(v & u ? ") (bogus)" : ")");

 }
 
 static const u_char *
 of10_data_print(netdissect_options *ndo,
 }
 
 static const u_char *
 of10_data_print(netdissect_options *ndo,

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

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

-       ND_PRINT((ndo, "\n\t data (%u octets)", len));
-       ND_TCHECK2(*cp, len);
+       ND_PRINT("\n\t data (%u octets)", len);
+       ND_TCHECK_LEN(cp, len);

        if (ndo->ndo_vflag >= 2)
                hex_and_ascii_print(ndo, "\n\t  ", cp, len);
        return cp + len;
 
 trunc:
        if (ndo->ndo_vflag >= 2)
                hex_and_ascii_print(ndo, "\n\t  ", cp, len);
        return cp + len;
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 static const u_char *
 of10_bsn_message_print(netdissect_options *ndo,
        return ep;
 }
 
 static const u_char *
 of10_bsn_message_print(netdissect_options *ndo,

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

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

-               goto corrupt;
+               goto invalid;

        /* subtype */
        /* subtype */

-       ND_TCHECK2(*cp, 4);
-       subtype = EXTRACT_32BITS(cp);
+       ND_TCHECK_4(cp);
+       subtype = GET_BE_U_4(cp);

        cp += 4;
        cp += 4;

-       ND_PRINT((ndo, "\n\t subtype %s", tok2str(bsn_subtype_str, "unknown (0x%08x)", subtype)));
+       ND_PRINT("\n\t subtype %s", tok2str(bsn_subtype_str, "unknown (0x%08x)", subtype));

        switch (subtype) {
        case BSN_GET_IP_MASK_REQUEST:
                /*
        switch (subtype) {
        case BSN_GET_IP_MASK_REQUEST:
                /*


@@ -739,13 +779,13 @@ of10_bsn_message_print(netdissect_options *ndo,
                 *
                 */
                if (len != 12)
                 *
                 */
                if (len != 12)

-                       goto corrupt;
+                       goto invalid;

                /* index */
                /* index */

-               ND_TCHECK2(*cp, 1);
-               ND_PRINT((ndo, ", index %u", *cp));
+               ND_TCHECK_1(cp);
+               ND_PRINT(", index %u", GET_U_1(cp));

                cp += 1;
                /* pad */
                cp += 1;
                /* pad */

-               ND_TCHECK2(*cp, 7);
+               ND_TCHECK_7(cp);

                cp += 7;
                break;
        case BSN_SET_IP_MASK:
                cp += 7;
                break;
        case BSN_SET_IP_MASK:


@@ -763,17 +803,17 @@ of10_bsn_message_print(netdissect_options *ndo,
                 *
                 */
                if (len != 12)
                 *
                 */
                if (len != 12)

-                       goto corrupt;
+                       goto invalid;

                /* index */
                /* index */

-               ND_TCHECK2(*cp, 1);
-               ND_PRINT((ndo, ", index %u", *cp));
+               ND_TCHECK_1(cp);
+               ND_PRINT(", index %u", GET_U_1(cp));

                cp += 1;
                /* pad */
                cp += 1;
                /* pad */

-               ND_TCHECK2(*cp, 3);
+               ND_TCHECK_3(cp);

                cp += 3;
                /* mask */
                cp += 3;
                /* mask */

-               ND_TCHECK2(*cp, 4);
-               ND_PRINT((ndo, ", mask %s", ipaddr_string(ndo, cp)));
+               ND_TCHECK_4(cp);
+               ND_PRINT(", mask %s", GET_IPADDR_STRING(cp));

                cp += 4;
                break;
        case BSN_SET_MIRRORING:
                cp += 4;
                break;
        case BSN_SET_MIRRORING:


@@ -785,21 +825,26 @@ of10_bsn_message_print(netdissect_options *ndo,
                 * +---------------+---------------+---------------+---------------+
                 * |                            subtype                            |
                 * +---------------+---------------+---------------+---------------+
                 * +---------------+---------------+---------------+---------------+
                 * |                            subtype                            |
                 * +---------------+---------------+---------------+---------------+

-                * |     ports     |                      pad                      |
+                * | report m. p.  |                      pad                      |

                 * +---------------+---------------+---------------+---------------+
                 *
                 */
                if (len != 8)
                 * +---------------+---------------+---------------+---------------+
                 *
                 */
                if (len != 8)

-                       goto corrupt;
-               /* ports */
-               ND_TCHECK2(*cp, 1);
-               ND_PRINT((ndo, ", ports %u", *cp));
+                       goto invalid;
+               /* report_mirror_ports */
+               ND_TCHECK_1(cp);
+               ND_PRINT(", report_mirror_ports %s",
+                        tok2str(bsn_onoff_str, "bogus (%u)", GET_U_1(cp)));

                cp += 1;
                /* pad */
                cp += 1;
                /* pad */

-               ND_TCHECK2(*cp, 3);
+               ND_TCHECK_3(cp);

                cp += 3;
                break;
        case BSN_GET_INTERFACES_REQUEST:
                cp += 3;
                break;
        case BSN_GET_INTERFACES_REQUEST:

+       case BSN_GET_L2_TABLE_REQUEST:
+       case BSN_BW_ENABLE_GET_REQUEST:
+       case BSN_BW_CLEAR_DATA_REQUEST:
+       case BSN_HYBRID_GET_REQUEST:

                /*
                 *  0                   1                   2                   3
                 *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
                /*
                 *  0                   1                   2                   3
                 *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1


@@ -809,175 +854,376 @@ of10_bsn_message_print(netdissect_options *ndo,
                 *
                 */
                if (len != 4)
                 *
                 */
                if (len != 4)

-                       goto corrupt;
+                       goto invalid;
+               break;
+       case BSN_VIRTUAL_PORT_REMOVE_REQUEST:
+               /*
+                *  0                   1                   2                   3
+                *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+                * +---------------+---------------+---------------+---------------+
+                * |                            subtype                            |
+                * +---------------+---------------+---------------+---------------+
+                * |                           vport_no                            |
+                * +---------------+---------------+---------------+---------------+
+                *
+                */
+               if (len != 8)
+                       goto invalid;
+               /* vport_no */
+               ND_TCHECK_4(cp);
+               ND_PRINT(", vport_no %u", GET_BE_U_4(cp));
+               cp += 4;
+               break;
+       case BSN_SHELL_COMMAND:
+               /*
+                *  0                   1                   2                   3
+                *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+                * +---------------+---------------+---------------+---------------+
+                * |                            subtype                            |
+                * +---------------+---------------+---------------+---------------+
+                * |                            service                            |
+                * +---------------+---------------+---------------+---------------+
+                * |                             data ...
+                * +---------------+---------------+--------
+                *
+                */
+               if (len < 8)
+                       goto invalid;
+               /* service */
+               ND_TCHECK_4(cp);
+               ND_PRINT(", service %u", GET_BE_U_4(cp));
+               cp += 4;
+               /* data */
+               ND_PRINT(", data '");
+               if (nd_printn(ndo, cp, len - 8, ep)) {
+                       ND_PRINT("'");
+                       goto trunc;
+               }
+               ND_PRINT("'");
+               cp += len - 8;
+               break;
+       case BSN_SHELL_OUTPUT:
+               /*
+                *  0                   1                   2                   3
+                *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+                * +---------------+---------------+---------------+---------------+
+                * |                            subtype                            |
+                * +---------------+---------------+---------------+---------------+
+                * |                             data ...
+                * +---------------+---------------+--------
+                *
+                */
+               /* already checked that len >= 4 */
+               /* data */
+               ND_PRINT(", data '");
+               if (nd_printn(ndo, cp, len - 4, ep)) {
+                       ND_PRINT("'");
+                       goto trunc;
+               }
+               ND_PRINT("'");
+               cp += len - 4;
+               break;
+       case BSN_SHELL_STATUS:
+               /*
+                *  0                   1                   2                   3
+                *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+                * +---------------+---------------+---------------+---------------+
+                * |                            subtype                            |
+                * +---------------+---------------+---------------+---------------+
+                * |                            status                             |
+                * +---------------+---------------+---------------+---------------+
+                *
+                */
+               if (len != 8)
+                       goto invalid;
+               /* status */
+               ND_TCHECK_4(cp);
+               ND_PRINT(", status 0x%08x", GET_BE_U_4(cp));
+               cp += 4;

                break;
        default:
                break;
        default:

-               ND_TCHECK2(*cp, len - 4);
+               ND_TCHECK_LEN(cp, len - 4);

                cp += len - 4;
        }
        return cp;
 
                cp += len - 4;
        }
        return cp;
 

-corrupt: /* skip the undersized data */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp0, len);
+invalid: /* skip the undersized data */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp0, len);

        return cp0 + len;
 trunc:
        return cp0 + len;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);
+       return ep;
+}
+
+static const u_char *
+of10_bsn_actions_print(netdissect_options *ndo,
+                       const u_char *cp, const u_char *ep, const u_int len)
+{
+       const u_char *cp0 = cp;
+       uint32_t subtype, vlan_tag;
+
+       if (len < 4)
+               goto invalid;
+       /* subtype */
+       ND_TCHECK_4(cp);
+       subtype = GET_BE_U_4(cp);
+       cp += 4;
+       ND_PRINT("\n\t  subtype %s", tok2str(bsn_action_subtype_str, "unknown (0x%08x)", subtype));
+       switch (subtype) {
+       case BSN_ACTION_MIRROR:
+               /*
+                *  0                   1                   2                   3
+                *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+                * +---------------+---------------+---------------+---------------+
+                * |                            subtype                            |
+                * +---------------+---------------+---------------+---------------+
+                * |                           dest_port                           |
+                * +---------------+---------------+---------------+---------------+
+                * |                           vlan_tag                            |
+                * +---------------+---------------+---------------+---------------+
+                * |  copy_stage   |                      pad                      |
+                * +---------------+---------------+---------------+---------------+
+                *
+                */
+               if (len != 16)
+                       goto invalid;
+               /* dest_port */
+               ND_TCHECK_4(cp);
+               ND_PRINT(", dest_port %u", GET_BE_U_4(cp));
+               cp += 4;
+               /* vlan_tag */
+               ND_TCHECK_4(cp);
+               vlan_tag = GET_BE_U_4(cp);
+               cp += 4;
+               switch (vlan_tag >> 16) {
+               case 0:
+                       ND_PRINT(", vlan_tag none");
+                       break;
+               case ETHERTYPE_8021Q:
+                       ND_PRINT(", vlan_tag 802.1Q (%s)", ieee8021q_tci_string(vlan_tag & 0xffff));
+                       break;
+               default:
+                       ND_PRINT(", vlan_tag unknown (0x%04x)", vlan_tag >> 16);
+               }
+               /* copy_stage */
+               ND_TCHECK_1(cp);
+               ND_PRINT(", copy_stage %s",
+                        tok2str(bsn_mirror_copy_stage_str, "unknown (%u)", GET_U_1(cp)));
+               cp += 1;
+               /* pad */
+               ND_TCHECK_3(cp);
+               cp += 3;
+               break;
+       default:
+               ND_TCHECK_LEN(cp, len - 4);
+               cp += len - 4;
+       }
+
+       return cp;
+
+invalid:
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp0, len);
+       return cp0 + len;
+trunc:
+       nd_print_trunc(ndo);
+       return ep;
+}
+
+static const u_char *
+of10_vendor_action_print(netdissect_options *ndo,
+                         const u_char *cp, const u_char *ep, const u_int len)
+{
+       uint32_t vendor;
+       const u_char *(*decoder)(netdissect_options *, const u_char *, const u_char *, const u_int);
+
+       if (len < 4)
+               goto invalid;
+       /* vendor */
+       ND_TCHECK_4(cp);
+       vendor = GET_BE_U_4(cp);
+       cp += 4;
+       ND_PRINT(", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor));
+       /* data */
+       decoder =
+               vendor == OUI_BSN         ? of10_bsn_actions_print         :
+               of10_data_print;
+       return decoder(ndo, cp, ep, len - 4);
+
+invalid: /* skip the undersized data */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp, len);
+       return cp + len;
+trunc:
+       nd_print_trunc(ndo);

        return ep;
 }
 
 static const u_char *
 of10_vendor_message_print(netdissect_options *ndo,
        return ep;
 }
 
 static const u_char *
 of10_vendor_message_print(netdissect_options *ndo,

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

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

-               goto corrupt;
+               goto invalid;

        /* vendor */
        /* vendor */

-       ND_TCHECK2(*cp, 4);
-       vendor = EXTRACT_32BITS(cp);
+       ND_TCHECK_4(cp);
+       vendor = GET_BE_U_4(cp);

        cp += 4;
        cp += 4;

-       ND_PRINT((ndo, ", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)));
+       ND_PRINT(", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor));

        /* data */
        decoder =
                vendor == OUI_BSN         ? of10_bsn_message_print         :
                of10_data_print;
        return decoder(ndo, cp, ep, len - 4);
 
        /* data */
        decoder =
                vendor == OUI_BSN         ? of10_bsn_message_print         :
                of10_data_print;
        return decoder(ndo, cp, ep, len - 4);
 

-corrupt: /* skip the undersized data */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp, len);
+invalid: /* skip the undersized data */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp, len);

        return cp + len;
 trunc:
        return cp + len;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* Vendor ID is mandatory, data is optional. */
 static const u_char *
 of10_vendor_data_print(netdissect_options *ndo,
        return ep;
 }
 
 /* Vendor ID is mandatory, data is optional. */
 static const u_char *
 of10_vendor_data_print(netdissect_options *ndo,

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

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

-               goto corrupt;
+               goto invalid;

        /* vendor */
        /* vendor */

-       ND_TCHECK2(*cp, 4);
-       vendor = EXTRACT_32BITS(cp);
+       ND_TCHECK_4(cp);
+       vendor = GET_BE_U_4(cp);

        cp += 4;
        cp += 4;

-       ND_PRINT((ndo, ", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)));
+       ND_PRINT(", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor));

        /* data */
        return of10_data_print(ndo, cp, ep, len - 4);
 
        /* data */
        return of10_data_print(ndo, cp, ep, len - 4);
 

-corrupt: /* skip the undersized data */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp, len);
+invalid: /* skip the undersized data */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp, len);

        return cp + len;
 trunc:
        return cp + len;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 static const u_char *
 of10_packet_data_print(netdissect_options *ndo,
        return ep;
 }
 
 static const u_char *
 of10_packet_data_print(netdissect_options *ndo,

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

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

-       ND_PRINT((ndo, "\n\t data (%u octets)", len));
+       ND_PRINT("\n\t data (%u octets)", len);

        if (ndo->ndo_vflag < 3)
                return cp + len;
        if (ndo->ndo_vflag < 3)
                return cp + len;

-       ND_TCHECK2(*cp, len);
+       ND_TCHECK_LEN(cp, len);

        ndo->ndo_vflag -= 3;
        ndo->ndo_vflag -= 3;

-       ND_PRINT((ndo, ", frame decoding below\n"));
-       ether_print(ndo, cp, len, ndo->ndo_snapend - cp, NULL, NULL);
+       ND_PRINT(", frame decoding below\n");
+       ether_print(ndo, cp, len, ND_BYTES_AVAILABLE_AFTER(cp), NULL, NULL);

        ndo->ndo_vflag += 3;
        return cp + len;
 
 trunc:
        ndo->ndo_vflag += 3;
        return cp + len;
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* [OF10] Section 5.2.1 */
 static const u_char *
 of10_phy_ports_print(netdissect_options *ndo,
        return ep;
 }
 
 /* [OF10] Section 5.2.1 */
 static const u_char *
 of10_phy_ports_print(netdissect_options *ndo,

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

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

-                       goto corrupt;
+                       goto invalid;

                /* port_no */
                /* 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("\n\t  port_no %s",
+                        tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

                cp += 2;
                /* hw_addr */
                cp += 2;
                /* hw_addr */

-               ND_TCHECK2(*cp, ETHER_ADDR_LEN);
-               ND_PRINT((ndo, ", hw_addr %s", etheraddr_string(ndo, cp)));
-               cp += ETHER_ADDR_LEN;
+               ND_TCHECK_LEN(cp, MAC_ADDR_LEN);
+               ND_PRINT(", hw_addr %s", GET_ETHERADDR_STRING(cp));
+               cp += MAC_ADDR_LEN;

                /* name */
                /* name */

-               ND_TCHECK2(*cp, OFP_MAX_PORT_NAME_LEN);
-               ND_PRINT((ndo, ", name '"));
-               fn_print(ndo, cp, cp + OFP_MAX_PORT_NAME_LEN);
-               ND_PRINT((ndo, "'"));
+               ND_TCHECK_LEN(cp, OFP_MAX_PORT_NAME_LEN);
+               ND_PRINT(", name '");
+               nd_print(ndo, cp, cp + OFP_MAX_PORT_NAME_LEN);
+               ND_PRINT("'");

                cp += OFP_MAX_PORT_NAME_LEN;
 
                if (ndo->ndo_vflag < 2) {
                cp += OFP_MAX_PORT_NAME_LEN;
 
                if (ndo->ndo_vflag < 2) {

-                       ND_TCHECK2(*cp, 24);
+                       ND_TCHECK_LEN(cp, 24);

                        cp += 24;
                        goto next_port;
                }
                /* config */
                        cp += 24;
                        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("\n\t   config 0x%08x", GET_BE_U_4(cp));
+               of10_bitmap_print(ndo, ofppc_bm, GET_BE_U_4(cp),
+                                 OFPPC_U);

                cp += 4;
                /* state */
                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("\n\t   state 0x%08x", GET_BE_U_4(cp));
+               of10_bitmap_print(ndo, ofpps_bm, GET_BE_U_4(cp),
+                                 OFPPS_U);

                cp += 4;
                /* curr */
                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("\n\t   curr 0x%08x", GET_BE_U_4(cp));
+               of10_bitmap_print(ndo, ofppf_bm, GET_BE_U_4(cp),
+                                 OFPPF_U);

                cp += 4;
                /* advertised */
                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("\n\t   advertised 0x%08x", GET_BE_U_4(cp));
+               of10_bitmap_print(ndo, ofppf_bm, GET_BE_U_4(cp),
+                                 OFPPF_U);

                cp += 4;
                /* supported */
                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("\n\t   supported 0x%08x", GET_BE_U_4(cp));
+               of10_bitmap_print(ndo, ofppf_bm, GET_BE_U_4(cp),
+                                 OFPPF_U);

                cp += 4;
                /* peer */
                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("\n\t   peer 0x%08x", GET_BE_U_4(cp));
+               of10_bitmap_print(ndo, ofppf_bm, GET_BE_U_4(cp),
+                                 OFPPF_U);

                cp += 4;
 next_port:
                len -= OF_PHY_PORT_LEN;
        } /* while */
        return cp;
 
                cp += 4;
 next_port:
                len -= OF_PHY_PORT_LEN;
        } /* while */
        return cp;
 

-corrupt: /* skip the undersized trailing data */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp0, len0);
+invalid: /* skip the undersized trailing data */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp0, len0);

        return cp0 + len0;
 trunc:
        return cp0 + len0;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* [OF10] Section 5.2.2 */
 static const u_char *
 of10_queue_props_print(netdissect_options *ndo,
        return ep;
 }
 
 /* [OF10] Section 5.2.2 */
 static const u_char *
 of10_queue_props_print(netdissect_options *ndo,

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

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


@@ -986,21 +1232,21 @@ of10_queue_props_print(netdissect_options *ndo,
                u_char plen_bogus = 0, skip = 0;
 
                if (len < OF_QUEUE_PROP_HEADER_LEN)
                u_char plen_bogus = 0, skip = 0;
 
                if (len < OF_QUEUE_PROP_HEADER_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* property */
                /* property */

-               ND_TCHECK2(*cp, 2);
-               property = EXTRACT_16BITS(cp);
+               ND_TCHECK_2(cp);
+               property = GET_BE_U_2(cp);

                cp += 2;
                cp += 2;

-               ND_PRINT((ndo, "\n\t   property %s", tok2str(ofpqt_str, "invalid (0x%04x)", property)));
+               ND_PRINT("\n\t   property %s", tok2str(ofpqt_str, "invalid (0x%04x)", property));

                /* len */
                /* len */

-               ND_TCHECK2(*cp, 2);
-               plen = EXTRACT_16BITS(cp);
+               ND_TCHECK_2(cp);
+               plen = GET_BE_U_2(cp);

                cp += 2;
                cp += 2;

-               ND_PRINT((ndo, ", len %u", plen));
+               ND_PRINT(", len %u", plen);

                if (plen < OF_QUEUE_PROP_HEADER_LEN || plen > len)
                if (plen < OF_QUEUE_PROP_HEADER_LEN || plen > len)

-                       goto corrupt;
+                       goto invalid;

                /* pad */
                /* pad */

-               ND_TCHECK2(*cp, 4);
+               ND_TCHECK_4(cp);

                cp += 4;
                /* property-specific constraints and decoding */
                switch (property) {
                cp += 4;
                /* property-specific constraints and decoding */
                switch (property) {


@@ -1014,25 +1260,25 @@ of10_queue_props_print(netdissect_options *ndo,
                        skip = 1;
                }
                if (plen_bogus) {
                        skip = 1;
                }
                if (plen_bogus) {

-                       ND_PRINT((ndo, " (bogus)"));
+                       ND_PRINT(" (bogus)");

                        skip = 1;
                }
                if (skip) {
                        skip = 1;
                }
                if (skip) {

-                       ND_TCHECK2(*cp, plen - 4);
+                       ND_TCHECK_LEN(cp, plen - 4);

                        cp += plen - 4;
                        goto next_property;
                }
                if (property == OFPQT_MIN_RATE) { /* the only case of property decoding */
                        /* rate */
                        cp += plen - 4;
                        goto next_property;
                }
                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 = GET_BE_U_2(cp);

                        cp += 2;
                        if (rate > 1000)
                        cp += 2;
                        if (rate > 1000)

-                               ND_PRINT((ndo, ", rate disabled"));
+                               ND_PRINT(", rate disabled");

                        else
                        else

-                               ND_PRINT((ndo, ", rate %u.%u%%", rate / 10, rate % 10));
+                               ND_PRINT(", rate %u.%u%%", rate / 10, rate % 10);

                        /* pad */
                        /* pad */

-                       ND_TCHECK2(*cp, 6);
+                       ND_TCHECK_6(cp);

                        cp += 6;
                }
 next_property:
                        cp += 6;
                }
 next_property:


@@ -1040,43 +1286,44 @@ next_property:
        } /* while */
        return cp;
 
        } /* while */
        return cp;
 

-corrupt: /* skip the rest of queue properties */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp0, len0);
+invalid: /* skip the rest of queue properties */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp0, len0);

        return cp0 + len0;
 trunc:
        return cp0 + len0;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_queues_print(netdissect_options *ndo,
        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_queues_print(netdissect_options *ndo,

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

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

-                       goto corrupt;
+                       goto invalid;

                /* queue_id */
                /* queue_id */

-               ND_TCHECK2(*cp, 4);
-               ND_PRINT((ndo, "\n\t  queue_id %u", EXTRACT_32BITS(cp)));
+               ND_TCHECK_4(cp);
+               ND_PRINT("\n\t  queue_id %u", GET_BE_U_4(cp));

                cp += 4;
                /* len */
                cp += 4;
                /* len */

-               ND_TCHECK2(*cp, 2);
-               desclen = EXTRACT_16BITS(cp);
+               ND_TCHECK_2(cp);
+               desclen = GET_BE_U_2(cp);

                cp += 2;
                cp += 2;

-               ND_PRINT((ndo, ", len %u", desclen));
+               ND_PRINT(", len %u", desclen);

                if (desclen < OF_PACKET_QUEUE_LEN || desclen > len)
                if (desclen < OF_PACKET_QUEUE_LEN || desclen > len)

-                       goto corrupt;
+                       goto invalid;

                /* pad */
                /* pad */

-               ND_TCHECK2(*cp, 2);
+               ND_TCHECK_2(cp);

                cp += 2;
                /* properties */
                if (ndo->ndo_vflag < 2) {
                cp += 2;
                /* properties */
                if (ndo->ndo_vflag < 2) {

-                       ND_TCHECK2(*cp, desclen - OF_PACKET_QUEUE_LEN);
+                       ND_TCHECK_LEN(cp, desclen - OF_PACKET_QUEUE_LEN);

                        cp += desclen - OF_PACKET_QUEUE_LEN;
                        goto next_queue;
                }
                        cp += desclen - OF_PACKET_QUEUE_LEN;
                        goto next_queue;
                }


@@ -1087,115 +1334,117 @@ next_queue:
        } /* while */
        return cp;
 
        } /* while */
        return cp;
 

-corrupt: /* skip the rest of queues */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp0, len0);
+invalid: /* skip the rest of queues */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp0, len0);

        return cp0 + len0;
 trunc:
        return cp0 + len0;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* [OF10] Section 5.2.3 */
 static const u_char *
 of10_match_print(netdissect_options *ndo,
        return ep;
 }
 
 /* [OF10] Section 5.2.3 */
 static const u_char *
 of10_match_print(netdissect_options *ndo,

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

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

-       u_char nw_bits;
+       u_int nw_bits;

        const char *field_name;
 
        /* wildcards */
        const char *field_name;
 
        /* wildcards */

-       ND_TCHECK2(*cp, 4);
-       wildcards = EXTRACT_32BITS(cp);
+       ND_TCHECK_4(cp);
+       wildcards = GET_BE_U_4(cp);

        if (wildcards & OFPFW_U)
        if (wildcards & OFPFW_U)

-               ND_PRINT((ndo, "%swildcards 0x%08x (bogus)", pfx, wildcards));
+               ND_PRINT("%swildcards 0x%08x (bogus)", pfx, wildcards);

        cp += 4;
        /* in_port */
        cp += 4;
        /* in_port */

-       ND_TCHECK2(*cp, 2);
+       ND_TCHECK_2(cp);

        if (! (wildcards & OFPFW_IN_PORT))
        if (! (wildcards & OFPFW_IN_PORT))

-               ND_PRINT((ndo, "%smatch in_port %s", pfx, tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+               ND_PRINT("%smatch in_port %s", pfx,
+                        tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

        cp += 2;
        /* dl_src */
        cp += 2;
        /* dl_src */

-       ND_TCHECK2(*cp, ETHER_ADDR_LEN);
+       ND_TCHECK_LEN(cp, MAC_ADDR_LEN);

        if (! (wildcards & OFPFW_DL_SRC))
        if (! (wildcards & OFPFW_DL_SRC))

-               ND_PRINT((ndo, "%smatch dl_src %s", pfx, etheraddr_string(ndo, cp)));
-       cp += ETHER_ADDR_LEN;
+               ND_PRINT("%smatch dl_src %s", pfx, GET_ETHERADDR_STRING(cp));
+       cp += MAC_ADDR_LEN;

        /* dl_dst */
        /* dl_dst */

-       ND_TCHECK2(*cp, ETHER_ADDR_LEN);
+       ND_TCHECK_LEN(cp, MAC_ADDR_LEN);

        if (! (wildcards & OFPFW_DL_DST))
        if (! (wildcards & OFPFW_DL_DST))

-               ND_PRINT((ndo, "%smatch dl_dst %s", pfx, etheraddr_string(ndo, cp)));
-       cp += ETHER_ADDR_LEN;
+               ND_PRINT("%smatch dl_dst %s", pfx, GET_ETHERADDR_STRING(cp));
+       cp += MAC_ADDR_LEN;

        /* dl_vlan */
        /* dl_vlan */

-       ND_TCHECK2(*cp, 2);
+       ND_TCHECK_2(cp);

        if (! (wildcards & OFPFW_DL_VLAN))
        if (! (wildcards & OFPFW_DL_VLAN))

-               ND_PRINT((ndo, "%smatch dl_vlan %s", pfx, vlan_str(EXTRACT_16BITS(cp))));
+               ND_PRINT("%smatch dl_vlan %s", pfx, vlan_str(GET_BE_U_2(cp)));

        cp += 2;
        /* dl_vlan_pcp */
        cp += 2;
        /* dl_vlan_pcp */

-       ND_TCHECK2(*cp, 1);
+       ND_TCHECK_1(cp);

        if (! (wildcards & OFPFW_DL_VLAN_PCP))
        if (! (wildcards & OFPFW_DL_VLAN_PCP))

-               ND_PRINT((ndo, "%smatch dl_vlan_pcp %s", pfx, pcp_str(*cp)));
+               ND_PRINT("%smatch dl_vlan_pcp %s", pfx, pcp_str(GET_U_1(cp)));

        cp += 1;
        /* pad1 */
        cp += 1;
        /* pad1 */

-       ND_TCHECK2(*cp, 1);
+       ND_TCHECK_1(cp);

        cp += 1;
        /* dl_type */
        cp += 1;
        /* dl_type */

-       ND_TCHECK2(*cp, 2);
-       dl_type = EXTRACT_16BITS(cp);
+       ND_TCHECK_2(cp);
+       dl_type = GET_BE_U_2(cp);

        cp += 2;
        if (! (wildcards & OFPFW_DL_TYPE))
        cp += 2;
        if (! (wildcards & OFPFW_DL_TYPE))

-               ND_PRINT((ndo, "%smatch dl_type 0x%04x", pfx, dl_type));
+               ND_PRINT("%smatch dl_type 0x%04x", pfx, dl_type);

        /* nw_tos */
        /* nw_tos */

-       ND_TCHECK2(*cp, 1);
+       ND_TCHECK_1(cp);

        if (! (wildcards & OFPFW_NW_TOS))
        if (! (wildcards & OFPFW_NW_TOS))

-               ND_PRINT((ndo, "%smatch nw_tos 0x%02x", pfx, *cp));
+               ND_PRINT("%smatch nw_tos 0x%02x", pfx, GET_U_1(cp));

        cp += 1;
        /* nw_proto */
        cp += 1;
        /* nw_proto */

-       ND_TCHECK2(*cp, 1);
-       nw_proto = *cp;
+       ND_TCHECK_1(cp);
+       nw_proto = GET_U_1(cp);

        cp += 1;
        if (! (wildcards & OFPFW_NW_PROTO)) {
                field_name = ! (wildcards & OFPFW_DL_TYPE) && dl_type == ETHERTYPE_ARP
                  ? "arp_opcode" : "nw_proto";
        cp += 1;
        if (! (wildcards & OFPFW_NW_PROTO)) {
                field_name = ! (wildcards & OFPFW_DL_TYPE) && dl_type == ETHERTYPE_ARP
                  ? "arp_opcode" : "nw_proto";

-               ND_PRINT((ndo, "%smatch %s %u", pfx, field_name, nw_proto));
+               ND_PRINT("%smatch %s %u", pfx, field_name, nw_proto);

        }
        /* pad2 */
        }
        /* pad2 */

-       ND_TCHECK2(*cp, 2);
+       ND_TCHECK_2(cp);

        cp += 2;
        /* nw_src */
        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)
        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));
+               ND_PRINT("%smatch nw_src %s/%u", pfx, GET_IPADDR_STRING(cp), 32 - nw_bits);

        cp += 4;
        /* nw_dst */
        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)
        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));
+               ND_PRINT("%smatch nw_dst %s/%u", pfx, GET_IPADDR_STRING(cp), 32 - nw_bits);

        cp += 4;
        /* tp_src */
        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";
        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("%smatch %s %u", pfx, field_name, GET_BE_U_2(cp));

        }
        cp += 2;
        /* tp_dst */
        }
        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";
        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("%smatch %s %u", pfx, field_name, GET_BE_U_2(cp));

        }
        return cp + 2;
 
 trunc:
        }
        return cp + 2;
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
        return ep;
 }
 


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

-                   u_int len) {
+                   u_int len)
+{

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


@@ -1212,20 +1462,20 @@ of10_actions_print(netdissect_options *ndo,
                u_char alen_bogus = 0, skip = 0;
 
                if (len < OF_ACTION_HEADER_LEN)
                u_char alen_bogus = 0, skip = 0;
 
                if (len < OF_ACTION_HEADER_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* type */
                /* type */

-               ND_TCHECK2(*cp, 2);
-               type = EXTRACT_16BITS(cp);
+               ND_TCHECK_2(cp);
+               type = GET_BE_U_2(cp);

                cp += 2;
                cp += 2;

-               ND_PRINT((ndo, "%saction type %s", pfx, tok2str(ofpat_str, "invalid (0x%04x)", type)));
+               ND_PRINT("%saction type %s", pfx, tok2str(ofpat_str, "invalid (0x%04x)", type));

                /* length */
                /* length */

-               ND_TCHECK2(*cp, 2);
-               alen = EXTRACT_16BITS(cp);
+               ND_TCHECK_2(cp);
+               alen = GET_BE_U_2(cp);

                cp += 2;
                cp += 2;

-               ND_PRINT((ndo, ", len %u", alen));
+               ND_PRINT(", len %u", alen);

                /* On action size underrun/overrun skip the rest of the action list. */
                if (alen < OF_ACTION_HEADER_LEN || alen > len)
                /* On action size underrun/overrun skip the rest of the action list. */
                if (alen < OF_ACTION_HEADER_LEN || alen > len)

-                       goto corrupt;
+                       goto invalid;

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


@@ -1252,11 +1502,11 @@ of10_actions_print(netdissect_options *ndo,
                        skip = 1;
                }
                if (alen_bogus) {
                        skip = 1;
                }
                if (alen_bogus) {

-                       ND_PRINT((ndo, " (bogus)"));
+                       ND_PRINT(" (bogus)");

                        skip = 1;
                }
                if (skip) {
                        skip = 1;
                }
                if (skip) {

-                       ND_TCHECK2(*cp, alen - 4);
+                       ND_TCHECK_LEN(cp, alen - 4);

                        cp += alen - 4;
                        goto next_action;
                }
                        cp += alen - 4;
                        goto next_action;
                }


@@ -1264,90 +1514,92 @@ of10_actions_print(netdissect_options *ndo,
                switch (type) {
                case OFPAT_OUTPUT:
                        /* port */
                switch (type) {
                case OFPAT_OUTPUT:
                        /* port */

-                       ND_TCHECK2(*cp, 2);
-                       output_port = EXTRACT_16BITS(cp);
+                       ND_TCHECK_2(cp);
+                       output_port = GET_BE_U_2(cp);

                        cp += 2;
                        cp += 2;

-                       ND_PRINT((ndo, ", port %s", tok2str(ofpp_str, "%u", output_port)));
+                       ND_PRINT(", port %s", tok2str(ofpp_str, "%u", output_port));

                        /* max_len */
                        /* max_len */

-                       ND_TCHECK2(*cp, 2);
+                       ND_TCHECK_2(cp);

                        if (output_port == OFPP_CONTROLLER)
                        if (output_port == OFPP_CONTROLLER)

-                               ND_PRINT((ndo, ", max_len %u", EXTRACT_16BITS(cp)));
+                               ND_PRINT(", max_len %u", GET_BE_U_2(cp));

                        cp += 2;
                        break;
                case OFPAT_SET_VLAN_VID:
                        /* vlan_vid */
                        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(", vlan_vid %s", vlan_str(GET_BE_U_2(cp)));

                        cp += 2;
                        /* pad */
                        cp += 2;
                        /* pad */

-                       ND_TCHECK2(*cp, 2);
+                       ND_TCHECK_2(cp);

                        cp += 2;
                        break;
                case OFPAT_SET_VLAN_PCP:
                        /* vlan_pcp */
                        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(", vlan_pcp %s", pcp_str(GET_U_1(cp)));

                        cp += 1;
                        /* pad */
                        cp += 1;
                        /* pad */

-                       ND_TCHECK2(*cp, 3);
+                       ND_TCHECK_3(cp);

                        cp += 3;
                        break;
                case OFPAT_SET_DL_SRC:
                case OFPAT_SET_DL_DST:
                        /* dl_addr */
                        cp += 3;
                        break;
                case OFPAT_SET_DL_SRC:
                case OFPAT_SET_DL_DST:
                        /* dl_addr */

-                       ND_TCHECK2(*cp, ETHER_ADDR_LEN);
-                       ND_PRINT((ndo, ", dl_addr %s", etheraddr_string(ndo, cp)));
-                       cp += ETHER_ADDR_LEN;
+                       ND_TCHECK_LEN(cp, MAC_ADDR_LEN);
+                       ND_PRINT(", dl_addr %s", GET_ETHERADDR_STRING(cp));
+                       cp += MAC_ADDR_LEN;

                        /* pad */
                        /* pad */

-                       ND_TCHECK2(*cp, 6);
+                       ND_TCHECK_6(cp);

                        cp += 6;
                        break;
                case OFPAT_SET_NW_SRC:
                case OFPAT_SET_NW_DST:
                        /* nw_addr */
                        cp += 6;
                        break;
                case OFPAT_SET_NW_SRC:
                case OFPAT_SET_NW_DST:
                        /* nw_addr */

-                       ND_TCHECK2(*cp, 4);
-                       ND_PRINT((ndo, ", nw_addr %s", ipaddr_string(ndo, cp)));
+                       ND_TCHECK_4(cp);
+                       ND_PRINT(", nw_addr %s", GET_IPADDR_STRING(cp));

                        cp += 4;
                        break;
                case OFPAT_SET_NW_TOS:
                        /* nw_tos */
                        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(", nw_tos 0x%02x", GET_U_1(cp));

                        cp += 1;
                        /* pad */
                        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 */
                        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(", tp_port %u", GET_BE_U_2(cp));

                        cp += 2;
                        /* pad */
                        cp += 2;
                        /* pad */

-                       ND_TCHECK2(*cp, 2);
+                       ND_TCHECK_2(cp);

                        cp += 2;
                        break;
                case OFPAT_ENQUEUE:
                        /* port */
                        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(", port %s",
+                                tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

                        cp += 2;
                        /* pad */
                        cp += 2;
                        /* pad */

-                       ND_TCHECK2(*cp, 6);
+                       ND_TCHECK_6(cp);

                        cp += 6;
                        /* queue_id */
                        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(", queue_id %s",
+                                tok2str(ofpq_str, "%u", GET_BE_U_4(cp)));

                        cp += 4;
                        break;
                case OFPAT_VENDOR:
                        cp += 4;
                        break;
                case OFPAT_VENDOR:

-                       if (ep == (cp = of10_vendor_data_print(ndo, cp, ep, alen - 4)))
+                       if (ep == (cp = of10_vendor_action_print(ndo, cp, ep, alen - 4)))

                                return ep; /* end of snapshot */
                        break;
                case OFPAT_STRIP_VLAN:
                        /* pad */
                                return ep; /* end of snapshot */
                        break;
                case OFPAT_STRIP_VLAN:
                        /* pad */

-                       ND_TCHECK2(*cp, 4);
+                       ND_TCHECK_4(cp);

                        cp += 4;
                        break;
                } /* switch */
                        cp += 4;
                        break;
                } /* switch */


@@ -1356,163 +1608,170 @@ next_action:
        } /* while */
        return cp;
 
        } /* while */
        return cp;
 

-corrupt: /* skip the rest of actions */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp0, len0);
+invalid: /* skip the rest of actions */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp0, len0);

        return cp0 + len0;
 trunc:
        return cp0 + len0;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* [OF10] Section 5.3.1 */
 static const u_char *
 of10_features_reply_print(netdissect_options *ndo,
        return ep;
 }
 
 /* [OF10] Section 5.3.1 */
 static const u_char *
 of10_features_reply_print(netdissect_options *ndo,

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

        /* datapath_id */
        /* datapath_id */

-       ND_TCHECK2(*cp, 8);
-       ND_PRINT((ndo, "\n\t dpid 0x%016" PRIx64, EXTRACT_64BITS(cp)));
+       ND_TCHECK_8(cp);
+       ND_PRINT("\n\t dpid 0x%016" PRIx64, GET_BE_U_8(cp));

        cp += 8;
        /* n_buffers */
        cp += 8;
        /* n_buffers */

-       ND_TCHECK2(*cp, 4);
-       ND_PRINT((ndo, ", n_buffers %u", EXTRACT_32BITS(cp)));
+       ND_TCHECK_4(cp);
+       ND_PRINT(", n_buffers %u", GET_BE_U_4(cp));

        cp += 4;
        /* n_tables */
        cp += 4;
        /* n_tables */

-       ND_TCHECK2(*cp, 1);
-       ND_PRINT((ndo, ", n_tables %u", *cp));
+       ND_TCHECK_1(cp);
+       ND_PRINT(", n_tables %u", GET_U_1(cp));

        cp += 1;
        /* pad */
        cp += 1;
        /* pad */

-       ND_TCHECK2(*cp, 3);
+       ND_TCHECK_3(cp);

        cp += 3;
        /* capabilities */
        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("\n\t capabilities 0x%08x", GET_BE_U_4(cp));
+       of10_bitmap_print(ndo, ofp_capabilities_bm, GET_BE_U_4(cp),
+                         OFPCAP_U);

        cp += 4;
        /* actions */
        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("\n\t actions 0x%08x", GET_BE_U_4(cp));
+       of10_bitmap_print(ndo, ofpat_bm, GET_BE_U_4(cp), OFPAT_U);

        cp += 4;
        /* ports */
        return of10_phy_ports_print(ndo, cp, ep, len - OF_SWITCH_FEATURES_LEN);
 
 trunc:
        cp += 4;
        /* ports */
        return of10_phy_ports_print(ndo, cp, ep, len - OF_SWITCH_FEATURES_LEN);
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* [OF10] Section 5.3.3 */
 static const u_char *
 of10_flow_mod_print(netdissect_options *ndo,
        return ep;
 }
 
 /* [OF10] Section 5.3.3 */
 static const u_char *
 of10_flow_mod_print(netdissect_options *ndo,

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

        uint16_t command;
 
        /* match */
        if (ep == (cp = of10_match_print(ndo, "\n\t ", cp, ep)))
                return ep; /* end of snapshot */
        /* cookie */
        uint16_t command;
 
        /* match */
        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("\n\t cookie 0x%016" PRIx64, GET_BE_U_8(cp));

        cp += 8;
        /* command */
        cp += 8;
        /* command */

-       ND_TCHECK2(*cp, 2);
-       command = EXTRACT_16BITS(cp);
-       ND_PRINT((ndo, ", command %s", tok2str(ofpfc_str, "invalid (0x%04x)", command)));
+       ND_TCHECK_2(cp);
+       command = GET_BE_U_2(cp);
+       ND_PRINT(", command %s", tok2str(ofpfc_str, "invalid (0x%04x)", command));

        cp += 2;
        /* idle_timeout */
        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 (GET_BE_U_2(cp))
+               ND_PRINT(", idle_timeout %u", GET_BE_U_2(cp));

        cp += 2;
        /* hard_timeout */
        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 (GET_BE_U_2(cp))
+               ND_PRINT(", hard_timeout %u", GET_BE_U_2(cp));

        cp += 2;
        /* priority */
        cp += 2;
        /* priority */

-       ND_TCHECK2(*cp, 2);
-       if (EXTRACT_16BITS(cp))
-               ND_PRINT((ndo, ", priority %u", EXTRACT_16BITS(cp)));
+       ND_TCHECK_2(cp);
+       if (GET_BE_U_2(cp))
+               ND_PRINT(", priority %u", GET_BE_U_2(cp));

        cp += 2;
        /* buffer_id */
        cp += 2;
        /* buffer_id */

-       ND_TCHECK2(*cp, 4);
+       ND_TCHECK_4(cp);

        if (command == OFPFC_ADD || command == OFPFC_MODIFY ||
            command == OFPFC_MODIFY_STRICT)
        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(", buffer_id %s",
+                        tok2str(bufferid_str, "0x%08x", GET_BE_U_4(cp)));

        cp += 4;
        /* out_port */
        cp += 4;
        /* out_port */

-       ND_TCHECK2(*cp, 2);
+       ND_TCHECK_2(cp);

        if (command == OFPFC_DELETE || command == OFPFC_DELETE_STRICT)
        if (command == OFPFC_DELETE || command == OFPFC_DELETE_STRICT)

-               ND_PRINT((ndo, ", out_port %s", tok2str(ofpp_str, "%u", EXTRACT_16BITS(cp))));
+               ND_PRINT(", out_port %s",
+                        tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

        cp += 2;
        /* flags */
        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(", flags 0x%04x", GET_BE_U_2(cp));
+       of10_bitmap_print(ndo, ofpff_bm, GET_BE_U_2(cp), OFPFF_U);

        cp += 2;
        /* actions */
        return of10_actions_print(ndo, "\n\t ", cp, ep, len - OF_FLOW_MOD_LEN);
 
 trunc:
        cp += 2;
        /* actions */
        return of10_actions_print(ndo, "\n\t ", cp, ep, len - OF_FLOW_MOD_LEN);
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_port_mod_print(netdissect_options *ndo,
        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_port_mod_print(netdissect_options *ndo,

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

        /* port_no */
        /* 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("\n\t port_no %s", tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

        cp += 2;
        /* hw_addr */
        cp += 2;
        /* hw_addr */

-       ND_TCHECK2(*cp, ETHER_ADDR_LEN);
-       ND_PRINT((ndo, ", hw_addr %s", etheraddr_string(ndo, cp)));
-       cp += ETHER_ADDR_LEN;
+       ND_TCHECK_LEN(cp, MAC_ADDR_LEN);
+       ND_PRINT(", hw_addr %s", GET_ETHERADDR_STRING(cp));
+       cp += MAC_ADDR_LEN;

        /* config */
        /* 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("\n\t config 0x%08x", GET_BE_U_4(cp));
+       of10_bitmap_print(ndo, ofppc_bm, GET_BE_U_4(cp), OFPPC_U);

        cp += 4;
        /* mask */
        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("\n\t mask 0x%08x", GET_BE_U_4(cp));
+       of10_bitmap_print(ndo, ofppc_bm, GET_BE_U_4(cp), OFPPC_U);

        cp += 4;
        /* advertise */
        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("\n\t advertise 0x%08x", GET_BE_U_4(cp));
+       of10_bitmap_print(ndo, ofppf_bm, GET_BE_U_4(cp), OFPPF_U);

        cp += 4;
        /* pad */
        cp += 4;
        /* pad */

-       ND_TCHECK2(*cp, 4);
+       ND_TCHECK_4(cp);

        return cp + 4;
 
 trunc:
        return cp + 4;
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* [OF10] Section 5.3.5 */
 static const u_char *
 of10_stats_request_print(netdissect_options *ndo,
        return ep;
 }
 
 /* [OF10] Section 5.3.5 */
 static const u_char *
 of10_stats_request_print(netdissect_options *ndo,

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

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

-       ND_TCHECK2(*cp, 2);
-       type = EXTRACT_16BITS(cp);
+       ND_TCHECK_2(cp);
+       type = GET_BE_U_2(cp);

        cp += 2;
        cp += 2;

-       ND_PRINT((ndo, "\n\t type %s", tok2str(ofpst_str, "invalid (0x%04x)", type)));
+       ND_PRINT("\n\t type %s", tok2str(ofpst_str, "invalid (0x%04x)", type));

        /* flags */
        /* flags */

-       ND_TCHECK2(*cp, 2);
-       ND_PRINT((ndo, ", flags 0x%04x", EXTRACT_16BITS(cp)));
-       if (EXTRACT_16BITS(cp))
-               ND_PRINT((ndo, " (bogus)"));
+       ND_TCHECK_2(cp);
+       ND_PRINT(", flags 0x%04x", GET_BE_U_2(cp));
+       if (GET_BE_U_2(cp))
+               ND_PRINT(" (bogus)");

        cp += 2;
        /* type-specific body of one of fixed lengths */
        len -= OF_STATS_REQUEST_LEN;
        cp += 2;
        /* type-specific body of one of fixed lengths */
        len -= OF_STATS_REQUEST_LEN;


@@ -1520,172 +1779,180 @@ of10_stats_request_print(netdissect_options *ndo,
        case OFPST_DESC:
        case OFPST_TABLE:
                if (len)
        case OFPST_DESC:
        case OFPST_TABLE:
                if (len)

-                       goto corrupt;
+                       goto invalid;

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

-                       goto corrupt;
+                       goto invalid;

                /* match */
                if (ep == (cp = of10_match_print(ndo, "\n\t ", cp, ep)))
                        return ep; /* end of snapshot */
                /* table_id */
                /* match */
                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("\n\t table_id %s",
+                        tok2str(tableid_str, "%u", GET_U_1(cp)));

                cp += 1;
                /* pad */
                cp += 1;
                /* pad */

-               ND_TCHECK2(*cp, 1);
+               ND_TCHECK_1(cp);

                cp += 1;
                /* out_port */
                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(", out_port %s",
+                        tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

                return cp + 2;
        case OFPST_PORT:
                if (len != OF_PORT_STATS_REQUEST_LEN)
                return cp + 2;
        case OFPST_PORT:
                if (len != OF_PORT_STATS_REQUEST_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* port_no */
                /* 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("\n\t port_no %s",
+                        tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

                cp += 2;
                /* pad */
                cp += 2;
                /* pad */

-               ND_TCHECK2(*cp, 6);
+               ND_TCHECK_6(cp);

                return cp + 6;
        case OFPST_QUEUE:
                if (len != OF_QUEUE_STATS_REQUEST_LEN)
                return cp + 6;
        case OFPST_QUEUE:
                if (len != OF_QUEUE_STATS_REQUEST_LEN)

-                       goto corrupt;
+                       goto invalid;

                /* port_no */
                /* 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("\n\t port_no %s",
+                        tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

                cp += 2;
                /* pad */
                cp += 2;
                /* pad */

-               ND_TCHECK2(*cp, 2);
+               ND_TCHECK_2(cp);

                cp += 2;
                /* queue_id */
                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(", queue_id %s",
+                        tok2str(ofpq_str, "%u", GET_BE_U_4(cp)));

                return cp + 4;
        case OFPST_VENDOR:
                return of10_vendor_data_print(ndo, cp, ep, len);
        }
        return cp;
 
                return cp + 4;
        case OFPST_VENDOR:
                return of10_vendor_data_print(ndo, cp, ep, len);
        }
        return cp;
 

-corrupt: /* skip the message body */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp0, len0);
+invalid: /* skip the message body */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp0, len0);

        return cp0 + len0;
 trunc:
        return cp0 + len0;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_desc_stats_reply_print(netdissect_options *ndo,
        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_desc_stats_reply_print(netdissect_options *ndo,

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

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

-               goto corrupt;
+               goto invalid;

        /* mfr_desc */
        /* mfr_desc */

-       ND_TCHECK2(*cp, DESC_STR_LEN);
-       ND_PRINT((ndo, "\n\t  mfr_desc '"));
-       fn_print(ndo, cp, cp + DESC_STR_LEN);
-       ND_PRINT((ndo, "'"));
+       ND_TCHECK_LEN(cp, DESC_STR_LEN);
+       ND_PRINT("\n\t  mfr_desc '");
+       nd_print(ndo, cp, cp + DESC_STR_LEN);
+       ND_PRINT("'");

        cp += DESC_STR_LEN;
        /* hw_desc */
        cp += DESC_STR_LEN;
        /* hw_desc */

-       ND_TCHECK2(*cp, DESC_STR_LEN);
-       ND_PRINT((ndo, "\n\t  hw_desc '"));
-       fn_print(ndo, cp, cp + DESC_STR_LEN);
-       ND_PRINT((ndo, "'"));
+       ND_TCHECK_LEN(cp, DESC_STR_LEN);
+       ND_PRINT("\n\t  hw_desc '");
+       nd_print(ndo, cp, cp + DESC_STR_LEN);
+       ND_PRINT("'");

        cp += DESC_STR_LEN;
        /* sw_desc */
        cp += DESC_STR_LEN;
        /* sw_desc */

-       ND_TCHECK2(*cp, DESC_STR_LEN);
-       ND_PRINT((ndo, "\n\t  sw_desc '"));
-       fn_print(ndo, cp, cp + DESC_STR_LEN);
-       ND_PRINT((ndo, "'"));
+       ND_TCHECK_LEN(cp, DESC_STR_LEN);
+       ND_PRINT("\n\t  sw_desc '");
+       nd_print(ndo, cp, cp + DESC_STR_LEN);
+       ND_PRINT("'");

        cp += DESC_STR_LEN;
        /* serial_num */
        cp += DESC_STR_LEN;
        /* serial_num */

-       ND_TCHECK2(*cp, SERIAL_NUM_LEN);
-       ND_PRINT((ndo, "\n\t  serial_num '"));
-       fn_print(ndo, cp, cp + SERIAL_NUM_LEN);
-       ND_PRINT((ndo, "'"));
+       ND_TCHECK_LEN(cp, SERIAL_NUM_LEN);
+       ND_PRINT("\n\t  serial_num '");
+       nd_print(ndo, cp, cp + SERIAL_NUM_LEN);
+       ND_PRINT("'");

        cp += SERIAL_NUM_LEN;
        /* dp_desc */
        cp += SERIAL_NUM_LEN;
        /* dp_desc */

-       ND_TCHECK2(*cp, DESC_STR_LEN);
-       ND_PRINT((ndo, "\n\t  dp_desc '"));
-       fn_print(ndo, cp, cp + DESC_STR_LEN);
-       ND_PRINT((ndo, "'"));
+       ND_TCHECK_LEN(cp, DESC_STR_LEN);
+       ND_PRINT("\n\t  dp_desc '");
+       nd_print(ndo, cp, cp + DESC_STR_LEN);
+       ND_PRINT("'");

        return cp + DESC_STR_LEN;
 
        return cp + DESC_STR_LEN;
 

-corrupt: /* skip the message body */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp, len);
+invalid: /* skip the message body */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp, len);

        return cp + len;
 trunc:
        return cp + len;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_flow_stats_reply_print(netdissect_options *ndo,
        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_flow_stats_reply_print(netdissect_options *ndo,

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

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

-                       goto corrupt;
+                       goto invalid;

                /* length */
                /* length */

-               ND_TCHECK2(*cp, 2);
-               entry_len = EXTRACT_16BITS(cp);
-               ND_PRINT((ndo, "\n\t length %u", entry_len));
+               ND_TCHECK_2(cp);
+               entry_len = GET_BE_U_2(cp);
+               ND_PRINT("\n\t length %u", entry_len);

                if (entry_len < OF_FLOW_STATS_LEN || entry_len > len)
                if (entry_len < OF_FLOW_STATS_LEN || entry_len > len)

-                       goto corrupt;
+                       goto invalid;

                cp += 2;
                /* table_id */
                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(", table_id %s",
+                        tok2str(tableid_str, "%u", GET_U_1(cp)));

                cp += 1;
                /* pad */
                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 */
                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("\n\t  duration_sec %u", GET_BE_U_4(cp));

                cp += 4;
                /* duration_nsec */
                cp += 4;
                /* duration_nsec */

-               ND_TCHECK2(*cp, 4);
-               ND_PRINT((ndo, ", duration_nsec %u", EXTRACT_32BITS(cp)));
+               ND_TCHECK_4(cp);
+               ND_PRINT(", duration_nsec %u", GET_BE_U_4(cp));

                cp += 4;
                /* priority */
                cp += 4;
                /* priority */

-               ND_TCHECK2(*cp, 2);
-               ND_PRINT((ndo, ", priority %u", EXTRACT_16BITS(cp)));
+               ND_TCHECK_2(cp);
+               ND_PRINT(", priority %u", GET_BE_U_2(cp));

                cp += 2;
                /* idle_timeout */
                cp += 2;
                /* idle_timeout */

-               ND_TCHECK2(*cp, 2);
-               ND_PRINT((ndo, ", idle_timeout %u", EXTRACT_16BITS(cp)));
+               ND_TCHECK_2(cp);
+               ND_PRINT(", idle_timeout %u", GET_BE_U_2(cp));

                cp += 2;
                /* hard_timeout */
                cp += 2;
                /* hard_timeout */

-               ND_TCHECK2(*cp, 2);
-               ND_PRINT((ndo, ", hard_timeout %u", EXTRACT_16BITS(cp)));
+               ND_TCHECK_2(cp);
+               ND_PRINT(", hard_timeout %u", GET_BE_U_2(cp));

                cp += 2;
                /* pad2 */
                cp += 2;
                /* pad2 */

-               ND_TCHECK2(*cp, 6);
+               ND_TCHECK_6(cp);

                cp += 6;
                /* cookie */
                cp += 6;
                /* cookie */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", cookie 0x%016" PRIx64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", cookie 0x%016" PRIx64, GET_BE_U_8(cp));

                cp += 8;
                /* packet_count */
                cp += 8;
                /* packet_count */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", packet_count %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", packet_count %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* byte_count */
                cp += 8;
                /* byte_count */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", byte_count %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", byte_count %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* actions */
                if (ep == (cp = of10_actions_print(ndo, "\n\t  ", cp, ep, entry_len - OF_FLOW_STATS_LEN)))
                cp += 8;
                /* actions */
                if (ep == (cp = of10_actions_print(ndo, "\n\t  ", cp, ep, entry_len - OF_FLOW_STATS_LEN)))


@@ -1695,12 +1962,12 @@ of10_flow_stats_reply_print(netdissect_options *ndo,
        } /* while */
        return cp;
 
        } /* while */
        return cp;
 

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

        return cp0 + len0;
 trunc:
        return cp0 + len0;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
        return ep;
 }
 


@@ -1708,239 +1975,249 @@ trunc:
 static const u_char *
 of10_aggregate_stats_reply_print(netdissect_options *ndo,
                                  const u_char *cp, const u_char *ep,
 static const u_char *
 of10_aggregate_stats_reply_print(netdissect_options *ndo,
                                  const u_char *cp, const u_char *ep,

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

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

-               goto corrupt;
+               goto invalid;

        /* packet_count */
        /* packet_count */

-       ND_TCHECK2(*cp, 8);
-       ND_PRINT((ndo, "\n\t packet_count %" PRIu64, EXTRACT_64BITS(cp)));
+       ND_TCHECK_8(cp);
+       ND_PRINT("\n\t packet_count %" PRIu64, GET_BE_U_8(cp));

        cp += 8;
        /* byte_count */
        cp += 8;
        /* byte_count */

-       ND_TCHECK2(*cp, 8);
-       ND_PRINT((ndo, ", byte_count %" PRIu64, EXTRACT_64BITS(cp)));
+       ND_TCHECK_8(cp);
+       ND_PRINT(", byte_count %" PRIu64, GET_BE_U_8(cp));

        cp += 8;
        /* flow_count */
        cp += 8;
        /* flow_count */

-       ND_TCHECK2(*cp, 4);
-       ND_PRINT((ndo, ", flow_count %u", EXTRACT_32BITS(cp)));
+       ND_TCHECK_4(cp);
+       ND_PRINT(", flow_count %u", GET_BE_U_4(cp));

        cp += 4;
        /* pad */
        cp += 4;
        /* pad */

-       ND_TCHECK2(*cp, 4);
+       ND_TCHECK_4(cp);

        return cp + 4;
 
        return cp + 4;
 

-corrupt: /* skip the message body */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp, len);
+invalid: /* skip the message body */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp, len);

        return cp + len;
 trunc:
        return cp + len;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_table_stats_reply_print(netdissect_options *ndo,
        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_table_stats_reply_print(netdissect_options *ndo,

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

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

-                       goto corrupt;
+                       goto invalid;

                /* table_id */
                /* 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("\n\t table_id %s",
+                        tok2str(tableid_str, "%u", GET_U_1(cp)));

                cp += 1;
                /* pad */
                cp += 1;
                /* pad */

-               ND_TCHECK2(*cp, 3);
+               ND_TCHECK_3(cp);

                cp += 3;
                /* name */
                cp += 3;
                /* name */

-               ND_TCHECK2(*cp, OFP_MAX_TABLE_NAME_LEN);
-               ND_PRINT((ndo, ", name '"));
-               fn_print(ndo, cp, cp + OFP_MAX_TABLE_NAME_LEN);
-               ND_PRINT((ndo, "'"));
+               ND_TCHECK_LEN(cp, OFP_MAX_TABLE_NAME_LEN);
+               ND_PRINT(", name '");
+               nd_print(ndo, cp, cp + OFP_MAX_TABLE_NAME_LEN);
+               ND_PRINT("'");

                cp += OFP_MAX_TABLE_NAME_LEN;
                /* wildcards */
                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("\n\t  wildcards 0x%08x", GET_BE_U_4(cp));
+               of10_bitmap_print(ndo, ofpfw_bm, GET_BE_U_4(cp),
+                                 OFPFW_U);

                cp += 4;
                /* max_entries */
                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("\n\t  max_entries %u", GET_BE_U_4(cp));

                cp += 4;
                /* active_count */
                cp += 4;
                /* active_count */

-               ND_TCHECK2(*cp, 4);
-               ND_PRINT((ndo, ", active_count %u", EXTRACT_32BITS(cp)));
+               ND_TCHECK_4(cp);
+               ND_PRINT(", active_count %u", GET_BE_U_4(cp));

                cp += 4;
                /* lookup_count */
                cp += 4;
                /* lookup_count */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", lookup_count %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", lookup_count %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* matched_count */
                cp += 8;
                /* matched_count */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", matched_count %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", matched_count %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
 
                len -= OF_TABLE_STATS_LEN;
        } /* while */
        return cp;
 
                cp += 8;
 
                len -= OF_TABLE_STATS_LEN;
        } /* while */
        return cp;
 

-corrupt: /* skip the undersized trailing data */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp0, len0);
+invalid: /* skip the undersized trailing data */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp0, len0);

        return cp0 + len0;
 trunc:
        return cp0 + len0;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_port_stats_reply_print(netdissect_options *ndo,
        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_port_stats_reply_print(netdissect_options *ndo,

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

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

-                       goto corrupt;
+                       goto invalid;

                /* port_no */
                /* 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("\n\t  port_no %s",
+                        tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

                cp += 2;
                if (ndo->ndo_vflag < 2) {
                cp += 2;
                if (ndo->ndo_vflag < 2) {

-                       ND_TCHECK2(*cp, OF_PORT_STATS_LEN - 2);
+                       ND_TCHECK_LEN(cp, OF_PORT_STATS_LEN - 2);

                        cp += OF_PORT_STATS_LEN - 2;
                        goto next_port;
                }
                /* pad */
                        cp += OF_PORT_STATS_LEN - 2;
                        goto next_port;
                }
                /* pad */

-               ND_TCHECK2(*cp, 6);
+               ND_TCHECK_6(cp);

                cp += 6;
                /* rx_packets */
                cp += 6;
                /* rx_packets */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", rx_packets %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", rx_packets %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* tx_packets */
                cp += 8;
                /* tx_packets */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", tx_packets %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", tx_packets %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* rx_bytes */
                cp += 8;
                /* rx_bytes */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", rx_bytes %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", rx_bytes %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* tx_bytes */
                cp += 8;
                /* tx_bytes */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", tx_bytes %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", tx_bytes %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* rx_dropped */
                cp += 8;
                /* rx_dropped */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", rx_dropped %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", rx_dropped %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* tx_dropped */
                cp += 8;
                /* tx_dropped */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", tx_dropped %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", tx_dropped %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* rx_errors */
                cp += 8;
                /* rx_errors */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", rx_errors %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", rx_errors %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* tx_errors */
                cp += 8;
                /* tx_errors */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", tx_errors %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", tx_errors %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* rx_frame_err */
                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(", rx_frame_err %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* rx_over_err */
                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(", rx_over_err %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* rx_crc_err */
                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(", rx_crc_err %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* collisions */
                cp += 8;
                /* collisions */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", collisions %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", collisions %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
 next_port:
                len -= OF_PORT_STATS_LEN;
        } /* while */
        return cp;
 
                cp += 8;
 next_port:
                len -= OF_PORT_STATS_LEN;
        } /* while */
        return cp;
 

-corrupt: /* skip the undersized trailing data */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp0, len0);
+invalid: /* skip the undersized trailing data */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp0, len0);

        return cp0 + len0;
 trunc:
        return cp0 + len0;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_queue_stats_reply_print(netdissect_options *ndo,
        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_queue_stats_reply_print(netdissect_options *ndo,

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

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

-                       goto corrupt;
+                       goto invalid;

                /* port_no */
                /* 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("\n\t  port_no %s",
+                        tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

                cp += 2;
                /* pad */
                cp += 2;
                /* pad */

-               ND_TCHECK2(*cp, 2);
+               ND_TCHECK_2(cp);

                cp += 2;
                /* queue_id */
                cp += 2;
                /* queue_id */

-               ND_TCHECK2(*cp, 4);
-               ND_PRINT((ndo, ", queue_id %u", EXTRACT_32BITS(cp)));
+               ND_TCHECK_4(cp);
+               ND_PRINT(", queue_id %u", GET_BE_U_4(cp));

                cp += 4;
                /* tx_bytes */
                cp += 4;
                /* tx_bytes */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", tx_bytes %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", tx_bytes %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* tx_packets */
                cp += 8;
                /* tx_packets */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", tx_packets %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", tx_packets %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
                /* tx_errors */
                cp += 8;
                /* tx_errors */

-               ND_TCHECK2(*cp, 8);
-               ND_PRINT((ndo, ", tx_errors %" PRIu64, EXTRACT_64BITS(cp)));
+               ND_TCHECK_8(cp);
+               ND_PRINT(", tx_errors %" PRIu64, GET_BE_U_8(cp));

                cp += 8;
 
                len -= OF_QUEUE_STATS_LEN;
        } /* while */
        return cp;
 
                cp += 8;
 
                len -= OF_QUEUE_STATS_LEN;
        } /* while */
        return cp;
 

-corrupt: /* skip the undersized trailing data */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp0, len0);
+invalid: /* skip the undersized trailing data */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp0, len0);

        return cp0 + len0;
 trunc:
        return cp0 + len0;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_stats_reply_print(netdissect_options *ndo,
        return ep;
 }
 
 /* ibid */
 static const u_char *
 of10_stats_reply_print(netdissect_options *ndo,

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

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

-       ND_TCHECK2(*cp, 2);
-       type = EXTRACT_16BITS(cp);
-       ND_PRINT((ndo, "\n\t type %s", tok2str(ofpst_str, "invalid (0x%04x)", type)));
+       ND_TCHECK_2(cp);
+       type = GET_BE_U_2(cp);
+       ND_PRINT("\n\t type %s", tok2str(ofpst_str, "invalid (0x%04x)", type));

        cp += 2;
        /* flags */
        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(", flags 0x%04x", GET_BE_U_2(cp));
+       of10_bitmap_print(ndo, ofpsf_reply_bm, GET_BE_U_2(cp),
+                         OFPSF_REPLY_U);

        cp += 2;
 
        if (ndo->ndo_vflag > 0) {
        cp += 2;
 
        if (ndo->ndo_vflag > 0) {


@@ -1956,150 +2233,157 @@ of10_stats_reply_print(netdissect_options *ndo,
                if (decoder != NULL)
                        return decoder(ndo, cp, ep, len - OF_STATS_REPLY_LEN);
        }
                if (decoder != NULL)
                        return decoder(ndo, cp, ep, len - OF_STATS_REPLY_LEN);
        }

-       ND_TCHECK2(*cp0, len);
+       ND_TCHECK_LEN(cp0, len);

        return cp0 + len;
 
 trunc:
        return cp0 + len;
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* [OF10] Section 5.3.6 */
 static const u_char *
 of10_packet_out_print(netdissect_options *ndo,
        return ep;
 }
 
 /* [OF10] Section 5.3.6 */
 static const u_char *
 of10_packet_out_print(netdissect_options *ndo,

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

        const u_char *cp0 = cp;
        const u_int len0 = len;
        uint16_t actions_len;
 
        /* buffer_id */
        const u_char *cp0 = cp;
        const u_int len0 = len;
        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("\n\t buffer_id 0x%08x", GET_BE_U_4(cp));

        cp += 4;
        /* in_port */
        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(", in_port %s", tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

        cp += 2;
        /* actions_len */
        cp += 2;
        /* actions_len */

-       ND_TCHECK2(*cp, 2);
-       actions_len = EXTRACT_16BITS(cp);
+       ND_TCHECK_2(cp);
+       actions_len = GET_BE_U_2(cp);

        cp += 2;
        if (actions_len > len - OF_PACKET_OUT_LEN)
        cp += 2;
        if (actions_len > len - OF_PACKET_OUT_LEN)

-               goto corrupt;
+               goto invalid;

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

-corrupt: /* skip the rest of the message body */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp0, len0);
+invalid: /* skip the rest of the message body */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp0, len0);

        return cp0 + len0;
 trunc:
        return cp0 + len0;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* [OF10] Section 5.4.1 */
 static const u_char *
 of10_packet_in_print(netdissect_options *ndo,
        return ep;
 }
 
 /* [OF10] Section 5.4.1 */
 static const u_char *
 of10_packet_in_print(netdissect_options *ndo,

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

        /* buffer_id */
        /* 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("\n\t buffer_id %s",
+                tok2str(bufferid_str, "0x%08x", GET_BE_U_4(cp)));

        cp += 4;
        /* total_len */
        cp += 4;
        /* total_len */

-       ND_TCHECK2(*cp, 2);
-       ND_PRINT((ndo, ", total_len %u", EXTRACT_16BITS(cp)));
+       ND_TCHECK_2(cp);
+       ND_PRINT(", total_len %u", GET_BE_U_2(cp));

        cp += 2;
        /* in_port */
        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(", in_port %s", tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

        cp += 2;
        /* reason */
        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(", reason %s",
+                tok2str(ofpr_str, "invalid (0x%02x)", GET_U_1(cp)));

        cp += 1;
        /* pad */
        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 */
        return of10_packet_data_print(ndo, cp, ep, len - (OF_PACKET_IN_LEN - 2));
 
 trunc:
        cp += 1;
        /* data */
        /* 2 mock octets count in OF_PACKET_IN_LEN but not in len */
        return of10_packet_data_print(ndo, cp, ep, len - (OF_PACKET_IN_LEN - 2));
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* [OF10] Section 5.4.2 */
 static const u_char *
 of10_flow_removed_print(netdissect_options *ndo,
        return ep;
 }
 
 /* [OF10] Section 5.4.2 */
 static const u_char *
 of10_flow_removed_print(netdissect_options *ndo,

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

        /* match */
        if (ep == (cp = of10_match_print(ndo, "\n\t ", cp, ep)))
                return ep; /* end of snapshot */
        /* cookie */
        /* match */
        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("\n\t cookie 0x%016" PRIx64, GET_BE_U_8(cp));

        cp += 8;
        /* priority */
        cp += 8;
        /* priority */

-       ND_TCHECK2(*cp, 2);
-       if (EXTRACT_16BITS(cp))
-               ND_PRINT((ndo, ", priority %u", EXTRACT_16BITS(cp)));
+       ND_TCHECK_2(cp);
+       if (GET_BE_U_2(cp))
+               ND_PRINT(", priority %u", GET_BE_U_2(cp));

        cp += 2;
        /* reason */
        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(", reason %s",
+                tok2str(ofprr_str, "unknown (0x%02x)", GET_U_1(cp)));

        cp += 1;
        /* pad */
        cp += 1;
        /* pad */

-       ND_TCHECK2(*cp, 1);
+       ND_TCHECK_1(cp);

        cp += 1;
        /* duration_sec */
        cp += 1;
        /* duration_sec */

-       ND_TCHECK2(*cp, 4);
-       ND_PRINT((ndo, ", duration_sec %u", EXTRACT_32BITS(cp)));
+       ND_TCHECK_4(cp);
+       ND_PRINT(", duration_sec %u", GET_BE_U_4(cp));

        cp += 4;
        /* duration_nsec */
        cp += 4;
        /* duration_nsec */

-       ND_TCHECK2(*cp, 4);
-       ND_PRINT((ndo, ", duration_nsec %u", EXTRACT_32BITS(cp)));
+       ND_TCHECK_4(cp);
+       ND_PRINT(", duration_nsec %u", GET_BE_U_4(cp));

        cp += 4;
        /* idle_timeout */
        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 (GET_BE_U_2(cp))
+               ND_PRINT(", idle_timeout %u", GET_BE_U_2(cp));

        cp += 2;
        /* pad2 */
        cp += 2;
        /* pad2 */

-       ND_TCHECK2(*cp, 2);
+       ND_TCHECK_2(cp);

        cp += 2;
        /* packet_count */
        cp += 2;
        /* packet_count */

-       ND_TCHECK2(*cp, 8);
-       ND_PRINT((ndo, ", packet_count %" PRIu64, EXTRACT_64BITS(cp)));
+       ND_TCHECK_8(cp);
+       ND_PRINT(", packet_count %" PRIu64, GET_BE_U_8(cp));

        cp += 8;
        /* byte_count */
        cp += 8;
        /* byte_count */

-       ND_TCHECK2(*cp, 8);
-       ND_PRINT((ndo, ", byte_count %" PRIu64, EXTRACT_64BITS(cp)));
+       ND_TCHECK_8(cp);
+       ND_PRINT(", byte_count %" PRIu64, GET_BE_U_8(cp));

        return cp + 8;
 
 trunc:
        return cp + 8;
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 /* [OF10] Section 5.4.4 */
 static const u_char *
 of10_error_print(netdissect_options *ndo,
        return ep;
 }
 
 /* [OF10] Section 5.4.4 */
 static const u_char *
 of10_error_print(netdissect_options *ndo,

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

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

-       ND_TCHECK2(*cp, 2);
-       type = EXTRACT_16BITS(cp);
+       ND_TCHECK_2(cp);
+       type = GET_BE_U_2(cp);

        cp += 2;
        cp += 2;

-       ND_PRINT((ndo, "\n\t type %s", tok2str(ofpet_str, "invalid (0x%04x)", type)));
+       ND_PRINT("\n\t type %s", tok2str(ofpet_str, "invalid (0x%04x)", type));

        /* code */
        /* code */

-       ND_TCHECK2(*cp, 2);
+       ND_TCHECK_2(cp);

        code_str =
                type == OFPET_HELLO_FAILED    ? ofphfc_str  :
                type == OFPET_BAD_REQUEST     ? ofpbrc_str  :
        code_str =
                type == OFPET_HELLO_FAILED    ? ofphfc_str  :
                type == OFPET_BAD_REQUEST     ? ofpbrc_str  :


@@ -2108,20 +2392,22 @@ of10_error_print(netdissect_options *ndo,
                type == OFPET_PORT_MOD_FAILED ? ofppmfc_str :
                type == OFPET_QUEUE_OP_FAILED ? ofpqofc_str :
                empty_str;
                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(", code %s",
+                tok2str(code_str, "invalid (0x%04x)", GET_BE_U_2(cp)));

        cp += 2;
        /* data */
        return of10_data_print(ndo, cp, ep, len - OF_ERROR_MSG_LEN);
 
 trunc:
        cp += 2;
        /* data */
        return of10_data_print(ndo, cp, ep, len - OF_ERROR_MSG_LEN);
 
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
 
 const u_char *
 of10_header_body_print(netdissect_options *ndo,
                        const u_char *cp, const u_char *ep, const uint8_t type,
        return ep;
 }
 
 const u_char *
 of10_header_body_print(netdissect_options *ndo,
                        const u_char *cp, const u_char *ep, const uint8_t type,

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

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


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

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

 
        /* [OF10] Section 5.1 */
 
        /* [OF10] Section 5.1 */

-       ND_PRINT((ndo, "\n\tversion 1.0, type %s, length %u, xid 0x%08x",
-              tok2str(ofpt_str, "invalid (0x%02x)", type), len, xid));
+       ND_PRINT("\n\tversion 1.0, type %s, length %u, xid 0x%08x",
+              tok2str(ofpt_str, "invalid (0x%02x)", type), len, xid);

        switch (type) {
        /* OpenFlow header only. */
        case OFPT_FEATURES_REQUEST: /* [OF10] Section 5.3.1 */
        switch (type) {
        /* OpenFlow header only. */
        case OFPT_FEATURES_REQUEST: /* [OF10] Section 5.3.1 */


@@ -2141,59 +2427,62 @@ of10_header_body_print(netdissect_options *ndo,
        case OFPT_BARRIER_REQUEST: /* [OF10] Section 5.3.7 */
        case OFPT_BARRIER_REPLY: /* ibid */
                if (len != OF_HEADER_LEN)
        case OFPT_BARRIER_REQUEST: /* [OF10] Section 5.3.7 */
        case OFPT_BARRIER_REPLY: /* ibid */
                if (len != OF_HEADER_LEN)

-                       goto corrupt;
+                       goto invalid;

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

-                       goto corrupt;
+                       goto invalid;

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

-               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("\n\t flags %s",
+                        tok2str(ofp_config_str, "invalid (0x%04x)", GET_BE_U_2(cp)));

                cp += 2;
                /* miss_send_len */
                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(", miss_send_len %u", GET_BE_U_2(cp));

                return cp + 2;
        case OFPT_PORT_MOD:
                if (len != OF_PORT_MOD_LEN)
                return cp + 2;
        case OFPT_PORT_MOD:
                if (len != OF_PORT_MOD_LEN)

-                       goto corrupt;
+                       goto invalid;

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

-                       goto corrupt;
+                       goto invalid;

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

-               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("\n\t port_no %s",
+                        tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

                cp += 2;
                /* pad */
                cp += 2;
                /* pad */

-               ND_TCHECK2(*cp, 2);
+               ND_TCHECK_2(cp);

                return cp + 2;
        case OFPT_FLOW_REMOVED:
                if (len != OF_FLOW_REMOVED_LEN)
                return cp + 2;
        case OFPT_FLOW_REMOVED:
                if (len != OF_FLOW_REMOVED_LEN)

-                       goto corrupt;
+                       goto invalid;

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

-                       goto corrupt;
+                       goto invalid;

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

-               ND_TCHECK2(*cp, 1);
-               ND_PRINT((ndo, "\n\t reason %s", tok2str(ofppr_str, "invalid (0x%02x)", *cp)));
+               ND_TCHECK_1(cp);
+               ND_PRINT("\n\t reason %s",
+                        tok2str(ofppr_str, "invalid (0x%02x)", GET_U_1(cp)));

                cp += 1;
                /* pad */
                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);
                cp += 7;
                /* desc */
                return of10_phy_ports_print(ndo, cp, ep, OF_PHY_PORT_LEN);


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

-                       goto corrupt;
+                       goto invalid;

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


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

-                       goto corrupt;
+                       goto invalid;

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

-                       goto corrupt;
+                       goto invalid;

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

-                       goto corrupt;
+                       goto invalid;

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


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

-                       goto corrupt;
+                       goto invalid;

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


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

-                       goto corrupt;
+                       goto invalid;

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


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

-                       goto corrupt;
+                       goto invalid;

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


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

-                       goto corrupt;
+                       goto invalid;

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


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

-                       goto corrupt;
+                       goto invalid;

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

-               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("\n\t port_no %s",
+                        tok2str(ofpp_str, "%u", GET_BE_U_2(cp)));

                cp += 2;
                /* pad */
                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);
        } /* switch (type) */
        goto next_message;
 
                cp += 6;
                /* queues */
                return of10_queues_print(ndo, cp, ep, len - OF_QUEUE_GET_CONFIG_REPLY_LEN);
        } /* switch (type) */
        goto next_message;
 

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

 next_message:
 next_message:

-       ND_TCHECK2(*cp0, len0 - OF_HEADER_LEN);
+       ND_TCHECK_LEN(cp0, len0 - OF_HEADER_LEN);

        return cp0 + len0 - OF_HEADER_LEN;
 trunc:
        return cp0 + len0 - OF_HEADER_LEN;
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return ep;
 }
        return ep;
 }