Reviewed-by: Joe Stringer <j...@wand.net.nz>
Signed-off-by: Ben Pfaff <b...@nicira.com>
---
v4: Fix build errors, test failures.
---
include/openflow/openflow-1.0.h | 4 +---
include/openflow/openflow-1.1.h | 4 +---
include/openflow/openflow-common.h | 4 ++++
lib/ofp-util.c | 10 +++++-----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/openflow/openflow-1.0.h b/include/openflow/openflow-1.0.h
index 831f6a9..2ee356d 100644
--- a/include/openflow/openflow-1.0.h
+++ b/include/openflow/openflow-1.0.h
@@ -47,9 +47,7 @@ enum ofp_port {
* types. */
enum ofp10_type {
/* Controller command messages. */
- OFPT10_PACKET_OUT = 13, /* Controller/switch message */
- OFPT10_FLOW_MOD, /* Controller/switch message */
- OFPT10_PORT_MOD, /* Controller/switch message */
+ OFPT10_PORT_MOD = 15, /* Controller/switch message */
/* Statistics messages. */
OFPT10_STATS_REQUEST, /* Controller/switch message */
diff --git a/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h
index 8461dad..f0c063b 100644
--- a/include/openflow/openflow-1.1.h
+++ b/include/openflow/openflow-1.1.h
@@ -74,9 +74,7 @@
* types. */
enum ofp11_type {
/* Controller command messages. */
- OFPT11_PACKET_OUT = 13, /* Controller/switch message */
- OFPT11_FLOW_MOD, /* Controller/switch message */
- OFPT11_GROUP_MOD, /* Controller/switch message */
+ OFPT11_GROUP_MOD = 15, /* Controller/switch message */
OFPT11_PORT_MOD, /* Controller/switch message */
OFPT11_TABLE_MOD, /* Controller/switch message */
diff --git a/include/openflow/openflow-common.h
b/include/openflow/openflow-common.h
index 3dc76cc..9788af1 100644
--- a/include/openflow/openflow-common.h
+++ b/include/openflow/openflow-common.h
@@ -103,6 +103,10 @@ enum ofp_type {
OFPT_PACKET_IN, /* Async message */
OFPT_FLOW_REMOVED, /* Async message */
OFPT_PORT_STATUS, /* Async message */
+
+ /* Controller command messages. */
+ OFPT_PACKET_OUT, /* Controller/switch message */
+ OFPT_FLOW_MOD, /* Controller/switch message */
};
/* Header on all OpenFlow packets. */
diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index 0ad23c7..60d0cfd 100644
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -1006,11 +1006,11 @@ ofputil_decode_msg_type__(const struct
ofp_header *oh, size_t length,
sizeof(struct ofp_port_status) + sizeof(struct ofp11_port), 0 },
{ OFPUTIL_OFPT_PACKET_OUT, OFP10_VERSION,
- OFPT10_PACKET_OUT, "OFPT_PACKET_OUT",
+ OFPT_PACKET_OUT, "OFPT_PACKET_OUT",
sizeof(struct ofp_packet_out), 1 },
{ OFPUTIL_OFPT_FLOW_MOD, OFP10_VERSION,
- OFPT10_FLOW_MOD, "OFPT_FLOW_MOD",
+ OFPT_FLOW_MOD, "OFPT_FLOW_MOD",
sizeof(struct ofp_flow_mod), 1 },
{ OFPUTIL_OFPT_PORT_MOD, OFP10_VERSION,
@@ -1759,7 +1759,7 @@ ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm,
case OFPUTIL_P_OF10:
case OFPUTIL_P_OF10_TID:
msg = ofpbuf_new(sizeof *ofm + actions_len);
- ofm = put_openflow(sizeof *ofm, OFPT10_FLOW_MOD, msg);
+ ofm = put_openflow(sizeof *ofm, OFPT_FLOW_MOD, msg);
ofputil_cls_rule_to_ofp10_match(&fm->cr, &ofm->match);
ofm->cookie = fm->new_cookie;
ofm->command = htons(command);
@@ -3081,7 +3081,7 @@ ofputil_encode_packet_out(const struct
ofputil_packet_out *po)
}
msg = ofpbuf_new(size);
- opo = put_openflow(sizeof *opo, OFPT10_PACKET_OUT, msg);
+ opo = put_openflow(sizeof *opo, OFPT_PACKET_OUT, msg);
opo->buffer_id = htonl(po->buffer_id);
opo->in_port = htons(po->in_port);
opo->actions_len = htons(actions_len);
@@ -3403,7 +3403,7 @@ make_flow_mod(uint16_t command, const struct
cls_rule *rule,
struct ofpbuf *out = ofpbuf_new(size);
ofm = ofpbuf_put_zeros(out, sizeof *ofm);
ofm->header.version = OFP10_VERSION;
- ofm->header.type = OFPT10_FLOW_MOD;
+ ofm->header.type = OFPT_FLOW_MOD;
ofm->header.length = htons(size);
ofm->cookie = 0;
ofm->priority = htons(MIN(rule->priority, UINT16_MAX));
--
1.7.2.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
