diff options
author | Patrick Kelsey <pkelsey@FreeBSD.org> | 2015-07-08 16:19:32 +0000 |
---|---|---|
committer | Patrick Kelsey <pkelsey@FreeBSD.org> | 2015-07-08 16:19:32 +0000 |
commit | 8bdc5a6251ddffc81a013f36b4384c8ace9c4bec (patch) | |
tree | f0c2243cc0a2a59f3eb1354ba3987d4cbcb788bc /contrib/tcpdump/print-openflow.c | |
parent | 6bae05d951855544018d42bbf8c04f3ceea630b8 (diff) | |
parent | 7041091186ddb72670e3e2d8254859ed31d3f2e6 (diff) | |
download | src-8bdc5a6251ddffc81a013f36b4384c8ace9c4bec.tar.gz src-8bdc5a6251ddffc81a013f36b4384c8ace9c4bec.zip |
MFV r285191: tcpdump 4.7.4.
Also, the changes made in r272451 and r272653 that were lost in the
merge of 4.6.2 (r276788) have been restored.
PR: 199568
Differential Revision: https://reviews.freebsd.org/D3007
Reviewed by: brooks, hiren
Approved by: jmallett (mentor)
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=285275
Diffstat (limited to 'contrib/tcpdump/print-openflow.c')
-rw-r--r-- | contrib/tcpdump/print-openflow.c | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/contrib/tcpdump/print-openflow.c b/contrib/tcpdump/print-openflow.c index 9a675855302c..8825ae3d5c87 100644 --- a/contrib/tcpdump/print-openflow.c +++ b/contrib/tcpdump/print-openflow.c @@ -40,22 +40,44 @@ #include "interface.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 +const struct tok onf_exp_str[] = { + { ONF_EXP_ONF, "ONF Extensions" }, + { ONF_EXP_BUTE, "Budapest University of Technology and Economics" }, + { ONF_EXP_NOVIFLOW, "NoviFlow" }, + { ONF_EXP_L3, "L3+ Extensions, Vendor Neutral" }, + { ONF_EXP_L4L7, "L4-L7 Extensions" }, + { ONF_EXP_WMOB, "Wireless and Mobility Extensions" }, + { ONF_EXP_FABS, "Forwarding Abstractions Extensions" }, + { ONF_EXP_OTRANS, "Optical Transport Extensions" }, + { 0, NULL } +}; + +const char * +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 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 * -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; @@ -110,7 +132,8 @@ 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) +{ const u_char *ep = cp + len; ND_PRINT((ndo, ": OpenFlow")); |