Use more the EXTRACT_8BITS() macro to fetch a one-byte value (17/n)

[tcpdump] / print-openflow.c

diff --git a/print-openflow.c b/print-openflow.c
index 233efc99c53946505c04714d41c7c8d8524ef87d..4918faf7d3b329b178813355b0e3f31d3981d39b 100644 (file)
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -30,11 +30,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* \summary: version-independent OpenFlow printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include "netdissect.h"
 #include "extract.h"
@@ -42,7 +44,6 @@
 #include "oui.h"
 
 static const char tstr[] = " [|openflow]";
-static const char cstr[] = " (invalid)";
 
 #define OF_VER_1_0    0x01
 
@@ -93,11 +94,11 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
        cp += 1;
        /* length */
        ND_TCHECK2(*cp, 2);
-       length = EXTRACT_16BITS(cp);
+       length = EXTRACT_BE_16BITS(cp);
        cp += 2;
        /* xid */
        ND_TCHECK2(*cp, 4);
-       xid = EXTRACT_32BITS(cp);
+       xid = EXTRACT_BE_32BITS(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
@@ -120,7 +121,7 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
        }
 
 invalid: /* fail current packet */
-       ND_PRINT((ndo, "%s", cstr));
+       ND_PRINT((ndo, "%s", istr));
        ND_TCHECK2(*cp, ep - cp);
        return ep;
 trunc: