/*
- * Copyright (c) 2011 Nicira Networks.
+ * Copyright (c) 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "classifier.h"
#include "dynamic-string.h"
+#include "ofp-errors.h"
#include "ofp-util.h"
#include "packets.h"
#include "random.h"
#include "shash.h"
#include "socket-util.h"
#include "unaligned.h"
+#include "vlog.h"
+
+VLOG_DEFINE_THIS_MODULE(meta_flow);
#define MF_FIELD_SIZES(MEMBER) \
sizeof ((union mf_value *)0)->MEMBER, \
{
MFF_TUN_ID, "tun_id", NULL,
MF_FIELD_SIZES(be64),
- MFM_FULLY, 0,
+ MFM_FULLY,
+ MFS_HEXADECIMAL,
+ MFP_NONE,
+ true,
+ NXM_NX_TUN_ID, "NXM_NX_TUN_ID",
+ NXM_NX_TUN_ID, "NXM_NX_TUN_ID",
+ }, {
+ MFF_METADATA, "metadata", NULL,
+ MF_FIELD_SIZES(be64),
+ MFM_FULLY,
MFS_HEXADECIMAL,
MFP_NONE,
- NXM_NX_TUN_ID,
+ true,
+ OXM_OF_METADATA, "OXM_OF_METADATA",
+ OXM_OF_METADATA, "OXM_OF_METADATA",
}, {
MFF_IN_PORT, "in_port", NULL,
MF_FIELD_SIZES(be16),
- MFM_NONE, FWW_IN_PORT,
+ MFM_NONE,
MFS_OFP_PORT,
MFP_NONE,
- NXM_OF_IN_PORT,
+ false,
+ NXM_OF_IN_PORT, "NXM_OF_IN_PORT",
+ OXM_OF_IN_PORT, "OXM_OF_IN_PORT",
},
#define REGISTER(IDX) \
{ \
MFF_REG##IDX, "reg" #IDX, NULL, \
MF_FIELD_SIZES(be32), \
- MFM_FULLY, 0, \
+ MFM_FULLY, \
MFS_HEXADECIMAL, \
MFP_NONE, \
- NXM_NX_REG(IDX), \
+ true, \
+ NXM_NX_REG(IDX), "NXM_NX_REG" #IDX, \
+ NXM_NX_REG(IDX), "NXM_NX_REG" #IDX, \
}
#if FLOW_N_REGS > 0
REGISTER(0),
REGISTER(4),
#endif
#if FLOW_N_REGS > 5
+ REGISTER(5),
+#endif
+#if FLOW_N_REGS > 6
+ REGISTER(6),
+#endif
+#if FLOW_N_REGS > 7
+ REGISTER(7),
+#endif
+#if FLOW_N_REGS > 8
#error
#endif
{
MFF_ETH_SRC, "eth_src", "dl_src",
MF_FIELD_SIZES(mac),
- MFM_NONE, FWW_DL_SRC,
+ MFM_FULLY,
MFS_ETHERNET,
MFP_NONE,
- NXM_OF_ETH_SRC,
+ true,
+ NXM_OF_ETH_SRC, "NXM_OF_ETH_SRC",
+ OXM_OF_ETH_SRC, "OXM_OF_ETH_SRC",
}, {
MFF_ETH_DST, "eth_dst", "dl_dst",
MF_FIELD_SIZES(mac),
- MFM_MCAST, 0,
+ MFM_FULLY,
MFS_ETHERNET,
MFP_NONE,
- NXM_OF_ETH_DST,
+ true,
+ NXM_OF_ETH_DST, "NXM_OF_ETH_DST",
+ OXM_OF_ETH_DST, "OXM_OF_ETH_DST",
}, {
MFF_ETH_TYPE, "eth_type", "dl_type",
MF_FIELD_SIZES(be16),
- MFM_NONE, FWW_DL_TYPE,
+ MFM_NONE,
MFS_HEXADECIMAL,
MFP_NONE,
- NXM_OF_ETH_TYPE,
+ false,
+ NXM_OF_ETH_TYPE, "NXM_OF_ETH_TYPE",
+ OXM_OF_ETH_TYPE, "OXM_OF_ETH_TYPE",
},
{
MFF_VLAN_TCI, "vlan_tci", NULL,
MF_FIELD_SIZES(be16),
- MFM_FULLY, 0,
+ MFM_FULLY,
MFS_HEXADECIMAL,
MFP_NONE,
- NXM_OF_VLAN_TCI,
+ true,
+ 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,
+ MFM_NONE,
MFS_DECIMAL,
MFP_NONE,
- 0,
+ true,
+ 0, NULL,
+ 0, NULL,
}, {
- MFF_VLAN_PCP, "dl_vlan_pcp", NULL,
+ MFF_VLAN_VID, "vlan_vid", NULL,
+ sizeof(ovs_be16), 12,
+ MFM_FULLY,
+ MFS_DECIMAL,
+ MFP_NONE,
+ true,
+ OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID",
+ OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID",
+ }, {
+ MFF_DL_VLAN_PCP, "dl_vlan_pcp", NULL,
1, 3,
- MFM_NONE, 0,
+ MFM_NONE,
MFS_DECIMAL,
MFP_NONE,
- 0,
+ true,
+ 0, NULL,
+ 0, NULL,
+ }, {
+ MFF_VLAN_PCP, "vlan_pcp", NULL,
+ 1, 3,
+ MFM_NONE,
+ MFS_DECIMAL,
+ MFP_VLAN_VID,
+ true,
+ OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP",
+ OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP",
},
/* ## -- ## */
{
MFF_IPV4_SRC, "ip_src", "nw_src",
MF_FIELD_SIZES(be32),
- MFM_CIDR, 0,
+ MFM_FULLY,
MFS_IPV4,
MFP_IPV4,
- NXM_OF_IP_SRC,
+ true,
+ NXM_OF_IP_SRC, "NXM_OF_IP_SRC",
+ OXM_OF_IPV4_SRC, "OXM_OF_IPV4_SRC",
}, {
MFF_IPV4_DST, "ip_dst", "nw_dst",
MF_FIELD_SIZES(be32),
- MFM_CIDR, 0,
+ MFM_FULLY,
MFS_IPV4,
MFP_IPV4,
- NXM_OF_IP_DST,
+ true,
+ NXM_OF_IP_DST, "NXM_OF_IP_DST",
+ OXM_OF_IPV4_DST, "OXM_OF_IPV4_DST",
},
{
MFF_IPV6_SRC, "ipv6_src", NULL,
MF_FIELD_SIZES(ipv6),
- MFM_CIDR, 0,
+ MFM_FULLY,
MFS_IPV6,
MFP_IPV6,
- NXM_NX_IPV6_SRC,
+ true,
+ NXM_NX_IPV6_SRC, "NXM_NX_IPV6_SRC",
+ OXM_OF_IPV6_SRC, "OXM_OF_IPV6_SRC",
}, {
MFF_IPV6_DST, "ipv6_dst", NULL,
MF_FIELD_SIZES(ipv6),
- MFM_CIDR, 0,
+ MFM_FULLY,
MFS_IPV6,
MFP_IPV6,
- NXM_NX_IPV6_DST,
+ true,
+ NXM_NX_IPV6_DST, "NXM_NX_IPV6_DST",
+ OXM_OF_IPV6_DST, "OXM_OF_IPV6_DST",
},
{
MFF_IPV6_LABEL, "ipv6_label", NULL,
4, 20,
- MFM_NONE, FWW_IPV6_LABEL,
+ MFM_FULLY,
MFS_HEXADECIMAL,
MFP_IPV6,
- NXM_NX_IPV6_LABEL,
+ false,
+ NXM_NX_IPV6_LABEL, "NXM_NX_IPV6_LABEL",
+ OXM_OF_IPV6_FLABEL, "OXM_OF_IPV6_FLABEL",
},
{
MFF_IP_PROTO, "nw_proto", NULL,
MF_FIELD_SIZES(u8),
- MFM_NONE, FWW_NW_PROTO,
+ MFM_NONE,
MFS_DECIMAL,
MFP_IP_ANY,
- NXM_OF_IP_PROTO,
+ false,
+ NXM_OF_IP_PROTO, "NXM_OF_IP_PROTO",
+ OXM_OF_IP_PROTO, "OXM_OF_IP_PROTO",
}, {
MFF_IP_DSCP, "nw_tos", NULL,
MF_FIELD_SIZES(u8),
- MFM_NONE, 0,
+ MFM_NONE,
MFS_DECIMAL,
MFP_IP_ANY,
- NXM_OF_IP_TOS,
+ true,
+ NXM_OF_IP_TOS, "NXM_OF_IP_TOS",
+ OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP",
}, {
MFF_IP_ECN, "nw_ecn", NULL,
1, 2,
- MFM_NONE, 0,
+ MFM_NONE,
MFS_DECIMAL,
MFP_IP_ANY,
- NXM_NX_IP_ECN,
+ true,
+ NXM_NX_IP_ECN, "NXM_NX_IP_ECN",
+ OXM_OF_IP_ECN, "OXM_OF_IP_ECN",
}, {
MFF_IP_TTL, "nw_ttl", NULL,
MF_FIELD_SIZES(u8),
- MFM_NONE, FWW_NW_TTL,
+ MFM_NONE,
MFS_DECIMAL,
MFP_IP_ANY,
- NXM_NX_IP_TTL,
+ true,
+ NXM_NX_IP_TTL, "NXM_NX_IP_TTL",
+ NXM_NX_IP_TTL, "NXM_NX_IP_TTL",
}, {
MFF_IP_FRAG, "ip_frag", NULL,
1, 2,
- MFM_FULLY, 0,
+ MFM_FULLY,
MFS_FRAG,
MFP_IP_ANY,
- NXM_NX_IP_FRAG,
+ false,
+ NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG",
+ NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG",
},
{
MFF_ARP_OP, "arp_op", NULL,
MF_FIELD_SIZES(be16),
- MFM_NONE, FWW_NW_PROTO,
+ MFM_NONE,
MFS_DECIMAL,
MFP_ARP,
- NXM_OF_ARP_OP,
+ false,
+ NXM_OF_ARP_OP, "NXM_OF_ARP_OP",
+ OXM_OF_ARP_OP, "OXM_OF_ARP_OP",
}, {
MFF_ARP_SPA, "arp_spa", NULL,
MF_FIELD_SIZES(be32),
- MFM_CIDR, 0,
+ MFM_FULLY,
MFS_IPV4,
MFP_ARP,
- NXM_OF_ARP_SPA,
+ false,
+ NXM_OF_ARP_SPA, "NXM_OF_ARP_SPA",
+ OXM_OF_ARP_SPA, "OXM_OF_ARP_SPA",
}, {
MFF_ARP_TPA, "arp_tpa", NULL,
MF_FIELD_SIZES(be32),
- MFM_CIDR, 0,
+ MFM_FULLY,
MFS_IPV4,
MFP_ARP,
- NXM_OF_ARP_TPA,
+ false,
+ NXM_OF_ARP_TPA, "NXM_OF_ARP_TPA",
+ OXM_OF_ARP_TPA, "OXM_OF_ARP_TPA",
}, {
MFF_ARP_SHA, "arp_sha", NULL,
MF_FIELD_SIZES(mac),
- MFM_NONE, FWW_ARP_SHA,
+ MFM_FULLY,
MFS_ETHERNET,
MFP_ARP,
- NXM_NX_ARP_SHA,
+ false,
+ NXM_NX_ARP_SHA, "NXM_NX_ARP_SHA",
+ OXM_OF_ARP_SHA, "OXM_OF_ARP_SHA",
}, {
MFF_ARP_THA, "arp_tha", NULL,
MF_FIELD_SIZES(mac),
- MFM_NONE, FWW_ARP_THA,
+ MFM_FULLY,
MFS_ETHERNET,
MFP_ARP,
- NXM_NX_ARP_THA,
+ false,
+ NXM_NX_ARP_THA, "NXM_NX_ARP_THA",
+ OXM_OF_ARP_THA, "OXM_OF_ARP_THA",
},
/* ## -- ## */
{
MFF_TCP_SRC, "tcp_src", "tp_src",
MF_FIELD_SIZES(be16),
- MFM_NONE, FWW_TP_SRC,
+ MFM_FULLY,
MFS_DECIMAL,
MFP_TCP,
- NXM_OF_TCP_SRC,
+ true,
+ NXM_OF_TCP_SRC, "NXM_OF_TCP_SRC",
+ OXM_OF_TCP_SRC, "OXM_OF_TCP_SRC",
}, {
MFF_TCP_DST, "tcp_dst", "tp_dst",
MF_FIELD_SIZES(be16),
- MFM_NONE, FWW_TP_DST,
+ MFM_FULLY,
MFS_DECIMAL,
MFP_TCP,
- NXM_OF_TCP_DST,
+ true,
+ NXM_OF_TCP_DST, "NXM_OF_TCP_DST",
+ OXM_OF_TCP_DST, "OXM_OF_TCP_DST",
},
{
MFF_UDP_SRC, "udp_src", NULL,
MF_FIELD_SIZES(be16),
- MFM_NONE, FWW_TP_SRC,
+ MFM_FULLY,
MFS_DECIMAL,
MFP_UDP,
- NXM_OF_UDP_SRC,
+ true,
+ NXM_OF_UDP_SRC, "NXM_OF_UDP_SRC",
+ OXM_OF_UDP_SRC, "OXM_OF_UDP_SRC",
}, {
MFF_UDP_DST, "udp_dst", NULL,
MF_FIELD_SIZES(be16),
- MFM_NONE, FWW_TP_DST,
+ MFM_FULLY,
MFS_DECIMAL,
MFP_UDP,
- NXM_OF_UDP_DST,
+ true,
+ NXM_OF_UDP_DST, "NXM_OF_UDP_DST",
+ OXM_OF_UDP_DST, "OXM_OF_UDP_DST",
},
{
- MFF_ICMP_TYPE, "icmp_type", NULL,
+ MFF_ICMPV4_TYPE, "icmp_type", NULL,
MF_FIELD_SIZES(u8),
- MFM_NONE, FWW_TP_SRC,
+ MFM_NONE,
MFS_DECIMAL,
- MFP_ICMP_ANY,
- NXM_OF_ICMP_TYPE,
+ MFP_ICMPV4,
+ false,
+ NXM_OF_ICMP_TYPE, "NXM_OF_ICMP_TYPE",
+ OXM_OF_ICMPV4_TYPE, "OXM_OF_ICMPV4_TYPE",
}, {
- MFF_ICMP_CODE, "icmp_code", NULL,
+ MFF_ICMPV4_CODE, "icmp_code", NULL,
MF_FIELD_SIZES(u8),
- MFM_NONE, FWW_TP_DST,
+ MFM_NONE,
MFS_DECIMAL,
- MFP_ICMP_ANY,
- NXM_OF_ICMP_CODE,
+ MFP_ICMPV4,
+ false,
+ NXM_OF_ICMP_CODE, "NXM_OF_ICMP_CODE",
+ OXM_OF_ICMPV4_CODE, "OXM_OF_ICMPV4_CODE",
+ },
+
+ {
+ MFF_ICMPV6_TYPE, "icmpv6_type", NULL,
+ MF_FIELD_SIZES(u8),
+ MFM_NONE,
+ MFS_DECIMAL,
+ MFP_ICMPV6,
+ false,
+ NXM_NX_ICMPV6_TYPE, "NXM_NX_ICMPV6_TYPE",
+ OXM_OF_ICMPV6_TYPE, "OXM_OF_ICMPV6_TYPE",
+ }, {
+ MFF_ICMPV6_CODE, "icmpv6_code", NULL,
+ MF_FIELD_SIZES(u8),
+ MFM_NONE,
+ MFS_DECIMAL,
+ MFP_ICMPV6,
+ false,
+ NXM_NX_ICMPV6_CODE, "NXM_NX_ICMPV6_CODE",
+ OXM_OF_ICMPV6_CODE, "OXM_OF_ICMPV6_CODE",
},
/* ## ---- ## */
{
MFF_ND_TARGET, "nd_target", NULL,
MF_FIELD_SIZES(ipv6),
- MFM_NONE, FWW_ND_TARGET,
+ MFM_FULLY,
MFS_IPV6,
MFP_ND,
- NXM_NX_ND_TARGET,
+ false,
+ NXM_NX_ND_TARGET, "NXM_NX_ND_TARGET",
+ OXM_OF_IPV6_ND_TARGET, "OXM_OF_IPV6_ND_TARGET",
}, {
MFF_ND_SLL, "nd_sll", NULL,
MF_FIELD_SIZES(mac),
- MFM_NONE, FWW_ARP_SHA,
+ MFM_FULLY,
MFS_ETHERNET,
MFP_ND_SOLICIT,
- NXM_NX_ND_SLL,
+ false,
+ NXM_NX_ND_SLL, "NXM_NX_ND_SLL",
+ OXM_OF_IPV6_ND_SLL, "OXM_OF_IPV6_ND_SLL",
}, {
MFF_ND_TLL, "nd_tll", NULL,
MF_FIELD_SIZES(mac),
- MFM_NONE, FWW_ARP_THA,
+ MFM_FULLY,
MFS_ETHERNET,
MFP_ND_ADVERT,
- NXM_NX_ND_TLL,
+ false,
+ NXM_NX_ND_TLL, "NXM_NX_ND_TLL",
+ OXM_OF_IPV6_ND_TLL, "OXM_OF_IPV6_ND_TLL",
}
};
+/* Maps an NXM or OXM header value to an mf_field. */
+struct nxm_field {
+ struct hmap_node hmap_node; /* In 'all_fields' hmap. */
+ uint32_t header; /* NXM or OXM header value. */
+ const struct mf_field *mf;
+};
+
+/* Contains 'struct nxm_field's. */
+static struct hmap all_fields = HMAP_INITIALIZER(&all_fields);
+
+/* Rate limit for parse errors. These always indicate a bug in an OpenFlow
+ * controller and so there's not much point in showing a lot of them. */
+static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
+
+const struct mf_field *mf_from_nxm_header__(uint32_t header);
+
/* Returns the field with the given 'id'. */
const struct mf_field *
mf_from_id(enum mf_field_id id)
return shash_find_data(&mf_by_name, name);
}
+static void
+add_nxm_field(uint32_t header, const struct mf_field *mf)
+{
+ struct nxm_field *f;
+
+ f = xmalloc(sizeof *f);
+ hmap_insert(&all_fields, &f->hmap_node, hash_int(header, 0));
+ f->header = header;
+ f->mf = mf;
+}
+
+static void
+nxm_init_add_field(const struct mf_field *mf, uint32_t header)
+{
+ if (header) {
+ assert(!mf_from_nxm_header__(header));
+ add_nxm_field(header, mf);
+ if (mf->maskable != MFM_NONE) {
+ add_nxm_field(NXM_MAKE_WILD_HEADER(header), mf);
+ }
+ }
+}
+
+static void
+nxm_init(void)
+{
+ const struct mf_field *mf;
+
+ for (mf = mf_fields; mf < &mf_fields[MFF_N_IDS]; mf++) {
+ nxm_init_add_field(mf, mf->nxm_header);
+ if (mf->oxm_header != mf->nxm_header) {
+ nxm_init_add_field(mf, mf->oxm_header);
+ }
+ }
+}
+
+const struct mf_field *
+mf_from_nxm_header(uint32_t header)
+{
+ if (hmap_is_empty(&all_fields)) {
+ nxm_init();
+ }
+ return mf_from_nxm_header__(header);
+}
+
+const struct mf_field *
+mf_from_nxm_header__(uint32_t header)
+{
+ const struct nxm_field *f;
+
+ HMAP_FOR_EACH_IN_BUCKET (f, hmap_node, hash_int(header, 0), &all_fields) {
+ if (f->header == header) {
+ return f->mf;
+ }
+ }
+
+ return NULL;
+}
+
/* Returns true if 'wc' wildcards all the bits in field 'mf', false if 'wc'
* specifies at least one bit in the field.
*
mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc)
{
switch (mf->id) {
+ case MFF_TUN_ID:
+ return !wc->masks.tun_id;
+ case MFF_METADATA:
+ return !wc->masks.metadata;
case MFF_IN_PORT:
+ return !wc->masks.in_port;
+ CASE_MFF_REGS:
+ return !wc->masks.regs[mf->id - MFF_REG0];
+
case MFF_ETH_SRC:
+ return eth_addr_is_zero(wc->masks.dl_src);
+ case MFF_ETH_DST:
+ return eth_addr_is_zero(wc->masks.dl_dst);
case MFF_ETH_TYPE:
- case MFF_IP_PROTO:
- case MFF_IP_TTL:
- case MFF_IPV6_LABEL:
- case MFF_ARP_OP:
+ return !wc->masks.dl_type;
+
case MFF_ARP_SHA:
- case MFF_ARP_THA:
- case MFF_TCP_SRC:
- case MFF_TCP_DST:
- case MFF_UDP_SRC:
- case MFF_UDP_DST:
- case MFF_ICMP_TYPE:
- case MFF_ICMP_CODE:
- case MFF_ND_TARGET:
case MFF_ND_SLL:
- case MFF_ND_TLL:
- assert(mf->fww_bit != 0);
- return (wc->wildcards & mf->fww_bit) != 0;
-
- case MFF_TUN_ID:
- return !wc->tun_id_mask;
+ return eth_addr_is_zero(wc->masks.arp_sha);
-#if FLOW_N_REGS > 0
- case MFF_REG0:
-#endif
-#if FLOW_N_REGS > 1
- case MFF_REG1:
-#endif
-#if FLOW_N_REGS > 2
- case MFF_REG2:
-#endif
-#if FLOW_N_REGS > 3
- case MFF_REG3:
-#endif
-#if FLOW_N_REGS > 4
- case MFF_REG4:
-#endif
-#if FLOW_N_REGS > 5
-#error
-#endif
- return !wc->reg_masks[mf->id - MFF_REG0];
-
- case MFF_ETH_DST:
- return ((wc->wildcards & (FWW_ETH_MCAST | FWW_DL_DST))
- == (FWW_ETH_MCAST | FWW_DL_DST));
+ case MFF_ARP_THA:
+ case MFF_ND_TLL:
+ return eth_addr_is_zero(wc->masks.arp_tha);
case MFF_VLAN_TCI:
- return !wc->vlan_tci_mask;
+ return !wc->masks.vlan_tci;
+ case MFF_DL_VLAN:
+ return !(wc->masks.vlan_tci & htons(VLAN_VID_MASK));
case MFF_VLAN_VID:
- return !(wc->vlan_tci_mask & htons(VLAN_VID_MASK));
+ return !(wc->masks.vlan_tci & htons(VLAN_VID_MASK | VLAN_CFI));
+ case MFF_DL_VLAN_PCP:
case MFF_VLAN_PCP:
- return !(wc->vlan_tci_mask & htons(VLAN_PCP_MASK));
+ return !(wc->masks.vlan_tci & htons(VLAN_PCP_MASK));
case MFF_IPV4_SRC:
- return !wc->nw_src_mask;
+ return !wc->masks.nw_src;
case MFF_IPV4_DST:
- return !wc->nw_dst_mask;
+ return !wc->masks.nw_dst;
case MFF_IPV6_SRC:
- return ipv6_mask_is_any(&wc->ipv6_src_mask);
+ return ipv6_mask_is_any(&wc->masks.ipv6_src);
case MFF_IPV6_DST:
- return ipv6_mask_is_any(&wc->ipv6_dst_mask);
+ return ipv6_mask_is_any(&wc->masks.ipv6_dst);
+
+ case MFF_IPV6_LABEL:
+ return !wc->masks.ipv6_label;
+ case MFF_IP_PROTO:
+ return !wc->masks.nw_proto;
case MFF_IP_DSCP:
- return !(wc->tos_mask & IP_DSCP_MASK);
+ return !(wc->masks.nw_tos & IP_DSCP_MASK);
case MFF_IP_ECN:
- return !(wc->tos_mask & IP_ECN_MASK);
+ return !(wc->masks.nw_tos & IP_ECN_MASK);
+ case MFF_IP_TTL:
+ return !wc->masks.nw_ttl;
+
+ case MFF_ND_TARGET:
+ return ipv6_mask_is_any(&wc->masks.nd_target);
+
case MFF_IP_FRAG:
- return !(wc->frag_mask & FLOW_FRAG_MASK);
+ return !(wc->masks.nw_frag & FLOW_NW_FRAG_MASK);
+ case MFF_ARP_OP:
+ return !wc->masks.nw_proto;
case MFF_ARP_SPA:
- return !wc->nw_src_mask;
+ return !wc->masks.nw_src;
case MFF_ARP_TPA:
- return !wc->nw_dst_mask;
+ return !wc->masks.nw_dst;
+
+ case MFF_TCP_SRC:
+ case MFF_UDP_SRC:
+ case MFF_ICMPV4_TYPE:
+ case MFF_ICMPV6_TYPE:
+ return !wc->masks.tp_src;
+ case MFF_TCP_DST:
+ case MFF_UDP_DST:
+ case MFF_ICMPV4_CODE:
+ case MFF_ICMPV6_CODE:
+ return !wc->masks.tp_dst;
case MFF_N_IDS:
default:
union mf_value *mask)
{
switch (mf->id) {
- case MFF_IN_PORT:
- case MFF_ETH_SRC:
- case MFF_ETH_TYPE:
- case MFF_IP_PROTO:
- case MFF_IP_TTL:
- case MFF_IPV6_LABEL:
- case MFF_ARP_OP:
- case MFF_ARP_SHA:
- case MFF_ARP_THA:
- case MFF_TCP_SRC:
- case MFF_TCP_DST:
- case MFF_UDP_SRC:
- case MFF_UDP_DST:
- case MFF_ICMP_TYPE:
- case MFF_ICMP_CODE:
- case MFF_ND_TARGET:
- 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;
-
case MFF_TUN_ID:
- mask->be64 = wc->tun_id_mask;
+ mask->be64 = wc->masks.tun_id;
break;
-
-#if FLOW_N_REGS > 0
- case MFF_REG0:
-#endif
-#if FLOW_N_REGS > 1
- case MFF_REG1:
-#endif
-#if FLOW_N_REGS > 2
- case MFF_REG2:
-#endif
-#if FLOW_N_REGS > 3
- case MFF_REG3:
-#endif
-#if FLOW_N_REGS > 4
- case MFF_REG4:
-#endif
-#if FLOW_N_REGS > 5
-#error
-#endif
- mask->be32 = htonl(wc->reg_masks[mf->id - MFF_REG0]);
+ case MFF_METADATA:
+ mask->be64 = wc->masks.metadata;
+ break;
+ case MFF_IN_PORT:
+ mask->be16 = htons(wc->masks.in_port);
+ break;
+ CASE_MFF_REGS:
+ mask->be32 = htonl(wc->masks.regs[mf->id - MFF_REG0]);
break;
case MFF_ETH_DST:
- memcpy(mask->mac, flow_wildcards_to_dl_dst_mask(wc->wildcards),
- ETH_ADDR_LEN);
+ memcpy(mask->mac, wc->masks.dl_dst, ETH_ADDR_LEN);
+ break;
+ case MFF_ETH_SRC:
+ memcpy(mask->mac, wc->masks.dl_src, ETH_ADDR_LEN);
+ break;
+ case MFF_ETH_TYPE:
+ mask->be16 = wc->masks.dl_type;
break;
case MFF_VLAN_TCI:
- mask->be16 = wc->vlan_tci_mask;
+ mask->be16 = wc->masks.vlan_tci;
+ break;
+ case MFF_DL_VLAN:
+ mask->be16 = wc->masks.vlan_tci & htons(VLAN_VID_MASK);
break;
case MFF_VLAN_VID:
- mask->be16 = wc->vlan_tci_mask & htons(VLAN_VID_MASK);
+ mask->be16 = wc->masks.vlan_tci & htons(VLAN_VID_MASK | VLAN_CFI);
break;
+ case MFF_DL_VLAN_PCP:
case MFF_VLAN_PCP:
- mask->u8 = vlan_tci_to_pcp(wc->vlan_tci_mask);
+ mask->u8 = vlan_tci_to_pcp(wc->masks.vlan_tci);
break;
case MFF_IPV4_SRC:
- mask->be32 = wc->nw_src_mask;
+ mask->be32 = wc->masks.nw_src;
break;
case MFF_IPV4_DST:
- mask->be32 = wc->nw_dst_mask;
+ mask->be32 = wc->masks.nw_dst;
break;
case MFF_IPV6_SRC:
- mask->ipv6 = wc->ipv6_src_mask;
+ mask->ipv6 = wc->masks.ipv6_src;
break;
case MFF_IPV6_DST:
- mask->ipv6 = wc->ipv6_dst_mask;
+ mask->ipv6 = wc->masks.ipv6_dst;
+ break;
+ case MFF_IPV6_LABEL:
+ mask->be32 = wc->masks.ipv6_label;
break;
+ case MFF_IP_PROTO:
+ mask->u8 = wc->masks.nw_proto;
+ break;
case MFF_IP_DSCP:
- mask->u8 = wc->tos_mask & IP_DSCP_MASK;
+ mask->u8 = wc->masks.nw_tos & IP_DSCP_MASK;
break;
case MFF_IP_ECN:
- mask->u8 = wc->tos_mask & IP_ECN_MASK;
+ mask->u8 = wc->masks.nw_tos & IP_ECN_MASK;
+ break;
+
+ case MFF_ND_TARGET:
+ mask->ipv6 = wc->masks.nd_target;
+ break;
+
+ case MFF_IP_TTL:
+ mask->u8 = wc->masks.nw_ttl;
break;
case MFF_IP_FRAG:
- mask->u8 = wc->frag_mask & FLOW_FRAG_MASK;
+ mask->u8 = wc->masks.nw_frag & FLOW_NW_FRAG_MASK;
break;
+ case MFF_ARP_OP:
+ mask->u8 = wc->masks.nw_proto;
+ break;
case MFF_ARP_SPA:
- mask->be32 = wc->nw_src_mask;
+ mask->be32 = wc->masks.nw_src;
break;
case MFF_ARP_TPA:
- mask->be32 = wc->nw_dst_mask;
+ mask->be32 = wc->masks.nw_dst;
+ break;
+ case MFF_ARP_SHA:
+ case MFF_ND_SLL:
+ memcpy(mask->mac, wc->masks.arp_sha, ETH_ADDR_LEN);
+ break;
+ case MFF_ARP_THA:
+ case MFF_ND_TLL:
+ memcpy(mask->mac, wc->masks.arp_tha, ETH_ADDR_LEN);
+ break;
+
+ case MFF_TCP_SRC:
+ case MFF_UDP_SRC:
+ mask->be16 = wc->masks.tp_src;
+ break;
+ case MFF_TCP_DST:
+ case MFF_UDP_DST:
+ mask->be16 = wc->masks.tp_dst;
+ break;
+
+ case MFF_ICMPV4_TYPE:
+ case MFF_ICMPV6_TYPE:
+ mask->u8 = ntohs(wc->masks.tp_src);
+ break;
+ case MFF_ICMPV4_CODE:
+ case MFF_ICMPV6_CODE:
+ mask->u8 = ntohs(wc->masks.tp_dst);
break;
case MFF_N_IDS:
case MFM_FULLY:
return true;
-
- case MFM_CIDR:
- return (mf->n_bytes == 4
- ? ip_is_cidr(mask->be32)
- : ipv6_is_cidr(&mask->ipv6));
-
- case MFM_MCAST:
- return flow_wildcards_is_dl_dst_mask_valid(mask->mac);
}
NOT_REACHED();
return flow->dl_type == htons(ETH_TYPE_IP);
case MFP_IPV6:
return flow->dl_type == htons(ETH_TYPE_IPV6);
+ case MFP_VLAN_VID:
+ return (flow->vlan_tci & htons(VLAN_CFI)) != 0;
case MFP_IP_ANY:
return is_ip_any(flow);
return is_ip_any(flow) && flow->nw_proto == IPPROTO_TCP;
case MFP_UDP:
return is_ip_any(flow) && flow->nw_proto == IPPROTO_UDP;
+ case MFP_ICMPV4:
+ return is_icmpv4(flow);
case MFP_ICMPV6:
return is_icmpv6(flow);
- case MFP_ICMP_ANY:
- return is_icmpv4(flow) || is_icmpv6(flow);
case MFP_ND:
return (is_icmpv6(flow)
{
switch (mf->id) {
case MFF_TUN_ID:
+ case MFF_METADATA:
case MFF_IN_PORT:
-#if FLOW_N_REGS > 0
- case MFF_REG0:
-#endif
-#if FLOW_N_REGS > 1
- case MFF_REG1:
-#endif
-#if FLOW_N_REGS > 2
- case MFF_REG2:
-#endif
-#if FLOW_N_REGS > 3
- case MFF_REG3:
-#endif
-#if FLOW_N_REGS > 4
- case MFF_REG4:
-#endif
-#if FLOW_N_REGS > 5
-#error
-#endif
+ CASE_MFF_REGS:
case MFF_ETH_SRC:
case MFF_ETH_DST:
case MFF_ETH_TYPE:
case MFF_TCP_DST:
case MFF_UDP_SRC:
case MFF_UDP_DST:
- case MFF_ICMP_TYPE:
- case MFF_ICMP_CODE:
+ case MFF_ICMPV4_TYPE:
+ case MFF_ICMPV4_CODE:
+ case MFF_ICMPV6_TYPE:
+ case MFF_ICMPV6_CODE:
case MFF_ND_TARGET:
case MFF_ND_SLL:
case MFF_ND_TLL:
case MFF_IP_ECN:
return !(value->u8 & ~IP_ECN_MASK);
case MFF_IP_FRAG:
- return !(value->u8 & ~FLOW_FRAG_MASK);
+ return !(value->u8 & ~FLOW_NW_FRAG_MASK);
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));
+ case MFF_VLAN_VID:
+ return !(value->be16 & htons(VLAN_PCP_MASK));
+ case MFF_DL_VLAN_PCP:
case MFF_VLAN_PCP:
- return !(value->u8 & ~7);
+ return !(value->u8 & ~(VLAN_PCP_MASK >> VLAN_PCP_SHIFT));
case MFF_IPV6_LABEL:
return !(value->be32 & ~htonl(IPV6_LABEL_MASK));
case MFF_TUN_ID:
value->be64 = flow->tun_id;
break;
+ case MFF_METADATA:
+ value->be64 = flow->metadata;
+ break;
case MFF_IN_PORT:
value->be16 = htons(flow->in_port);
break;
-#if FLOW_N_REGS > 0
- case MFF_REG0:
-#endif
-#if FLOW_N_REGS > 1
- case MFF_REG1:
-#endif
-#if FLOW_N_REGS > 2
- case MFF_REG2:
-#endif
-#if FLOW_N_REGS > 3
- case MFF_REG3:
-#endif
-#if FLOW_N_REGS > 4
- case MFF_REG4:
-#endif
-#if FLOW_N_REGS > 5
-#error
-#endif
+ CASE_MFF_REGS:
value->be32 = htonl(flow->regs[mf->id - MFF_REG0]);
break;
case MFF_ETH_SRC:
- memcpy(value->mac, flow->dl_src, ETH_ADDR_LEN);
+ memcpy(value->mac, flow->dl_src, ETH_ADDR_LEN);
+ break;
+
+ case MFF_ETH_DST:
+ memcpy(value->mac, flow->dl_dst, ETH_ADDR_LEN);
+ break;
+
+ case MFF_ETH_TYPE:
+ value->be16 = flow->dl_type;
+ break;
+
+ case MFF_VLAN_TCI:
+ value->be16 = flow->vlan_tci;
+ break;
+
+ case MFF_DL_VLAN:
+ value->be16 = flow->vlan_tci & htons(VLAN_VID_MASK);
+ break;
+ case MFF_VLAN_VID:
+ value->be16 = flow->vlan_tci & htons(VLAN_VID_MASK | VLAN_CFI);
+ break;
+
+ case MFF_DL_VLAN_PCP:
+ case MFF_VLAN_PCP:
+ value->u8 = vlan_tci_to_pcp(flow->vlan_tci);
+ break;
+
+ case MFF_IPV4_SRC:
+ value->be32 = flow->nw_src;
+ break;
+
+ case MFF_IPV4_DST:
+ value->be32 = flow->nw_dst;
+ break;
+
+ case MFF_IPV6_SRC:
+ value->ipv6 = flow->ipv6_src;
+ break;
+
+ case MFF_IPV6_DST:
+ value->ipv6 = flow->ipv6_dst;
+ break;
+
+ case MFF_IPV6_LABEL:
+ value->be32 = flow->ipv6_label;
+ break;
+
+ case MFF_IP_PROTO:
+ value->u8 = flow->nw_proto;
+ break;
+
+ case MFF_IP_DSCP:
+ value->u8 = flow->nw_tos & IP_DSCP_MASK;
+ break;
+
+ case MFF_IP_ECN:
+ value->u8 = flow->nw_tos & IP_ECN_MASK;
+ break;
+
+ case MFF_IP_TTL:
+ value->u8 = flow->nw_ttl;
+ break;
+
+ case MFF_IP_FRAG:
+ value->u8 = flow->nw_frag;
+ break;
+
+ case MFF_ARP_OP:
+ value->be16 = htons(flow->nw_proto);
+ break;
+
+ case MFF_ARP_SPA:
+ value->be32 = flow->nw_src;
+ break;
+
+ case MFF_ARP_TPA:
+ value->be32 = flow->nw_dst;
+ break;
+
+ case MFF_ARP_SHA:
+ case MFF_ND_SLL:
+ memcpy(value->mac, flow->arp_sha, ETH_ADDR_LEN);
+ break;
+
+ case MFF_ARP_THA:
+ case MFF_ND_TLL:
+ memcpy(value->mac, flow->arp_tha, ETH_ADDR_LEN);
+ break;
+
+ case MFF_TCP_SRC:
+ case MFF_UDP_SRC:
+ value->be16 = flow->tp_src;
+ break;
+
+ case MFF_TCP_DST:
+ case MFF_UDP_DST:
+ value->be16 = flow->tp_dst;
+ break;
+
+ case MFF_ICMPV4_TYPE:
+ case MFF_ICMPV6_TYPE:
+ value->u8 = ntohs(flow->tp_src);
+ break;
+
+ case MFF_ICMPV4_CODE:
+ case MFF_ICMPV6_CODE:
+ value->u8 = ntohs(flow->tp_dst);
+ break;
+
+ case MFF_ND_TARGET:
+ value->ipv6 = flow->nd_target;
+ break;
+
+ case MFF_N_IDS:
+ default:
+ NOT_REACHED();
+ }
+}
+
+/* Makes 'match' match field 'mf' exactly, with the value matched taken from
+ * 'value'. The caller is responsible for ensuring that 'match' meets 'mf''s
+ * prerequisites. */
+void
+mf_set_value(const struct mf_field *mf,
+ const union mf_value *value, struct match *match)
+{
+ switch (mf->id) {
+ case MFF_TUN_ID:
+ match_set_tun_id(match, value->be64);
+ break;
+ case MFF_METADATA:
+ match_set_metadata(match, value->be64);
+ break;
+
+ case MFF_IN_PORT:
+ match_set_in_port(match, ntohs(value->be16));
+ break;
+
+ CASE_MFF_REGS:
+ match_set_reg(match, mf->id - MFF_REG0, ntohl(value->be32));
+ break;
+
+ case MFF_ETH_SRC:
+ match_set_dl_src(match, value->mac);
break;
case MFF_ETH_DST:
- memcpy(value->mac, flow->dl_dst, ETH_ADDR_LEN);
+ match_set_dl_dst(match, value->mac);
break;
case MFF_ETH_TYPE:
- value->be16 = flow->dl_type;
+ match_set_dl_type(match, value->be16);
break;
case MFF_VLAN_TCI:
- value->be16 = flow->vlan_tci;
+ match_set_dl_tci(match, value->be16);
break;
+ case MFF_DL_VLAN:
+ match_set_dl_vlan(match, value->be16);
+ break;
case MFF_VLAN_VID:
- value->be16 = flow->vlan_tci & htons(VLAN_VID_MASK);
+ match_set_vlan_vid(match, value->be16);
break;
+ case MFF_DL_VLAN_PCP:
case MFF_VLAN_PCP:
- value->u8 = vlan_tci_to_pcp(flow->vlan_tci);
+ match_set_dl_vlan_pcp(match, value->u8);
break;
case MFF_IPV4_SRC:
- value->be32 = flow->nw_src;
+ match_set_nw_src(match, value->be32);
break;
case MFF_IPV4_DST:
- value->be32 = flow->nw_dst;
+ match_set_nw_dst(match, value->be32);
break;
case MFF_IPV6_SRC:
- value->ipv6 = flow->ipv6_src;
+ match_set_ipv6_src(match, &value->ipv6);
break;
case MFF_IPV6_DST:
- value->ipv6 = flow->ipv6_dst;
+ match_set_ipv6_dst(match, &value->ipv6);
break;
case MFF_IPV6_LABEL:
- value->be32 = flow->ipv6_label;
+ match_set_ipv6_label(match, value->be32);
break;
case MFF_IP_PROTO:
- value->u8 = flow->nw_proto;
+ match_set_nw_proto(match, value->u8);
break;
case MFF_IP_DSCP:
- value->u8 = flow->tos & IP_DSCP_MASK;
+ match_set_nw_dscp(match, value->u8);
break;
case MFF_IP_ECN:
- value->u8 = flow->tos & IP_ECN_MASK;
+ match_set_nw_ecn(match, value->u8);
break;
case MFF_IP_TTL:
- value->u8 = flow->nw_ttl;
+ match_set_nw_ttl(match, value->u8);
break;
case MFF_IP_FRAG:
- value->u8 = flow->frag;
+ match_set_nw_frag(match, value->u8);
break;
case MFF_ARP_OP:
- value->be16 = htons(flow->nw_proto);
+ match_set_nw_proto(match, ntohs(value->be16));
break;
case MFF_ARP_SPA:
- value->be32 = flow->nw_src;
+ match_set_nw_src(match, value->be32);
break;
case MFF_ARP_TPA:
- value->be32 = flow->nw_dst;
+ match_set_nw_dst(match, value->be32);
break;
case MFF_ARP_SHA:
case MFF_ND_SLL:
- memcpy(value->mac, flow->arp_sha, ETH_ADDR_LEN);
+ match_set_arp_sha(match, value->mac);
break;
case MFF_ARP_THA:
case MFF_ND_TLL:
- memcpy(value->mac, flow->arp_tha, ETH_ADDR_LEN);
+ match_set_arp_tha(match, value->mac);
break;
case MFF_TCP_SRC:
- value->be16 = flow->tp_src;
- break;
-
- case MFF_TCP_DST:
- value->be16 = flow->tp_dst;
- break;
-
case MFF_UDP_SRC:
- value->be16 = flow->tp_src;
+ match_set_tp_src(match, value->be16);
break;
+ case MFF_TCP_DST:
case MFF_UDP_DST:
- value->be16 = flow->tp_dst;
+ match_set_tp_dst(match, value->be16);
break;
- case MFF_ICMP_TYPE:
- value->u8 = ntohs(flow->tp_src);
+ case MFF_ICMPV4_TYPE:
+ case MFF_ICMPV6_TYPE:
+ match_set_icmp_type(match, value->u8);
break;
- case MFF_ICMP_CODE:
- value->u8 = ntohs(flow->tp_dst);
+ case MFF_ICMPV4_CODE:
+ case MFF_ICMPV6_CODE:
+ match_set_icmp_code(match, value->u8);
break;
case MFF_ND_TARGET:
- value->ipv6 = flow->nd_target;
+ match_set_nd_target(match, &value->ipv6);
break;
case MFF_N_IDS:
}
}
-/* Makes 'rule' match field 'mf' exactly, with the value matched taken from
- * 'value'. The caller is responsible for ensuring that 'rule' meets 'mf''s
+/* Makes 'match' match field 'mf' exactly, with the value matched taken from
+ * 'value'. The caller is responsible for ensuring that 'match' meets 'mf''s
* prerequisites. */
void
-mf_set_value(const struct mf_field *mf,
- const union mf_value *value, struct cls_rule *rule)
+mf_set_flow_value(const struct mf_field *mf,
+ const union mf_value *value, struct flow *flow)
{
switch (mf->id) {
case MFF_TUN_ID:
- cls_rule_set_tun_id(rule, value->be64);
+ flow->tun_id = value->be64;
+ break;
+ case MFF_METADATA:
+ flow->metadata = value->be64;
break;
case MFF_IN_PORT:
- cls_rule_set_in_port(rule, ntohs(value->be16));
+ flow->in_port = ntohs(value->be16);
break;
-#if FLOW_N_REGS > 0
- case MFF_REG0:
-#endif
-#if FLOW_N_REGS > 1
- case MFF_REG1:
-#endif
-#if FLOW_N_REGS > 2
- case MFF_REG2:
-#endif
-#if FLOW_N_REGS > 3
- case MFF_REG3:
-#endif
-#if FLOW_N_REGS > 4
- case MFF_REG4:
-#endif
-#if FLOW_N_REGS > 5
-#error
-#endif
-#if FLOW_N_REGS > 0
- cls_rule_set_reg(rule, mf->id - MFF_REG0, ntohl(value->be32));
+ CASE_MFF_REGS:
+ flow->regs[mf->id - MFF_REG0] = ntohl(value->be32);
break;
-#endif
case MFF_ETH_SRC:
- cls_rule_set_dl_src(rule, value->mac);
+ memcpy(flow->dl_src, value->mac, ETH_ADDR_LEN);
break;
case MFF_ETH_DST:
- cls_rule_set_dl_dst(rule, value->mac);
+ memcpy(flow->dl_dst, value->mac, ETH_ADDR_LEN);
break;
case MFF_ETH_TYPE:
- cls_rule_set_dl_type(rule, value->be16);
+ flow->dl_type = value->be16;
break;
case MFF_VLAN_TCI:
- cls_rule_set_dl_tci(rule, value->be16);
+ flow->vlan_tci = value->be16;
break;
+ case MFF_DL_VLAN:
+ flow_set_dl_vlan(flow, value->be16);
+ break;
case MFF_VLAN_VID:
- cls_rule_set_dl_vlan(rule, value->be16);
+ flow_set_vlan_vid(flow, value->be16);
break;
+ case MFF_DL_VLAN_PCP:
case MFF_VLAN_PCP:
- cls_rule_set_dl_vlan_pcp(rule, value->u8);
+ flow_set_vlan_pcp(flow, value->u8);
break;
case MFF_IPV4_SRC:
- cls_rule_set_nw_src(rule, value->be32);
+ flow->nw_src = value->be32;
break;
case MFF_IPV4_DST:
- cls_rule_set_nw_dst(rule, value->be32);
+ flow->nw_dst = value->be32;
break;
case MFF_IPV6_SRC:
- cls_rule_set_ipv6_src(rule, &value->ipv6);
+ flow->ipv6_src = value->ipv6;
break;
case MFF_IPV6_DST:
- cls_rule_set_ipv6_dst(rule, &value->ipv6);
+ flow->ipv6_dst = value->ipv6;
break;
case MFF_IPV6_LABEL:
- cls_rule_set_ipv6_label(rule, value->be32);
+ flow->ipv6_label = value->be32 & ~htonl(IPV6_LABEL_MASK);
break;
case MFF_IP_PROTO:
- cls_rule_set_nw_proto(rule, value->u8);
+ flow->nw_proto = value->u8;
break;
case MFF_IP_DSCP:
- cls_rule_set_nw_dscp(rule, value->u8);
+ flow->nw_tos &= ~IP_DSCP_MASK;
+ flow->nw_tos |= value->u8 & IP_DSCP_MASK;
break;
case MFF_IP_ECN:
- cls_rule_set_nw_ecn(rule, value->u8);
+ flow->nw_tos &= ~IP_ECN_MASK;
+ flow->nw_tos |= value->u8 & IP_ECN_MASK;
break;
case MFF_IP_TTL:
- cls_rule_set_nw_ttl(rule, value->u8);
+ flow->nw_ttl = value->u8;
break;
case MFF_IP_FRAG:
- cls_rule_set_frag(rule, value->u8);
+ flow->nw_frag &= value->u8;
break;
case MFF_ARP_OP:
- cls_rule_set_nw_proto(rule, ntohs(value->be16));
+ flow->nw_proto = ntohs(value->be16);
break;
case MFF_ARP_SPA:
- cls_rule_set_nw_src(rule, value->be32);
+ flow->nw_src = value->be32;
break;
case MFF_ARP_TPA:
- cls_rule_set_nw_dst(rule, value->be32);
+ flow->nw_dst = value->be32;
break;
case MFF_ARP_SHA:
case MFF_ND_SLL:
- cls_rule_set_arp_sha(rule, value->mac);
+ memcpy(flow->arp_sha, value->mac, ETH_ADDR_LEN);
break;
case MFF_ARP_THA:
case MFF_ND_TLL:
- cls_rule_set_arp_tha(rule, value->mac);
+ memcpy(flow->arp_tha, value->mac, ETH_ADDR_LEN);
break;
case MFF_TCP_SRC:
- cls_rule_set_tp_src(rule, value->be16);
- break;
-
- case MFF_TCP_DST:
- cls_rule_set_tp_dst(rule, value->be16);
- break;
-
case MFF_UDP_SRC:
- cls_rule_set_tp_src(rule, value->be16);
+ flow->tp_src = value->be16;
break;
+ case MFF_TCP_DST:
case MFF_UDP_DST:
- cls_rule_set_tp_dst(rule, value->be16);
+ flow->tp_dst = value->be16;
break;
- case MFF_ICMP_TYPE:
- cls_rule_set_icmp_type(rule, value->u8);
+ case MFF_ICMPV4_TYPE:
+ case MFF_ICMPV6_TYPE:
+ flow->tp_src = htons(value->u8);
break;
- case MFF_ICMP_CODE:
- cls_rule_set_icmp_code(rule, value->u8);
+ case MFF_ICMPV4_CODE:
+ case MFF_ICMPV6_CODE:
+ flow->tp_dst = htons(value->u8);
break;
case MFF_ND_TARGET:
- cls_rule_set_nd_target(rule, &value->ipv6);
+ flow->nd_target = value->ipv6;
break;
case MFF_N_IDS:
}
}
-/* Makes 'rule' wildcard field 'mf'.
+/* Returns true if 'mf' has a zero value in 'flow', false if it is nonzero.
*
- * The caller is responsible for ensuring that 'rule' meets 'mf''s
+ * The caller is responsible for ensuring that 'flow' meets 'mf''s
+ * prerequisites. */
+bool
+mf_is_zero(const struct mf_field *mf, const struct flow *flow)
+{
+ union mf_value value;
+
+ mf_get_value(mf, flow, &value);
+ return is_all_zeros((const uint8_t *) &value, mf->n_bytes);
+}
+
+/* Makes 'match' wildcard field 'mf'.
+ *
+ * The caller is responsible for ensuring that 'match' meets 'mf''s
* prerequisites. */
void
-mf_set_wild(const struct mf_field *mf, struct cls_rule *rule)
+mf_set_wild(const struct mf_field *mf, struct match *match)
{
switch (mf->id) {
case MFF_TUN_ID:
- cls_rule_set_tun_id_masked(rule, htonll(0), htonll(0));
+ match_set_tun_id_masked(match, htonll(0), htonll(0));
break;
+ case MFF_METADATA:
+ match_set_metadata_masked(match, htonll(0), htonll(0));
case MFF_IN_PORT:
- rule->wc.wildcards |= FWW_IN_PORT;
- rule->flow.in_port = 0;
+ match->flow.in_port = 0;
+ match->wc.masks.in_port = 0;
break;
-#if FLOW_N_REGS > 0
- case MFF_REG0:
- cls_rule_set_reg_masked(rule, 0, 0, 0);
- break;
-#endif
-#if FLOW_N_REGS > 1
- case MFF_REG1:
- cls_rule_set_reg_masked(rule, 1, 0, 0);
- break;
-#endif
-#if FLOW_N_REGS > 2
- case MFF_REG2:
- cls_rule_set_reg_masked(rule, 2, 0, 0);
- break;
-#endif
-#if FLOW_N_REGS > 3
- case MFF_REG3:
- cls_rule_set_reg_masked(rule, 3, 0, 0);
- break;
-#endif
-#if FLOW_N_REGS > 4
- case MFF_REG4:
- cls_rule_set_reg_masked(rule, 4, 0, 0);
+ CASE_MFF_REGS:
+ match_set_reg_masked(match, mf->id - MFF_REG0, 0, 0);
break;
-#endif
-#if FLOW_N_REGS > 5
-#error
-#endif
case MFF_ETH_SRC:
- rule->wc.wildcards |= FWW_DL_SRC;
- memset(rule->flow.dl_src, 0, sizeof rule->flow.dl_src);
+ memset(match->flow.dl_src, 0, ETH_ADDR_LEN);
+ memset(match->wc.masks.dl_src, 0, ETH_ADDR_LEN);
break;
case MFF_ETH_DST:
- rule->wc.wildcards |= FWW_DL_DST | FWW_ETH_MCAST;
- memset(rule->flow.dl_dst, 0, sizeof rule->flow.dl_dst);
+ memset(match->flow.dl_dst, 0, ETH_ADDR_LEN);
+ memset(match->wc.masks.dl_dst, 0, ETH_ADDR_LEN);
break;
case MFF_ETH_TYPE:
- rule->wc.wildcards |= FWW_DL_TYPE;
- rule->flow.dl_type = htons(0);
+ match->flow.dl_type = htons(0);
+ match->wc.masks.dl_type = htons(0);
break;
case MFF_VLAN_TCI:
- cls_rule_set_dl_tci_masked(rule, htons(0), htons(0));
+ match_set_dl_tci_masked(match, htons(0), htons(0));
break;
+ case MFF_DL_VLAN:
case MFF_VLAN_VID:
- cls_rule_set_any_vid(rule);
+ match_set_any_vid(match);
break;
+ case MFF_DL_VLAN_PCP:
case MFF_VLAN_PCP:
- cls_rule_set_any_pcp(rule);
+ match_set_any_pcp(match);
break;
case MFF_IPV4_SRC:
case MFF_ARP_SPA:
- cls_rule_set_nw_src_masked(rule, htonl(0), htonl(0));
+ match_set_nw_src_masked(match, htonl(0), htonl(0));
break;
case MFF_IPV4_DST:
case MFF_ARP_TPA:
- cls_rule_set_nw_dst_masked(rule, htonl(0), htonl(0));
+ match_set_nw_dst_masked(match, htonl(0), htonl(0));
break;
case MFF_IPV6_SRC:
- memset(&rule->wc.ipv6_src_mask, 0, sizeof rule->wc.ipv6_src_mask);
- memset(&rule->flow.ipv6_src, 0, sizeof rule->flow.ipv6_src);
+ memset(&match->wc.masks.ipv6_src, 0, sizeof match->wc.masks.ipv6_src);
+ memset(&match->flow.ipv6_src, 0, sizeof match->flow.ipv6_src);
break;
case MFF_IPV6_DST:
- memset(&rule->wc.ipv6_dst_mask, 0, sizeof rule->wc.ipv6_dst_mask);
- memset(&rule->flow.ipv6_dst, 0, sizeof rule->flow.ipv6_dst);
+ memset(&match->wc.masks.ipv6_dst, 0, sizeof match->wc.masks.ipv6_dst);
+ memset(&match->flow.ipv6_dst, 0, sizeof match->flow.ipv6_dst);
break;
case MFF_IPV6_LABEL:
- rule->wc.wildcards |= FWW_IPV6_LABEL;
- rule->flow.ipv6_label = 0;
+ match->wc.masks.ipv6_label = htonl(0);
+ match->flow.ipv6_label = htonl(0);
break;
case MFF_IP_PROTO:
- rule->wc.wildcards |= FWW_NW_PROTO;
- rule->flow.nw_proto = 0;
+ match->wc.masks.nw_proto = 0;
+ match->flow.nw_proto = 0;
break;
case MFF_IP_DSCP:
- rule->wc.tos_mask |= IP_DSCP_MASK;
- rule->flow.tos &= ~IP_DSCP_MASK;
+ match->wc.masks.nw_tos &= ~IP_DSCP_MASK;
+ match->flow.nw_tos &= ~IP_DSCP_MASK;
break;
case MFF_IP_ECN:
- rule->wc.tos_mask |= IP_ECN_MASK;
- rule->flow.tos &= ~IP_ECN_MASK;
+ match->wc.masks.nw_tos &= ~IP_ECN_MASK;
+ match->flow.nw_tos &= ~IP_ECN_MASK;
break;
case MFF_IP_TTL:
- rule->wc.wildcards |= FWW_NW_TTL;
- rule->flow.nw_ttl = 0;
+ match->wc.masks.nw_ttl = 0;
+ match->flow.nw_ttl = 0;
break;
case MFF_IP_FRAG:
- rule->wc.frag_mask |= FLOW_FRAG_MASK;
- rule->flow.frag &= ~FLOW_FRAG_MASK;
+ match->wc.masks.nw_frag |= FLOW_NW_FRAG_MASK;
+ match->flow.nw_frag &= ~FLOW_NW_FRAG_MASK;
break;
case MFF_ARP_OP:
- rule->wc.wildcards |= FWW_NW_PROTO;
- rule->flow.nw_proto = 0;
+ match->wc.masks.nw_proto = 0;
+ match->flow.nw_proto = 0;
break;
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(match->flow.arp_sha, 0, ETH_ADDR_LEN);
+ memset(match->wc.masks.arp_sha, 0, ETH_ADDR_LEN);
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(match->flow.arp_tha, 0, ETH_ADDR_LEN);
+ memset(match->wc.masks.arp_tha, 0, ETH_ADDR_LEN);
break;
case MFF_TCP_SRC:
case MFF_UDP_SRC:
- case MFF_ICMP_TYPE:
- rule->wc.wildcards |= FWW_TP_SRC;
- rule->flow.tp_src = htons(0);
+ case MFF_ICMPV4_TYPE:
+ case MFF_ICMPV6_TYPE:
+ match->wc.masks.tp_src = htons(0);
+ match->flow.tp_src = htons(0);
break;
case MFF_TCP_DST:
case MFF_UDP_DST:
- case MFF_ICMP_CODE:
- rule->wc.wildcards |= FWW_TP_DST;
- rule->flow.tp_dst = htons(0);
+ case MFF_ICMPV4_CODE:
+ case MFF_ICMPV6_CODE:
+ match->wc.masks.tp_dst = htons(0);
+ match->flow.tp_dst = htons(0);
break;
case MFF_ND_TARGET:
- rule->wc.wildcards |= FWW_ND_TARGET;
- memset(&rule->flow.nd_target, 0, sizeof rule->flow.nd_target);
+ memset(&match->wc.masks.nd_target, 0,
+ sizeof match->wc.masks.nd_target);
+ memset(&match->flow.nd_target, 0, sizeof match->flow.nd_target);
break;
case MFF_N_IDS:
}
}
-/* Makes 'rule' match field 'mf' with the specified 'value' and 'mask'.
+/* Makes 'match' match field 'mf' with the specified 'value' and 'mask'.
* 'value' specifies a value to match and 'mask' specifies a wildcard pattern,
* with a 1-bit indicating that the corresponding value bit must match and a
* 0-bit indicating a don't-care.
*
* If 'mask' is NULL or points to all-1-bits, then this call is equivalent to
- * mf_set_value(mf, value, rule). If 'mask' points to all-0-bits, then this
- * call is equivalent to mf_set_wild(mf, rule).
+ * mf_set_value(mf, value, match). If 'mask' points to all-0-bits, then this
+ * call is equivalent to mf_set_wild(mf, match).
*
* 'mask' must be a valid mask for 'mf' (see mf_is_mask_valid()). The caller
- * is responsible for ensuring that 'rule' meets 'mf''s prerequisites. */
+ * is responsible for ensuring that 'match' meets 'mf''s prerequisites. */
void
mf_set(const struct mf_field *mf,
const union mf_value *value, const union mf_value *mask,
- struct cls_rule *rule)
+ struct match *match)
{
if (!mask || is_all_ones((const uint8_t *) mask, mf->n_bytes)) {
- mf_set_value(mf, value, rule);
+ mf_set_value(mf, value, match);
return;
} else if (is_all_zeros((const uint8_t *) mask, mf->n_bytes)) {
- mf_set_wild(mf, rule);
+ mf_set_wild(mf, match);
return;
}
switch (mf->id) {
case MFF_IN_PORT:
- case MFF_ETH_SRC:
case MFF_ETH_TYPE:
- case MFF_VLAN_VID:
+ case MFF_DL_VLAN:
+ case MFF_DL_VLAN_PCP:
case MFF_VLAN_PCP:
- case MFF_IPV6_LABEL:
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_TCP_SRC:
- case MFF_TCP_DST:
- case MFF_UDP_SRC:
- case MFF_UDP_DST:
- case MFF_ICMP_TYPE:
- case MFF_ICMP_CODE:
- case MFF_ND_TARGET:
- case MFF_ND_SLL:
- case MFF_ND_TLL:
+ case MFF_ICMPV4_TYPE:
+ case MFF_ICMPV4_CODE:
+ case MFF_ICMPV6_TYPE:
+ case MFF_ICMPV6_CODE:
NOT_REACHED();
case MFF_TUN_ID:
- cls_rule_set_tun_id_masked(rule, value->be64, mask->be64);
+ match_set_tun_id_masked(match, value->be64, mask->be64);
+ break;
+ case MFF_METADATA:
+ match_set_metadata_masked(match, value->be64, mask->be64);
break;
-#if FLOW_N_REGS > 0
- case MFF_REG0:
-#endif
-#if FLOW_N_REGS > 1
- case MFF_REG1:
-#endif
-#if FLOW_N_REGS > 2
- case MFF_REG2:
-#endif
-#if FLOW_N_REGS > 3
- case MFF_REG3:
-#endif
-#if FLOW_N_REGS > 4
- case MFF_REG4:
-#endif
-#if FLOW_N_REGS > 5
-#error
-#endif
- cls_rule_set_reg_masked(rule, mf->id - MFF_REG0,
- ntohl(value->be32), ntohl(mask->be32));
+ CASE_MFF_REGS:
+ match_set_reg_masked(match, mf->id - MFF_REG0,
+ ntohl(value->be32), ntohl(mask->be32));
break;
case MFF_ETH_DST:
- if (flow_wildcards_is_dl_dst_mask_valid(mask->mac)) {
- cls_rule_set_dl_dst_masked(rule, value->mac, mask->mac);
- }
+ match_set_dl_dst_masked(match, value->mac, mask->mac);
+ break;
+
+ case MFF_ETH_SRC:
+ match_set_dl_src_masked(match, value->mac, mask->mac);
+ break;
+
+ case MFF_ARP_SHA:
+ case MFF_ND_SLL:
+ match_set_arp_sha_masked(match, value->mac, mask->mac);
+ break;
+
+ case MFF_ARP_THA:
+ case MFF_ND_TLL:
+ match_set_arp_tha_masked(match, value->mac, mask->mac);
break;
case MFF_VLAN_TCI:
- cls_rule_set_dl_tci_masked(rule, value->be16, mask->be16);
+ match_set_dl_tci_masked(match, value->be16, mask->be16);
+ break;
+
+ case MFF_VLAN_VID:
+ match_set_vlan_vid_masked(match, value->be16, mask->be16);
break;
case MFF_IPV4_SRC:
- cls_rule_set_nw_src_masked(rule, value->be32, mask->be32);
+ match_set_nw_src_masked(match, value->be32, mask->be32);
break;
case MFF_IPV4_DST:
- cls_rule_set_nw_dst_masked(rule, value->be32, mask->be32);
+ match_set_nw_dst_masked(match, value->be32, mask->be32);
break;
case MFF_IPV6_SRC:
- cls_rule_set_ipv6_src_masked(rule, &value->ipv6, &mask->ipv6);
+ match_set_ipv6_src_masked(match, &value->ipv6, &mask->ipv6);
break;
case MFF_IPV6_DST:
- cls_rule_set_ipv6_dst_masked(rule, &value->ipv6, &mask->ipv6);
+ match_set_ipv6_dst_masked(match, &value->ipv6, &mask->ipv6);
+ break;
+
+ case MFF_IPV6_LABEL:
+ if ((mask->be32 & htonl(IPV6_LABEL_MASK)) == htonl(IPV6_LABEL_MASK)) {
+ mf_set_value(mf, value, match);
+ } else {
+ match_set_ipv6_label_masked(match, value->be32, mask->be32);
+ }
+ break;
+
+ case MFF_ND_TARGET:
+ match_set_nd_target_masked(match, &value->ipv6, &mask->ipv6);
break;
case MFF_IP_FRAG:
- cls_rule_set_frag_masked(rule, value->u8, mask->u8);
+ match_set_nw_frag_masked(match, value->u8, mask->u8);
break;
case MFF_ARP_SPA:
- cls_rule_set_nw_src_masked(rule, value->be32, mask->be32);
+ match_set_nw_src_masked(match, value->be32, mask->be32);
break;
case MFF_ARP_TPA:
- cls_rule_set_nw_dst_masked(rule, value->be32, mask->be32);
+ match_set_nw_dst_masked(match, value->be32, mask->be32);
+ break;
+
+ case MFF_TCP_SRC:
+ case MFF_UDP_SRC:
+ match_set_tp_src_masked(match, value->be16, mask->be16);
+ break;
+
+ case MFF_TCP_DST:
+ case MFF_UDP_DST:
+ match_set_tp_dst_masked(match, value->be16, mask->be16);
break;
case MFF_N_IDS:
}
}
-/* Makes a subfield starting at bit offset 'ofs' and continuing for 'n_bits' in
- * 'rule''s field 'mf' exactly match the 'n_bits' least-significant bits of
- * 'x'.
- *
- * Example: suppose that 'mf' is originally the following 2-byte field in
- * 'rule':
- *
- * value == 0xe00a == 2#1110000000001010
- * mask == 0xfc3f == 2#1111110000111111
- *
- * The call mf_set_subfield(mf, 0x55, 8, 7, rule) would have the following
- * effect (note that 0x55 is 2#1010101):
- *
- * value == 0xd50a == 2#1101010100001010
- * mask == 0xff3f == 2#1111111100111111
- *
- * The caller is responsible for ensuring that the result will be a valid
- * wildcard pattern for 'mf'. The caller is responsible for ensuring that
- * 'rule' meets 'mf''s prerequisites. */
-void
-mf_set_subfield(const struct mf_field *mf, uint64_t x, unsigned int ofs,
- unsigned int n_bits, struct cls_rule *rule)
+static enum ofperr
+mf_check__(const struct mf_subfield *sf, const struct flow *flow,
+ const char *type)
{
- if (ofs == 0 && mf->n_bytes * 8 == n_bits) {
- union mf_value value;
- int i;
-
- for (i = mf->n_bytes - 1; i >= 0; i--) {
- ((uint8_t *) &value)[i] = x;
- x >>= 8;
- }
- mf_set_value(mf, &value, rule);
+ if (!sf->field) {
+ VLOG_WARN_RL(&rl, "unknown %s field", type);
+ } else if (!sf->n_bits) {
+ VLOG_WARN_RL(&rl, "zero bit %s field %s", type, sf->field->name);
+ } else if (sf->ofs >= sf->field->n_bits) {
+ VLOG_WARN_RL(&rl, "bit offset %d exceeds %d-bit width of %s field %s",
+ sf->ofs, sf->field->n_bits, type, sf->field->name);
+ } else if (sf->ofs + sf->n_bits > sf->field->n_bits) {
+ VLOG_WARN_RL(&rl, "bit offset %d and width %d exceeds %d-bit width "
+ "of %s field %s", sf->ofs, sf->n_bits,
+ sf->field->n_bits, type, sf->field->name);
+ } else if (flow && !mf_are_prereqs_ok(sf->field, flow)) {
+ VLOG_WARN_RL(&rl, "%s field %s lacks correct prerequisites",
+ type, sf->field->name);
} else {
- union mf_value value, mask;
- uint8_t *vp, *mp;
- unsigned int byte_ofs;
-
- mf_get(mf, rule, &value, &mask);
-
- byte_ofs = mf->n_bytes - ofs / 8;
- vp = &((uint8_t *) &value)[byte_ofs];
- mp = &((uint8_t *) &mask)[byte_ofs];
- if (ofs % 8) {
- unsigned int chunk = MIN(8 - ofs % 8, n_bits);
- uint8_t chunk_mask = ((1 << chunk) - 1) << (ofs % 8);
-
- *--vp &= ~chunk_mask;
- *vp |= chunk_mask & (x << (ofs % 8));
- *--mp |= chunk_mask;
-
- x >>= chunk;
- n_bits -= chunk;
- ofs += chunk;
- }
- while (n_bits >= 8) {
- *--vp = x;
- *--mp = 0xff;
- x >>= 8;
- n_bits -= 8;
- ofs += 8;
- }
- if (n_bits) {
- uint8_t chunk_mask = (1 << n_bits) - 1;
+ return 0;
+ }
- *--vp &= ~chunk_mask;
- *vp |= chunk_mask & x;
- *--mp |= chunk_mask;
- }
+ return OFPERR_OFPBAC_BAD_ARGUMENT;
+}
+
+/* Checks whether 'sf' is valid for reading a subfield out of 'flow'. Returns
+ * 0 if so, otherwise an OpenFlow error code (e.g. as returned by
+ * ofp_mkerr()). */
+enum ofperr
+mf_check_src(const struct mf_subfield *sf, const struct flow *flow)
+{
+ return mf_check__(sf, flow, "source");
+}
- mf_set(mf, &value, &mask, rule);
+/* Checks whether 'sf' is valid for writing a subfield into 'flow'. Returns 0
+ * if so, otherwise an OpenFlow error code (e.g. as returned by
+ * ofp_mkerr()). */
+enum ofperr
+mf_check_dst(const struct mf_subfield *sf, const struct flow *flow)
+{
+ int error = mf_check__(sf, flow, "destination");
+ if (!error && !sf->field->writable) {
+ VLOG_WARN_RL(&rl, "destination field %s is not writable",
+ sf->field->name);
+ return OFPERR_OFPBAC_BAD_ARGUMENT;
}
+ return error;
}
-/* Copies the value and wildcard bit pattern for 'mf' from 'rule' into the
+/* Copies the value and wildcard bit pattern for 'mf' from 'match' into the
* 'value' and 'mask', respectively. */
void
-mf_get(const struct mf_field *mf, const struct cls_rule *rule,
+mf_get(const struct mf_field *mf, const struct match *match,
union mf_value *value, union mf_value *mask)
{
- mf_get_value(mf, &rule->flow, value);
- mf_get_mask(mf, &rule->wc, mask);
+ mf_get_value(mf, &match->flow, value);
+ mf_get_mask(mf, &match->wc, mask);
}
/* Assigns a random value for field 'mf' to 'value'. */
switch (mf->id) {
case MFF_TUN_ID:
+ case MFF_METADATA:
case MFF_IN_PORT:
-#if FLOW_N_REGS > 0
- case MFF_REG0:
-#endif
-#if FLOW_N_REGS > 1
- case MFF_REG1:
-#endif
-#if FLOW_N_REGS > 2
- case MFF_REG2:
-#endif
-#if FLOW_N_REGS > 3
- case MFF_REG3:
-#endif
-#if FLOW_N_REGS > 4
- case MFF_REG4:
-#endif
-#if FLOW_N_REGS > 5
-#error
-#endif
+ CASE_MFF_REGS:
case MFF_ETH_SRC:
case MFF_ETH_DST:
case MFF_ETH_TYPE:
case MFF_TCP_DST:
case MFF_UDP_SRC:
case MFF_UDP_DST:
- case MFF_ICMP_TYPE:
- case MFF_ICMP_CODE:
+ case MFF_ICMPV4_TYPE:
+ case MFF_ICMPV4_CODE:
+ case MFF_ICMPV6_TYPE:
+ case MFF_ICMPV6_CODE:
case MFF_ND_TARGET:
case MFF_ND_SLL:
case MFF_ND_TLL:
break;
case MFF_IP_FRAG:
- value->u8 &= FLOW_FRAG_MASK;
+ value->u8 &= FLOW_NW_FRAG_MASK;
break;
case MFF_ARP_OP:
value->be16 &= htons(0xff);
break;
- case MFF_VLAN_VID:
+ case MFF_DL_VLAN:
value->be16 &= htons(VLAN_VID_MASK);
break;
+ case MFF_VLAN_VID:
+ value->be16 &= htons(VLAN_VID_MASK | VLAN_CFI);
+ break;
+ case MFF_DL_VLAN_PCP:
case MFF_VLAN_PCP:
value->u8 &= 0x07;
break;
netmask = strtok_r(NULL, "/", &save_ptr);
if (netmask) {
- int prefix = atoi(netmask);
- if (prefix <= 0 || prefix > 128) {
- free(str);
- return xasprintf("%s: prefix bits not between 1 and 128", s);
- } else {
- *mask = ipv6_create_mask(prefix);
+ if (inet_pton(AF_INET6, netmask, mask) != 1) {
+ int prefix = atoi(netmask);
+ if (prefix <= 0 || prefix > 128) {
+ free(str);
+ return xasprintf("%s: prefix bits not between 1 and 128", s);
+ } else {
+ *mask = ipv6_create_mask(prefix);
+ }
}
} else {
*mask = in6addr_exact;
uint16_t port;
assert(mf->n_bytes == sizeof(ovs_be16));
- if (ofputil_port_from_string(s, &port)) {
+ port = ofputil_port_from_string(s);
+ if (port) {
*valuep = htons(port);
*maskp = htons(UINT16_MAX);
return NULL;
};
static const struct frag_handling all_frags[] = {
-#define A FLOW_FRAG_ANY
-#define L FLOW_FRAG_LATER
+#define A FLOW_NW_FRAG_ANY
+#define L FLOW_NW_FRAG_LATER
/* name mask value */
{ "no", A|L, 0 },
if (!strcasecmp(s, h->name)) {
/* We force the upper bits of the mask on to make mf_parse_value()
* happy (otherwise it will never think it's an exact match.) */
- *maskp = h->mask | ~FLOW_FRAG_MASK;
+ *maskp = h->mask | ~FLOW_NW_FRAG_MASK;
*valuep = h->value;
return NULL;
}
uint8_t mask = *maskp;
value &= mask;
- mask &= FLOW_FRAG_MASK;
+ mask &= FLOW_NW_FRAG_MASK;
for (h = all_frags; h < &all_frags[ARRAY_SIZE(all_frags)]; h++) {
if (value == h->value && mask == h->mask) {
break;
case MFS_ETHERNET:
- ds_put_format(s, ETH_ADDR_FMT, ETH_ADDR_ARGS(value->mac));
- if (mask) {
- ds_put_format(s, "/"ETH_ADDR_FMT, ETH_ADDR_ARGS(mask->mac));
- }
+ eth_format_masked(value->mac, mask->mac, s);
break;
case MFS_IPV4:
NOT_REACHED();
}
}
+\f
+/* Makes subfield 'sf' within 'flow' exactly match the 'sf->n_bits'
+ * least-significant bits in 'x'.
+ */
+void
+mf_write_subfield_flow(const struct mf_subfield *sf,
+ const union mf_subvalue *x, struct flow *flow)
+{
+ const struct mf_field *field = sf->field;
+ union mf_value value;
+
+ mf_get_value(field, flow, &value);
+ bitwise_copy(x, sizeof *x, 0, &value, field->n_bytes,
+ sf->ofs, sf->n_bits);
+ mf_set_flow_value(field, &value, flow);
+}
+
+/* Makes subfield 'sf' within 'match' exactly match the 'sf->n_bits'
+ * least-significant bits in 'x'.
+ */
+void
+mf_write_subfield(const struct mf_subfield *sf, const union mf_subvalue *x,
+ struct match *match)
+{
+ const struct mf_field *field = sf->field;
+ union mf_value value, mask;
+
+ mf_get(field, match, &value, &mask);
+ bitwise_copy(x, sizeof *x, 0, &value, field->n_bytes, sf->ofs, sf->n_bits);
+ bitwise_one ( &mask, field->n_bytes, sf->ofs, sf->n_bits);
+ mf_set(field, &value, &mask, match);
+}
+
+/* Initializes 'x' to the value of 'sf' within 'flow'. 'sf' must be valid for
+ * reading 'flow', e.g. as checked by mf_check_src(). */
+void
+mf_read_subfield(const struct mf_subfield *sf, const struct flow *flow,
+ union mf_subvalue *x)
+{
+ union mf_value value;
+
+ mf_get_value(sf->field, flow, &value);
+
+ memset(x, 0, sizeof *x);
+ bitwise_copy(&value, sf->field->n_bytes, sf->ofs,
+ x, sizeof *x, 0,
+ sf->n_bits);
+}
+
+/* Returns the value of 'sf' within 'flow'. 'sf' must be valid for reading
+ * 'flow', e.g. as checked by mf_check_src() and sf->n_bits must be 64 or
+ * less. */
+uint64_t
+mf_get_subfield(const struct mf_subfield *sf, const struct flow *flow)
+{
+ union mf_value value;
+
+ mf_get_value(sf->field, flow, &value);
+ return bitwise_get(&value, sf->field->n_bytes, sf->ofs, sf->n_bits);
+}
+
+/* Formats 'sf' into 's' in a format normally acceptable to
+ * mf_parse_subfield(). (It won't be acceptable if sf->field is NULL or if
+ * sf->field has no NXM name.) */
+void
+mf_format_subfield(const struct mf_subfield *sf, struct ds *s)
+{
+ if (!sf->field) {
+ ds_put_cstr(s, "<unknown>");
+ } else if (sf->field->nxm_name) {
+ ds_put_cstr(s, sf->field->nxm_name);
+ } else if (sf->field->nxm_header) {
+ uint32_t header = sf->field->nxm_header;
+ ds_put_format(s, "%d:%d", NXM_VENDOR(header), NXM_FIELD(header));
+ } else {
+ ds_put_cstr(s, sf->field->name);
+ }
+
+ if (sf->field && sf->ofs == 0 && sf->n_bits == sf->field->n_bits) {
+ ds_put_cstr(s, "[]");
+ } else if (sf->n_bits == 1) {
+ ds_put_format(s, "[%d]", sf->ofs);
+ } else {
+ ds_put_format(s, "[%d..%d]", sf->ofs, sf->ofs + sf->n_bits - 1);
+ }
+}
+
+static const struct mf_field *
+mf_parse_subfield_name(const char *name, int name_len, bool *wild)
+{
+ int i;
+
+ *wild = name_len > 2 && !memcmp(&name[name_len - 2], "_W", 2);
+ if (*wild) {
+ name_len -= 2;
+ }
+
+ for (i = 0; i < MFF_N_IDS; i++) {
+ const struct mf_field *mf = mf_from_id(i);
+
+ if (mf->nxm_name
+ && !strncmp(mf->nxm_name, name, name_len)
+ && mf->nxm_name[name_len] == '\0') {
+ return mf;
+ }
+ if (mf->oxm_name
+ && !strncmp(mf->oxm_name, name, name_len)
+ && mf->oxm_name[name_len] == '\0') {
+ return mf;
+ }
+ }
+
+ return NULL;
+}
+
+/* Parses a subfield from the beginning of '*sp' into 'sf'. If successful,
+ * returns NULL and advances '*sp' to the first byte following the parsed
+ * string. On failure, returns a malloc()'d error message, does not modify
+ * '*sp', and does not properly initialize 'sf'.
+ *
+ * The syntax parsed from '*sp' takes the form "header[start..end]" where
+ * 'header' is the name of an NXM field and 'start' and 'end' are (inclusive)
+ * bit indexes. "..end" may be omitted to indicate a single bit. "start..end"
+ * may both be omitted (the [] are still required) to indicate an entire
+ * field. */
+char *
+mf_parse_subfield__(struct mf_subfield *sf, const char **sp)
+{
+ const struct mf_field *field;
+ const char *name;
+ int start, end;
+ const char *s;
+ int name_len;
+ bool wild;
+
+ s = *sp;
+ name = s;
+ name_len = strcspn(s, "[");
+ if (s[name_len] != '[') {
+ return xasprintf("%s: missing [ looking for field name", *sp);
+ }
+
+ field = mf_parse_subfield_name(name, name_len, &wild);
+ if (!field) {
+ return xasprintf("%s: unknown field `%.*s'", *sp, name_len, s);
+ }
+
+ s += name_len;
+ if (sscanf(s, "[%d..%d]", &start, &end) == 2) {
+ /* Nothing to do. */
+ } else if (sscanf(s, "[%d]", &start) == 1) {
+ end = start;
+ } else if (!strncmp(s, "[]", 2)) {
+ start = 0;
+ end = field->n_bits - 1;
+ } else {
+ return xasprintf("%s: syntax error expecting [] or [<bit>] or "
+ "[<start>..<end>]", *sp);
+ }
+ s = strchr(s, ']') + 1;
+
+ if (start > end) {
+ return xasprintf("%s: starting bit %d is after ending bit %d",
+ *sp, start, end);
+ } else if (start >= field->n_bits) {
+ return xasprintf("%s: starting bit %d is not valid because field is "
+ "only %d bits wide", *sp, start, field->n_bits);
+ } else if (end >= field->n_bits){
+ return xasprintf("%s: ending bit %d is not valid because field is "
+ "only %d bits wide", *sp, end, field->n_bits);
+ }
+
+ sf->field = field;
+ sf->ofs = start;
+ sf->n_bits = end - start + 1;
+
+ *sp = s;
+ return NULL;
+}
+
+/* Parses a subfield from the beginning of 's' into 'sf'. Returns the first
+ * byte in 's' following the parsed string.
+ *
+ * Exits with an error message if 's' has incorrect syntax.
+ *
+ * The syntax parsed from 's' takes the form "header[start..end]" where
+ * 'header' is the name of an NXM field and 'start' and 'end' are (inclusive)
+ * bit indexes. "..end" may be omitted to indicate a single bit. "start..end"
+ * may both be omitted (the [] are still required) to indicate an entire
+ * field. */
+const char *
+mf_parse_subfield(struct mf_subfield *sf, const char *s)
+{
+ char *msg = mf_parse_subfield__(sf, &s);
+ if (msg) {
+ ovs_fatal(0, "%s", msg);
+ }
+ return s;
+}
+
+void
+mf_format_subvalue(const union mf_subvalue *subvalue, struct ds *s)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(subvalue->u8); i++) {
+ if (subvalue->u8[i]) {
+ ds_put_format(s, "0x%"PRIx8, subvalue->u8[i]);
+ for (i++; i < ARRAY_SIZE(subvalue->u8); i++) {
+ ds_put_format(s, "%02"PRIx8, subvalue->u8[i]);
+ }
+ return;
+ }
+ }
+ ds_put_char(s, '0');
+}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff