Add program_name field in the netdissect_options structure

[tcpdump] / print-openflow.c

diff --git a/print-openflow.c b/print-openflow.c
index 8825ae3d5c8714a72fc559536f00d59ebf0bf55c..b1315f03476805898d872f2a584ead97ae450ec1 100644 (file)
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -30,20 +30,19 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-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)";
+static const char istr[] = " (invalid)";
 
 #define OF_VER_1_0    0x01
 
@@ -83,7 +82,7 @@ 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;
@@ -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. */
@@ -120,8 +119,8 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
                return cp + length - OF_HEADER_LEN; /* done with current message */
        }
 
-corrupt: /* fail current packet */
-       ND_PRINT((ndo, "%s", cstr));
+invalid: /* fail current packet */
+       ND_PRINT((ndo, "%s", istr));
        ND_TCHECK2(*cp, ep - cp);
        return ep;
 trunc: