Merge pull request #760 from leres/master

[tcpdump] / print-openflow.c

diff --git a/print-openflow.c b/print-openflow.c
index 8825ae3d5c8714a72fc559536f00d59ebf0bf55c..636663365548927dfafd26bacfdc7afb7dc4a6ac 100644 (file)
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -30,20 +30,19 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: version-independent OpenFlow printer */
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "openflow.h"
 #include "oui.h"
 
-static const char tstr[] = " [|openflow]";
-static const char cstr[] = " (corrupt)";
 
 #define OF_VER_1_0    0x01
 
@@ -70,8 +69,8 @@ static void
 of_header_print(netdissect_options *ndo, const uint8_t version, const uint8_t type,
                       const uint16_t length, const uint32_t xid)
 {
-       ND_PRINT((ndo, "\n\tversion unknown (0x%02x), type 0x%02x, length %u, xid 0x%08x",
-              version, type, length, xid));
+       ND_PRINT("\n\tversion unknown (0x%02x), type 0x%02x, length %u, xid 0x%08x",
+              version, type, length, xid);
 }
 
 /* Print a single OpenFlow message. */
@@ -83,22 +82,22 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
        uint32_t xid;
 
        if (ep < cp + OF_HEADER_LEN)
-               goto corrupt;
+               goto invalid;
        /* version */
-       ND_TCHECK2(*cp, 1);
-       version = *cp;
+       ND_TCHECK_1(cp);
+       version = GET_U_1(cp);
        cp += 1;
        /* type */
-       ND_TCHECK2(*cp, 1);
-       type = *cp;
+       ND_TCHECK_1(cp);
+       type = GET_U_1(cp);
        cp += 1;
        /* length */
-       ND_TCHECK2(*cp, 2);
-       length = EXTRACT_16BITS(cp);
+       ND_TCHECK_2(cp);
+       length = GET_BE_U_2(cp);
        cp += 2;
        /* xid */
-       ND_TCHECK2(*cp, 4);
-       xid = EXTRACT_32BITS(cp);
+       ND_TCHECK_4(cp);
+       xid = GET_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
@@ -107,7 +106,7 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
         * segment. */
        if (length < OF_HEADER_LEN) {
                of_header_print(ndo, version, type, length, xid);
-               goto corrupt;
+               goto invalid;
        }
        /* Decode known protocol versions further without printing the header (the
         * type decoding is version-specific. */
@@ -116,27 +115,26 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
                return of10_header_body_print(ndo, cp, ep, type, length, xid);
        default:
                of_header_print(ndo, version, type, length, xid);
-               ND_TCHECK2(*cp, length - OF_HEADER_LEN);
+               ND_TCHECK_LEN(cp, length - OF_HEADER_LEN);
                return cp + length - OF_HEADER_LEN; /* done with current message */
        }
 
-corrupt: /* fail current packet */
-       ND_PRINT((ndo, "%s", cstr));
-       ND_TCHECK2(*cp, ep - cp);
+invalid: /* fail current packet */
+       nd_print_invalid(ndo);
+       ND_TCHECK_LEN(cp, ep - cp);
        return ep;
 trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);
        return ep;
 }
 
 /* Print a TCP segment worth of OpenFlow messages presuming the segment begins
  * on a message boundary. */
 void
-openflow_print(netdissect_options *ndo, const u_char *cp, const u_int len)
+openflow_print(netdissect_options *ndo, const u_char *cp, const u_int len _U_)
 {
-       const u_char *ep = cp + len;
-
-       ND_PRINT((ndo, ": OpenFlow"));
-       while (cp < ep)
-               cp = of_header_body_print(ndo, cp, ep);
+       ndo->ndo_protocol = "openflow";
+       ND_PRINT(": OpenFlow");
+       while (cp < ndo->ndo_snapend)
+               cp = of_header_body_print(ndo, cp, ndo->ndo_snapend);
 }