mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 23:35:27 +00:00
Code Issues Releases Wiki Activity

datapath: Set the correct bits for OFPAT_SET_NW_TOS action.

Browse Source 
The DSCP bits are the high bits, not the low bits.

Reported-by: Jean Tourrilhes <jt@hpl.hp.com>
This commit is contained in:
Ben Pfaff
2010-02-11 15:19:26 -08:00
committed by Justin Pettit
parent 2d38e234f4
commit f119330116
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
datapath/actions.c
View File

@@ -15,6 +15,7 @@
#include <linux/udp.h> #include <linux/udp.h>
#include <linux/in6.h> #include <linux/in6.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <net/inet_ecn.h>
#include <net/ip.h> #include <net/ip.h>
#include <net/checksum.h> #include <net/checksum.h>
#include "datapath.h" #include "datapath.h"
@@ -298,10 +299,10 @@ static struct sk_buff *set_nw_tos(struct sk_buff *skb,
struct iphdr *nh = ip_hdr(skb); struct iphdr *nh = ip_hdr(skb);
u8 *f = &nh->tos; u8 *f = &nh->tos;
u8 old = *f; u8 old = *f;
u8 new;
/* We only set the lower 6 bits. */ /* Set the DSCP bits and preserve the ECN bits. */
u8 new = (a->nw_tos & 0x3f) | (nh->tos & 0xc0); new = (a->nw_tos & ~INET_ECN_MASK) | (nh->tos & INET_ECN_MASK);
update_csum(&nh->check, skb, htons((uint16_t)old), update_csum(&nh->check, skb, htons((uint16_t)old),
htons((uint16_t)new), 0); htons((uint16_t)new), 0);
*f = new; *f = new;

4
lib/dpif-netdev.c
View File

@@ -1179,8 +1179,8 @@ dp_netdev_set_nw_tos(struct ofpbuf *packet, flow_t *key,
struct ip_header *nh = packet->l3; struct ip_header *nh = packet->l3;
uint8_t *field = &nh->ip_tos; uint8_t *field = &nh->ip_tos;
/* We only set the lower 6 bits. */ /* Set the DSCP bits and preserve the ECN bits. */
uint8_t new = (a->nw_tos & 0x3f) | (nh->ip_tos & 0xc0); uint8_t new = (a->nw_tos & IP_DSCP_MASK) | (nh->ip_tos & IP_ECN_MASK);
nh->ip_csum = recalc_csum16(nh->ip_csum, htons((uint16_t)*field), nh->ip_csum = recalc_csum16(nh->ip_csum, htons((uint16_t)*field),
htons((uint16_t)a->nw_tos)); htons((uint16_t)a->nw_tos));

2
lib/flow.c
View File

@@ -151,7 +151,7 @@ flow_extract(struct ofpbuf *packet, uint16_t in_port, flow_t *flow)
if (nh) { if (nh) {
flow->nw_src = nh->ip_src; flow->nw_src = nh->ip_src;
flow->nw_dst = nh->ip_dst; flow->nw_dst = nh->ip_dst;
flow->nw_tos = nh->ip_tos & 0xfc; flow->nw_tos = nh->ip_tos & IP_DSCP_MASK;
flow->nw_proto = nh->ip_proto; flow->nw_proto = nh->ip_proto;
packet->l4 = b.data; packet->l4 = b.data;
if (!IP_IS_FRAGMENT(nh->ip_frag_off)) { if (!IP_IS_FRAGMENT(nh->ip_frag_off)) {

4
lib/packets.h
View File

@@ -224,6 +224,10 @@ BUILD_ASSERT_DECL(VLAN_ETH_HEADER_LEN == sizeof(struct vlan_eth_header));
#define IP_IHL(ip_ihl_ver) ((ip_ihl_ver) & 15) #define IP_IHL(ip_ihl_ver) ((ip_ihl_ver) & 15)
#define IP_IHL_VER(ihl, ver) (((ver) << 4) | (ihl)) #define IP_IHL_VER(ihl, ver) (((ver) << 4) | (ihl))
/* TOS fields. */
#define IP_ECN_MASK 0x03
#define IP_DSCP_MASK 0xfc
#define IP_TYPE_ICMP 1 #define IP_TYPE_ICMP 1
#define IP_TYPE_TCP 6 #define IP_TYPE_TCP 6
#define IP_TYPE_UDP 17 #define IP_TYPE_UDP 17