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-parse: Add support for vlan_tci field.

Browse Source 
Until now, the flow parser has supported dl_vlan and dl_vlan_pcp but not
the fully maskable vlan_tci that NXM allows.  This adds that support.
This commit is contained in:
Ben Pfaff
2011-06-08 12:28:44 -07:00
parent c168dcc8f7
commit 33d8c6b412
3 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/ofp-parse.c
View File

@@ -183,6 +183,35 @@ error:
ovs_fatal(0, "%s: bad syntax for tunnel id", str);
}
static void
str_to_vlan_tci(const char *str, ovs_be16 *vlan_tcip, ovs_be16 *maskp)
{
uint16_t vlan_tci, mask;
char *tail;
errno = 0;
vlan_tci = strtol(str, &tail, 0);
if (errno || (*tail != '\0' && *tail != '/')) {
goto error;
}
if (*tail == '/') {
mask = strtol(tail + 1, &tail, 0);
if (errno || *tail != '\0') {
goto error;
}
} else {
mask = UINT16_MAX;
}
*vlan_tcip = htons(vlan_tci);
*maskp = htons(mask);
return;
error:
ovs_fatal(0, "%s: bad syntax for vlan_tci", str);
}
static void
str_to_ipv6(const char *str_, struct in6_addr *addrp, struct in6_addr *maskp)
{
@@ -552,6 +581,7 @@ parse_protocol(const char *name, const struct protocol **p_out)
FIELD(F_IN_PORT, "in_port", FWW_IN_PORT) \
FIELD(F_DL_VLAN, "dl_vlan", 0) \
FIELD(F_DL_VLAN_PCP, "dl_vlan_pcp", 0) \
FIELD(F_VLAN_TCI, "vlan_tci", 0) \
FIELD(F_DL_SRC, "dl_src", FWW_DL_SRC) \
FIELD(F_DL_DST, "dl_dst", FWW_DL_DST | FWW_ETH_MCAST) \
FIELD(F_DL_TYPE, "dl_type", FWW_DL_TYPE) \
@@ -611,6 +641,7 @@ parse_field_value(struct cls_rule *rule, enum field_index index,
uint8_t mac[ETH_ADDR_LEN], mac_mask[ETH_ADDR_LEN];
ovs_be64 tun_id, tun_mask;
ovs_be32 ip, mask;
ovs_be16 tci, tci_mask;
struct in6_addr ipv6, ipv6_mask;
uint16_t port_no;
@@ -635,6 +666,11 @@ parse_field_value(struct cls_rule *rule, enum field_index index,
cls_rule_set_dl_vlan_pcp(rule, str_to_u32(value));
break;
case F_VLAN_TCI:
str_to_vlan_tci(value, &tci, &tci_mask);
cls_rule_set_dl_tci_masked(rule, tci, tci_mask);
break;
case F_DL_SRC:
str_to_mac(value, mac);
cls_rule_set_dl_src(rule, mac);