X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmeta-flow.c;h=38c9a27aacab165c5e0bb25332ba1294b1bea1c7;hb=c6100d92142bc3dd325180cb4e10553eb4341731;hp=99a97726175cfb5bc324bd636c963842f6761daa;hpb=e2170cffc1e736db85b461b9bff2afa74ba180f2;p=openvswitch diff --git a/lib/meta-flow.c b/lib/meta-flow.c index 99a97726..38c9a27a 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -49,7 +49,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_TUN_ID, "tun_id", NULL, MF_FIELD_SIZES(be64), - MFM_FULLY, 0, + MFM_FULLY, MFS_HEXADECIMAL, MFP_NONE, true, @@ -58,7 +58,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_METADATA, "metadata", NULL, MF_FIELD_SIZES(be64), - MFM_FULLY, 0, + MFM_FULLY, MFS_HEXADECIMAL, MFP_NONE, true, @@ -67,7 +67,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IN_PORT, "in_port", NULL, MF_FIELD_SIZES(be16), - MFM_NONE, FWW_IN_PORT, + MFM_NONE, MFS_OFP_PORT, MFP_NONE, false, @@ -79,7 +79,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { \ MFF_REG##IDX, "reg" #IDX, NULL, \ MF_FIELD_SIZES(be32), \ - MFM_FULLY, 0, \ + MFM_FULLY, \ MFS_HEXADECIMAL, \ MFP_NONE, \ true, \ @@ -121,7 +121,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_ETH_SRC, "eth_src", "dl_src", MF_FIELD_SIZES(mac), - MFM_FULLY, 0, + MFM_FULLY, MFS_ETHERNET, MFP_NONE, true, @@ -130,7 +130,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ETH_DST, "eth_dst", "dl_dst", MF_FIELD_SIZES(mac), - MFM_FULLY, 0, + MFM_FULLY, MFS_ETHERNET, MFP_NONE, true, @@ -139,7 +139,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ETH_TYPE, "eth_type", "dl_type", MF_FIELD_SIZES(be16), - MFM_NONE, 0, + MFM_NONE, MFS_HEXADECIMAL, MFP_NONE, false, @@ -150,7 +150,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_VLAN_TCI, "vlan_tci", NULL, MF_FIELD_SIZES(be16), - MFM_FULLY, 0, + MFM_FULLY, MFS_HEXADECIMAL, MFP_NONE, true, @@ -159,7 +159,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_DL_VLAN, "dl_vlan", NULL, sizeof(ovs_be16), 12, - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_NONE, true, @@ -168,7 +168,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_VLAN_VID, "vlan_vid", NULL, sizeof(ovs_be16), 12, - MFM_FULLY, 0, + MFM_FULLY, MFS_DECIMAL, MFP_NONE, true, @@ -177,7 +177,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_DL_VLAN_PCP, "dl_vlan_pcp", NULL, 1, 3, - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_NONE, true, @@ -186,7 +186,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_VLAN_PCP, "vlan_pcp", NULL, 1, 3, - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_VLAN_VID, true, @@ -201,7 +201,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_IPV4_SRC, "ip_src", "nw_src", MF_FIELD_SIZES(be32), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV4, MFP_IPV4, true, @@ -210,7 +210,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IPV4_DST, "ip_dst", "nw_dst", MF_FIELD_SIZES(be32), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV4, MFP_IPV4, true, @@ -221,7 +221,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_IPV6_SRC, "ipv6_src", NULL, MF_FIELD_SIZES(ipv6), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV6, MFP_IPV6, true, @@ -230,7 +230,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IPV6_DST, "ipv6_dst", NULL, MF_FIELD_SIZES(ipv6), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV6, MFP_IPV6, true, @@ -240,7 +240,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_IPV6_LABEL, "ipv6_label", NULL, 4, 20, - MFM_FULLY, 0, + MFM_FULLY, MFS_HEXADECIMAL, MFP_IPV6, false, @@ -251,7 +251,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_IP_PROTO, "nw_proto", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_IP_ANY, false, @@ -260,7 +260,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IP_DSCP, "nw_tos", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_IP_ANY, true, @@ -269,7 +269,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IP_ECN, "nw_ecn", NULL, 1, 2, - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_IP_ANY, true, @@ -278,7 +278,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IP_TTL, "nw_ttl", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_IP_ANY, true, @@ -287,7 +287,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_IP_FRAG, "ip_frag", NULL, 1, 2, - MFM_FULLY, 0, + MFM_FULLY, MFS_FRAG, MFP_IP_ANY, false, @@ -298,7 +298,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_ARP_OP, "arp_op", NULL, MF_FIELD_SIZES(be16), - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_ARP, false, @@ -307,7 +307,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ARP_SPA, "arp_spa", NULL, MF_FIELD_SIZES(be32), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV4, MFP_ARP, false, @@ -316,7 +316,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ARP_TPA, "arp_tpa", NULL, MF_FIELD_SIZES(be32), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV4, MFP_ARP, false, @@ -325,7 +325,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ARP_SHA, "arp_sha", NULL, MF_FIELD_SIZES(mac), - MFM_FULLY, 0, + MFM_FULLY, MFS_ETHERNET, MFP_ARP, false, @@ -334,7 +334,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ARP_THA, "arp_tha", NULL, MF_FIELD_SIZES(mac), - MFM_FULLY, 0, + MFM_FULLY, MFS_ETHERNET, MFP_ARP, false, @@ -349,7 +349,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_TCP_SRC, "tcp_src", "tp_src", MF_FIELD_SIZES(be16), - MFM_FULLY, 0, + MFM_FULLY, MFS_DECIMAL, MFP_TCP, true, @@ -358,7 +358,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_TCP_DST, "tcp_dst", "tp_dst", MF_FIELD_SIZES(be16), - MFM_FULLY, 0, + MFM_FULLY, MFS_DECIMAL, MFP_TCP, true, @@ -369,7 +369,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_UDP_SRC, "udp_src", NULL, MF_FIELD_SIZES(be16), - MFM_FULLY, 0, + MFM_FULLY, MFS_DECIMAL, MFP_UDP, true, @@ -378,7 +378,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_UDP_DST, "udp_dst", NULL, MF_FIELD_SIZES(be16), - MFM_FULLY, 0, + MFM_FULLY, MFS_DECIMAL, MFP_UDP, true, @@ -389,7 +389,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_ICMPV4_TYPE, "icmp_type", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_ICMPV4, false, @@ -398,7 +398,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ICMPV4_CODE, "icmp_code", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_ICMPV4, false, @@ -409,7 +409,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_ICMPV6_TYPE, "icmpv6_type", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_ICMPV6, false, @@ -418,7 +418,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ICMPV6_CODE, "icmpv6_code", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, 0, + MFM_NONE, MFS_DECIMAL, MFP_ICMPV6, false, @@ -433,7 +433,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_ND_TARGET, "nd_target", NULL, MF_FIELD_SIZES(ipv6), - MFM_FULLY, 0, + MFM_FULLY, MFS_IPV6, MFP_ND, false, @@ -442,7 +442,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ND_SLL, "nd_sll", NULL, MF_FIELD_SIZES(mac), - MFM_FULLY, 0, + MFM_FULLY, MFS_ETHERNET, MFP_ND_SOLICIT, false, @@ -451,7 +451,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { }, { MFF_ND_TLL, "nd_tll", NULL, MF_FIELD_SIZES(mac), - MFM_FULLY, 0, + MFM_FULLY, MFS_ETHERNET, MFP_ND_ADVERT, false, @@ -573,88 +573,85 @@ bool mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) { switch (mf->id) { - case MFF_IN_PORT: - assert(mf->fww_bit != 0); - return (wc->wildcards & mf->fww_bit) != 0; - case MFF_TUN_ID: - return !wc->tun_id_mask; + return !wc->masks.tun_id; case MFF_METADATA: - return !wc->metadata_mask; - + return !wc->masks.metadata; + case MFF_IN_PORT: + return !wc->masks.in_port; CASE_MFF_REGS: - return !wc->reg_masks[mf->id - MFF_REG0]; + return !wc->masks.regs[mf->id - MFF_REG0]; case MFF_ETH_SRC: - return eth_addr_is_zero(wc->dl_src_mask); + return eth_addr_is_zero(wc->masks.dl_src); case MFF_ETH_DST: - return eth_addr_is_zero(wc->dl_dst_mask); + return eth_addr_is_zero(wc->masks.dl_dst); case MFF_ETH_TYPE: - return !wc->dl_type_mask; + return !wc->masks.dl_type; case MFF_ARP_SHA: case MFF_ND_SLL: - return eth_addr_is_zero(wc->arp_sha_mask); + return eth_addr_is_zero(wc->masks.arp_sha); case MFF_ARP_THA: case MFF_ND_TLL: - return eth_addr_is_zero(wc->arp_tha_mask); + 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->vlan_tci_mask & htons(VLAN_VID_MASK)); + return !(wc->masks.vlan_tci & htons(VLAN_VID_MASK)); case MFF_VLAN_VID: - return !(wc->vlan_tci_mask & htons(VLAN_VID_MASK | VLAN_CFI)); + 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->ipv6_label_mask; + return !wc->masks.ipv6_label; case MFF_IP_PROTO: - return !wc->nw_proto_mask; + return !wc->masks.nw_proto; case MFF_IP_DSCP: - return !(wc->nw_tos_mask & IP_DSCP_MASK); + return !(wc->masks.nw_tos & IP_DSCP_MASK); case MFF_IP_ECN: - return !(wc->nw_tos_mask & IP_ECN_MASK); + return !(wc->masks.nw_tos & IP_ECN_MASK); case MFF_IP_TTL: - return !wc->nw_ttl_mask; + return !wc->masks.nw_ttl; case MFF_ND_TARGET: - return ipv6_mask_is_any(&wc->nd_target_mask); + return ipv6_mask_is_any(&wc->masks.nd_target); case MFF_IP_FRAG: - return !(wc->nw_frag_mask & FLOW_NW_FRAG_MASK); + return !(wc->masks.nw_frag & FLOW_NW_FRAG_MASK); case MFF_ARP_OP: - return !wc->nw_proto_mask; + 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->tp_src_mask; + return !wc->masks.tp_src; case MFF_TCP_DST: case MFF_UDP_DST: case MFF_ICMPV4_CODE: case MFF_ICMPV6_CODE: - return !wc->tp_dst_mask; + return !wc->masks.tp_dst; case MFF_N_IDS: default: @@ -673,118 +670,115 @@ mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc, union mf_value *mask) { switch (mf->id) { - case MFF_IN_PORT: - 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; case MFF_METADATA: - mask->be64 = wc->metadata_mask; + 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->reg_masks[mf->id - MFF_REG0]); + mask->be32 = htonl(wc->masks.regs[mf->id - MFF_REG0]); break; case MFF_ETH_DST: - memcpy(mask->mac, wc->dl_dst_mask, ETH_ADDR_LEN); + memcpy(mask->mac, wc->masks.dl_dst, ETH_ADDR_LEN); break; case MFF_ETH_SRC: - memcpy(mask->mac, wc->dl_src_mask, ETH_ADDR_LEN); + memcpy(mask->mac, wc->masks.dl_src, ETH_ADDR_LEN); break; case MFF_ETH_TYPE: - mask->be16 = wc->dl_type_mask; + 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->vlan_tci_mask & htons(VLAN_VID_MASK); + 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 | VLAN_CFI); + 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->ipv6_label_mask; + mask->be32 = wc->masks.ipv6_label; break; case MFF_IP_PROTO: - mask->u8 = wc->nw_proto_mask; + mask->u8 = wc->masks.nw_proto; break; case MFF_IP_DSCP: - mask->u8 = wc->nw_tos_mask & IP_DSCP_MASK; + mask->u8 = wc->masks.nw_tos & IP_DSCP_MASK; break; case MFF_IP_ECN: - mask->u8 = wc->nw_tos_mask & IP_ECN_MASK; + mask->u8 = wc->masks.nw_tos & IP_ECN_MASK; break; case MFF_ND_TARGET: - mask->ipv6 = wc->nd_target_mask; + mask->ipv6 = wc->masks.nd_target; break; case MFF_IP_TTL: - mask->u8 = wc->nw_ttl_mask; + mask->u8 = wc->masks.nw_ttl; break; case MFF_IP_FRAG: - mask->u8 = wc->nw_frag_mask & FLOW_NW_FRAG_MASK; + mask->u8 = wc->masks.nw_frag & FLOW_NW_FRAG_MASK; break; case MFF_ARP_OP: - mask->u8 = wc->nw_proto_mask; + 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->arp_sha_mask, ETH_ADDR_LEN); + memcpy(mask->mac, wc->masks.arp_sha, ETH_ADDR_LEN); break; case MFF_ARP_THA: case MFF_ND_TLL: - memcpy(mask->mac, wc->arp_tha_mask, ETH_ADDR_LEN); + memcpy(mask->mac, wc->masks.arp_tha, ETH_ADDR_LEN); break; case MFF_TCP_SRC: case MFF_UDP_SRC: - mask->be16 = wc->tp_src_mask; + mask->be16 = wc->masks.tp_src; break; case MFF_TCP_DST: case MFF_UDP_DST: - mask->be16 = wc->tp_dst_mask; + mask->be16 = wc->masks.tp_dst; break; case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: - mask->u8 = ntohs(wc->tp_src_mask); + mask->u8 = ntohs(wc->masks.tp_src); break; case MFF_ICMPV4_CODE: case MFF_ICMPV6_CODE: - mask->u8 = ntohs(wc->tp_dst_mask); + mask->u8 = ntohs(wc->masks.tp_dst); break; case MFF_N_IDS: @@ -1092,141 +1086,141 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, } } -/* 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) + const union mf_value *value, struct match *match) { switch (mf->id) { case MFF_TUN_ID: - cls_rule_set_tun_id(rule, value->be64); + match_set_tun_id(match, value->be64); break; case MFF_METADATA: - cls_rule_set_metadata(rule, value->be64); + match_set_metadata(match, value->be64); break; case MFF_IN_PORT: - cls_rule_set_in_port(rule, ntohs(value->be16)); + match_set_in_port(match, ntohs(value->be16)); break; CASE_MFF_REGS: - cls_rule_set_reg(rule, mf->id - MFF_REG0, ntohl(value->be32)); + match_set_reg(match, mf->id - MFF_REG0, ntohl(value->be32)); break; case MFF_ETH_SRC: - cls_rule_set_dl_src(rule, value->mac); + match_set_dl_src(match, value->mac); break; case MFF_ETH_DST: - cls_rule_set_dl_dst(rule, value->mac); + match_set_dl_dst(match, value->mac); break; case MFF_ETH_TYPE: - cls_rule_set_dl_type(rule, value->be16); + match_set_dl_type(match, value->be16); break; case MFF_VLAN_TCI: - cls_rule_set_dl_tci(rule, value->be16); + match_set_dl_tci(match, value->be16); break; case MFF_DL_VLAN: - cls_rule_set_dl_vlan(rule, value->be16); + match_set_dl_vlan(match, value->be16); break; case MFF_VLAN_VID: - cls_rule_set_vlan_vid(rule, value->be16); + match_set_vlan_vid(match, value->be16); break; case MFF_DL_VLAN_PCP: case MFF_VLAN_PCP: - cls_rule_set_dl_vlan_pcp(rule, value->u8); + match_set_dl_vlan_pcp(match, value->u8); break; case MFF_IPV4_SRC: - cls_rule_set_nw_src(rule, value->be32); + match_set_nw_src(match, value->be32); break; case MFF_IPV4_DST: - cls_rule_set_nw_dst(rule, value->be32); + match_set_nw_dst(match, value->be32); break; case MFF_IPV6_SRC: - cls_rule_set_ipv6_src(rule, &value->ipv6); + match_set_ipv6_src(match, &value->ipv6); break; case MFF_IPV6_DST: - cls_rule_set_ipv6_dst(rule, &value->ipv6); + match_set_ipv6_dst(match, &value->ipv6); break; case MFF_IPV6_LABEL: - cls_rule_set_ipv6_label(rule, value->be32); + match_set_ipv6_label(match, value->be32); break; case MFF_IP_PROTO: - cls_rule_set_nw_proto(rule, value->u8); + match_set_nw_proto(match, value->u8); break; case MFF_IP_DSCP: - cls_rule_set_nw_dscp(rule, value->u8); + match_set_nw_dscp(match, value->u8); break; case MFF_IP_ECN: - cls_rule_set_nw_ecn(rule, value->u8); + match_set_nw_ecn(match, value->u8); break; case MFF_IP_TTL: - cls_rule_set_nw_ttl(rule, value->u8); + match_set_nw_ttl(match, value->u8); break; case MFF_IP_FRAG: - cls_rule_set_nw_frag(rule, value->u8); + match_set_nw_frag(match, value->u8); break; case MFF_ARP_OP: - cls_rule_set_nw_proto(rule, ntohs(value->be16)); + match_set_nw_proto(match, ntohs(value->be16)); break; case MFF_ARP_SPA: - cls_rule_set_nw_src(rule, value->be32); + match_set_nw_src(match, value->be32); break; case MFF_ARP_TPA: - cls_rule_set_nw_dst(rule, value->be32); + match_set_nw_dst(match, value->be32); break; case MFF_ARP_SHA: case MFF_ND_SLL: - cls_rule_set_arp_sha(rule, value->mac); + match_set_arp_sha(match, value->mac); break; case MFF_ARP_THA: case MFF_ND_TLL: - cls_rule_set_arp_tha(rule, value->mac); + match_set_arp_tha(match, value->mac); break; case MFF_TCP_SRC: case MFF_UDP_SRC: - cls_rule_set_tp_src(rule, value->be16); + match_set_tp_src(match, value->be16); break; case MFF_TCP_DST: case MFF_UDP_DST: - cls_rule_set_tp_dst(rule, value->be16); + match_set_tp_dst(match, value->be16); break; case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: - cls_rule_set_icmp_type(rule, value->u8); + match_set_icmp_type(match, value->u8); break; case MFF_ICMPV4_CODE: case MFF_ICMPV6_CODE: - cls_rule_set_icmp_code(rule, value->u8); + match_set_icmp_code(match, value->u8); break; case MFF_ND_TARGET: - cls_rule_set_nd_target(rule, &value->ipv6); + match_set_nd_target(match, &value->ipv6); break; case MFF_N_IDS: @@ -1235,8 +1229,8 @@ mf_set_value(const struct mf_field *mf, } } -/* 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_flow_value(const struct mf_field *mf, @@ -1393,144 +1387,145 @@ mf_is_zero(const struct mf_field *mf, const struct flow *flow) return is_all_zeros((const uint8_t *) &value, mf->n_bytes); } -/* Makes 'rule' wildcard field 'mf'. +/* Makes 'match' wildcard field 'mf'. * - * The caller is responsible for ensuring that 'rule' meets 'mf''s + * 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: - cls_rule_set_metadata_masked(rule, htonll(0), htonll(0)); + 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; CASE_MFF_REGS: - cls_rule_set_reg_masked(rule, mf->id - MFF_REG0, 0, 0); + match_set_reg_masked(match, mf->id - MFF_REG0, 0, 0); break; case MFF_ETH_SRC: - memset(rule->flow.dl_src, 0, ETH_ADDR_LEN); - memset(rule->wc.dl_src_mask, 0, ETH_ADDR_LEN); + memset(match->flow.dl_src, 0, ETH_ADDR_LEN); + memset(match->wc.masks.dl_src, 0, ETH_ADDR_LEN); break; case MFF_ETH_DST: - memset(rule->flow.dl_dst, 0, ETH_ADDR_LEN); - memset(rule->wc.dl_dst_mask, 0, ETH_ADDR_LEN); + 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->flow.dl_type = htons(0); - rule->wc.dl_type_mask = 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.ipv6_label_mask = 0; - 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.nw_proto_mask = 0; - rule->flow.nw_proto = 0; + match->wc.masks.nw_proto = 0; + match->flow.nw_proto = 0; break; case MFF_IP_DSCP: - rule->wc.nw_tos_mask &= ~IP_DSCP_MASK; - rule->flow.nw_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.nw_tos_mask &= ~IP_ECN_MASK; - rule->flow.nw_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.nw_ttl_mask = 0; - rule->flow.nw_ttl = 0; + match->wc.masks.nw_ttl = 0; + match->flow.nw_ttl = 0; break; case MFF_IP_FRAG: - rule->wc.nw_frag_mask |= FLOW_NW_FRAG_MASK; - rule->flow.nw_frag &= ~FLOW_NW_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.nw_proto_mask = 0; - 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: - memset(rule->flow.arp_sha, 0, ETH_ADDR_LEN); - memset(rule->wc.arp_sha_mask, 0, ETH_ADDR_LEN); + 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: - memset(rule->flow.arp_tha, 0, ETH_ADDR_LEN); - memset(rule->wc.arp_tha_mask, 0, ETH_ADDR_LEN); + 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_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: - rule->wc.tp_src_mask = htons(0); - rule->flow.tp_src = htons(0); + match->wc.masks.tp_src = htons(0); + match->flow.tp_src = htons(0); break; case MFF_TCP_DST: case MFF_UDP_DST: case MFF_ICMPV4_CODE: case MFF_ICMPV6_CODE: - rule->wc.tp_dst_mask = htons(0); - rule->flow.tp_dst = htons(0); + match->wc.masks.tp_dst = htons(0); + match->flow.tp_dst = htons(0); break; case MFF_ND_TARGET: - memset(&rule->wc.nd_target_mask, 0, sizeof rule->wc.nd_target_mask); - 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: @@ -1539,27 +1534,27 @@ mf_set_wild(const struct mf_field *mf, struct cls_rule *rule) } } -/* 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; } @@ -1581,91 +1576,91 @@ mf_set(const struct mf_field *mf, 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: - cls_rule_set_metadata_masked(rule, value->be64, mask->be64); + match_set_metadata_masked(match, value->be64, mask->be64); break; CASE_MFF_REGS: - cls_rule_set_reg_masked(rule, mf->id - MFF_REG0, - ntohl(value->be32), ntohl(mask->be32)); + match_set_reg_masked(match, mf->id - MFF_REG0, + ntohl(value->be32), ntohl(mask->be32)); break; case MFF_ETH_DST: - 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: - cls_rule_set_dl_src_masked(rule, value->mac, mask->mac); + match_set_dl_src_masked(match, value->mac, mask->mac); break; case MFF_ARP_SHA: case MFF_ND_SLL: - cls_rule_set_arp_sha_masked(rule, value->mac, mask->mac); + match_set_arp_sha_masked(match, value->mac, mask->mac); break; case MFF_ARP_THA: case MFF_ND_TLL: - cls_rule_set_arp_tha_masked(rule, value->mac, mask->mac); + 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: - cls_rule_set_vlan_vid_masked(rule, value->be16, mask->be16); + 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, rule); + mf_set_value(mf, value, match); } else { - cls_rule_set_ipv6_label_masked(rule, value->be32, mask->be32); + match_set_ipv6_label_masked(match, value->be32, mask->be32); } break; case MFF_ND_TARGET: - cls_rule_set_nd_target_masked(rule, &value->ipv6, &mask->ipv6); + match_set_nd_target_masked(match, &value->ipv6, &mask->ipv6); break; case MFF_IP_FRAG: - cls_rule_set_nw_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: - cls_rule_set_tp_src_masked(rule, value->be16, mask->be16); + match_set_tp_src_masked(match, value->be16, mask->be16); break; case MFF_TCP_DST: case MFF_UDP_DST: - cls_rule_set_tp_dst_masked(rule, value->be16, mask->be16); + match_set_tp_dst_masked(match, value->be16, mask->be16); break; case MFF_N_IDS: @@ -1723,14 +1718,14 @@ mf_check_dst(const struct mf_subfield *sf, const struct flow *flow) 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'. */ @@ -1946,7 +1941,8 @@ mf_from_ofp_port_string(const struct mf_field *mf, const char *s, 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; @@ -2158,20 +2154,36 @@ mf_format(const struct mf_field *mf, } } -/* Makes subfield 'sf' within 'rule' exactly match the 'sf->n_bits' +/* 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 cls_rule *rule) + struct match *match) { const struct mf_field *field = sf->field; union mf_value value, mask; - mf_get(field, rule, &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, rule); + mf_set(field, &value, &mask, match); } /* Initializes 'x' to the value of 'sf' within 'flow'. 'sf' must be valid for @@ -2340,3 +2352,20 @@ mf_parse_subfield(struct mf_subfield *sf, const char *s) } 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'); +}