mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

ofp-actions: Distinguish OF1.1/1.2 push_mpls from OF1.3+.

Browse Source 
In OpenFlow 1.1 and 1.2, the push_mpls action pushes the MPLS label after
any existing VLAN tag.  In OpenFlow 1.3, it pushes the label before any
existing VLAN tag.  Until now, the action parser didn't distinguish these
cases.  This commit adds support.  Nothing yet actually changes the
behavior of push_mpls.

enum ofpact_mpls_position contributed by Ben Pfaff.

Signed-off-by: Joe Stringer <joe@wand.net.nz>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Joe Stringer
2013-10-17 10:15:08 +09:00
committed by Ben Pfaff
parent ad9ca2fc4a
commit a7a2d006ba
6 changed files with 115 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/ofp-util.c
View File

@@ -1504,7 +1504,8 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm,
return error;
}
error = ofpacts_pull_openflow11_instructions(&b, b.size, ofpacts);
error = ofpacts_pull_openflow11_instructions(&b, oh->version,
b.size, ofpacts);
if (error) {
return error;
}
@@ -2360,7 +2361,8 @@ ofputil_decode_flow_stats_reply(struct ofputil_flow_stats *fs,
return EINVAL;
}
if (ofpacts_pull_openflow11_instructions(msg, length - sizeof *ofs -
if (ofpacts_pull_openflow11_instructions(msg, oh->version,
length - sizeof *ofs -
padded_match_len, ofpacts)) {
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST_FLOW reply bad instructions");
return EINVAL;
@@ -3092,7 +3094,8 @@ ofputil_decode_packet_out(struct ofputil_packet_out *po,
return error;
}
error = ofpacts_pull_openflow11_actions(&b, ntohs(opo->actions_len),
error = ofpacts_pull_openflow11_actions(&b, oh->version,
ntohs(opo->actions_len),
ofpacts);
if (error) {
return error;
@@ -5674,8 +5677,8 @@ ofputil_append_group_desc_reply(const struct ofputil_group_desc *gds,
}
static enum ofperr
ofputil_pull_buckets(struct ofpbuf *msg, size_t buckets_length,
struct list *buckets)
ofputil_pull_buckets(struct ofpbuf *msg, enum ofp_version version,
size_t buckets_length, struct list *buckets)
{
struct ofp11_bucket *ob;
@@ -5708,8 +5711,8 @@ ofputil_pull_buckets(struct ofpbuf *msg, size_t buckets_length,
buckets_length -= ob_len;
ofpbuf_init(&ofpacts, 0);
error = ofpacts_pull_openflow11_actions(msg, ob_len - sizeof *ob,
&ofpacts);
error = ofpacts_pull_openflow11_actions(msg, version,
ob_len - sizeof *ob, &ofpacts);
if (error) {
ofpbuf_uninit(&ofpacts);
ofputil_bucket_list_destroy(buckets);
@@ -5745,7 +5748,7 @@ ofputil_pull_buckets(struct ofpbuf *msg, size_t buckets_length,
* otherwise a positive errno value. */
int
ofputil_decode_group_desc_reply(struct ofputil_group_desc *gd,
struct ofpbuf *msg)
struct ofpbuf *msg, enum ofp_version version)
{
struct ofp11_group_desc_stats *ogds;
size_t length;
@@ -5774,7 +5777,8 @@ ofputil_decode_group_desc_reply(struct ofputil_group_desc *gd,
return OFPERR_OFPBRC_BAD_LEN;
}
return ofputil_pull_buckets(msg, length - sizeof *ogds, &gd->buckets);
return ofputil_pull_buckets(msg, version, length - sizeof *ogds,
&gd->buckets);
}
/* Converts abstract group mod 'gm' into a message for OpenFlow version
@@ -5857,7 +5861,7 @@ ofputil_decode_group_mod(const struct ofp_header *oh,
gm->type = ogm->type;
gm->group_id = ntohl(ogm->group_id);
return ofputil_pull_buckets(&msg, msg.size, &gm->buckets);
return ofputil_pull_buckets(&msg, oh->version, msg.size, &gm->buckets);
}
/* Parse a queue status request message into 'oqsr'.