Use nd_ types, add EXTRACT_ calls.

[tcpdump] / print-openflow.c

diff --git a/print-openflow.c b/print-openflow.c
index d7682a0ecb71aea312fb9ff645261669aa5bf470..3ef914323460702018225498f83d97621879678f 100644 (file)
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -30,20 +30,20 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

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

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_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]";
 #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
 
 
 #define OF_VER_1_0    0x01
 


@@ -60,42 +60,45 @@ const struct tok onf_exp_str[] = {
 };
 
 const char *
 };
 
 const char *

-of_vendor_name(const uint32_t vendor) {
+of_vendor_name(const uint32_t vendor)
+{

        const struct tok *table = (vendor & 0xff000000) == 0 ? oui_values : onf_exp_str;
        return tok2str(table, "unknown", vendor);
 }
 
 static void
 of_header_print(netdissect_options *ndo, const uint8_t version, const uint8_t type,
        const struct tok *table = (vendor & 0xff000000) == 0 ? oui_values : onf_exp_str;
        return tok2str(table, "unknown", vendor);
 }
 
 static void
 of_header_print(netdissect_options *ndo, const uint8_t version, const uint8_t type,

-                      const uint16_t length, const uint32_t xid) {
+                      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));
 }
 
 /* Print a single OpenFlow message. */
 static const u_char *
        ND_PRINT((ndo, "\n\tversion unknown (0x%02x), type 0x%02x, length %u, xid 0x%08x",
               version, type, length, xid));
 }
 
 /* Print a single OpenFlow message. */
 static const u_char *

-of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
+of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{

        uint8_t version, type;
        uint16_t length;
        uint32_t xid;
 
        if (ep < cp + OF_HEADER_LEN)
        uint8_t version, type;
        uint16_t length;
        uint32_t xid;
 
        if (ep < cp + OF_HEADER_LEN)

-               goto corrupt;
+               goto invalid;

        /* version */
        /* version */

-       ND_TCHECK2(*cp, 1);
-       version = *cp;
+       ND_TCHECK_1(cp);
+       version = EXTRACT_U_1(cp);

        cp += 1;
        /* type */
        cp += 1;
        /* type */

-       ND_TCHECK2(*cp, 1);
-       type = *cp;
+       ND_TCHECK_1(cp);
+       type = EXTRACT_U_1(cp);

        cp += 1;
        /* length */
        cp += 1;
        /* length */

-       ND_TCHECK2(*cp, 2);
-       length = EXTRACT_16BITS(cp);
+       ND_TCHECK_2(cp);
+       length = EXTRACT_BE_U_2(cp);

        cp += 2;
        /* xid */
        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
        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


@@ -104,7 +107,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);
         * 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. */
        }
        /* Decode known protocol versions further without printing the header (the
         * type decoding is version-specific. */


@@ -113,13 +116,13 @@ 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);
                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 */
        }
 
                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((ndo, "%s", istr));
+       ND_TCHECK_LEN(cp, ep - cp);

        return ep;
 trunc:
        ND_PRINT((ndo, "%s", tstr));
        return ep;
 trunc:
        ND_PRINT((ndo, "%s", tstr));


@@ -129,7 +132,8 @@ trunc:
 /* Print a TCP segment worth of OpenFlow messages presuming the segment begins
  * on a message boundary. */
 void
 /* 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)
+{

        const u_char *ep = cp + len;
 
        ND_PRINT((ndo, ": OpenFlow"));
        const u_char *ep = cp + len;
 
        ND_PRINT((ndo, ": OpenFlow"));