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

ofp-util: Factor wildcard translation out of ofputil_cls_rule_from_match().

Browse Source 
This seems like a small cleanup, plus the new function for translating
wildcards will be independently useful in an upcoming commit.
This commit is contained in:
Ben Pfaff
2011-05-31 16:15:45 -07:00
parent 47271d0d8d
commit eb6f28db08
1 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/ofp-util.c
View File

@@ -101,19 +101,12 @@ static const flow_wildcards_t WC_INVARIANTS = 0
#undef WC_INVARIANT_BIT #undef WC_INVARIANT_BIT
; ;
/* Converts the ofp_match in 'match' into a cls_rule in 'rule', with the given /* Converts the wildcard in 'ofpfw' into a flow_wildcards in 'wc' for use in
* 'priority'. */ * struct cls_rule. It is the caller's responsibility to handle the special
void * case where the flow match's dl_vlan is set to OFP_VLAN_NONE. */
ofputil_cls_rule_from_match(const struct ofp_match *match, static void
unsigned int priority, struct cls_rule *rule) ofputil_wildcard_from_openflow(uint32_t ofpfw, struct flow_wildcards *wc)
{ {
struct flow_wildcards *wc = &rule->wc;
uint32_t ofpfw;
/* Initialize rule->priority. */
ofpfw = ntohl(match->wildcards) & OFPFW_ALL;
rule->priority = !ofpfw ? UINT16_MAX : priority;
/* Initialize most of rule->wc. */ /* Initialize most of rule->wc. */
flow_wildcards_init_catchall(wc); flow_wildcards_init_catchall(wc);
wc->wildcards = (OVS_FORCE flow_wildcards_t) ofpfw & WC_INVARIANTS; wc->wildcards = (OVS_FORCE flow_wildcards_t) ofpfw & WC_INVARIANTS;
@@ -134,6 +127,27 @@ ofputil_cls_rule_from_match(const struct ofp_match *match,
wc->wildcards |= FWW_ETH_MCAST; wc->wildcards |= FWW_ETH_MCAST;
} }
/* VLAN TCI mask. */
if (!(ofpfw & OFPFW_DL_VLAN_PCP)) {
wc->vlan_tci_mask |= htons(VLAN_PCP_MASK | VLAN_CFI);
}
if (!(ofpfw & OFPFW_DL_VLAN)) {
wc->vlan_tci_mask |= htons(VLAN_VID_MASK | VLAN_CFI);
}
}
/* Converts the ofp_match in 'match' into a cls_rule in 'rule', with the given
* 'priority'. */
void
ofputil_cls_rule_from_match(const struct ofp_match *match,
unsigned int priority, struct cls_rule *rule)
{
uint32_t ofpfw = ntohl(match->wildcards) & OFPFW_ALL;
/* Initialize rule->priority, rule->wc. */
rule->priority = !ofpfw ? UINT16_MAX : priority;
ofputil_wildcard_from_openflow(ofpfw, &rule->wc);
/* Initialize most of rule->flow. */ /* Initialize most of rule->flow. */
rule->flow.nw_src = match->nw_src; rule->flow.nw_src = match->nw_src;
rule->flow.nw_dst = match->nw_dst; rule->flow.nw_dst = match->nw_dst;
@@ -157,24 +171,14 @@ ofputil_cls_rule_from_match(const struct ofp_match *match,
* However, older versions of OVS treated this as matching packets * However, older versions of OVS treated this as matching packets
* withut an 802.1Q header, so we do here too. */ * withut an 802.1Q header, so we do here too. */
rule->flow.vlan_tci = htons(0); rule->flow.vlan_tci = htons(0);
wc->vlan_tci_mask = htons(0xffff); rule->wc.vlan_tci_mask = htons(0xffff);
} else { } else {
ovs_be16 vid, pcp, tci; ovs_be16 vid, pcp, tci;
/* Compute mask. */
wc->vlan_tci_mask = htons(0);
if (!(ofpfw & OFPFW_DL_VLAN_PCP)) {
wc->vlan_tci_mask |= htons(VLAN_PCP_MASK | VLAN_CFI);
}
if (!(ofpfw & OFPFW_DL_VLAN)) {
wc->vlan_tci_mask |= htons(VLAN_VID_MASK | VLAN_CFI);
}
/* Compute match value based on mask. */
vid = match->dl_vlan & htons(VLAN_VID_MASK); vid = match->dl_vlan & htons(VLAN_VID_MASK);
pcp = htons((match->dl_vlan_pcp << VLAN_PCP_SHIFT) & VLAN_PCP_MASK); pcp = htons((match->dl_vlan_pcp << VLAN_PCP_SHIFT) & VLAN_PCP_MASK);
tci = vid | pcp | htons(VLAN_CFI); tci = vid | pcp | htons(VLAN_CFI);
rule->flow.vlan_tci = tci & wc->vlan_tci_mask; rule->flow.vlan_tci = tci & rule->wc.vlan_tci_mask;
} }
/* Clean up. */ /* Clean up. */