Looks good.
--Justin
On Oct 26, 2011, at 10:09 AM, Ben Pfaff wrote:
> It's always been my intention that ports used as port mirroring
> destinations (SPAN) be reserved solely for that purpose. When SPAN and
> RSPAN are both configured, however, RSPAN mirror packets could get directed
> to SPAN ports, which was unintentional.
>
> This commit also updates the documentation to make it clear (if that is
> even necessary) that this behavior is intentional.
>
> Found by inspection.
> ---
> ofproto/ofproto-dpif.c | 1 +
> vswitchd/vswitch.xml | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
> index b53452d..0a3fe63 100644
> --- a/ofproto/ofproto-dpif.c
> +++ b/ofproto/ofproto-dpif.c
> @@ -4615,6 +4615,7 @@ compose_mirror_dsts(struct action_xlate_ctx *ctx,
>
> HMAP_FOR_EACH (bundle, hmap_node, &ofproto->bundles) {
> if (ofbundle_includes_vlan(bundle, m->out_vlan)
> + && !bundle->mirror_out
> && set_dst(ctx, &dst, in_bundle, bundle))
> {
> /* set_dst() got dst->vid from the input packet's
> VLAN,
> diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
> index bcb6b6f..ed3de6c 100644
> --- a/vswitchd/vswitch.xml
> +++ b/vswitchd/vswitch.xml
> @@ -1913,6 +1913,7 @@
> <p>Output port for selected packets, if nonempty.</p>
> <p>Specifying a port for mirror output reserves that port exclusively
> for mirroring. No frames other than those selected for mirroring
> + via this column
> will be forwarded to the port, and any frames received on the port
> will be discarded.</p>
> <p>
> --
> 1.7.2.5
>
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
