mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-04 16:25:17 +00:00
Code Issues Releases Wiki Activity

flow: Enable retrieval of TCP flags from IPv6 traffic.

Browse Source 
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 <mmao@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
This commit is contained in:
Jesse Gross
2012-03-23 13:25:31 -07:00
parent 9c47b45a3b
commit 11460e2316
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
datapath/flow.c
View File

@@ -184,7 +184,8 @@ void ovs_flow_used(struct sw_flow *flow, struct sk_buff *skb)
{ {
u8 tcp_flags = 0; 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 && flow->key.ip.proto == IPPROTO_TCP &&
likely(skb->len >= skb_transport_offset(skb) + sizeof(struct tcphdr))) { likely(skb->len >= skb_transport_offset(skb) + sizeof(struct tcphdr))) {
u8 *tcp = (u8 *)tcp_hdr(skb); u8 *tcp = (u8 *)tcp_hdr(skb);

3
lib/dpif-netdev.c
View File

@@ -976,7 +976,8 @@ dp_netdev_flow_used(struct dp_netdev_flow *flow, struct flow *key,
flow->used = time_msec(); flow->used = time_msec();
flow->packet_count++; flow->packet_count++;
flow->byte_count += packet->size; 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) { key->nw_proto == IPPROTO_TCP && packet->l7) {
struct tcp_header *th = packet->l4; struct tcp_header *th = packet->l4;
flow->tcp_ctl |= th->tcp_ctl; flow->tcp_ctl |= th->tcp_ctl;