X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-util.c;h=9210413a1417f15d78b9e07df12b0f3623f3d932;hb=6e11a6a15519561d932a018b2ca19dc3acee87c2;hp=11836ccdd94a73e91a4394865e96abc340182833;hpb=dfdfc8d43d102f4b5851d26773c1786ee2b13877;p=openvswitch

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index 11836ccd..9210413a 100644
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -20,11 +20,13 @@
 #include <stdlib.h>
 #include "byte-order.h"
 #include "classifier.h"
+#include "multipath.h"
 #include "nx-match.h"
 #include "ofp-util.h"
 #include "ofpbuf.h"
 #include "packets.h"
 #include "random.h"
+#include "type-props.h"
 #include "vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(ofp_util);
@@ -105,7 +107,7 @@ void
 ofputil_cls_rule_from_match(const struct ofp_match *match,
                             unsigned int priority,
                             enum nx_flow_format flow_format,
-                            uint64_t cookie, struct cls_rule *rule)
+                            ovs_be64 cookie, struct cls_rule *rule)
 {
     struct flow_wildcards *wc = &rule->wc;
     unsigned int ofpfw;
@@ -117,19 +119,19 @@ ofputil_cls_rule_from_match(const struct ofp_match *match,
     rule->priority = !ofpfw ? UINT16_MAX : priority;
 
     /* Initialize most of rule->wc. */
+    flow_wildcards_init_catchall(wc);
     wc->wildcards = ofpfw & WC_INVARIANTS;
     if (ofpfw & OFPFW_NW_TOS) {
         wc->wildcards |= FWW_NW_TOS;
     }
-    memset(wc->reg_masks, 0, sizeof wc->reg_masks);
     wc->nw_src_mask = ofputil_wcbits_to_netmask(ofpfw >> OFPFW_NW_SRC_SHIFT);
     wc->nw_dst_mask = ofputil_wcbits_to_netmask(ofpfw >> OFPFW_NW_DST_SHIFT);
 
     if (flow_format == NXFF_TUN_ID_FROM_COOKIE && !(ofpfw & NXFW_TUN_ID)) {
-        rule->flow.tun_id = htonl(ntohll(cookie) >> 32);
+        rule->flow.tun_id = htonll(ntohll(cookie) >> 32);
     } else {
         wc->wildcards |= FWW_TUN_ID;
-        rule->flow.tun_id = 0;
+        rule->flow.tun_id = htonll(0);
     }
 
     if (ofpfw & OFPFW_DL_DST) {
@@ -199,16 +201,21 @@ ofputil_cls_rule_from_match(const struct ofp_match *match,
     cls_rule_zero_wildcarded_fields(rule);
 }
 
-/* Extract 'flow' with 'wildcards' into the OpenFlow match structure
- * 'match'.
+/* Convert 'rule' into the OpenFlow match structure 'match'.  'flow_format'
+ * must either NXFF_OPENFLOW10 or NXFF_TUN_ID_FROM_COOKIE.
  *
- * 'flow_format' must either NXFF_OPENFLOW10 or NXFF_TUN_ID_FROM_COOKIE.  In
- * the latter case only, 'match''s NXFW_TUN_ID bit will be filled in; otherwise
- * it is always set to 0. */
+ * The NXFF_TUN_ID_FROM_COOKIE flow format requires modifying the flow cookie.
+ * This function can help with that, if 'cookie_out' is nonnull.  For
+ * NXFF_OPENFLOW10, or if the tunnel ID is wildcarded, 'cookie_in' will be
+ * copied directly to '*cookie_out'.  For NXFF_TUN_ID_FROM_COOKIE when tunnel
+ * ID is matched, 'cookie_in' will be modified appropriately before setting
+ * '*cookie_out'.
+ */
 void
 ofputil_cls_rule_to_match(const struct cls_rule *rule,
                           enum nx_flow_format flow_format,
-                          struct ofp_match *match)
+                          struct ofp_match *match,
+                          ovs_be64 cookie_in, ovs_be64 *cookie_out)
 {
     const struct flow_wildcards *wc = &rule->wc;
     unsigned int ofpfw;
@@ -220,8 +227,19 @@ ofputil_cls_rule_to_match(const struct cls_rule *rule,
     if (wc->wildcards & FWW_NW_TOS) {
         ofpfw |= OFPFW_NW_TOS;
     }
-    if (flow_format == NXFF_TUN_ID_FROM_COOKIE && wc->wildcards & FWW_TUN_ID) {
-        ofpfw |= NXFW_TUN_ID;
+
+    /* Tunnel ID. */
+    if (flow_format == NXFF_TUN_ID_FROM_COOKIE) {
+        if (wc->wildcards & FWW_TUN_ID) {
+            ofpfw |= NXFW_TUN_ID;
+        } else {
+            uint32_t cookie_lo = ntohll(cookie_in);
+            uint32_t cookie_hi = ntohll(rule->flow.tun_id);
+            cookie_in = htonll(cookie_lo | ((uint64_t) cookie_hi << 32));
+        }
+    }
+    if (cookie_out) {
+        *cookie_out = cookie_in;
     }
 
     /* Translate VLANs. */
@@ -345,7 +363,7 @@ ofputil_lookup_openflow_message(const struct ofputil_msg_category *cat,
         }
     }
 
-    VLOG_WARN_RL(&bad_ofmsg_rl, "received %s of unknown type %u",
+    VLOG_WARN_RL(&bad_ofmsg_rl, "received %s of unknown type %"PRIu32,
                  cat->name, value);
     return cat->missing_error;
 }
@@ -454,7 +472,7 @@ ofputil_decode_nxst_request(const struct ofp_header *oh,
     };
 
     static const struct ofputil_msg_category nxst_request_category = {
-        "Nicira extension statistics",
+        "Nicira extension statistics request",
         nxst_requests, ARRAY_SIZE(nxst_requests),
         OFP_MKERR(OFPET_BAD_REQUEST, OFPBRC_BAD_SUBTYPE)
     };
@@ -488,7 +506,7 @@ ofputil_decode_nxst_reply(const struct ofp_header *oh,
     };
 
     static const struct ofputil_msg_category nxst_reply_category = {
-        "Nicira extension statistics",
+        "Nicira extension statistics reply",
         nxst_replies, ARRAY_SIZE(nxst_replies),
         OFP_MKERR(OFPET_BAD_REQUEST, OFPBRC_BAD_SUBTYPE)
     };
@@ -755,6 +773,452 @@ ofputil_msg_type_code(const struct ofputil_msg_type *type)
 {
     return type->code;
 }
+
+/* Flow formats. */
+
+bool
+ofputil_flow_format_is_valid(enum nx_flow_format flow_format)
+{
+    switch (flow_format) {
+    case NXFF_OPENFLOW10:
+    case NXFF_TUN_ID_FROM_COOKIE:
+    case NXFF_NXM:
+        return true;
+    }
+
+    return false;
+}
+
+const char *
+ofputil_flow_format_to_string(enum nx_flow_format flow_format)
+{
+    switch (flow_format) {
+    case NXFF_OPENFLOW10:
+        return "openflow10";
+    case NXFF_TUN_ID_FROM_COOKIE:
+        return "tun_id_from_cookie";
+    case NXFF_NXM:
+        return "nxm";
+    default:
+        NOT_REACHED();
+    }
+}
+
+int
+ofputil_flow_format_from_string(const char *s)
+{
+    return (!strcmp(s, "openflow10") ? NXFF_OPENFLOW10
+            : !strcmp(s, "tun_id_from_cookie") ? NXFF_TUN_ID_FROM_COOKIE
+            : !strcmp(s, "nxm") ? NXFF_NXM
+            : -1);
+}
+
+static bool
+regs_fully_wildcarded(const struct flow_wildcards *wc)
+{
+    int i;
+
+    for (i = 0; i < FLOW_N_REGS; i++) {
+        if (wc->reg_masks[i] != 0) {
+            return false;
+        }
+    }
+    return true;
+}
+
+/* Returns the minimum nx_flow_format to use for sending 'rule' to a switch
+ * (e.g. to add or remove a flow).  'cookie_support' should be true if the
+ * command to be sent includes a flow cookie (as OFPT_FLOW_MOD does, for
+ * example) or false if the command does not (OFPST_FLOW and OFPST_AGGREGATE do
+ * not, for example).  If 'cookie_support' is true, then 'cookie' should be the
+ * cookie to be sent; otherwise its value is ignored.
+ *
+ * The "best" flow format is chosen on this basis:
+ *
+ *   - It must be capable of expressing the rule.  NXFF_OPENFLOW10 flows can't
+ *     handle tunnel IDs.  NXFF_TUN_ID_FROM_COOKIE flows can't handle registers
+ *     or fixing the Ethernet multicast bit, and can't handle tunnel IDs that
+ *     conflict with the high 32 bits of the cookie or commands that don't
+ *     support cookies.
+ *
+ *   - Otherwise, the chosen format should be as backward compatible as
+ *     possible.  (NXFF_OPENFLOW10 is more backward compatible than
+ *     NXFF_TUN_ID_FROM_COOKIE, which is more backward compatible than
+ *     NXFF_NXM.)
+ */
+enum nx_flow_format
+ofputil_min_flow_format(const struct cls_rule *rule, bool cookie_support,
+                        ovs_be64 cookie)
+{
+    const struct flow_wildcards *wc = &rule->wc;
+    ovs_be32 cookie_hi = htonl(ntohll(cookie) >> 32);
+
+    if (!(wc->wildcards & FWW_DL_DST) != !(wc->wildcards & FWW_ETH_MCAST)
+        || !regs_fully_wildcarded(wc)
+        || (!(wc->wildcards & FWW_TUN_ID)
+            && (!cookie_support
+                || (cookie_hi && cookie_hi != ntohll(rule->flow.tun_id))))) {
+        return NXFF_NXM;
+    } else if (!(wc->wildcards & FWW_TUN_ID)) {
+        return NXFF_TUN_ID_FROM_COOKIE;
+    } else {
+        return NXFF_OPENFLOW10;
+    }
+}
+
+/* Returns an OpenFlow message that can be used to set the flow format to
+ * 'flow_format'.  */
+struct ofpbuf *
+ofputil_make_set_flow_format(enum nx_flow_format flow_format)
+{
+    struct ofpbuf *msg;
+
+    if (flow_format == NXFF_OPENFLOW10
+        || flow_format == NXFF_TUN_ID_FROM_COOKIE) {
+        struct nxt_tun_id_cookie *tic;
+
+        tic = make_nxmsg(sizeof *tic, NXT_TUN_ID_FROM_COOKIE, &msg);
+        tic->set = flow_format == NXFF_TUN_ID_FROM_COOKIE;
+    } else {
+        struct nxt_set_flow_format *sff;
+
+        sff = make_nxmsg(sizeof *sff, NXT_SET_FLOW_FORMAT, &msg);
+        sff->format = htonl(flow_format);
+    }
+
+    return msg;
+}
+
+/* Converts an OFPT_FLOW_MOD or NXT_FLOW_MOD message 'oh' into an abstract
+ * flow_mod in 'fm'.  Returns 0 if successful, otherwise an OpenFlow error
+ * code.
+ *
+ * For OFPT_FLOW_MOD messages, 'flow_format' should be the current flow format
+ * at the time when the message was received.  Otherwise 'flow_format' is
+ * ignored.
+ *
+ * Does not validate the flow_mod actions. */
+int
+ofputil_decode_flow_mod(struct flow_mod *fm, const struct ofp_header *oh,
+                        enum nx_flow_format flow_format)
+{
+    const struct ofputil_msg_type *type;
+    struct ofpbuf b;
+
+    ofpbuf_use_const(&b, oh, ntohs(oh->length));
+
+    ofputil_decode_msg_type(oh, &type);
+    if (ofputil_msg_type_code(type) == OFPUTIL_OFPT_FLOW_MOD) {
+        /* Standard OpenFlow flow_mod. */
+        struct ofp_match match, orig_match;
+        const struct ofp_flow_mod *ofm;
+        int error;
+
+        /* Dissect the message. */
+        ofm = ofpbuf_pull(&b, sizeof *ofm);
+        error = ofputil_pull_actions(&b, b.size, &fm->actions, &fm->n_actions);
+        if (error) {
+            return error;
+        }
+
+        /* Normalize ofm->match.  If normalization actually changes anything,
+         * then log the differences. */
+        match = ofm->match;
+        match.pad1[0] = match.pad2[0] = 0;
+        orig_match = match;
+        normalize_match(&match);
+        if (memcmp(&match, &orig_match, sizeof orig_match)) {
+            if (!VLOG_DROP_INFO(&bad_ofmsg_rl)) {
+                char *old = ofp_match_to_literal_string(&orig_match);
+                char *new = ofp_match_to_literal_string(&match);
+                VLOG_INFO("normalization changed ofp_match, details:");
+                VLOG_INFO(" pre: %s", old);
+                VLOG_INFO("post: %s", new);
+                free(old);
+                free(new);
+            }
+        }
+
+        /* Translate the message. */
+        ofputil_cls_rule_from_match(&match, ntohs(ofm->priority), flow_format,
+                                    ofm->cookie, &fm->cr);
+        fm->cookie = ofm->cookie;
+        fm->command = ntohs(ofm->command);
+        fm->idle_timeout = ntohs(ofm->idle_timeout);
+        fm->hard_timeout = ntohs(ofm->hard_timeout);
+        fm->buffer_id = ntohl(ofm->buffer_id);
+        fm->out_port = ntohs(ofm->out_port);
+        fm->flags = ntohs(ofm->flags);
+    } else if (ofputil_msg_type_code(type) == OFPUTIL_NXT_FLOW_MOD) {
+        /* Nicira extended flow_mod. */
+        const struct nx_flow_mod *nfm;
+        int error;
+
+        /* Dissect the message. */
+        nfm = ofpbuf_pull(&b, sizeof *nfm);
+        error = nx_pull_match(&b, ntohs(nfm->match_len), ntohs(nfm->priority),
+                              &fm->cr);
+        if (error) {
+            return error;
+        }
+        error = ofputil_pull_actions(&b, b.size, &fm->actions, &fm->n_actions);
+        if (error) {
+            return error;
+        }
+
+        /* Translate the message. */
+        fm->cookie = nfm->cookie;
+        fm->command = ntohs(nfm->command);
+        fm->idle_timeout = ntohs(nfm->idle_timeout);
+        fm->hard_timeout = ntohs(nfm->hard_timeout);
+        fm->buffer_id = ntohl(nfm->buffer_id);
+        fm->out_port = ntohs(nfm->out_port);
+        fm->flags = ntohs(nfm->flags);
+    } else {
+        NOT_REACHED();
+    }
+
+    return 0;
+}
+
+/* Converts 'fm' into an OFPT_FLOW_MOD or NXT_FLOW_MOD message according to
+ * 'flow_format' and returns the message. */
+struct ofpbuf *
+ofputil_encode_flow_mod(const struct flow_mod *fm,
+                        enum nx_flow_format flow_format)
+{
+    size_t actions_len = fm->n_actions * sizeof *fm->actions;
+    struct ofpbuf *msg;
+
+    if (flow_format == NXFF_OPENFLOW10
+        || flow_format == NXFF_TUN_ID_FROM_COOKIE) {
+        struct ofp_flow_mod *ofm;
+
+        msg = ofpbuf_new(sizeof *ofm + actions_len);
+        ofm = put_openflow(sizeof *ofm, OFPT_FLOW_MOD, msg);
+        ofputil_cls_rule_to_match(&fm->cr, flow_format, &ofm->match,
+                                  fm->cookie, &ofm->cookie);
+        ofm->command = htons(fm->command);
+        ofm->idle_timeout = htons(fm->idle_timeout);
+        ofm->hard_timeout = htons(fm->hard_timeout);
+        ofm->priority = htons(fm->cr.priority);
+        ofm->buffer_id = htonl(fm->buffer_id);
+        ofm->out_port = htons(fm->out_port);
+        ofm->flags = htons(fm->flags);
+    } else if (flow_format == NXFF_NXM) {
+        struct nx_flow_mod *nfm;
+        int match_len;
+
+        msg = ofpbuf_new(sizeof *nfm + NXM_TYPICAL_LEN + actions_len);
+        put_nxmsg(sizeof *nfm, NXT_FLOW_MOD, msg);
+        match_len = nx_put_match(msg, &fm->cr);
+
+        nfm = msg->data;
+        nfm->cookie = fm->cookie;
+        nfm->command = htons(fm->command);
+        nfm->idle_timeout = htons(fm->idle_timeout);
+        nfm->hard_timeout = htons(fm->hard_timeout);
+        nfm->priority = htons(fm->cr.priority);
+        nfm->buffer_id = htonl(fm->buffer_id);
+        nfm->out_port = htons(fm->out_port);
+        nfm->flags = htons(fm->flags);
+        nfm->match_len = htons(match_len);
+    } else {
+        NOT_REACHED();
+    }
+
+    ofpbuf_put(msg, fm->actions, actions_len);
+    update_openflow_length(msg);
+    return msg;
+}
+
+static int
+ofputil_decode_ofpst_flow_request(struct flow_stats_request *fsr,
+                                  const struct ofp_header *oh,
+                                  enum nx_flow_format flow_format,
+                                  bool aggregate)
+{
+    const struct ofp_flow_stats_request *ofsr = ofputil_stats_body(oh);
+
+    fsr->aggregate = aggregate;
+    ofputil_cls_rule_from_match(&ofsr->match, 0, flow_format, 0, &fsr->match);
+    fsr->out_port = ntohs(ofsr->out_port);
+    fsr->table_id = ofsr->table_id;
+
+    return 0;
+}
+
+static int
+ofputil_decode_nxst_flow_request(struct flow_stats_request *fsr,
+                                 const struct ofp_header *oh,
+                                 bool aggregate)
+{
+    const struct nx_flow_stats_request *nfsr;
+    struct ofpbuf b;
+    int error;
+
+    ofpbuf_use_const(&b, oh, ntohs(oh->length));
+
+    nfsr = ofpbuf_pull(&b, sizeof *nfsr);
+    error = nx_pull_match(&b, ntohs(nfsr->match_len), 0, &fsr->match);
+    if (error) {
+        return error;
+    }
+    if (b.size) {
+        return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN);
+    }
+
+    fsr->aggregate = aggregate;
+    fsr->out_port = ntohs(nfsr->out_port);
+    fsr->table_id = nfsr->table_id;
+
+    return 0;
+}
+
+/* Converts an OFPST_FLOW, OFPST_AGGREGATE, NXST_FLOW, or NXST_AGGREGATE
+ * message 'oh', received when the current flow format was 'flow_format', into
+ * an abstract flow_stats_request in 'fsr'.  Returns 0 if successful, otherwise
+ * an OpenFlow error code.
+ *
+ * For OFPST_FLOW and OFPST_AGGREGATE messages, 'flow_format' should be the
+ * current flow format at the time when the message was received.  Otherwise
+ * 'flow_format' is ignored. */
+int
+ofputil_decode_flow_stats_request(struct flow_stats_request *fsr,
+                                  const struct ofp_header *oh,
+                                  enum nx_flow_format flow_format)
+{
+    const struct ofputil_msg_type *type;
+    struct ofpbuf b;
+    int code;
+
+    ofpbuf_use_const(&b, oh, ntohs(oh->length));
+
+    ofputil_decode_msg_type(oh, &type);
+    code = ofputil_msg_type_code(type);
+    switch (code) {
+    case OFPUTIL_OFPST_FLOW_REQUEST:
+        return ofputil_decode_ofpst_flow_request(fsr, oh, flow_format, false);
+
+    case OFPUTIL_OFPST_AGGREGATE_REQUEST:
+        return ofputil_decode_ofpst_flow_request(fsr, oh, flow_format, true);
+
+    case OFPUTIL_NXST_FLOW_REQUEST:
+        return ofputil_decode_nxst_flow_request(fsr, oh, false);
+
+    case OFPUTIL_NXST_AGGREGATE_REQUEST:
+        return ofputil_decode_nxst_flow_request(fsr, oh, true);
+
+    default:
+        /* Hey, the caller lied. */
+        NOT_REACHED();
+    }
+}
+
+/* Converts abstract flow_stats_request 'fsr' into an OFPST_FLOW,
+ * OFPST_AGGREGATE, NXST_FLOW, or NXST_AGGREGATE message 'oh' according to
+ * 'flow_format', and returns the message. */
+struct ofpbuf *
+ofputil_encode_flow_stats_request(const struct flow_stats_request *fsr,
+                                  enum nx_flow_format flow_format)
+{
+    struct ofpbuf *msg;
+
+    if (flow_format == NXFF_OPENFLOW10
+        || flow_format == NXFF_TUN_ID_FROM_COOKIE) {
+        struct ofp_flow_stats_request *ofsr;
+        int type;
+
+        BUILD_ASSERT_DECL(sizeof(struct ofp_flow_stats_request)
+                          == sizeof(struct ofp_aggregate_stats_request));
+
+        type = fsr->aggregate ? OFPST_AGGREGATE : OFPST_FLOW;
+        ofsr = ofputil_make_stats_request(sizeof *ofsr, type, &msg);
+        ofputil_cls_rule_to_match(&fsr->match, flow_format, &ofsr->match,
+                                  0, NULL);
+        ofsr->table_id = fsr->table_id;
+        ofsr->out_port = htons(fsr->out_port);
+    } else if (flow_format == NXFF_NXM) {
+        struct nx_flow_stats_request *nfsr;
+        int match_len;
+        int subtype;
+
+        subtype = fsr->aggregate ? NXST_AGGREGATE : NXST_FLOW;
+        ofputil_make_nxstats_request(sizeof *nfsr, subtype, &msg);
+        match_len = nx_put_match(msg, &fsr->match);
+
+        nfsr = msg->data;
+        nfsr->out_port = htons(fsr->out_port);
+        nfsr->match_len = htons(match_len);
+        nfsr->table_id = fsr->table_id;
+    } else {
+        NOT_REACHED();
+    }
+
+    return msg;
+}
+
+/* Converts an OFPT_FLOW_REMOVED or NXT_FLOW_REMOVED message 'oh', received
+ * when the current flow format was 'flow_format', into an abstract
+ * ofputil_flow_removed in 'fr'.  Returns 0 if successful, otherwise an
+ * OpenFlow error code.
+ *
+ * For OFPT_FLOW_REMOVED messages, 'flow_format' should be the current flow
+ * format at the time when the message was received.  Otherwise 'flow_format'
+ * is ignored. */
+int
+ofputil_decode_flow_removed(struct ofputil_flow_removed *fr,
+                            const struct ofp_header *oh,
+                            enum nx_flow_format flow_format)
+{
+    const struct ofputil_msg_type *type;
+    enum ofputil_msg_code code;
+
+    ofputil_decode_msg_type(oh, &type);
+    code = ofputil_msg_type_code(type);
+    if (code == OFPUTIL_OFPT_FLOW_REMOVED) {
+        const struct ofp_flow_removed *ofr;
+
+        ofr = (const struct ofp_flow_removed *) oh;
+        ofputil_cls_rule_from_match(&ofr->match, ntohs(ofr->priority),
+                                    flow_format, ofr->cookie, &fr->rule);
+        fr->cookie = ofr->cookie;
+        fr->reason = ofr->reason;
+        fr->duration_sec = ntohl(ofr->duration_sec);
+        fr->duration_nsec = ntohl(ofr->duration_nsec);
+        fr->idle_timeout = ntohs(ofr->idle_timeout);
+        fr->packet_count = ntohll(ofr->packet_count);
+        fr->byte_count = ntohll(ofr->byte_count);
+    } else if (code == OFPUTIL_NXT_FLOW_REMOVED) {
+        struct nx_flow_removed *nfr;
+        struct ofpbuf b;
+        int error;
+
+        ofpbuf_use_const(&b, oh, ntohs(oh->length));
+
+        nfr = ofpbuf_pull(&b, sizeof *nfr);
+        error = nx_pull_match(&b, ntohs(nfr->match_len), ntohs(nfr->priority),
+                              &fr->rule);
+        if (error) {
+            return error;
+        }
+        if (b.size) {
+            return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN);
+        }
+
+        fr->cookie = nfr->cookie;
+        fr->reason = nfr->reason;
+        fr->duration_sec = ntohl(nfr->duration_sec);
+        fr->duration_nsec = ntohl(nfr->duration_nsec);
+        fr->idle_timeout = ntohs(nfr->idle_timeout);
+        fr->packet_count = ntohll(nfr->packet_count);
+        fr->byte_count = ntohll(nfr->byte_count);
+    } else {
+        NOT_REACHED();
+    }
+
+    return 0;
+}
 
 /* Returns a string representing the message type of 'type'.  The string is the
  * enumeration constant for the type, e.g. "OFPT_HELLO".  For statistics
@@ -947,6 +1411,22 @@ ofputil_stats_body_len(const struct ofp_header *oh)
     return ntohs(oh->length) - sizeof(struct ofp_stats_request);
 }
 
+/* Returns the first byte of the body of the nicira_stats_msg in 'oh'. */
+const void *
+ofputil_nxstats_body(const struct ofp_header *oh)
+{
+    assert(oh->type == OFPT_STATS_REQUEST || oh->type == OFPT_STATS_REPLY);
+    return ((const struct nicira_stats_msg *) oh) + 1;
+}
+
+/* Returns the length of the body of the nicira_stats_msg in 'oh'. */
+size_t
+ofputil_nxstats_body_len(const struct ofp_header *oh)
+{
+    assert(oh->type == OFPT_STATS_REQUEST || oh->type == OFPT_STATS_REPLY);
+    return ntohs(oh->length) - sizeof(struct nicira_stats_msg);
+}
+
 struct ofpbuf *
 make_flow_mod(uint16_t command, const struct cls_rule *rule,
               size_t actions_len)
@@ -960,7 +1440,7 @@ make_flow_mod(uint16_t command, const struct cls_rule *rule,
     ofm->header.length = htons(size);
     ofm->cookie = 0;
     ofm->priority = htons(MIN(rule->priority, UINT16_MAX));
-    ofputil_cls_rule_to_match(rule, NXFF_OPENFLOW10, &ofm->match);
+    ofputil_cls_rule_to_match(rule, NXFF_OPENFLOW10, &ofm->match, 0, NULL);
     ofm->command = htons(command);
     return out;
 }
@@ -1157,9 +1637,23 @@ check_action_exact_len(const union ofp_action *a, unsigned int len,
                        unsigned int required_len)
 {
     if (len != required_len) {
-        VLOG_DBG_RL(&bad_ofmsg_rl,
-                    "action %u has invalid length %"PRIu16" (must be %u)\n",
-                    a->type, ntohs(a->header.len), required_len);
+        VLOG_WARN_RL(&bad_ofmsg_rl, "action %"PRIu16" has invalid length "
+                     "%"PRIu16" (must be %u)\n",
+                     ntohs(a->type), ntohs(a->header.len), required_len);
+        return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_LEN);
+    }
+    return 0;
+}
+
+static int
+check_nx_action_exact_len(const struct nx_action_header *a,
+                          unsigned int len, unsigned int required_len)
+{
+    if (len != required_len) {
+        VLOG_WARN_RL(&bad_ofmsg_rl,
+                     "Nicira action %"PRIu16" has invalid length %"PRIu16" "
+                     "(must be %u)\n",
+                     ntohs(a->subtype), ntohs(a->len), required_len);
         return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_LEN);
     }
     return 0;
@@ -1220,34 +1714,42 @@ check_nicira_action(const union ofp_action *a, unsigned int len,
                     const struct flow *flow)
 {
     const struct nx_action_header *nah;
+    uint16_t subtype;
     int error;
 
     if (len < 16) {
-        VLOG_DBG_RL(&bad_ofmsg_rl,
-                    "Nicira vendor action only %u bytes", len);
+        VLOG_WARN_RL(&bad_ofmsg_rl,
+                     "Nicira vendor action only %u bytes", len);
         return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_LEN);
     }
     nah = (const struct nx_action_header *) a;
 
-    switch (ntohs(nah->subtype)) {
+    subtype = ntohs(nah->subtype);
+    if (subtype > TYPE_MAXIMUM(enum nx_action_subtype)) {
+        /* This is necessary because enum nx_action_subtype is probably an
+         * 8-bit type, so the cast below throws away the top 8 bits. */
+        return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR_TYPE);
+    }
+
+    switch ((enum nx_action_subtype) subtype) {
     case NXAST_RESUBMIT:
     case NXAST_SET_TUNNEL:
     case NXAST_DROP_SPOOFED_ARP:
     case NXAST_SET_QUEUE:
     case NXAST_POP_QUEUE:
-        return check_action_exact_len(a, len, 16);
+        return check_nx_action_exact_len(nah, len, 16);
 
     case NXAST_REG_MOVE:
-        error = check_action_exact_len(a, len,
-                                       sizeof(struct nx_action_reg_move));
+        error = check_nx_action_exact_len(nah, len,
+                                          sizeof(struct nx_action_reg_move));
         if (error) {
             return error;
         }
         return nxm_check_reg_move((const struct nx_action_reg_move *) a, flow);
 
     case NXAST_REG_LOAD:
-        error = check_action_exact_len(a, len,
-                                       sizeof(struct nx_action_reg_load));
+        error = check_nx_action_exact_len(nah, len,
+                                          sizeof(struct nx_action_reg_load));
         if (error) {
             return error;
         }
@@ -1256,7 +1758,23 @@ check_nicira_action(const union ofp_action *a, unsigned int len,
     case NXAST_NOTE:
         return 0;
 
+    case NXAST_SET_TUNNEL64:
+        return check_nx_action_exact_len(
+            nah, len, sizeof(struct nx_action_set_tunnel64));
+
+    case NXAST_MULTIPATH:
+        error = check_nx_action_exact_len(
+            nah, len, sizeof(struct nx_action_multipath));
+        if (error) {
+            return error;
+        }
+        return multipath_check((const struct nx_action_multipath *) a);
+
+    case NXAST_SNAT__OBSOLETE:
     default:
+        VLOG_WARN_RL(&bad_ofmsg_rl,
+                     "unknown Nicira vendor action subtype %"PRIu16,
+                     ntohs(nah->subtype));
         return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR_TYPE);
     }
 }
