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

ofp-parse: Add support for dl_dst masks in flow match parsing.

Browse Source 
This makes it possible to add flows that match on the Ethernet multicast
bit with ovs-ofctl.

CC: Paul Ingram <paul@nicira.com>
CC: Amar Padmanabhan <amar@nicira.com>
This commit is contained in:
Ben Pfaff
2011-06-07 09:22:24 -07:00
parent db7f828182
commit cb8ca532a6
3 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/ofp-parse.c
View File

@@ -83,6 +83,27 @@ str_to_mac(const char *str, uint8_t mac[6])
}
}
static void
str_to_eth_dst(const char *str,
uint8_t mac[ETH_ADDR_LEN], uint8_t mask[ETH_ADDR_LEN])
{
if (sscanf(str, ETH_ADDR_SCAN_FMT"/"ETH_ADDR_SCAN_FMT,
ETH_ADDR_SCAN_ARGS(mac), ETH_ADDR_SCAN_ARGS(mask))
== ETH_ADDR_SCAN_COUNT * 2) {
if (!flow_wildcards_is_dl_dst_mask_valid(mask)) {
ovs_fatal(0, "%s: invalid Ethernet destination mask (only "
"00:00:00:00:00:00, 01:00:00:00:00:00, "
"fe:ff:ff:ff:ff:ff, and ff:ff:ff:ff:ff:ff are allowed)",
str);
}
} else if (sscanf(str, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac))
== ETH_ADDR_SCAN_COUNT) {
memset(mask, 0xff, ETH_ADDR_LEN);
} else {
ovs_fatal(0, "invalid mac address %s", str);
}
}
static void
str_to_ip(const char *str_, ovs_be32 *ip, ovs_be32 *maskp)
{
@@ -592,7 +613,7 @@ static void
parse_field_value(struct cls_rule *rule, enum field_index index,
const char *value)
{
uint8_t mac[ETH_ADDR_LEN];
uint8_t mac[ETH_ADDR_LEN], mac_mask[ETH_ADDR_LEN];
ovs_be64 tun_id, tun_mask;
ovs_be32 ip, mask;
struct in6_addr ipv6, ipv6_mask;
@@ -625,8 +646,8 @@ parse_field_value(struct cls_rule *rule, enum field_index index,
break;
case F_DL_DST:
str_to_mac(value, mac);
cls_rule_set_dl_dst(rule, mac);
str_to_eth_dst(value, mac, mac_mask);
cls_rule_set_dl_dst_masked(rule, mac, mac_mask);
break;
case F_DL_TYPE: