do not warn about extra lines in stderr if there is a stderr file that was compared

[tcpdump] / print-openflow.c

diff --git a/print-openflow.c b/print-openflow.c
index d7682a0ecb71aea312fb9ff645261669aa5bf470..0b80981ee069cbc1ea1b367ea36d60437bf386d0 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,27 +60,30 @@ 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 */
        ND_TCHECK2(*cp, 1);
        version = *cp;
        /* version */
        ND_TCHECK2(*cp, 1);
        version = *cp;


@@ -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. */


@@ -117,8 +120,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 */
        }
 
                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:
        ND_TCHECK2(*cp, ep - cp);
        return ep;
 trunc:


@@ -129,10 +132,9 @@ 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) {
-       const u_char *ep = cp + len;
-
+openflow_print(netdissect_options *ndo, const u_char *cp, const u_int len _U_)
+{

        ND_PRINT((ndo, ": OpenFlow"));
        ND_PRINT((ndo, ": OpenFlow"));

-       while (cp < ep)
-               cp = of_header_body_print(ndo, cp, ep);
+       while (cp < ndo->ndo_snapend)
+               cp = of_header_body_print(ndo, cp, ndo->ndo_snapend);

 }
 }