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 233efc99c53946505c04714d41c7c8d8524ef87d..0b80981ee069cbc1ea1b367ea36d60437bf386d0 100644 (file)
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -30,11 +30,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* \summary: version-independent OpenFlow printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include "netdissect.h"
 #include "extract.h"
@@ -42,7 +44,6 @@
 #include "oui.h"
 
 static const char tstr[] = " [|openflow]";
-static const char cstr[] = " (invalid)";
 
 #define OF_VER_1_0    0x01
 
@@ -120,7 +121,7 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
        }
 
 invalid: /* fail current packet */
-       ND_PRINT((ndo, "%s", cstr));
+       ND_PRINT((ndo, "%s", istr));
        ND_TCHECK2(*cp, ep - cp);
        return ep;
 trunc:
@@ -131,11 +132,9 @@ trunc:
 /* 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);
+       while (cp < ndo->ndo_snapend)
+               cp = of_header_body_print(ndo, cp, ndo->ndo_snapend);
 }