Use more the ND_TCHECK_1() macro

[tcpdump] / print-openflow.c

diff --git a/print-openflow.c b/print-openflow.c
index edad214853d509ea0a1acac104cb75f7619c6d54..16d1e18bfaf75c7866a2e9853321d036b783cf4e 100644 (file)
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -30,6 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* \summary: version-independent OpenFlow printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -42,7 +44,6 @@
 #include "oui.h"
 
 static const char tstr[] = " [|openflow]";
-static const char istr[] = " (invalid)";
 
 #define OF_VER_1_0    0x01
 
@@ -84,20 +85,20 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
        if (ep < cp + OF_HEADER_LEN)
                goto invalid;
        /* version */
-       ND_TCHECK2(*cp, 1);
+       ND_TCHECK_1(cp);
        version = *cp;
        cp += 1;
        /* type */
-       ND_TCHECK2(*cp, 1);
+       ND_TCHECK_1(cp);
        type = *cp;
        cp += 1;
        /* length */
-       ND_TCHECK2(*cp, 2);
-       length = EXTRACT_16BITS(cp);
+       ND_TCHECK_2(cp);
+       length = EXTRACT_BE_U_2(cp);
        cp += 2;
        /* xid */
-       ND_TCHECK2(*cp, 4);
-       xid = EXTRACT_32BITS(cp);
+       ND_TCHECK_4(cp);
+       xid = EXTRACT_BE_U_4(cp);
        cp += 4;
        /* Message length includes the header length and a message always includes
         * the basic header. A message length underrun fails decoding of the rest of