make sure that EXIT code is appended to results file

[tcpdump] / print-openflow.c

diff --git a/print-openflow.c b/print-openflow.c
index 9a675855302c2a0765101fce97483ab5462f1a61..8825ae3d5c8714a72fc559536f00d59ebf0bf55c 100644 (file)
--- a/print-openflow.c
+++ b/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"));