From ad0c9114e00a9a30168e0c13c17d8f65571aa67f Mon Sep 17 00:00:00 2001 From: glebius Date: Fri, 10 Feb 2017 07:22:12 +0000 Subject: Merge r309649, r313048, r313083, r313104: tcpdump 4.9.0 --- contrib/tcpdump/print-openflow.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'contrib/tcpdump/print-openflow.c') diff --git a/contrib/tcpdump/print-openflow.c b/contrib/tcpdump/print-openflow.c index 8825ae3..043adc2 100644 --- a/contrib/tcpdump/print-openflow.c +++ b/contrib/tcpdump/print-openflow.c @@ -30,20 +30,20 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED +/* \summary: version-independent OpenFlow printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include -#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)"; #define OF_VER_1_0 0x01 @@ -83,7 +83,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 +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); - goto corrupt; + goto invalid; } /* Decode known protocol versions further without printing the header (the * type decoding is version-specific. */ @@ -120,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 */ } -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: -- cgit v1.1