According to the OpenFlow specification, the OFPP_ALL output to
every port except the input port regardless of whether or not they
are "blocked or link down". This patch implements this logic, and
marginally simplifies the interface of flood_packets().
---
ofproto/ofproto-dpif.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 0b715d6..15d0883 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -3870,16 +3870,20 @@ xlate_resubmit_table(struct action_xlate_ctx *ctx,
}
static void
-flood_packets(struct action_xlate_ctx *ctx, ovs_be32 mask)
+flood_packets(struct action_xlate_ctx *ctx, bool all)
{
struct ofport_dpif *ofport;
commit_odp_actions(ctx);
HMAP_FOR_EACH (ofport, up.hmap_node, &ctx->ofproto->up.ports) {
uint16_t ofp_port = ofport->up.ofp_port;
- if (ofp_port != ctx->flow.in_port
- && !(ofport->up.opp.config & mask)
- && stp_forward_in_state(ofport->stp_state)) {
+
+ if (ofp_port == ctx->flow.in_port) {
+ continue;
+ }
+
+ if (all || (!(ofport->up.opp.config & htonl(OFPPC_NO_FLOOD))
+ && stp_forward_in_state(ofport->stp_state))) {
compose_output_action(ctx, ofport->odp_port);
}
}
@@ -3918,10 +3922,10 @@ xlate_output_action__(struct action_xlate_ctx *ctx,
xlate_normal(ctx);
break;
case OFPP_FLOOD:
- flood_packets(ctx, htonl(OFPPC_NO_FLOOD));
+ flood_packets(ctx, false);
break;
case OFPP_ALL:
- flood_packets(ctx, htonl(0));
+ flood_packets(ctx, true);
break;
case OFPP_CONTROLLER:
commit_odp_actions(ctx);
--
1.7.7.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
