Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

hwsim: require enabling rule before use 

The hwsim Rule API was structured as properties so once a rule is
created it automatically starts being applied to frames. This happens
before anything has time to actually define the rule (source, destination
etc). This leads to every single frame being matched to the rule until
these other properties are added, which can result in unexpected behavior.

To fix this an "Enabled" property has been added and the rule will not
be applied until this is true.
This commit is contained in:
James Prestwood 2021-08-18 15:09:28 -07:00 committed by Denis Kenzior
parent 9eb3adc33b
commit a4ee9c8152
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tools/hwsim.c
View File

@ -124,6 +124,7 @@ struct hwsim_rule {
bool destination_any : 1;
bool bidirectional : 1;
bool drop : 1;
bool enabled : 1;
uint32_t frequency;
int priority;
int signal;
@ -1177,6 +1178,9 @@ static void process_rules(const struct radio_info_rec *src_radio,
rule_entry = rule_entry->next) {
struct hwsim_rule *rule = rule_entry->data;
if (!rule->enabled)
return;
if (!rule->source_any &&
!radio_match_addr(src_radio, rule->source) &&
(!rule->bidirectional ||
@ -1996,6 +2000,7 @@ static struct l_dbus_message *rule_add(struct l_dbus *dbus,
rule->source_any = true;
rule->destination_any = true;
rule->delay = HWSIM_DELAY_MIN_MS;
rule->enabled = false;
if (!rules)
rules = l_queue_new();
@ -2369,6 +2374,37 @@ invalid_args:
return dbus_error_invalid_args(message);
}
static bool rule_property_get_enabled(struct l_dbus *dbus,
struct l_dbus_message *message,
struct l_dbus_message_builder *builder,
void *user_data)
{
struct hwsim_rule *rule = user_data;
bool bval = rule->enabled;
l_dbus_message_builder_append_basic(builder, 'b', &bval);
return true;
}
static struct l_dbus_message *rule_property_set_enabled(
struct l_dbus *dbus,
struct l_dbus_message *message,
struct l_dbus_message_iter *new_value,
l_dbus_property_complete_cb_t complete,
void *user_data)
{
struct hwsim_rule *rule = user_data;
bool bval;
if (!l_dbus_message_iter_get_variant(new_value, "b", &bval))
return dbus_error_invalid_args(message);
rule->enabled = bval;
return l_dbus_message_new_method_return(message);
}
static void setup_rule_interface(struct l_dbus_interface *interface)
{
l_dbus_interface_method(interface, "Remove", 0, rule_remove, "", "");
@ -2409,6 +2445,10 @@ static void setup_rule_interface(struct l_dbus_interface *interface)
L_DBUS_PROPERTY_FLAG_AUTO_EMIT, "ay",
rule_property_get_prefix,
rule_property_set_prefix);
l_dbus_interface_property(interface, "Enabled",
L_DBUS_PROPERTY_FLAG_AUTO_EMIT, "b",
rule_property_get_enabled,
rule_property_set_enabled);
}
static void request_name_callback(struct l_dbus *dbus, bool success,