Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

hwsim: Use util_is_broadcast_address

Browse Source 
Replace is_multicast_addr with util_is_broadcast_address usage.
is_multicast_addr seems to have been wrong, first because we're not
interested in just any multicast address (defined to be same as "group
address"), but rather specifically the broadcast address, as we don't
know of any specific address groups other than broadcast.  And also
wrong because the "Individual/Group bit" is the LSB of byte 0, not the
MSB of byte 0 apparently.
This commit is contained in:
Andrew Zaborowski 2017-09-22 05:06:24 +02:00 committed by Denis Kenzior
parent 9ef5f68d4b
commit a7ee2c428a
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/hwsim.c
View File

@ -1003,11 +1003,6 @@ static void rtnl_link_notify(uint16_t type, const void *data, uint32_t len,
} }
} }
static bool is_multicast_addr(const uint8_t *addr)
{
return util_is_bit_set(addr[0], 7);
}
struct hwsim_tx_info { struct hwsim_tx_info {
int8_t idx; int8_t idx;
uint8_t count; uint8_t count;
@ -1035,8 +1030,8 @@ struct hwsim_frame {
static bool radio_match_addr(const struct radio_info_rec *radio, static bool radio_match_addr(const struct radio_info_rec *radio,
const uint8_t *addr) const uint8_t *addr)
{ {
if (!radio || is_multicast_addr(addr)) if (!radio || util_is_broadcast_address(addr))
return !radio && is_multicast_addr(addr); return !radio && util_is_broadcast_address(addr);
return !memcmp(addr, radio->addrs[0], ETH_ALEN) || return !memcmp(addr, radio->addrs[0], ETH_ALEN) ||
!memcmp(addr, radio->addrs[1], ETH_ALEN); !memcmp(addr, radio->addrs[1], ETH_ALEN);
@ -1230,7 +1225,7 @@ static void process_frame(struct hwsim_frame *frame)
const struct l_queue_entry *entry; const struct l_queue_entry *entry;
bool drop_mcast = false; bool drop_mcast = false;
if (is_multicast_addr(frame->dst_ether_addr)) if (util_is_broadcast_address(frame->dst_ether_addr))
process_rules(frame->src_radio, NULL, frame, &drop_mcast); process_rules(frame->src_radio, NULL, frame, &drop_mcast);
for (entry = l_queue_get_entries(radio_info); entry; for (entry = l_queue_get_entries(radio_info); entry;
@ -1256,7 +1251,7 @@ static void process_frame(struct hwsim_frame *frame)
* by only forwarding the frame to the radios that have * by only forwarding the frame to the radios that have
* at least one interface with this specific address. * at least one interface with this specific address.
*/ */
if (!is_multicast_addr(frame->dst_ether_addr)) { if (!util_is_broadcast_address(frame->dst_ether_addr)) {
struct interface_match_data match_data = { struct interface_match_data match_data = {
radio, radio,
frame->dst_ether_addr, frame->dst_ether_addr,
@ -1785,7 +1780,7 @@ static bool rule_property_get_destination(struct l_dbus *dbus,
if (rule->destination_any) if (rule->destination_any)
str = "any"; str = "any";
else if (is_multicast_addr(rule->destination)) else if (util_is_broadcast_address(rule->destination))
str = "multicast"; str = "multicast";
else else
str = util_address_to_string(rule->destination); str = util_address_to_string(rule->destination);