@@ -1265,9 +1783,10 @@ static int
 check_action(const union ofp_action *a, unsigned int len,
              const struct flow *flow, int max_ports)
 {
+    enum ofp_action_type type = ntohs(a->type);
     int error;
 
-    switch (ntohs(a->type)) {
+    switch (type) {
     case OFPAT_OUTPUT:
         error = check_action_exact_len(a, len, 8);
         if (error) {
@@ -1316,8 +1835,7 @@ check_action(const union ofp_action *a, unsigned int len,
         return check_enqueue_action(a, len, max_ports);
 
     default:
-        VLOG_WARN_RL(&bad_ofmsg_rl, "unknown action type %"PRIu16,
-                ntohs(a->type));
+        VLOG_WARN_RL(&bad_ofmsg_rl, "unknown action type %d", (int) type);
         return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_TYPE);
     }
 }
@@ -1336,16 +1854,16 @@ validate_actions(const union ofp_action *actions, size_t n_actions,
         int error;
 
         if (n_slots > slots_left) {
-            VLOG_DBG_RL(&bad_ofmsg_rl,
-                        "action requires %u slots but only %u remain",
-                        n_slots, slots_left);
+            VLOG_WARN_RL(&bad_ofmsg_rl,
+                         "action requires %u slots but only %u remain",
+                         n_slots, slots_left);
             return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_LEN);
         } else if (!len) {
-            VLOG_DBG_RL(&bad_ofmsg_rl, "action has invalid length 0");
+            VLOG_WARN_RL(&bad_ofmsg_rl, "action has invalid length 0");
             return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_LEN);
         } else if (len % OFP_ACTION_ALIGN) {
-            VLOG_DBG_RL(&bad_ofmsg_rl, "action length %u is not a multiple "
-                        "of %d", len, OFP_ACTION_ALIGN);
+            VLOG_WARN_RL(&bad_ofmsg_rl, "action length %u is not a multiple "
+                         "of %d", len, OFP_ACTION_ALIGN);
             return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_LEN);
         }
 
