projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simap: New data structure for string-to-integer maps.
[openvswitch]
/
lib
/
ofp-util.c
diff --git
a/lib/ofp-util.c
b/lib/ofp-util.c
index 48be7749fc2a076f4c5be9d64ac3fda234ca62df..90124ec86af0104bda224608d142f7ab22c44423 100644
(file)
--- a/
lib/ofp-util.c
+++ b/
lib/ofp-util.c
@@
-1461,10
+1461,7
@@
ofputil_decode_flow_mod(struct ofputil_flow_mod *fm,
}
/* Converts 'fm' into an OFPT_FLOW_MOD or NXT_FLOW_MOD message according to
}
/* Converts 'fm' into an OFPT_FLOW_MOD or NXT_FLOW_MOD message according to
- * 'protocol' and returns the message.
- *
- * 'flow_mod_table_id' should be true if the NXT_FLOW_MOD_TABLE_ID extension is
- * enabled, false otherwise. */
+ * 'protocol' and returns the message. */
struct ofpbuf *
ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm,
enum ofputil_protocol protocol)
struct ofpbuf *
ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm,
enum ofputil_protocol protocol)
@@
-3309,6
+3306,7
@@
ofputil_check_output_port(uint16_t port, int max_ports)
case OFPP_FLOOD:
case OFPP_ALL:
case OFPP_CONTROLLER:
case OFPP_FLOOD:
case OFPP_ALL:
case OFPP_CONTROLLER:
+ case OFPP_NONE:
case OFPP_LOCAL:
return 0;
case OFPP_LOCAL:
return 0;
@@
-3760,11
+3758,13
@@
ofputil_put_action(enum ofputil_action_code code, struct ofpbuf *buf)
bool
action_outputs_to_port(const union ofp_action *action, ovs_be16 port)
{
bool
action_outputs_to_port(const union ofp_action *action, ovs_be16 port)
{
- switch (
ntohs(action->type
)) {
- case OFPAT10_OUTPUT:
+ switch (
ofputil_decode_action(action
)) {
+ case OFP
UTIL_OFP
AT10_OUTPUT:
return action->output.port == port;
return action->output.port == port;
- case OFPAT10_ENQUEUE:
+ case OFP
UTIL_OFP
AT10_ENQUEUE:
return ((const struct ofp_action_enqueue *) action)->port == port;
return ((const struct ofp_action_enqueue *) action)->port == port;
+ case OFPUTIL_NXAST_CONTROLLER:
+ return port == htons(OFPP_CONTROLLER);
default:
return false;
}
default:
return false;
}