diff options
| author | Ben Pfaff <blp@nicira.com> | 2015-10-16 13:01:04 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2015-10-16 23:52:40 -0700 |
| commit | a20111174e368aba0e6d6869b8bbcd432cb38159 (patch) | |
| tree | b25b836351083cfb5f0ffc50c7026fc6b2c3896d | |
| parent | d387d24dca19988de1d8935c036a04fc2ed9a8c4 (diff) | |
ovn: Add new predicates for matching broadcast and multicast packets.
In my opinion, "eth.mcast" is a bit more readable than "eth.dst[40]", and
so on.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Justin Pettit <jpettit@nicira.com>
| -rw-r--r-- | ovn/controller/lflow.c | 4 | ||||
| -rw-r--r-- | ovn/northd/ovn-northd.c | 4 | ||||
| -rw-r--r-- | ovn/ovn-sb.xml | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/ovn/controller/lflow.c b/ovn/controller/lflow.c index 37dc48d00..38c72c179 100644 --- a/ovn/controller/lflow.c +++ b/ovn/controller/lflow.c @@ -71,6 +71,9 @@ symtab_init(void) expr_symtab_add_field(&symtab, "eth.src", MFF_ETH_SRC, NULL, false); expr_symtab_add_field(&symtab, "eth.dst", MFF_ETH_DST, NULL, false); expr_symtab_add_field(&symtab, "eth.type", MFF_ETH_TYPE, NULL, true); + expr_symtab_add_predicate(&symtab, "eth.bcast", + "eth.dst == ff:ff:ff:ff:ff:ff"); + expr_symtab_add_subfield(&symtab, "eth.mcast", NULL, "eth.dst[40]"); expr_symtab_add_field(&symtab, "vlan.tci", MFF_VLAN_TCI, NULL, false); expr_symtab_add_predicate(&symtab, "vlan.present", "vlan.tci[12]"); @@ -89,6 +92,7 @@ symtab_init(void) expr_symtab_add_field(&symtab, "ip4.src", MFF_IPV4_SRC, "ip4", false); expr_symtab_add_field(&symtab, "ip4.dst", MFF_IPV4_DST, "ip4", false); + expr_symtab_add_predicate(&symtab, "ip4.mcast", "ip4.dst[28..31] == 0xe"); expr_symtab_add_predicate(&symtab, "icmp4", "ip4 && ip.proto == 1"); expr_symtab_add_field(&symtab, "icmp4.type", MFF_ICMPV4_TYPE, "icmp4", diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index ca2eca694..6ef134f83 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -913,7 +913,7 @@ build_lflows(struct northd_context *ctx, struct hmap *datapaths, } } HMAP_FOR_EACH (od, key_node, datapaths) { - ovn_lflow_add(&lflows, od, P_IN, S_IN_L2_LKUP, 100, "eth.dst[40]", + ovn_lflow_add(&lflows, od, P_IN, S_IN_L2_LKUP, 100, "eth.mcast", "outport = \""MC_FLOOD"\"; output;"); } @@ -961,7 +961,7 @@ build_lflows(struct northd_context *ctx, struct hmap *datapaths, /* Egress table 2: Egress port security multicast/broadcast (priority * 100). */ HMAP_FOR_EACH (od, key_node, datapaths) { - ovn_lflow_add(&lflows, od, P_OUT, S_OUT_PORT_SEC, 100, "eth.dst[40]", + ovn_lflow_add(&lflows, od, P_OUT, S_OUT_PORT_SEC, 100, "eth.mcast", "output;"); } diff --git a/ovn/ovn-sb.xml b/ovn/ovn-sb.xml index 87b944b90..55da9eefb 100644 --- a/ovn/ovn-sb.xml +++ b/ovn/ovn-sb.xml @@ -722,8 +722,11 @@ </p> <ul> + <li><code>eth.bcast</code> expands to <code>eth.dst == ff:ff:ff:ff:ff:ff</code></li> + <li><code>eth.mcast</code> expands to <code>eth.dst[40]</code></li> <li><code>vlan.present</code> expands to <code>vlan.tci[12]</code></li> <li><code>ip4</code> expands to <code>eth.type == 0x800</code></li> + <li><code>ip4.mcast</code> expands to <code>ip4.dst[28..31] == 0xe</code></li> <li><code>ip6</code> expands to <code>eth.type == 0x86dd</code></li> <li><code>ip</code> expands to <code>ip4 || ip6</code></li> <li><code>icmp4</code> expands to <code>ip4 && ip.proto == 1</code></li> |