projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
meta-flow: Rename MFF_VLAN_VID->MFF_DL_VLAN, MFF_VLAN_PCP->MFF_DL_VLAN_PCP.
[openvswitch]
/
lib
/
meta-flow.c
diff --git
a/lib/meta-flow.c
b/lib/meta-flow.c
index 8bc3d1a59e89d6bc057ee5a74c99e5fa72b0a4cd..f5754431a3103d05f6789c7b8b711c49b6314b5b 100644
(file)
--- a/
lib/meta-flow.c
+++ b/
lib/meta-flow.c
@@
-157,7
+157,7
@@
static const struct mf_field mf_fields[MFF_N_IDS] = {
NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI",
NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI",
}, {
NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI",
NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI",
}, {
- MFF_
VLAN_VID
, "dl_vlan", NULL,
+ MFF_
DL_VLAN
, "dl_vlan", NULL,
sizeof(ovs_be16), 12,
MFM_NONE, 0,
MFS_DECIMAL,
sizeof(ovs_be16), 12,
MFM_NONE, 0,
MFS_DECIMAL,
@@
-166,7
+166,7
@@
static const struct mf_field mf_fields[MFF_N_IDS] = {
OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID",
OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID",
}, {
OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID",
OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID",
}, {
- MFF_VLAN_PCP, "dl_vlan_pcp", NULL,
+ MFF_
DL_
VLAN_PCP, "dl_vlan_pcp", NULL,
1, 3,
MFM_NONE, 0,
MFS_DECIMAL,
1, 3,
MFM_NONE, 0,
MFS_DECIMAL,
@@
-307,7
+307,7
@@
static const struct mf_field mf_fields[MFF_N_IDS] = {
}, {
MFF_ARP_SHA, "arp_sha", NULL,
MF_FIELD_SIZES(mac),
}, {
MFF_ARP_SHA, "arp_sha", NULL,
MF_FIELD_SIZES(mac),
- MFM_
NONE, FWW_ARP_SHA
,
+ MFM_
FULLY, 0
,
MFS_ETHERNET,
MFP_ARP,
false,
MFS_ETHERNET,
MFP_ARP,
false,
@@
-316,7
+316,7
@@
static const struct mf_field mf_fields[MFF_N_IDS] = {
}, {
MFF_ARP_THA, "arp_tha", NULL,
MF_FIELD_SIZES(mac),
}, {
MFF_ARP_THA, "arp_tha", NULL,
MF_FIELD_SIZES(mac),
- MFM_
NONE, FWW_ARP_THA
,
+ MFM_
FULLY, 0
,
MFS_ETHERNET,
MFP_ARP,
false,
MFS_ETHERNET,
MFP_ARP,
false,
@@
-424,7
+424,7
@@
static const struct mf_field mf_fields[MFF_N_IDS] = {
}, {
MFF_ND_SLL, "nd_sll", NULL,
MF_FIELD_SIZES(mac),
}, {
MFF_ND_SLL, "nd_sll", NULL,
MF_FIELD_SIZES(mac),
- MFM_
NONE, FWW_ARP_SHA
,
+ MFM_
FULLY, 0
,
MFS_ETHERNET,
MFP_ND_SOLICIT,
false,
MFS_ETHERNET,
MFP_ND_SOLICIT,
false,
@@
-433,7
+433,7
@@
static const struct mf_field mf_fields[MFF_N_IDS] = {
}, {
MFF_ND_TLL, "nd_tll", NULL,
MF_FIELD_SIZES(mac),
}, {
MFF_ND_TLL, "nd_tll", NULL,
MF_FIELD_SIZES(mac),
- MFM_
NONE, FWW_ARP_THA
,
+ MFM_
FULLY, 0
,
MFS_ETHERNET,
MFP_ND_ADVERT,
false,
MFS_ETHERNET,
MFP_ND_ADVERT,
false,
@@
-562,10
+562,6
@@
mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc)
case MFF_IP_ECN:
case MFF_IP_TTL:
case MFF_ARP_OP:
case MFF_IP_ECN:
case MFF_IP_TTL:
case MFF_ARP_OP:
- case MFF_ARP_SHA:
- case MFF_ARP_THA:
- case MFF_ND_SLL:
- case MFF_ND_TLL:
assert(mf->fww_bit != 0);
return (wc->wildcards & mf->fww_bit) != 0;
assert(mf->fww_bit != 0);
return (wc->wildcards & mf->fww_bit) != 0;
@@
-582,11
+578,19
@@
mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc)
case MFF_ETH_DST:
return eth_addr_is_zero(wc->dl_dst_mask);
case MFF_ETH_DST:
return eth_addr_is_zero(wc->dl_dst_mask);
+ case MFF_ARP_SHA:
+ case MFF_ND_SLL:
+ return eth_addr_is_zero(wc->arp_sha_mask);
+
+ case MFF_ARP_THA:
+ case MFF_ND_TLL:
+ return eth_addr_is_zero(wc->arp_tha_mask);
+
case MFF_VLAN_TCI:
return !wc->vlan_tci_mask;
case MFF_VLAN_TCI:
return !wc->vlan_tci_mask;
- case MFF_
VLAN_VID
:
+ case MFF_
DL_VLAN
:
return !(wc->vlan_tci_mask & htons(VLAN_VID_MASK));
return !(wc->vlan_tci_mask & htons(VLAN_VID_MASK));
- case MFF_VLAN_PCP:
+ case MFF_
DL_
VLAN_PCP:
return !(wc->vlan_tci_mask & htons(VLAN_PCP_MASK));
case MFF_IPV4_SRC:
return !(wc->vlan_tci_mask & htons(VLAN_PCP_MASK));
case MFF_IPV4_SRC:
@@
-647,12
+651,7
@@
mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc,
case MFF_IP_DSCP:
case MFF_IP_ECN:
case MFF_IP_TTL:
case MFF_IP_DSCP:
case MFF_IP_ECN:
case MFF_IP_TTL:
- case MFF_IPV6_LABEL:
case MFF_ARP_OP:
case MFF_ARP_OP:
- case MFF_ARP_SHA:
- case MFF_ARP_THA:
- case MFF_ND_SLL:
- case MFF_ND_TLL:
assert(mf->fww_bit != 0);
memset(mask, wc->wildcards & mf->fww_bit ? 0x00 : 0xff, mf->n_bytes);
break;
assert(mf->fww_bit != 0);
memset(mask, wc->wildcards & mf->fww_bit ? 0x00 : 0xff, mf->n_bytes);
break;
@@
-679,10
+678,10
@@
mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc,
case MFF_VLAN_TCI:
mask->be16 = wc->vlan_tci_mask;
break;
case MFF_VLAN_TCI:
mask->be16 = wc->vlan_tci_mask;
break;
- case MFF_
VLAN_VID
:
+ case MFF_
DL_VLAN
:
mask->be16 = wc->vlan_tci_mask & htons(VLAN_VID_MASK);
break;
mask->be16 = wc->vlan_tci_mask & htons(VLAN_VID_MASK);
break;
- case MFF_VLAN_PCP:
+ case MFF_
DL_
VLAN_PCP:
mask->u8 = vlan_tci_to_pcp(wc->vlan_tci_mask);
break;
mask->u8 = vlan_tci_to_pcp(wc->vlan_tci_mask);
break;
@@
-699,6
+698,9
@@
mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc,
case MFF_IPV6_DST:
mask->ipv6 = wc->ipv6_dst_mask;
break;
case MFF_IPV6_DST:
mask->ipv6 = wc->ipv6_dst_mask;
break;
+ case MFF_IPV6_LABEL:
+ mask->be32 = wc->ipv6_label_mask;
+ break;
case MFF_ND_TARGET:
mask->ipv6 = wc->nd_target_mask;
case MFF_ND_TARGET:
mask->ipv6 = wc->nd_target_mask;
@@
-714,6
+716,14
@@
mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc,
case MFF_ARP_TPA:
mask->be32 = wc->nw_dst_mask;
break;
case MFF_ARP_TPA:
mask->be32 = wc->nw_dst_mask;
break;
+ case MFF_ARP_SHA:
+ case MFF_ND_SLL:
+ memcpy(mask->mac, wc->arp_sha_mask, ETH_ADDR_LEN);
+ break;
+ case MFF_ARP_THA:
+ case MFF_ND_TLL:
+ memcpy(mask->mac, wc->arp_tha_mask, ETH_ADDR_LEN);
+ break;
case MFF_TCP_SRC:
case MFF_UDP_SRC:
case MFF_TCP_SRC:
case MFF_UDP_SRC:
@@
-876,10
+886,10
@@
mf_is_value_valid(const struct mf_field *mf, const union mf_value *value)
case MFF_ARP_OP:
return !(value->be16 & htons(0xff00));
case MFF_ARP_OP:
return !(value->be16 & htons(0xff00));
- case MFF_
VLAN_VID
:
+ case MFF_
DL_VLAN
:
return !(value->be16 & htons(VLAN_CFI | VLAN_PCP_MASK));
return !(value->be16 & htons(VLAN_CFI | VLAN_PCP_MASK));
- case MFF_VLAN_PCP:
+ case MFF_
DL_
VLAN_PCP:
return !(value->u8 & ~(VLAN_PCP_MASK >> VLAN_PCP_SHIFT));
case MFF_IPV6_LABEL:
return !(value->u8 & ~(VLAN_PCP_MASK >> VLAN_PCP_SHIFT));
case MFF_IPV6_LABEL:
@@
-929,11
+939,11
@@
mf_get_value(const struct mf_field *mf, const struct flow *flow,
value->be16 = flow->vlan_tci;
break;
value->be16 = flow->vlan_tci;
break;
- case MFF_
VLAN_VID
:
+ case MFF_
DL_VLAN
:
value->be16 = flow->vlan_tci & htons(VLAN_VID_MASK);
break;
value->be16 = flow->vlan_tci & htons(VLAN_VID_MASK);
break;
- case MFF_VLAN_PCP:
+ case MFF_
DL_
VLAN_PCP:
value->u8 = vlan_tci_to_pcp(flow->vlan_tci);
break;
value->u8 = vlan_tci_to_pcp(flow->vlan_tci);
break;
@@
-1068,11
+1078,11
@@
mf_set_value(const struct mf_field *mf,
cls_rule_set_dl_tci(rule, value->be16);
break;
cls_rule_set_dl_tci(rule, value->be16);
break;
- case MFF_
VLAN_VID
:
+ case MFF_
DL_VLAN
:
cls_rule_set_dl_vlan(rule, value->be16);
break;
cls_rule_set_dl_vlan(rule, value->be16);
break;
- case MFF_VLAN_PCP:
+ case MFF_
DL_
VLAN_PCP:
cls_rule_set_dl_vlan_pcp(rule, value->u8);
break;
cls_rule_set_dl_vlan_pcp(rule, value->u8);
break;
@@
-1207,11
+1217,11
@@
mf_set_flow_value(const struct mf_field *mf,
flow->vlan_tci = value->be16;
break;
flow->vlan_tci = value->be16;
break;
- case MFF_
VLAN_VID
:
+ case MFF_
DL_VLAN
:
flow_set_vlan_vid(flow, value->be16);
break;
flow_set_vlan_vid(flow, value->be16);
break;
- case MFF_VLAN_PCP:
+ case MFF_
DL_
VLAN_PCP:
flow_set_vlan_pcp(flow, value->u8);
break;
flow_set_vlan_pcp(flow, value->u8);
break;
@@
-1364,11
+1374,11
@@
mf_set_wild(const struct mf_field *mf, struct cls_rule *rule)
cls_rule_set_dl_tci_masked(rule, htons(0), htons(0));
break;
cls_rule_set_dl_tci_masked(rule, htons(0), htons(0));
break;
- case MFF_
VLAN_VID
:
+ case MFF_
DL_VLAN
:
cls_rule_set_any_vid(rule);
break;
cls_rule_set_any_vid(rule);
break;
- case MFF_VLAN_PCP:
+ case MFF_
DL_
VLAN_PCP:
cls_rule_set_any_pcp(rule);
break;
cls_rule_set_any_pcp(rule);
break;
@@
-1429,14
+1439,14
@@
mf_set_wild(const struct mf_field *mf, struct cls_rule *rule)
case MFF_ARP_SHA:
case MFF_ND_SLL:
case MFF_ARP_SHA:
case MFF_ND_SLL:
-
rule->wc.wildcards |= FWW_ARP_SHA
;
- memset(rule->
flow.arp_sha, 0, sizeof rule->flow.arp_sha
);
+
memset(rule->flow.arp_sha, 0, ETH_ADDR_LEN)
;
+ memset(rule->
wc.arp_sha_mask, 0, ETH_ADDR_LEN
);
break;
case MFF_ARP_THA:
case MFF_ND_TLL:
break;
case MFF_ARP_THA:
case MFF_ND_TLL:
-
rule->wc.wildcards |= FWW_ARP_THA
;
- memset(rule->
flow.arp_tha, 0, sizeof rule->flow.arp_tha
);
+
memset(rule->flow.arp_tha, 0, ETH_ADDR_LEN)
;
+ memset(rule->
wc.arp_tha_mask, 0, ETH_ADDR_LEN
);
break;
case MFF_TCP_SRC:
break;
case MFF_TCP_SRC:
@@
-1493,21
+1503,17
@@
mf_set(const struct mf_field *mf,
switch (mf->id) {
case MFF_IN_PORT:
case MFF_ETH_TYPE:
switch (mf->id) {
case MFF_IN_PORT:
case MFF_ETH_TYPE:
- case MFF_
VLAN_VID
:
- case MFF_VLAN_PCP:
+ case MFF_
DL_VLAN
:
+ case MFF_
DL_
VLAN_PCP:
case MFF_IP_PROTO:
case MFF_IP_TTL:
case MFF_IP_DSCP:
case MFF_IP_ECN:
case MFF_ARP_OP:
case MFF_IP_PROTO:
case MFF_IP_TTL:
case MFF_IP_DSCP:
case MFF_IP_ECN:
case MFF_ARP_OP:
- case MFF_ARP_SHA:
- case MFF_ARP_THA:
case MFF_ICMPV4_TYPE:
case MFF_ICMPV4_CODE:
case MFF_ICMPV6_TYPE:
case MFF_ICMPV6_CODE:
case MFF_ICMPV4_TYPE:
case MFF_ICMPV4_CODE:
case MFF_ICMPV6_TYPE:
case MFF_ICMPV6_CODE:
- case MFF_ND_SLL:
- case MFF_ND_TLL:
NOT_REACHED();
case MFF_TUN_ID:
NOT_REACHED();
case MFF_TUN_ID:
@@
-1530,6
+1536,16
@@
mf_set(const struct mf_field *mf,
cls_rule_set_dl_src_masked(rule, value->mac, mask->mac);
break;
cls_rule_set_dl_src_masked(rule, value->mac, mask->mac);
break;
+ case MFF_ARP_SHA:
+ case MFF_ND_SLL:
+ cls_rule_set_arp_sha_masked(rule, value->mac, mask->mac);
+ break;
+
+ case MFF_ARP_THA:
+ case MFF_ND_TLL:
+ cls_rule_set_arp_tha_masked(rule, value->mac, mask->mac);
+ break;
+
case MFF_VLAN_TCI:
cls_rule_set_dl_tci_masked(rule, value->be16, mask->be16);
break;
case MFF_VLAN_TCI:
cls_rule_set_dl_tci_masked(rule, value->be16, mask->be16);
break;
@@
-1707,11
+1723,11
@@
mf_random_value(const struct mf_field *mf, union mf_value *value)
value->be16 &= htons(0xff);
break;
value->be16 &= htons(0xff);
break;
- case MFF_
VLAN_VID
:
+ case MFF_
DL_VLAN
:
value->be16 &= htons(VLAN_VID_MASK);
break;
value->be16 &= htons(VLAN_VID_MASK);
break;
- case MFF_VLAN_PCP:
+ case MFF_
DL_
VLAN_PCP:
value->u8 &= 0x07;
break;
value->u8 &= 0x07;
break;