X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fclassifier.c;h=38f1a4feaf27838928c810ccd3a272bad854b8f3;hb=cc34bc8c8611868474253b8fbd9e79cd66c60c94;hp=088367a969233ca7c7d22f7d2d97108e5d2e628c;hpb=a7d78e8d22e068a0fda8a258aac4dde1aaf1bbe0;p=openvswitch diff --git a/lib/classifier.c b/lib/classifier.c index 088367a9..38f1a4fe 100644 --- a/lib/classifier.c +++ b/lib/classifier.c @@ -266,7 +266,7 @@ cls_rule_set_any_vid(struct cls_rule *rule) void cls_rule_set_dl_vlan(struct cls_rule *rule, ovs_be16 dl_vlan) { - flow_set_vlan_vid(&rule->flow, dl_vlan); + flow_set_dl_vlan(&rule->flow, dl_vlan); if (dl_vlan == htons(OFP10_VLAN_NONE)) { rule->wc.vlan_tci_mask = htons(UINT16_MAX); } else { @@ -274,6 +274,31 @@ cls_rule_set_dl_vlan(struct cls_rule *rule, ovs_be16 dl_vlan) } } +/* Sets the VLAN VID that 'flow' matches to 'vid', which is interpreted as an + * OpenFlow 1.2 "vlan_vid" value, that is, the low 13 bits of 'vlan_tci' (VID + * plus CFI). */ +void +cls_rule_set_vlan_vid(struct cls_rule *rule, ovs_be16 vid) +{ + cls_rule_set_vlan_vid_masked(rule, vid, htons(VLAN_VID_MASK | VLAN_CFI)); +} + + +/* Sets the VLAN VID that 'flow' matches to 'vid', which is interpreted as an + * OpenFlow 1.2 "vlan_vid" value, that is, the low 13 bits of 'vlan_tci' (VID + * plus CFI), with the corresponding 'mask'. */ +void +cls_rule_set_vlan_vid_masked(struct cls_rule *rule, + ovs_be16 vid, ovs_be16 mask) +{ + ovs_be16 pcp_mask = htons(VLAN_PCP_MASK); + ovs_be16 vid_mask = htons(VLAN_VID_MASK | VLAN_CFI); + + mask &= vid_mask; + flow_set_vlan_vid(&rule->flow, vid & mask); + rule->wc.vlan_tci_mask = mask | (rule->wc.vlan_tci_mask & pcp_mask); +} + /* Modifies 'rule' so that the VLAN PCP is wildcarded. If the VID is already * wildcarded, then 'rule' will match a packet regardless of whether it has an * 802.1Q header or not. */ @@ -412,15 +437,31 @@ cls_rule_set_icmp_code(struct cls_rule *rule, uint8_t icmp_code) void cls_rule_set_arp_sha(struct cls_rule *rule, const uint8_t sha[ETH_ADDR_LEN]) { - rule->wc.wildcards &= ~FWW_ARP_SHA; - memcpy(rule->flow.arp_sha, sha, ETH_ADDR_LEN); + cls_rule_set_eth(sha, rule->flow.arp_sha, rule->wc.arp_sha_mask); +} + +void +cls_rule_set_arp_sha_masked(struct cls_rule *rule, + const uint8_t arp_sha[ETH_ADDR_LEN], + const uint8_t mask[ETH_ADDR_LEN]) +{ + cls_rule_set_eth_masked(arp_sha, mask, + rule->flow.arp_sha, rule->wc.arp_sha_mask); } void cls_rule_set_arp_tha(struct cls_rule *rule, const uint8_t tha[ETH_ADDR_LEN]) { - rule->wc.wildcards &= ~FWW_ARP_THA; - memcpy(rule->flow.arp_tha, tha, ETH_ADDR_LEN); + cls_rule_set_eth(tha, rule->flow.arp_tha, rule->wc.arp_tha_mask); +} + +void +cls_rule_set_arp_tha_masked(struct cls_rule *rule, + const uint8_t arp_tha[ETH_ADDR_LEN], + const uint8_t mask[ETH_ADDR_LEN]) +{ + cls_rule_set_eth_masked(arp_tha, mask, + rule->flow.arp_tha, rule->wc.arp_tha_mask); } void @@ -566,7 +607,7 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14); if (rule->priority != OFP_DEFAULT_PRIORITY) { ds_put_format(s, "priority=%d,", rule->priority); @@ -704,14 +745,8 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) } } if (f->dl_type == htons(ETH_TYPE_ARP)) { - if (!(w & FWW_ARP_SHA)) { - ds_put_format(s, "arp_sha="ETH_ADDR_FMT",", - ETH_ADDR_ARGS(f->arp_sha)); - } - if (!(w & FWW_ARP_THA)) { - ds_put_format(s, "arp_tha="ETH_ADDR_FMT",", - ETH_ADDR_ARGS(f->arp_tha)); - } + format_eth_masked(s, "arp_sha", f->arp_sha, wc->arp_sha_mask); + format_eth_masked(s, "arp_tha", f->arp_tha, wc->arp_tha_mask); } if (!(w & FWW_NW_DSCP)) { ds_put_format(s, "nw_tos=%"PRIu8",", f->nw_tos & IP_DSCP_MASK); @@ -748,14 +783,8 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) format_be16_masked(s, "icmp_code", f->tp_dst, wc->tp_dst_mask); format_ipv6_netmask(s, "nd_target", &f->nd_target, &wc->nd_target_mask); - if (!(w & FWW_ARP_SHA)) { - ds_put_format(s, "nd_sll="ETH_ADDR_FMT",", - ETH_ADDR_ARGS(f->arp_sha)); - } - if (!(w & FWW_ARP_THA)) { - ds_put_format(s, "nd_tll="ETH_ADDR_FMT",", - ETH_ADDR_ARGS(f->arp_tha)); - } + format_eth_masked(s, "nd_sll", f->arp_sha, wc->arp_sha_mask); + format_eth_masked(s, "nd_tll", f->arp_tha, wc->arp_tha_mask); } else { format_be16_masked(s, "tp_src", f->tp_src, wc->tp_src_mask); format_be16_masked(s, "tp_dst", f->tp_dst, wc->tp_dst_mask); @@ -1262,7 +1291,7 @@ flow_equal_except(const struct flow *a, const struct flow *b, const flow_wildcards_t wc = wildcards->wildcards; int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14); for (i = 0; i < FLOW_N_REGS; i++) { if ((a->regs[i] ^ b->regs[i]) & wildcards->reg_masks[i]) { @@ -1288,8 +1317,10 @@ flow_equal_except(const struct flow *a, const struct flow *b, && (wc & FWW_NW_DSCP || !((a->nw_tos ^ b->nw_tos) & IP_DSCP_MASK)) && (wc & FWW_NW_ECN || !((a->nw_tos ^ b->nw_tos) & IP_ECN_MASK)) && !((a->nw_frag ^ b->nw_frag) & wildcards->nw_frag_mask) - && (wc & FWW_ARP_SHA || eth_addr_equals(a->arp_sha, b->arp_sha)) - && (wc & FWW_ARP_THA || eth_addr_equals(a->arp_tha, b->arp_tha)) + && eth_addr_equal_except(a->arp_sha, b->arp_sha, + wildcards->arp_sha_mask) + && eth_addr_equal_except(a->arp_tha, b->arp_tha, + wildcards->arp_tha_mask) && !((a->ipv6_label ^ b->ipv6_label) & wildcards->ipv6_label_mask) && ipv6_equal_except(&a->ipv6_src, &b->ipv6_src, &wildcards->ipv6_src_mask)