aboutsummaryrefslogtreecommitdiff
path: root/lib/vconn.c
diff options
context:
space:
mode:
authorJustin Pettit <jpettit@nicira.com>2009-11-11 14:59:49 -0800
committerJustin Pettit <jpettit@nicira.com>2010-02-20 02:22:26 -0800
commit959a2ecdc8a5ffe53e74456ff6eb1ec25092db75 (patch)
treed7f7759d577a14c00c0e255e2403a4ecd1f4534d /lib/vconn.c
parent2f6d344525463ebe52f6bbd0e9a4cc22e33dacbe (diff)
ofproto: Match VLAN PCP and rewrite ToS bits (OpenFlow 0.9)
Starting in OpenFlow 0.9, it is possible to match on the VLAN PCP (priority) field and rewrite the IP ToS/DSCP bits. This check-in provides that support and bumps the wire protocol number to 0x98. NOTE: The wire changes come together over the set of OpenFlow 0.9 commits, so OVS will not be OpenFlow-compatible with any official release between this commit and the one that completes the set.
Diffstat (limited to 'lib/vconn.c')
-rw-r--r--lib/vconn.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/vconn.c b/lib/vconn.c
index c77b6524..e381c3d8 100644
--- a/lib/vconn.c
+++ b/lib/vconn.c
@@ -892,6 +892,7 @@ make_flow_mod(uint16_t command, const flow_t *flow, size_t actions_len)
memcpy(ofm->match.dl_src, flow->dl_src, sizeof ofm->match.dl_src);
memcpy(ofm->match.dl_dst, flow->dl_dst, sizeof ofm->match.dl_dst);
ofm->match.dl_vlan = flow->dl_vlan;
+ ofm->match.dl_vlan_pcp = flow->dl_vlan_pcp;
ofm->match.dl_type = flow->dl_type;
ofm->match.nw_src = flow->nw_src;
ofm->match.nw_dst = flow->nw_dst;
@@ -1292,6 +1293,7 @@ check_action(const union ofp_action *a, unsigned int len, int max_ports)
case OFPAT_STRIP_VLAN:
case OFPAT_SET_NW_SRC:
case OFPAT_SET_NW_DST:
+ case OFPAT_SET_NW_TOS:
case OFPAT_SET_TP_SRC:
case OFPAT_SET_TP_DST:
return check_action_exact_len(a, len, 8);