On Fri, Mar 23, 2012 at 1:48 PM, Jesse Gross <je...@nicira.com> wrote:
> We currently check that a packet is IPv4 and TCP before fetching the
> TCP flags. This enables fetching from IPv6 packets as well.
>
> Bug #10194
>
> Reported-by: Michael Mao <m...@nicira.com>
> Signed-off-by: Jesse Gross <je...@nicira.com>
> ---
> datapath/flow.c | 3 ++-
> lib/dpif-netdev.c | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/datapath/flow.c b/datapath/flow.c
> index 27a8f24..86cbd78 100644
> --- a/datapath/flow.c
> +++ b/datapath/flow.c
> @@ -184,7 +184,8 @@ void ovs_flow_used(struct sw_flow *flow, struct sk_buff
> *skb)
> {
> u8 tcp_flags = 0;
>
> - if (flow->key.eth.type == htons(ETH_P_IP) &&
> + if ((flow->key.eth.type == htons(ETH_P_IP) ||
> + flow->key.eth.type == htons(ETH_P_IPV6)) &&
> flow->key.ip.proto == IPPROTO_TCP &&
> likely(skb->len >= skb_transport_offset(skb) + sizeof(struct
> tcphdr))) {
> u8 *tcp = (u8 *)tcp_hdr(skb);
> diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
> index d73050a..a38e56b 100644
> --- a/lib/dpif-netdev.c
> +++ b/lib/dpif-netdev.c
> @@ -976,7 +976,8 @@ dp_netdev_flow_used(struct dp_netdev_flow *flow, struct
> flow *key,
> flow->used = time_msec();
> flow->packet_count++;
> flow->byte_count += packet->size;
> - if (key->dl_type == htons(ETH_TYPE_IP) &&
> + if ((key->dl_type == htons(ETH_TYPE_IP) ||
> + key->dl_type == htons(ETH_TYPE_IPV6)) &&
> key->nw_proto == IPPROTO_TCP && packet->l7) {
> struct tcp_header *th = packet->l4;
> flow->tcp_ctl |= th->tcp_ctl;
> --
Looks good.
Acked-by: Pravin B Shelar <pshe...@nicira.com>
> 1.7.5.4
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
