From patchwork Thu Aug 11 17:58:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 12941676 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 69D132CA7 for ; Thu, 11 Aug 2022 17:59:04 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id 73so17724267pgb.9 for ; Thu, 11 Aug 2022 10:59:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=Ipl4an6rKguN3FMXDtrPuFyxjG+SRjLiEMvLxzXRQQY=; b=KQO42zjYJvMpbafuCc/xa6YfYZA6uNyciBRPcLEqzjF+sGlmf2eIOiSatmZJcfVt1g yENLfmyjZRNKN4YORd6VWF77CeitPosUlEI+vMd+UnTCIYKz41oV80kFcFK0DvC3zrju uS7W9IbPBENEHF1TrcNuvMUh3AERI5+kzuXDImli4H9WbVymf17rCsxuNGRKK/VU76v0 ZImiGB0ZtD72LdJ6Byvvm6Pw49oF+w9yYWlFfK3RtxNTO8yN+Cm6cYbSm9HVScI2ttqj f9cO1xzc5XeBM414nyxa2al4jLHLRiylNE6YGJMU79VAUmlp0IOSKKFcYAnJBb04hgRf oztA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=Ipl4an6rKguN3FMXDtrPuFyxjG+SRjLiEMvLxzXRQQY=; b=pPaGMhGuqrYRw1ipeEZjUxDRjTxbsgVCrSOgIYVpb8lUfgrmC2b9b4yJTWTwk+1yrO LBX5azx1pM/H3+yBk/4h2KOOfQBY+MaWeqyrCVXUiczaCPu/EtJ3g4PBGj8c1qUSk03T S+h6GsjFge18Ya4xjA00t78oWHRc0PSJCk03DlWdVUIiSgJ7Ykz1r0oQfuPjSLmTdnlX SnXx+q2iqNCqNrkEEgjvKd/9p7UTmv9dYj/t2nDYquS9sU9UAbqceeYHo5FsVdYmi/pZ Q5T7QJUFtxdDrQGGCap2QpgTofoYt9+115TljosDdxtDSIYOYumgzXkhjKL+1Cz39vmD lO+A== X-Gm-Message-State: ACgBeo0Mzm+vf9c0BHvpHQ6WuXshBiEwHrIMM9OkRdx6tAjB+T7DI+g0 7yZl/OzjCDWYkZdUu+I+I6EUnRQpMgY= X-Google-Smtp-Source: AA6agR6piyFHBjgte2Rpb1JasXnx0JNZKAWTK+1VQ6GBsn0nff/oKE4ZprRfkBaX1t8UfGVAfTsZ6Q== X-Received: by 2002:a63:1a49:0:b0:41b:c0b2:c94d with SMTP id a9-20020a631a49000000b0041bc0b2c94dmr171698pgm.524.1660240743557; Thu, 11 Aug 2022 10:59:03 -0700 (PDT) Received: from jprestwo-xps.none ([50.39.168.145]) by smtp.gmail.com with ESMTPSA id w125-20020a626283000000b0052ab602a7d0sm4292685pfb.100.2022.08.11.10.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 10:59:03 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 1/6] doc: add documentation for StationDebug Date: Thu, 11 Aug 2022 10:58:55 -0700 Message-Id: <20220811175900.443310-1-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.3 Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- doc/station-debug-api.txt | 72 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 doc/station-debug-api.txt diff --git a/doc/station-debug-api.txt b/doc/station-debug-api.txt new file mode 100644 index 00000000..18971f1b --- /dev/null +++ b/doc/station-debug-api.txt @@ -0,0 +1,72 @@ +Station Debug hierarchy [experimental] +============================ + +These are all development APIs not meant for production use. + +Service net.connman.iwd +Interface net.connman.iwd.StationDebug +Object path /net/connman/iwd/{phy0,phy1,...}/{1,2,...} + +Methods void ConnectBssid(array(y) address) + + Connect to a specific BSS. The address parameter should + be a byte array of length 6, the BSSID of a BSS which + IWD already has in its scan list. + + Possible errors: net.connman.iwd.InvalidArguments + net.connman.iwd.NotFound + + void Roam(array(y) address) + + Roam to a specific BSS. The address parameter should be + a byte array of length 6, the BSSID of a BSS to roam to. + This BSS needs to be in IWD's scan results and fit the + requirements for a roam candidate (same network). + The type of roam is dependent on the network and is + chosen automatically by IWD. + + Possible errors: net.connman.iwd.InvalidArguments + net.connman.iwd.NotConnected + + void Scan(array(q) frequencies) + + Scan on specific frequencies. The frequencies parameter + should be a list of valid frequencies. + + Possible errors: net.connman.iwd.Busy + net.connman.iwd.InvalidArguments + net.connamn.iwd.Failed + + a{oaa{sv}} GetNetworks() + + Get a list of networks including data for individual + BSS's. Returns a dictionary where keys are network + object paths and values are arrays of dictionaries + containing BSS information: + + { + /network/path/1: [ + { + Address: 11:22:33:44:55, + Frequency: 1234, + RSSI: -20, + Rank: 1000 + MDE: 001122 + }, + { ... } + ] + } + + Hidden BSS's are also included under the network path + "/hidden" since this will not interfere with a valid + network path. + +Signals: Event(s name, av data) + + Signal sent for various debug events. The 'name' is the + event name, and 'data' is event dependent. + +Properties: boolean AutoConnect + + True if IWD is in an autoconnect state. This property + can be written to put IWD into an autoconnect state. From patchwork Thu Aug 11 17:58:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 12941677 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDB694690 for ; Thu, 11 Aug 2022 17:59:04 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id 12so17752643pga.1 for ; Thu, 11 Aug 2022 10:59:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=wXDriboPA7Pt5wyY/fwcamBHlraw9IFgUdWuZHaA6b4=; b=Jas64FxWcERorrjhjOkOOcHpWMQHLVyDgXzbCzWykgQBH3kbDWOy3ra7So0i45fwjB fnYeBFIdgvWTN3C3rhLEGLiJQvuy2HUyvMCoSWFf+iuYZYIHRzonappgmAwNI1nDRLo8 A2Con4C3qMjbIqtyl8NrWY01tbuFj59GC0RxSy6/d6++TDdc1Gkxg+RFN8FoJaccy/g+ mn3DkEbOgSgJ+5JPS5f+skce3Pt+LvqXSwkpysp2YKDxw49VN78KO1D3A93KGfNRgCFn LNBcDiPqmlfHPqyhFOrkFkX5Ld06RkPTy6UM6LfoPL6thQHHuPVwP6Sa+9hxxmRtFnsm PvIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=wXDriboPA7Pt5wyY/fwcamBHlraw9IFgUdWuZHaA6b4=; b=y/n5KDJEIzxzwKklW6GZ/JwR0/9/qmgKK/NMp+QbX6ryWs14eBONn1B4u5SkDzXOM3 WouQ2fqmYHp5yVhT2/cds6aITH6qYduO5/qZf3met0JTHJOEd3U35PQr4piHYgMOB8Qi 51GYsf33BrPLtx+v3ZE01h8FXGAUBXXg0FypXNAk26f6mGhWY3Ac/TnPgdrAfTkP0JSh MzbVkCd3wrnNPLdH9arT4My8ydZEHdji+cKES97A/VqcdLt1kJMV2bdPyBhfq4ntQOV6 H65pQw19bESTwB2VxAJi6+pG4ulQ4SwlzyYcz+gXU5C8B56Y+bMi32c1bizi5QXdeWEi ekiQ== X-Gm-Message-State: ACgBeo0282x96jf7qlsQd4jsN+TChBygocV6vGxe8geJhu8e0tCFfLd/ J+OdiEsUe6RPputUbGh1hOC7lfFGi/4= X-Google-Smtp-Source: AA6agR7fGl6yplpS8fofOFqFe7n7FfHNBacGpG3yb94JGDDR6cRgiQJB+89fSN0zsV0AtfxntNMUeQ== X-Received: by 2002:a05:6a00:1a14:b0:52d:5fee:d46b with SMTP id g20-20020a056a001a1400b0052d5feed46bmr367405pfv.82.1660240744001; Thu, 11 Aug 2022 10:59:04 -0700 (PDT) Received: from jprestwo-xps.none ([50.39.168.145]) by smtp.gmail.com with ESMTPSA id w125-20020a626283000000b0052ab602a7d0sm4292685pfb.100.2022.08.11.10.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 10:59:03 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 2/6] station: add debug method GetNetworks Date: Thu, 11 Aug 2022 10:58:56 -0700 Message-Id: <20220811175900.443310-2-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20220811175900.443310-1-prestwoj@gmail.com> References: <20220811175900.443310-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This gets all networks but includes individual entries for each BSS. --- src/station.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) v2: * Made Rank a uint16 * Made Address a string, this makes parsing on the iwctl side a bit easier. * Use path as dictionary keys to avoid possible duplication. This also makes the hidden array cleaner since we can use /hidden instead of an empty string. diff --git a/src/station.c b/src/station.c index 57dbd0d5..0d2b0990 100644 --- a/src/station.c +++ b/src/station.c @@ -4600,6 +4600,106 @@ static struct l_dbus_message *station_property_set_autoconnect( return l_dbus_message_new_method_return(message); } +static void station_append_byte_array(struct l_dbus_message_builder *builder, + const char *name, + const uint8_t *bytes, size_t len) +{ + size_t i; + + l_dbus_message_builder_enter_dict(builder, "sv"); + l_dbus_message_builder_append_basic(builder, 's', name); + l_dbus_message_builder_enter_variant(builder, "ay"); + l_dbus_message_builder_enter_array(builder, "y"); + + for (i = 0; i < len; i++) + l_dbus_message_builder_append_basic(builder, 'y', &bytes[i]); + + l_dbus_message_builder_leave_array(builder); + l_dbus_message_builder_leave_variant(builder); + l_dbus_message_builder_leave_dict(builder); +} + +static void station_append_bss_list(struct l_dbus_message_builder *builder, + const struct l_queue_entry *entry) +{ + for (; entry; entry = entry->next) { + struct scan_bss *bss = entry->data; + int32_t rssi = bss->signal_strength / 100; + + l_dbus_message_builder_enter_array(builder, "{sv}"); + + dbus_append_dict_basic(builder, "Frequency", 'u', + &bss->frequency); + dbus_append_dict_basic(builder, "RSSI", 'i', + &rssi); + dbus_append_dict_basic(builder, "Rank", 'q', &bss->rank); + + dbus_append_dict_basic(builder, "Address", 's', + util_address_to_string(bss->addr)); + + station_append_byte_array(builder, "MDE", bss->mde, 3); + + l_dbus_message_builder_leave_array(builder); + } +} + +static struct l_dbus_message *station_debug_get_networks(struct l_dbus *dbus, + struct l_dbus_message *message, + void *user_data) +{ + struct station *station = user_data; + struct l_dbus_message *reply = + l_dbus_message_new_method_return(message); + struct l_dbus_message_builder *builder = + l_dbus_message_builder_new(reply); + const struct l_queue_entry *entry; + + l_dbus_message_builder_enter_array(builder, "{oaa{sv}}"); + + if (l_queue_isempty(station->networks_sorted)) + goto try_hidden; + + for (entry = l_queue_get_entries(station->networks_sorted); entry; + entry = entry->next) { + const struct network *network = entry->data; + + l_dbus_message_builder_enter_dict(builder, "oaa{sv}"); + l_dbus_message_builder_append_basic(builder, 'o', + network_get_path(network)); + l_dbus_message_builder_enter_array(builder, "a{sv}"); + + station_append_bss_list(builder, + network_bss_list_get_entries(network)); + + l_dbus_message_builder_leave_array(builder); + l_dbus_message_builder_leave_dict(builder); + } + +try_hidden: + if (l_queue_isempty(station->hidden_bss_list_sorted)) + goto done; + + /* + * Hidden Networks. Use a special /hidden path for these which should + * never conflict with a real network path + */ + l_dbus_message_builder_enter_dict(builder, "oaa{sv}"); + l_dbus_message_builder_append_basic(builder, 'o', "/hidden"); + l_dbus_message_builder_enter_array(builder, "a{sv}"); + station_append_bss_list(builder, + l_queue_get_entries(station->hidden_bss_list_sorted)); + l_dbus_message_builder_leave_array(builder); + l_dbus_message_builder_leave_dict(builder); + +done: + l_dbus_message_builder_leave_array(builder); + + l_dbus_message_builder_finalize(builder); + l_dbus_message_builder_destroy(builder); + + return reply; +} + static void station_setup_debug_interface( struct l_dbus_interface *interface) { @@ -4612,6 +4712,9 @@ static void station_setup_debug_interface( l_dbus_interface_method(interface, "Scan", 0, station_debug_scan, "", "aq", "frequencies"); + l_dbus_interface_method(interface, "GetNetworks", 0, + station_debug_get_networks, "a{oaa{sv}}", "", + "networks"); l_dbus_interface_signal(interface, "Event", 0, "sav", "name", "data"); From patchwork Thu Aug 11 17:58:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 12941678 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 638DA46A1 for ; Thu, 11 Aug 2022 17:59:05 +0000 (UTC) Received: by mail-pf1-f169.google.com with SMTP id p125so13569995pfp.2 for ; Thu, 11 Aug 2022 10:59:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=E81VTOvPCEUHxm0VJkd0oBTpejh7M3DlPSx5n7K/QDU=; b=HKgD0lMKdEXAtpqrkqSFM70VS0RChcPjMOZVgtjGfhfw8IKL1ndME/2cjw0zMYDp9N Sc88HSb5/SuGvMczzxjZx0A1MqN+fXpA8TQTfd5NpZe/Jh/2i6ApOBYCgrbyHZhpal86 eH6B93uGxGo2qwu5ncKco50uVxP04KIGx7Y/tlm96tW8uwWkX/fEYVi7vfBUvYhp6o/B Bun1GhImvx6v0+VLOLqJN9w3+TeHKa6DYFFm+eZrYlwgarWJ1T3pd9VkIuzUg3a23A7S SB3sxWrH6dXdhzK2OFA2fcXmCyDoK7hhrIYqPbildpOmBPCKyDw7bOB43S3MAqJo9Viy U/tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=E81VTOvPCEUHxm0VJkd0oBTpejh7M3DlPSx5n7K/QDU=; b=GyDz2sJqUdGlrPz999aYT1Y8Jiedz6GlPxaHXDtNFqKsEAHBlCepa2IbXg0Gbs7pU2 9xeFXZy4cdNbhQ6vyeZ0UsL+CVP8Zb8gmhmOhqKN2jdPEJLRLux9nhafgLAuejYqx+L3 LZyOGKNIDGfJYThdYg4pcT1GsRTJpGFdvBzcwaP06Y5w2Y/uYoV3PBAHl3VNIo6V7NVj UGkcWoqT60Mg4xZPMio0XhSboruKQ0cjINxjjnFqulofB3b7Ll6aD9uSoge18oLRrdMS kmdH/WglzwZ1N12jfIIY5+I5+MJMhE59DYvQvVKrU7KKEhbkb7gWLrW3O/OgvhmrkHkn NBZA== X-Gm-Message-State: ACgBeo28UIK3ECHksBM1JkoTT3dC4aGfiocLQc39RGMqtmS6NNfKvQmv TuY+MgDNbuZ6AuFgu35cUDjX1X4cKoQ= X-Google-Smtp-Source: AA6agR75MuKjgt++ZJLWal++4W3dPjbWh+zlhV+YbNk7r4lgtYI5xabufEAVatGfuGKzCyot2qgKtQ== X-Received: by 2002:a63:d448:0:b0:41d:d4e9:b4aa with SMTP id i8-20020a63d448000000b0041dd4e9b4aamr161356pgj.123.1660240744616; Thu, 11 Aug 2022 10:59:04 -0700 (PDT) Received: from jprestwo-xps.none ([50.39.168.145]) by smtp.gmail.com with ESMTPSA id w125-20020a626283000000b0052ab602a7d0sm4292685pfb.100.2022.08.11.10.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 10:59:04 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 3/6] client: allow entity name to be passed to completion Date: Thu, 11 Aug 2022 10:58:57 -0700 Message-Id: <20220811175900.443310-3-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20220811175900.443310-1-prestwoj@gmail.com> References: <20220811175900.443310-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There is a limitation of libreadline where no context/userdata can be passed to completion functions. This effects iwctl since the entity value isn't known to completion functions. Workarounds such as getting the default device are employed but its not a great solution. Instead hack around this limitation by parsing the prompt to extract the entity (second arg). Then use a generic match function given to readline which can call the actual match function and include the entity. --- client/adapter.c | 3 ++- client/command.c | 39 ++++++++++++++++++++++++++++++++++++++- client/command.h | 9 ++++++--- client/device.c | 3 ++- client/known-networks.c | 3 ++- client/station.c | 6 ++++-- 6 files changed, 54 insertions(+), 9 deletions(-) diff --git a/client/adapter.c b/client/adapter.c index 394eae0d..1719b970 100644 --- a/client/adapter.c +++ b/client/adapter.c @@ -319,7 +319,8 @@ static enum cmd_status cmd_set_property(const char *adapter_name, return CMD_STATUS_TRIGGERED; } -static char *set_property_cmd_arg_completion(const char *text, int state) +static char *set_property_cmd_arg_completion(const char *text, int state, + const char *phy) { return proxy_property_completion(adapter_properties, text, state); } diff --git a/client/command.c b/client/command.c index c0576e97..46752c72 100644 --- a/client/command.c +++ b/client/command.c @@ -213,20 +213,57 @@ bool command_line_find_token(const char *token, uint8_t num_to_inspect) return false; } +/* + * Work around readline limitations of not being able to pass a context pointer + * to match functions. Set the command match function/entity to these globals + * and call a generic match function which can call the _real_ match function + * and include the entity. + */ +static command_completion_func_t cmd_current_completion_func = NULL; +static const char *cmd_current_entity = NULL; + +static char *cmd_completion_generic(const char *text, int state) +{ + return cmd_current_completion_func(text, state, cmd_current_entity); +} + static char **cmd_completion_match_entity_cmd(const char *cmd, const char *text, const struct command *cmd_list) { char **matches = NULL; size_t i; + char *family = NULL; + char *entity = NULL; + char *prompt = NULL; for (i = 0; cmd_list[i].cmd; i++) { + char *tmp; + if (strcmp(cmd_list[i].cmd, cmd)) continue; if (!cmd_list[i].completion) break; - matches = rl_completion_matches(text, cmd_list[i].completion); + if (cmd_list[i].entity) { + prompt = rl_copy_text(0, rl_end); + + family = strtok_r(prompt, " ", &tmp); + if (!family) + goto done; + + entity = strtok_r(NULL, " ", &tmp); + } + +done: + cmd_current_completion_func = cmd_list[i].completion; + cmd_current_entity = entity; + + matches = rl_completion_matches(text, cmd_completion_generic); + + l_free(prompt); + cmd_current_completion_func = NULL; + cmd_current_entity = NULL; break; } diff --git a/client/command.h b/client/command.h index 23f23dc9..1f841689 100644 --- a/client/command.h +++ b/client/command.h @@ -25,7 +25,10 @@ #define COMMAND_OPTION_PASSPHRASE "passphrase" #define COMMAND_OPTION_DONTASK "dont-ask" -typedef char *(*command_completion_func_t) (const char *text, int state); +typedef char *(*command_completion_func_t)(const char *text, int state, + const char *entity); +typedef char *(*command_rl_completion_func_t)(const char *text, int state); + enum cmd_status { CMD_STATUS_TRIGGERED, @@ -51,8 +54,8 @@ struct command_family { const char *caption; const char *name; const struct command *command_list; - command_completion_func_t family_arg_completion; - command_completion_func_t entity_arg_completion; + command_rl_completion_func_t family_arg_completion; + command_rl_completion_func_t entity_arg_completion; void (*set_default_entity)(const char *entity); void (*reset_default_entity)(void); }; diff --git a/client/device.c b/client/device.c index 9f8d731c..8b27ddd2 100644 --- a/client/device.c +++ b/client/device.c @@ -398,7 +398,8 @@ static enum cmd_status cmd_set_property(const char *device_name, return CMD_STATUS_TRIGGERED; } -static char *set_property_cmd_arg_completion(const char *text, int state) +static char *set_property_cmd_arg_completion(const char *text, int state, + const char *device_name) { return proxy_property_completion(device_properties, text, state); } diff --git a/client/known-networks.c b/client/known-networks.c index 56c34a2e..b2023e35 100644 --- a/client/known-networks.c +++ b/client/known-networks.c @@ -387,7 +387,8 @@ static enum cmd_status cmd_set_property(const char *network_name, return CMD_STATUS_TRIGGERED; } -static char *set_property_cmd_arg_completion(const char *text, int state) +static char *set_property_cmd_arg_completion(const char *text, int state, + const char *network_name) { return proxy_property_completion(known_network_properties, text, state); } diff --git a/client/station.c b/client/station.c index 64becdbd..90291c88 100644 --- a/client/station.c +++ b/client/station.c @@ -277,7 +277,8 @@ static enum cmd_status cmd_list(const char *device_name, char **argv, int argc) return CMD_STATUS_DONE; } -static char *connect_cmd_arg_completion(const char *text, int state) +static char *connect_cmd_arg_completion(const char *text, int state, + const char *device_name) { const struct proxy_interface *device = device_get_default(); @@ -489,7 +490,8 @@ static void ordered_networks_callback(struct l_dbus_message *message, l_queue_destroy(networks, ordered_networks_destroy); } -static char *get_networks_cmd_arg_completion(const char *text, int state) +static char *get_networks_cmd_arg_completion(const char *text, int state, + const char *device_name) { static int index; static int len; From patchwork Thu Aug 11 17:58:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 12941680 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4073B2CA7 for ; Thu, 11 Aug 2022 17:59:06 +0000 (UTC) Received: by mail-pf1-f174.google.com with SMTP id z187so17080848pfb.12 for ; Thu, 11 Aug 2022 10:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=AroT2anseqTNB9gatoNKuqu8wrkjWl9lttltD2/hzS0=; b=NjSbB6a1jA1ySM56rGj5o3v99F6U3gGSz2/m6KWeEq/zWToIovJIQIqiUEaWc1F4lD 7/SAiX5AmtXYqLviMIlGcQgWVu+lWS+GS41YCWRcb0+InSSPVKWSvs9Cr9QEgzr2gBtg 0cZgeG201csoZvD3gJCLdP2DmgeG5iYbv3XRIt5+rbgA4/NS3d/O6J40P1PNJtoL8Tt8 x44c3UB0N7rPeCgJFHpvry4bgdYhZADRJ5ztKDSeo3aYHRAQ71Rlkunjh47Nw2fnrHin o/93EhPavI922PSJD4iVCCU7M7e9u27JbXvJAI0N8kTbwEFc/oBN/OcCezE2zYhe4zYG WzMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=AroT2anseqTNB9gatoNKuqu8wrkjWl9lttltD2/hzS0=; b=AWdy9iumEkYoslb2ClU76dmw/or5O/nmOMgaaDmMugjFh3bv7m3gTE74krH2f897kF RXEe+F8eKuMQbEfQMPxsSBzdC3PeJsT/Ntj9cHoO9RnZ21pO6fk/mzLxKmVySNQunNZD ESWvpN4IQa8kjCEqrFWsPE+PBJgUtR+5JTltR42dK1IJaOLr4FHnMxNXJDkc4gqzZBDK EssVSFxpW6V2qRQsz4UAfIj3tkmExtNGxBjC7vFNEi1Q7NFIA7AqMW5hbeKgqhAANGcP Cgp3go+YSIz5E1LOOQgdgp0amoNSLUAEPU8GI57JuAcpQ2nxMBZGyyIoayYRGqeo95oL bqiA== X-Gm-Message-State: ACgBeo3kfj3pttO6AAhfj3+GM901vWa5MrA5/ZEU34fII2X+sM+t0UUn lHPpVEwTMr992+HBdqohL8njkechevE= X-Google-Smtp-Source: AA6agR4snMXCQU5z0BYUY8n5lsJSWLX3cFN2xwxv5winIVdxrhs8Oe1zex31nWQ2xf6iDx7LlrRDzA== X-Received: by 2002:a63:565c:0:b0:41d:17e1:32f with SMTP id g28-20020a63565c000000b0041d17e1032fmr160124pgm.445.1660240745340; Thu, 11 Aug 2022 10:59:05 -0700 (PDT) Received: from jprestwo-xps.none ([50.39.168.145]) by smtp.gmail.com with ESMTPSA id w125-20020a626283000000b0052ab602a7d0sm4292685pfb.100.2022.08.11.10.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 10:59:04 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 4/6] client: add station-debug command interface Date: Thu, 11 Aug 2022 10:58:58 -0700 Message-Id: <20220811175900.443310-4-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20220811175900.443310-1-prestwoj@gmail.com> References: <20220811175900.443310-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This lets iwctl call methods on .StationDebug. The command name is called 'debug'. This can only be used when both iwctl and IWD are in developer mode (-E) --- Makefile.am | 4 +- client/station-debug.c | 451 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 454 insertions(+), 1 deletion(-) create mode 100644 client/station-debug.c diff --git a/Makefile.am b/Makefile.am index cffb0738..ed93d000 100644 --- a/Makefile.am +++ b/Makefile.am @@ -301,7 +301,9 @@ client_iwctl_SOURCES = client/main.c \ client/wsc.c client/station.c \ client/diagnostic.c client/diagnostic.h \ client/daemon.c client/daemon.h \ - client/dpp.c + client/dpp.c client/station-debug.c \ + src/util.c src/util.h \ + src/band.c src/band.h client_iwctl_LDADD = $(ell_ldadd) $(READLINE_LIBS) diff --git a/client/station-debug.c b/client/station-debug.c new file mode 100644 index 00000000..4009fbbe --- /dev/null +++ b/client/station-debug.c @@ -0,0 +1,451 @@ +#include +#include "ell/useful.h" + +#include "client/command.h" +#include "client/dbus-proxy.h" +#include "client/device.h" +#include "client/display.h" +#include "client/properties.h" +#include "client/network.h" +#include "src/util.h" + +struct station_debug { + struct l_queue *network_list; + bool autoconnect; +}; + +struct network { + char *ssid; + struct l_queue *bss_list; +}; + +struct bss { + char addr[18]; + uint32_t frequency; + int8_t rssi; + int32_t rank; + uint8_t mde[3]; +}; + +static void network_free(void *data) +{ + struct network *network = data; + + l_queue_destroy(network->bss_list, l_free); +} + +static void *station_debug_create(void) +{ + struct station_debug *debug = l_new(struct station_debug, 1); + + debug->network_list = l_queue_new(); + + return debug; +} + +static void station_debug_destroy(void *data) +{ + struct station_debug *debug = data; + + l_queue_destroy(debug->network_list, network_free); + + l_free(debug); +} + +static void check_errors_method_callback(struct l_dbus_message *message, + void *user_data) +{ + dbus_message_has_error(message); +} + +static enum cmd_status cmd_debug_connect(const char *device_name, + char **argv, int argc) +{ + + const struct proxy_interface *debug_i; + uint8_t addr[6]; + + if (argc < 1) + return CMD_STATUS_INVALID_ARGS; + + debug_i = device_proxy_find(device_name, IWD_STATION_DEBUG_INTERFACE); + if (!debug_i) { + display_error("IWD not in developer mode"); + return CMD_STATUS_INVALID_VALUE; + } + + if (!util_string_to_address(argv[0], addr)) + return CMD_STATUS_INVALID_ARGS; + + proxy_interface_method_call(debug_i, "ConnectBssid", "ay", + check_errors_method_callback, 6, + addr[0], addr[1], addr[2], + addr[3], addr[4], addr[5]); + return CMD_STATUS_TRIGGERED; +} + +static enum cmd_status cmd_debug_roam(const char *device_name, + char **argv, int argc) +{ + const struct proxy_interface *debug_i; + uint8_t addr[6]; + + if (argc < 1) + return CMD_STATUS_INVALID_ARGS; + + debug_i = device_proxy_find(device_name, IWD_STATION_DEBUG_INTERFACE); + if (!debug_i) { + display_error("IWD not in developer mode"); + return CMD_STATUS_INVALID_VALUE; + } + + if (!util_string_to_address(argv[0], addr)) + return CMD_STATUS_INVALID_ARGS; + + proxy_interface_method_call(debug_i, "Roam", "ay", + check_errors_method_callback, 6, + addr[0], addr[1], addr[2], + addr[3], addr[4], addr[5]); + return CMD_STATUS_TRIGGERED; +} + +static void get_byte_array(struct l_dbus_message_iter *variant, uint8_t *out, + unsigned int len) +{ + struct l_dbus_message_iter array; + uint32_t elems = 6; + uint8_t *a; + + if (!l_dbus_message_iter_get_variant(variant, "ay", &array)) + goto error; + + if (!l_dbus_message_iter_get_fixed_array(&array, &a, &elems)) + goto error; + + if (elems != len) + goto error; + + memcpy(out, a, len); + + return; + +error: + display_error("Invalid Address element"); +} + +static void get_address(struct l_dbus_message_iter *variant, + char addr_out[static 18]) +{ + char *s; + + if (!l_dbus_message_iter_get_variant(variant, "s", &s)) + goto error; + + if (strlen(s) != 17) + goto error; + + strcpy(addr_out, s); + + return; + +error: + display_error("Invalid Address element"); +} + +static uint32_t get_u32(struct l_dbus_message_iter *variant) +{ + uint32_t u32 = 0; + + if (!l_dbus_message_iter_get_variant(variant, "u", &u32)) + display_error("Invalid Frequency element"); + + return u32; +} + +static uint32_t get_u16(struct l_dbus_message_iter *variant) +{ + uint32_t u16 = 0; + + if (!l_dbus_message_iter_get_variant(variant, "q", &u16)) + display_error("Invalid Frequency element"); + + return u16; +} + +static uint32_t get_i32(struct l_dbus_message_iter *variant) +{ + int32_t i32 = 0; + + if (!l_dbus_message_iter_get_variant(variant, "i", &i32)) + display_error("Invalid Frequency element"); + + return i32; +} + +static void display_bss(struct bss *bss) +{ + char row[128]; + + sprintf(row, "%s%-*s %s %-*i %-*u %-*i %02x%02x%02x", + MARGIN MARGIN, 4, "", bss->addr, 4, bss->rssi, + 6, bss->frequency, 8, bss->rank, + bss->mde[0], bss->mde[1], bss->mde[2]); + + display("%s\n", row); + + return; +} + +static void get_networks_method_callback(struct l_dbus_message *message, + void *user_data) +{ + struct proxy_interface *debug_i = user_data; + struct station_debug *debug = proxy_interface_get_data(debug_i); + struct l_dbus_message_iter iter; + struct l_dbus_message_iter variant; + struct l_dbus_message_iter array; + struct l_dbus_message_iter dict; + const char *key; + + if (dbus_message_has_error(message)) + return; + + if (!l_dbus_message_get_arguments(message, "a{oaa{sv}}", &iter)) { + l_error("Failed to parse GetDiagnostics message"); + return; + } + + display_table_header("Available Networks (debug)", + "%s%-*s %-*s %-*s %-*s %-*s %-*s %-*s", + "", 2, "", 4, "SSID", 17, "BSSID", 4, "RSSI", + 6, "Freq", 8, "Rank", 10, "MDE"); + + while (l_dbus_message_iter_next_entry(&iter, &key, &array)) { + struct network *network = l_new(struct network, 1); + const struct proxy_interface *net_i = network_get_proxy(key); + + if (net_i) + network->ssid = l_strdup(network_get_name(net_i)); + else + network->ssid = l_strdup(""); + + network->bss_list = l_queue_new(); + + if (!strcmp(key, "/hidden")) + display_table_row(MARGIN MARGIN, 3, 32, "Hidden BSS's", + 18, "", 6, ""); + else + display_table_row(MARGIN MARGIN, 3, 32, network->ssid, + 18, "", 6, ""); + + while (l_dbus_message_iter_next_entry(&array, &dict)) { + struct bss *bss = l_new(struct bss, 1); + + while (l_dbus_message_iter_next_entry(&dict, &key, + &variant)) { + if (!strcmp(key, "Address")) + get_address(&variant, bss->addr); + else if (!strcmp(key, "Frequency")) + bss->frequency = get_u32(&variant); + else if (!strcmp(key, "RSSI")) + bss->rssi = get_i32(&variant); + else if (!strcmp(key, "Rank")) + bss->rank = get_u16(&variant); + else if (!strcmp(key, "MDE")) + get_byte_array(&variant, bss->mde, 3); + } + + display_bss(bss); + + l_queue_push_tail(network->bss_list, bss); + } + + l_queue_push_tail(debug->network_list, network); + } + + display_table_footer(); +} + +static enum cmd_status cmd_debug_get_networks(const char *device_name, + char **argv, int argc) +{ + const struct proxy_interface *debug_i; + + debug_i = device_proxy_find(device_name, IWD_STATION_DEBUG_INTERFACE); + if (!debug_i) { + display_error("IWD not in developer mode"); + return CMD_STATUS_INVALID_VALUE; + } + + proxy_interface_method_call(debug_i, "GetNetworks", "", + get_networks_method_callback); + + return CMD_STATUS_TRIGGERED; +} + +static char *connect_debug_cmd_arg_completion(const char *text, int state, + const char *device_name) +{ + const struct proxy_interface *debug_i; + struct station_debug *debug; + static const struct l_queue_entry *n_entry; + static const struct l_queue_entry *b_entry; + size_t len = strlen(text); + + debug_i = device_proxy_find(device_name, IWD_STATION_DEBUG_INTERFACE); + if (!debug_i) + return NULL; + + debug = proxy_interface_get_data(debug_i); + + if (!state) + n_entry = l_queue_get_entries(debug->network_list); + + while (n_entry) { + struct network *network = n_entry->data; + + n_entry = n_entry->next; + + if (!b_entry) + b_entry = l_queue_get_entries(network->bss_list); + + while (b_entry) { + struct bss *bss = b_entry->data; + + b_entry = b_entry->next; + + if (len > strlen(bss->addr)) + return NULL; + + if (strncmp(text, bss->addr, len)) + continue; + + return l_strdup_printf(MAC, MAC_STR(bss->addr)); + } + } + + return NULL; +} + +static const char *get_autoconnect_tostr(const void *data) +{ + const struct station_debug *debug = data; + + return debug->autoconnect ? "on" : "off"; +} + +static void update_autoconnect(void *data, struct l_dbus_message_iter *variant) +{ + struct station_debug *debug = data; + bool value; + + if (!l_dbus_message_iter_get_variant(variant, "b", &value)) { + debug->autoconnect = false; + + return; + } + + debug->autoconnect = value; +} + +static const struct proxy_interface_property debug_properties[] = { + { "AutoConnect", "b", update_autoconnect, get_autoconnect_tostr, true, + properties_builder_append_on_off_variant, + properties_on_off_opts }, + { } +}; + +static enum cmd_status cmd_debug_set_autoconnect(const char *device_name, + char **argv, int argc) +{ + const struct proxy_interface *proxy = device_proxy_find(device_name, + IWD_STATION_DEBUG_INTERFACE); + + if (!proxy) { + display_error("IWD not in developer mode"); + return CMD_STATUS_INVALID_VALUE; + } + + if (argc != 1) + return CMD_STATUS_INVALID_ARGS; + + if (!proxy_property_set(proxy, "AutoConnect", argv[0], + check_errors_method_callback)) + return CMD_STATUS_INVALID_VALUE; + + return CMD_STATUS_TRIGGERED; +} + +static const struct command station_debug_commands[] = { + { "", "connect", "", cmd_debug_connect, + "Connect to a specific BSS", false, + connect_debug_cmd_arg_completion }, + { "", "roam", "", cmd_debug_roam, + "Roam to a BSS", false }, + { "", "get-networks", NULL, cmd_debug_get_networks, + "Get networks", true }, + { "", "autoconnect", "on|off", cmd_debug_set_autoconnect, + "Set AutoConnect property", false }, + { } +}; + +static char *family_debug_arg_completion(const char *text, int state) +{ + return device_arg_completion(text, state, station_debug_commands, + IWD_STATION_DEBUG_INTERFACE); +} + +static char *entity_debug_arg_completion(const char *text, int state) +{ + return command_entity_arg_completion(text, state, + station_debug_commands); +} + +static struct command_family station_debug_command_family = { + .caption = "Station Debug", + .name = "debug", + .command_list = station_debug_commands, + .family_arg_completion = family_debug_arg_completion, + .entity_arg_completion = entity_debug_arg_completion, +}; + +static int station_debug_command_family_init(void) +{ + command_family_register(&station_debug_command_family); + + return 0; +} + +static void station_debug_command_family_exit(void) +{ + command_family_unregister(&station_debug_command_family); +} + +COMMAND_FAMILY(station_debug_command_family, station_debug_command_family_init, + station_debug_command_family_exit) + +static const struct proxy_interface_type_ops station_debug_ops = { + .create = station_debug_create, + .destroy = station_debug_destroy, +}; + +static struct proxy_interface_type station_debug_interface_type = { + .interface = IWD_STATION_DEBUG_INTERFACE, + .ops = &station_debug_ops, + .properties = debug_properties, +}; + +static int station_debug_interface_init(void) +{ + proxy_interface_type_register(&station_debug_interface_type); + + return 0; +} + +static void station_debug_interface_exit(void) +{ + proxy_interface_type_unregister(&station_debug_interface_type); +} + +INTERFACE_TYPE(station_debug_interface_type, station_debug_interface_init, + station_debug_interface_exit) From patchwork Thu Aug 11 17:58:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 12941679 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A544A4690 for ; Thu, 11 Aug 2022 17:59:06 +0000 (UTC) Received: by mail-pg1-f174.google.com with SMTP id r22so15339881pgm.5 for ; Thu, 11 Aug 2022 10:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=JmingVSDa6aIkhua9EWpczKHECzAoIMQ6GHEYWePYuA=; b=YxTv9vc0wNwpMurG8ZgwqPO6Vu3TJTZfw7kMecTOMKdppRiM3P8UaKC856W3vdFlm8 RJZ1w80N6lh22wbWyr5tdL7tHLoQzqOuIsBY5WJdUqdh3idNAPMui/JfElpu7S6ddDvx uM8IWuellbKTDmXc2OXeZtXNGkWRu9joPNKFnbH3m2AnzxQ/jKHWxAXvrmUEsci2wz9S 6513miJ9Fp9RWVFr/DdSE9+UOvvEy6ThIT/2JRsRC6e0ccyeM8yFhwFuLeKwS5iRw6Yt aR87N25p/EUBs4Dmgjh9IfNzLP7qxhK+lvjNqdOm/PAuYaDvD6JRqC/wvG8Vz6UKECpF gcxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=JmingVSDa6aIkhua9EWpczKHECzAoIMQ6GHEYWePYuA=; b=S6Ks6nTgIclWYBJtsxoycpz9qRGa7Oxea1fMLaH9CpnDLydI3UeWjVBO7FBTlKPIo1 SfUYnp2cRlzxYNwoafUxhH9EHZoWVGkTo1cAaZcQLRjhsWz7zSs8gTMmW7oLN8Wa2kFS 0oyKPYAM3gAOzXzUCC2f6YwD9zWx/aTO/N7UH1oBIGuFsAkRCdnMygHaTWLPyceANglP CIPss5ZphxV5PyuvUqAIiZYayd2dXoouTbuGcBacdyzedi89iE4+WmmJMed1NQmAshf6 NYkIOPs2gxlsJuieNmGWy35/ExMCgJEbnGAzatwzUNIleDw2f8O6KXEKT3aO0J7rtcDQ D4Ag== X-Gm-Message-State: ACgBeo0hnhsq4OveyE7uH2YQ1wTjdYoE/7zJZL+CMC/2XPqp27oiLnd5 qwiVs1JT+WLTCMln4t6y51+IwKeBVKY= X-Google-Smtp-Source: AA6agR5S6062xokMvIhTggGUQIFEKp3uCx2hIINAHVHoXnKKdgbzCw9Z1UWPafI/CtBSkZSGhdCcQA== X-Received: by 2002:a05:6a00:4147:b0:52d:fe84:2614 with SMTP id bv7-20020a056a00414700b0052dfe842614mr318695pfb.10.1660240745933; Thu, 11 Aug 2022 10:59:05 -0700 (PDT) Received: from jprestwo-xps.none ([50.39.168.145]) by smtp.gmail.com with ESMTPSA id w125-20020a626283000000b0052ab602a7d0sm4292685pfb.100.2022.08.11.10.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 10:59:05 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 5/6] client: fix station autocomplete with multiple phys Date: Thu, 11 Aug 2022 10:58:59 -0700 Message-Id: <20220811175900.443310-5-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20220811175900.443310-1-prestwoj@gmail.com> References: <20220811175900.443310-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The limitations of readline required that the autocompletion choose a 'default' device. With multiple phys this doesn't work. Now the readline limitation has been worked around and station can look up the device for the command completion. --- client/station.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/station.c b/client/station.c index 90291c88..b070807b 100644 --- a/client/station.c +++ b/client/station.c @@ -280,7 +280,8 @@ static enum cmd_status cmd_list(const char *device_name, char **argv, int argc) static char *connect_cmd_arg_completion(const char *text, int state, const char *device_name) { - const struct proxy_interface *device = device_get_default(); + const struct proxy_interface *device = device_proxy_find(device_name, + IWD_STATION_INTERFACE); if (!device) return NULL; From patchwork Thu Aug 11 17:59:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 12941681 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6942E46AC for ; Thu, 11 Aug 2022 17:59:07 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id g12so17127687pfb.3 for ; Thu, 11 Aug 2022 10:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=bQHd1bKvsoQtg+sNOI9cwdpCJrHos8NUF8yaXX7/Q9E=; b=Mcm4M74fZOgj81Vz44FdvbD1z/LL9P9AyqHQdRcCi7/wmQ5bP6jcfPFzK5hcDqCyQi qYwJ69SA4ilaYpEtimjQQmrfR/apbqKztJPB3mFaRZmoRMdwqY+SaPFTU13luOyR4hYR UCDmAHR+IGkn8uRawRYmrgzux27pvGsvrW0y5fdc2DAVDz/uyFMeBM25838vvl//V9Ug 9gVYHzV6quaVCMBYFnujPfGdL0QyEDxu7Ey7Sia0QehZphofH915rgZo7po0REI5/L7z gHAyj0TIlxsz9ZER9qBkBsPjskaXWgZ0QpoeihTJeluvASn6fsGh8H4yuSjdJSSOCe2f zsEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=bQHd1bKvsoQtg+sNOI9cwdpCJrHos8NUF8yaXX7/Q9E=; b=7jstHIB35eL5LpkS2qCw2C257C22I7AvPmbEk35g7OiX4b/UHnh0jhr/lxbZQE+DJG elm/XVgxPhSp2J9RjJdiIlNLG2yfXzAeFhwlDK7vAGdaw+cdYyGb8YMG6K2pEdAiZPm9 kfHgtH/O3F22WmOolrkBL3gI6vB8XQydtM8P/TyZQYKeAlOg5Fbpl1VQYNIuAEUJzYez /N9qDO5DWRjtILCYUBmMOW2cVq82D/EBNh0TWFH2TSNUmkLn6zRkynKXM/CmC6lq7QoE fUw/XlJ4pYNL9QLY9Wlk9ALiZZK8kTJcvVmGD4wKLjBk9mN+MPMXNWarmD3aooOD/wTL dBig== X-Gm-Message-State: ACgBeo3hgU3+fAzkFIKxv12KcpDOmvg6ssqFfjkMt4ITt6rQGMsYNIRN ZkEKYCBMT7LhAOF40zEWq7ap0toXw/c= X-Google-Smtp-Source: AA6agR4AIsvfQbmR4zgc0GMiQRxllsiXeUCi4IPvsD8Ck3NH69Ozx9CxfQGMp7rUCnrJKypo8AKMJA== X-Received: by 2002:a63:d750:0:b0:41b:3eec:f9d0 with SMTP id w16-20020a63d750000000b0041b3eecf9d0mr163361pgi.289.1660240746659; Thu, 11 Aug 2022 10:59:06 -0700 (PDT) Received: from jprestwo-xps.none ([50.39.168.145]) by smtp.gmail.com with ESMTPSA id w125-20020a626283000000b0052ab602a7d0sm4292685pfb.100.2022.08.11.10.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 10:59:06 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 6/6] device: command: remove default device concept Date: Thu, 11 Aug 2022 10:59:00 -0700 Message-Id: <20220811175900.443310-6-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20220811175900.443310-1-prestwoj@gmail.com> References: <20220811175900.443310-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There was quite a bit of framework behind setting/resetting a default device, which is now no longer needed. --- client/command.c | 18 ---------------- client/command.h | 3 --- client/dbus-proxy.c | 2 -- client/device.c | 50 --------------------------------------------- 4 files changed, 73 deletions(-) diff --git a/client/command.c b/client/command.c index 46752c72..dbd97703 100644 --- a/client/command.c +++ b/client/command.c @@ -329,9 +329,6 @@ static char **cmd_completion_match_family_cmd(const char *cmd_family, break; } - if (family->set_default_entity) - family->set_default_entity(arg1); - matches = cmd_completion_match_entity_cmd(arg2, text, family->command_list); @@ -663,21 +660,6 @@ int command_get_exit_status(void) return exit_status; } -void command_reset_default_entities(void) -{ - const struct l_queue_entry *entry; - - for (entry = l_queue_get_entries(command_families); entry; - entry = entry->next) { - struct command_family *family = entry->data; - - if (!family->reset_default_entity) - continue; - - family->reset_default_entity(); - } -} - void command_family_register(const struct command_family *family) { l_queue_push_tail(command_families, (void *) family); diff --git a/client/command.h b/client/command.h index 1f841689..96eefdec 100644 --- a/client/command.h +++ b/client/command.h @@ -56,8 +56,6 @@ struct command_family { const struct command *command_list; command_rl_completion_func_t family_arg_completion; command_rl_completion_func_t entity_arg_completion; - void (*set_default_entity)(const char *entity); - void (*reset_default_entity)(void); }; bool command_option_get(const char *name, const char **value_out); @@ -74,7 +72,6 @@ void command_noninteractive_trigger(void); bool command_is_interactive_mode(void); int command_get_exit_status(void); void command_set_exit_status(int status); -void command_reset_default_entities(void); void command_family_register(const struct command_family *family); void command_family_unregister(const struct command_family *family); diff --git a/client/dbus-proxy.c b/client/dbus-proxy.c index 1534488e..42b8427f 100644 --- a/client/dbus-proxy.c +++ b/client/dbus-proxy.c @@ -806,8 +806,6 @@ static void service_disappeared_callback(struct l_dbus *dbus, l_queue_clear(proxy_interfaces, proxy_interface_destroy); - command_reset_default_entities(); - display_disable_cmd_prompt(); } diff --git a/client/device.c b/client/device.c index 8b27ddd2..ce2afc81 100644 --- a/client/device.c +++ b/client/device.c @@ -42,8 +42,6 @@ struct device { const struct proxy_interface *adapter; }; -static struct proxy_interface *default_device; - static void display_device(const struct proxy_interface *proxy) { const struct device *device = proxy_interface_get_data(proxy); @@ -260,52 +258,6 @@ static bool match_by_partial_name(const void *a, const void *b) return !strncmp(device->name, text, strlen(text)); } -static bool match_all(const void *a, const void *b) -{ - return true; -} - -static void device_set_default(const char *device_name) -{ - struct l_queue *match; - - if (!device_name) - return; - - match = proxy_interface_find_all(device_interface_type.interface, - match_by_name, device_name); - - if (!match) - return; - - default_device = l_queue_pop_head(match); - l_queue_destroy(match, NULL); -} - -static void device_reset_default(void) -{ - default_device = NULL; -} - -const struct proxy_interface *device_get_default(void) -{ - struct l_queue *match; - - if (default_device) - return default_device; - - match = proxy_interface_find_all(device_interface_type.interface, - match_all, NULL); - - if (!match) - return NULL; - - default_device = l_queue_pop_head(match); - l_queue_destroy(match, NULL); - - return default_device; -} - const struct proxy_interface *device_proxy_find_by_name(const char *name) { struct l_queue *match; @@ -464,8 +416,6 @@ static struct command_family device_command_family = { .command_list = device_commands, .family_arg_completion = family_arg_completion, .entity_arg_completion = entity_arg_completion, - .set_default_entity = device_set_default, - .reset_default_entity = device_reset_default, }; static int device_command_family_init(void)