ofp-util: Allow encoding of Open Flow 1.1 & 1.2 Barrier Request Messages

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index 5d92e9f2fe3c646626dfc180b9e9282016b94687..c1e8ce4ec121a7fce37a326076d7838392c0af6a 100644 (file)
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -2996,9 +2996,25 @@ make_echo_reply(const struct ofp_header *rq)
 }
 
 struct ofpbuf *
-ofputil_encode_barrier_request(void)
+ofputil_encode_barrier_request(enum ofp_version ofp_version)
 {
-    return ofpraw_alloc(OFPRAW_OFPT10_BARRIER_REQUEST, OFP10_VERSION, 0);
+    enum ofpraw type;
+
+    switch (ofp_version) {
+    case OFP12_VERSION:
+    case OFP11_VERSION:
+        type = OFPRAW_OFPT11_BARRIER_REQUEST;
+        break;
+
+    case OFP10_VERSION:
+        type = OFPRAW_OFPT10_BARRIER_REQUEST;
+        break;
+
+    default:
+        NOT_REACHED();
+    }
+
+    return ofpraw_alloc(type, ofp_version, 0);
 }
 
 const char *

diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index 032b156dea2091a2a014fbe9592f1e6e61737a5f..18cee7a32b6bd389b6debc24763a66431acff9f9 100644 (file)
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -497,7 +497,7 @@ void ofputil_append_port_desc_stats_reply(enum ofp_version ofp_version,
 struct ofpbuf *make_echo_request(void);
 struct ofpbuf *make_echo_reply(const struct ofp_header *rq);
 
-struct ofpbuf *ofputil_encode_barrier_request(void);
+struct ofpbuf *ofputil_encode_barrier_request(enum ofp_version);
 
 const char *ofputil_frag_handling_to_string(enum ofp_config_flags);
 bool ofputil_frag_handling_from_string(const char *, enum ofp_config_flags *);

diff --git a/lib/vconn.c b/lib/vconn.c
index cbe3c77131d63f2d32a9a4a420bbf1982d74d0a4..b2d81e93cc7f8e4e09a0363ed8d3dea4ffcb962b 100644 (file)
--- a/lib/vconn.c
+++ b/lib/vconn.c
@@ -756,7 +756,7 @@ vconn_transact_noreply(struct vconn *vconn, struct ofpbuf *request,
     }
 
     /* Send barrier. */
-    barrier = ofputil_encode_barrier_request();
+    barrier = ofputil_encode_barrier_request(vconn_get_version(vconn));
     barrier_xid = ((struct ofp_header *) barrier->data)->xid;
     error = vconn_send_block(vconn, barrier);
     if (error) {

diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
index 61d02669146fb24037886c5b33a1b20d20f7fd6f..b4f4483594c4a2436158873fde3ed3768259e8bd 100644 (file)
--- a/utilities/ovs-ofctl.c
+++ b/utilities/ovs-ofctl.c
@@ -1217,7 +1217,7 @@ ofctl_barrier(struct unixctl_conn *conn, int argc OVS_UNUSED,
         return;
     }
 
-    msg = ofputil_encode_barrier_request();
+    msg = ofputil_encode_barrier_request(vconn_get_version(aux->vconn));
     error = vconn_send_block(aux->vconn, msg);
     if (error) {
         ofpbuf_delete(msg);