@@ -1592,13 +2110,14 @@ make_ofp_error_msg(int error, const struct ofp_header *oh)
         oem->type = htons(NXET_VENDOR);
         oem->code = htons(NXVC_VENDOR_ERROR);
 
-        nve = ofpbuf_put_uninit(buf, sizeof *nve);
+        nve = (struct nx_vendor_error *)oem->data;
         nve->vendor = htonl(vendor_id);
         nve->type = htons(type);
         nve->code = htons(code);
     }
 
     if (len) {
+        buf->size -= len;
         ofpbuf_put(buf, data, len);
     }
 
@@ -1621,16 +2140,16 @@ ofputil_pull_actions(struct ofpbuf *b, unsigned int actions_len,
                      union ofp_action **actionsp, size_t *n_actionsp)
 {
     if (actions_len % OFP_ACTION_ALIGN != 0) {
-        VLOG_DBG_RL(&bad_ofmsg_rl, "OpenFlow message actions length %u "
-                    "is not a multiple of %d", actions_len, OFP_ACTION_ALIGN);
+        VLOG_WARN_RL(&bad_ofmsg_rl, "OpenFlow message actions length %u "
+                     "is not a multiple of %d", actions_len, OFP_ACTION_ALIGN);
         goto error;
     }
 
     *actionsp = ofpbuf_try_pull(b, actions_len);
     if (*actionsp == NULL) {
-        VLOG_DBG_RL(&bad_ofmsg_rl, "OpenFlow message actions length %u "
-                    "exceeds remaining message length (%zu)",
-                    actions_len, b->size);
+        VLOG_WARN_RL(&bad_ofmsg_rl, "OpenFlow message actions length %u "
+                     "exceeds remaining message length (%zu)",
+                     actions_len, b->size);
         goto error;
     }