mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

packets: Fix eth_addr_equal_except().

Browse Source 
It turns out that eth_addr_equal_except() computed the exact
opposite of what it purported to.  It returned true if the two
arguments where *not* equal.  This is extremely confusing, so this
patch changes it.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
This commit is contained in:
Ethan Jackson
2012-06-06 17:37:46 -07:00
parent aecfb4af7e
commit 3b842fc2f0
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/classifier.c
View File

@@ -1204,10 +1204,10 @@ flow_equal_except(const struct flow *a, const struct flow *b,
&& (wc & FWW_DL_TYPE || a->dl_type == b->dl_type) && (wc & FWW_DL_TYPE || a->dl_type == b->dl_type)
&& !((a->tp_src ^ b->tp_src) & wildcards->tp_src_mask) && !((a->tp_src ^ b->tp_src) & wildcards->tp_src_mask)
&& !((a->tp_dst ^ b->tp_dst) & wildcards->tp_dst_mask) && !((a->tp_dst ^ b->tp_dst) & wildcards->tp_dst_mask)
&& !eth_addr_equal_except(a->dl_src, b->dl_src, && eth_addr_equal_except(a->dl_src, b->dl_src,
wildcards->dl_src_mask) wildcards->dl_src_mask)
&& !eth_addr_equal_except(a->dl_dst, b->dl_dst, && eth_addr_equal_except(a->dl_dst, b->dl_dst,
wildcards->dl_dst_mask) wildcards->dl_dst_mask)
&& (wc & FWW_NW_PROTO || a->nw_proto == b->nw_proto) && (wc & FWW_NW_PROTO || a->nw_proto == b->nw_proto)
&& (wc & FWW_NW_TTL || a->nw_ttl == b->nw_ttl) && (wc & FWW_NW_TTL || a->nw_ttl == b->nw_ttl)
&& (wc & FWW_NW_DSCP || !((a->nw_tos ^ b->nw_tos) & IP_DSCP_MASK)) && (wc & FWW_NW_DSCP || !((a->nw_tos ^ b->nw_tos) & IP_DSCP_MASK))

12
lib/packets.h
View File

@@ -84,12 +84,12 @@ static inline bool eth_addr_equal_except(const uint8_t a[ETH_ADDR_LEN],
const uint8_t b[ETH_ADDR_LEN], const uint8_t b[ETH_ADDR_LEN],
const uint8_t mask[ETH_ADDR_LEN]) const uint8_t mask[ETH_ADDR_LEN])
{ {
return (((a[0] ^ b[0]) & mask[0]) return !(((a[0] ^ b[0]) & mask[0])
|| ((a[1] ^ b[1]) & mask[1]) || ((a[1] ^ b[1]) & mask[1])
|| ((a[2] ^ b[2]) & mask[2]) || ((a[2] ^ b[2]) & mask[2])
|| ((a[3] ^ b[3]) & mask[3]) || ((a[3] ^ b[3]) & mask[3])
|| ((a[4] ^ b[4]) & mask[4]) || ((a[4] ^ b[4]) & mask[4])
|| ((a[5] ^ b[5]) & mask[5])); || ((a[5] ^ b[5]) & mask[5]));
} }
static inline uint64_t eth_addr_to_uint64(const uint8_t ea[ETH_ADDR_LEN]) static inline uint64_t eth_addr_to_uint64(const uint8_t ea[ETH_ADDR_LEN])
{ {

8
tests/test-classifier.c
View File

@@ -203,11 +203,11 @@ match(const struct cls_rule *wild, const struct flow *fixed)
} else if (f_idx == CLS_F_IDX_TP_DST) { } else if (f_idx == CLS_F_IDX_TP_DST) {
eq = !((fixed->tp_dst ^ wild->flow.tp_dst) & wild->wc.tp_dst_mask); eq = !((fixed->tp_dst ^ wild->flow.tp_dst) & wild->wc.tp_dst_mask);
} else if (f_idx == CLS_F_IDX_DL_SRC) { } else if (f_idx == CLS_F_IDX_DL_SRC) {
eq = !eth_addr_equal_except(fixed->dl_src, wild->flow.dl_src, eq = eth_addr_equal_except(fixed->dl_src, wild->flow.dl_src,
wild->wc.dl_src_mask); wild->wc.dl_src_mask);
} else if (f_idx == CLS_F_IDX_DL_DST) { } else if (f_idx == CLS_F_IDX_DL_DST) {
eq = !eth_addr_equal_except(fixed->dl_dst, wild->flow.dl_dst, eq = eth_addr_equal_except(fixed->dl_dst, wild->flow.dl_dst,
wild->wc.dl_dst_mask); wild->wc.dl_dst_mask);
} else if (f_idx == CLS_F_IDX_VLAN_TCI) { } else if (f_idx == CLS_F_IDX_VLAN_TCI) {
eq = !((fixed->vlan_tci ^ wild->flow.vlan_tci) eq = !((fixed->vlan_tci ^ wild->flow.vlan_tci)
& wild->wc.vlan_tci_mask); & wild->wc.vlan_tci_mask);