In the NEW_RADIO callback hwsim was assuming that DBus had no yet replied to the Create() method. In some cases the NEW_RADIO event fires before the actual callback which will respond to DBus. This causes a crash in the create callback. --- tools/hwsim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/hwsim.c b/tools/hwsim.c index 641a6c6f..c17792bf 100644 --- a/tools/hwsim.c +++ b/tools/hwsim.c @@ -1579,7 +1579,7 @@ static void radio_manager_create_callback(struct l_genl_msg *msg, */ radio = l_queue_find(radio_info, radio_info_match_id, L_UINT_TO_PTR(pending_create_radio_id)); - if (radio) { + if (radio && pending_create_msg) { const char *path = radio_get_path(radio); reply = l_dbus_message_new_method_return(pending_create_msg); -- 2.26.2

The Create() API was limited to only taking a Name and boolean (for p2p enabling). The actual hwsim nl80211 API can take more attributes than this (which are actually utilized when creating from the command line). To get the DBus API up to the same functionality the two arguments in Create were replaced with a single dictionary. This allows for extending later if more arguments are needed. --- tools/hwsim.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/tools/hwsim.c b/tools/hwsim.c index c17792bf..6a1eb348 100644 --- a/tools/hwsim.c +++ b/tools/hwsim.c @@ -1599,20 +1599,38 @@ static struct l_dbus_message *radio_manager_create(struct l_dbus *dbus, void *user_data) { struct l_genl_msg *new_msg; - const char *name; - bool p2p; + struct l_dbus_message_iter dict; + struct l_dbus_message_iter variant; + const char *key; + const char *name = NULL; + bool p2p = false; if (pending_create_msg) return dbus_error_busy(message); - if (!l_dbus_message_get_arguments(message, "sb", &name, &p2p)) - return dbus_error_invalid_args(message); + if (!l_dbus_message_get_arguments(message, "a{sv}", &dict)) + goto invalid; + + while (l_dbus_message_iter_next_entry(&dict, &key, &variant)) { + bool ret = false; - new_msg = l_genl_msg_new_sized(HWSIM_CMD_NEW_RADIO, 16 + strlen(name)); + if (!strcmp(key, "Name")) + ret = l_dbus_message_iter_get_variant(&variant, + "s", &name); + else if (!strcmp(key, "P2P")) + ret = l_dbus_message_iter_get_variant(&variant, + "b", &p2p); + + if (!ret) + goto invalid; + } + + new_msg = l_genl_msg_new_sized(HWSIM_CMD_NEW_RADIO, + 16 + name ? strlen(name) : 0); l_genl_msg_append_attr(new_msg, HWSIM_ATTR_DESTROY_RADIO_ON_CLOSE, 0, NULL); - if (name[0]) + if (name) l_genl_msg_append_attr(new_msg, HWSIM_ATTR_RADIO_NAME, strlen(name) + 1, name); @@ -1627,12 +1645,15 @@ static struct l_dbus_message *radio_manager_create(struct l_dbus *dbus, pending_create_radio_id = 0; return NULL; + +invalid: + return dbus_error_invalid_args(message); } static void setup_radio_manager_interface(struct l_dbus_interface *interface) { l_dbus_interface_method(interface, "CreateRadio", 0, - radio_manager_create, "o", "sb", + radio_manager_create, "o", "a{sv}", "path", "name", "p2p_device"); } -- 2.26.2

Common API to wait for a DBus service to appear on the bus --- tools/test-runner | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/test-runner b/tools/test-runner index bc580a41..d16c8885 100755 --- a/tools/test-runner +++ b/tools/test-runner @@ -616,6 +616,15 @@ class Namespace: return False + def wait_for_dbus_service(self, service): + tries = 0 + + while not self._bus.name_has_owner(service): + if tries > 200: + raise TimeoutError('DBus service %s did not appear', service) + tries += 1 + sleep(0.1) + def __str__(self): ret = 'Namespace: %s\n' % self.name ret += 'Processes:\n' -- 2.26.2

Update the Dbus API to allow disabling iftypes and ciphers just as you can with the command line. --- tools/hwsim.c | 141 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 84 insertions(+), 57 deletions(-) diff --git a/tools/hwsim.c b/tools/hwsim.c index 6a1eb348..62a7d66d 100644 --- a/tools/hwsim.c +++ b/tools/hwsim.c @@ -195,6 +195,62 @@ static void do_debug(const char *str, void *user_data) l_info("%s%s", prefix, str); } +static void hwsim_disable_support(const char *disable, + const struct hwsim_support *map, uint32_t *mask) +{ + char **list = l_strsplit(disable, ','); + char **iter = list; + int i; + + while (*iter) { + for (i = 0; map[i].name; i++) { + if (!strcmp(map[i].name, *iter)) + *mask &= ~(map[i].value); + } + + iter++; + } + + l_strfreev(list); +} + +static bool is_cipher_disabled(const char *args, enum crypto_cipher cipher) +{ + char **list = l_strsplit(args, ','); + char **iter = list; + int i; + + while (*iter) { + for (i = 0; cipher_map[i].name; i++) { + if (!strcmp(*iter, cipher_map[i].name) && + cipher == cipher_map[i].value) { + printf("disable cipher: %s\n", cipher_map[i].name); + l_strfreev(list); + return true; + } + } + + iter++; + } + + l_strfreev(list); + + return false; +} + +static void hwsim_disable_ciphers(const char *disable) +{ + uint8_t i; + + for (i = 0; i < L_ARRAY_SIZE(hwsim_supported_ciphers); i++) { + if (is_cipher_disabled(disable, hwsim_supported_ciphers[i])) + continue; + + hwsim_ciphers[hwsim_num_ciphers] = hwsim_supported_ciphers[i]; + hwsim_num_ciphers++; + } +} + static void create_callback(struct l_genl_msg *msg, void *user_data) { struct l_genl_attr attr; @@ -1604,6 +1660,8 @@ static struct l_dbus_message *radio_manager_create(struct l_dbus *dbus, const char *key; const char *name = NULL; bool p2p = false; + const char *disabled_iftypes = NULL; + const char *disabled_ciphers = NULL; if (pending_create_msg) return dbus_error_busy(message); @@ -1620,7 +1678,12 @@ static struct l_dbus_message *radio_manager_create(struct l_dbus *dbus, else if (!strcmp(key, "P2P")) ret = l_dbus_message_iter_get_variant(&variant, "b", &p2p); - + else if (!strcmp(key, "InterfaceTypeDisable")) + ret = l_dbus_message_iter_get_variant(&variant, "s", + &disabled_iftypes); + else if (!strcmp(key, "CipherTypeDisable")) + ret = l_dbus_message_iter_get_variant(&variant, "s", + &disabled_ciphers); if (!ret) goto invalid; } @@ -1638,6 +1701,26 @@ static struct l_dbus_message *radio_manager_create(struct l_dbus *dbus, l_genl_msg_append_attr(new_msg, HWSIM_ATTR_SUPPORT_P2P_DEVICE, 0, NULL); + if (disabled_iftypes) { + hwsim_disable_support(disabled_iftypes, iftype_map, + &hwsim_iftypes); + + if (hwsim_iftypes != HWSIM_DEFAULT_IFTYPES) + l_genl_msg_append_attr(new_msg, + HWSIM_ATTR_IFTYPE_SUPPORT, + 4, &hwsim_iftypes); + } + + if (disabled_ciphers) { + hwsim_disable_ciphers(disabled_ciphers); + + if (hwsim_num_ciphers) + l_genl_msg_append_attr(new_msg, HWSIM_ATTR_CIPHER_SUPPORT, + sizeof(uint32_t) * hwsim_num_ciphers, + hwsim_ciphers); + + } + l_genl_family_send(hwsim, new_msg, radio_manager_create_callback, pending_create_msg, NULL); @@ -2525,62 +2608,6 @@ error: l_main_quit(); } -static void hwsim_disable_support(char *disable, - const struct hwsim_support *map, uint32_t *mask) -{ - char **list = l_strsplit(disable, ','); - char **iter = list; - int i; - - while (*iter) { - for (i = 0; map[i].name; i++) { - if (!strcmp(map[i].name, *iter)) - *mask &= ~(map[i].value); - } - - iter++; - } - - l_strfreev(list); -} - -static bool is_cipher_disabled(char *args, enum crypto_cipher cipher) -{ - char **list = l_strsplit(args, ','); - char **iter = list; - int i; - - while (*iter) { - for (i = 0; cipher_map[i].name; i++) { - if (!strcmp(*iter, cipher_map[i].name) && - cipher == cipher_map[i].value) { - printf("disable cipher: %s\n", cipher_map[i].name); - l_strfreev(list); - return true; - } - } - - iter++; - } - - l_strfreev(list); - - return false; -} - -static void hwsim_disable_ciphers(char *disable) -{ - uint8_t i; - - for (i = 0; i < L_ARRAY_SIZE(hwsim_supported_ciphers); i++) { - if (is_cipher_disabled(disable, hwsim_supported_ciphers[i])) - continue; - - hwsim_ciphers[hwsim_num_ciphers] = hwsim_supported_ciphers[i]; - hwsim_num_ciphers++; - } -} - static void family_discovered(const struct l_genl_family_info *info, void *user_data) { -- 2.26.2

Use the hwsim DBus API rather than command line. This both is faster and more dynamic than doing so with the command line. This also avoids tracking the radio ID since we can just hang on to the radio Dbus object directly. --- tools/test-runner | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/tools/test-runner b/tools/test-runner index 16628399..7bd15a28 100755 --- a/tools/test-runner +++ b/tools/test-runner @@ -41,7 +41,6 @@ TIOCSTTY = 0x540E config = None intf_id = 0 -rad_id = 0 TEST_MAX_TIMEOUT = 120 @@ -314,35 +313,26 @@ class VirtualRadio(Radio): than the command line. ''' def __init__(self, name, config=None): - global rad_id - - super().__init__(name) - self.disable_cipher = None self.disable_iftype = None - args = ['hwsim', '--create', '--name', self.name, '--nointerface', '--p2p'] + hwsim = importlib.import_module('hwsim').Hwsim() if config: - self.disable_iftype = config.get('iftype_disable', False) - if self.disable_iftype: - args.append('--iftype-disable') - args.append(self.disable_iftype) - - self.disable_cipher = config.get('cipher_disable', False) - if self.disable_cipher: - args.append('--cipher-disable') - args.append(self.disable_cipher) + self.disable_iftype = config.get('iftype_disable', None) + self.disable_cipher = config.get('cipher_disable', None) - Process(args, wait=True) + self._radio = hwsim.radios.create(name, p2p_device=True, + iftype_disable=self.disable_iftype, + cipher_disable=self.disable_cipher) - self.id = rad_id - rad_id += 1 + super().__init__(self._radio.name) def __del__(self): super().__del__() - Process(['hwsim', '--destroy=%s' % self.id]) + self._radio.remove() + self._radio = None def __str__(self): ret = super().__str__() -- 2.26.2