Filter collection of rules for flow monitor updates
based on the monitor's out_group as well as its out_port.
Currently the flow monitor request decoder only allows the out_group to be
OFPG_ANY which means that this logic change will have no runtime affect yet.
A subsequent patch will update the flow monitor request decoder.
This is in preparation for supporting OpenFlow1.4 flow monitors.
Signed-off-by: Simon Horman <ho...@verge.net.au>
---
ofproto/ofproto.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 793574b..5cb61d7 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -4830,8 +4830,10 @@ ofproto_collect_ofmonitor_refresh_rule(const struct
ofmonitor *m,
}
if (!(rule->pending
- ? ofoperation_has_out_port(rule->pending, m->out_port)
- : ofproto_rule_has_out_port(rule, m->out_port))) {
+ ? (ofoperation_has_out_port(rule->pending, m->out_port)
+ && ofoperation_has_out_group(rule->pending, m->out_group))
+ : (ofproto_rule_has_out_port(rule, m->out_port)
+ && ofproto_rule_has_out_group(rule, m->out_group)))) {
return;
}
--
2.0.0.rc2
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
