Merge pull request #760 from leres/master

[tcpdump] / print-openflow.c

diff --git a/print-openflow.c b/print-openflow.c
index 3ef914323460702018225498f83d97621879678f..636663365548927dfafd26bacfdc7afb7dc4a6ac 100644 (file)
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -33,17 +33,16 @@
 /* \summary: version-independent OpenFlow printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
 #include "openflow.h"
 #include "oui.h"
 
-static const char tstr[] = " [|openflow]";
 
 #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. */
@@ -86,19 +85,19 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
                goto invalid;
        /* version */
        ND_TCHECK_1(cp);
-       version = EXTRACT_U_1(cp);
+       version = GET_U_1(cp);
        cp += 1;
        /* type */
        ND_TCHECK_1(cp);
-       type = EXTRACT_U_1(cp);
+       type = GET_U_1(cp);
        cp += 1;
        /* length */
        ND_TCHECK_2(cp);
-       length = EXTRACT_BE_U_2(cp);
+       length = GET_BE_U_2(cp);
        cp += 2;
        /* xid */
        ND_TCHECK_4(cp);
-       xid = EXTRACT_BE_U_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
@@ -121,22 +120,21 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
        }
 
 invalid: /* fail current packet */
-       ND_PRINT((ndo, "%s", istr));
+       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);
 }