From: "Michał Lowas-Rzechonek" <michal.lowas-rzechonek@silvair.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH RESEND BlueZ 1/1] mesh: Add --io option
Date: Mon, 13 Jan 2020 13:27:25 +0100 [thread overview]
Message-ID: <20200113122726.768-2-michal.lowas-rzechonek@silvair.com> (raw)
In-Reply-To: <20200113122726.768-1-michal.lowas-rzechonek@silvair.com>
This allows specifying io type and options when invoking the daemon.
By default, meshd runs with MESH_IO_TYPE_GENERIC and tries to attach to
the first available HCI interface.
Option "--index=<n>" is now just a shortcut for "--io=generic:<n>"
---
mesh/main.c | 99 +++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 81 insertions(+), 18 deletions(-)
diff --git a/mesh/main.c b/mesh/main.c
index 010edcf85..243e756f9 100644
--- a/mesh/main.c
+++ b/mesh/main.c
@@ -40,10 +40,12 @@
static const char *config_dir;
static const char *mesh_conf_fname;
-static int ctlr_index = MGMT_INDEX_NONE;
+static enum mesh_io_type io_type;
+static void *io_opts;
static const struct option main_options[] = {
{ "index", required_argument, NULL, 'i' },
+ { "io", required_argument, NULL, 'I' },
{ "config", optional_argument, NULL, 'c' },
{ "nodetach", no_argument, NULL, 'n' },
{ "debug", no_argument, NULL, 'd' },
@@ -54,16 +56,23 @@ static const struct option main_options[] = {
static void usage(void)
{
- l_info("");
- l_info("Usage:\n"
+ fprintf(stderr,
+ "Usage:\n"
"\tbluetooth-meshd [options]\n");
- l_info("Options:\n"
- "\t--index <hcinum> Use specified controller\n"
+ fprintf(stderr,
+ "Options:\n"
+ "\t--index <hcinum> Equivalent of `--io=generic:<hcinum>`\n"
+ "\t--io <io> Use specified io (default: generic)\n"
"\t--config Configuration directory\n"
"\t--nodetach Run in foreground\n"
"\t--debug Enable debug output\n"
"\t--dbus-debug Enable D-Bus debugging\n"
"\t--help Show %s information\n", __func__);
+ fprintf(stderr,
+ "io:\n"
+ "\tgeneric[:<index>]\n"
+ "\t\tUse generic HCI io on interface hci<index>, or the first\n"
+ "\t\tavailable one\n");
}
static void do_debug(const char *str, void *user_data)
@@ -100,8 +109,8 @@ static void request_name_callback(struct l_dbus *dbus, bool success,
return;
}
- if (!mesh_init(config_dir, mesh_conf_fname, MESH_IO_TYPE_GENERIC,
- &ctlr_index, mesh_ready_callback, dbus)) {
+ if (!mesh_init(config_dir, mesh_conf_fname, io_type, io_opts,
+ mesh_ready_callback, dbus)) {
l_error("Failed to initialize mesh");
l_main_quit();
}
@@ -133,12 +142,44 @@ static void signal_handler(uint32_t signo, void *user_data)
terminated = true;
}
+static bool parse_io(const char *optarg, enum mesh_io_type *type, void **opts)
+{
+ if (strstr(optarg, "generic") == optarg) {
+ int *index = l_new(int, 1);
+
+ *type = MESH_IO_TYPE_GENERIC;
+ *opts = index;
+
+ optarg += strlen("generic");
+ if (!*optarg) {
+ *index = MGMT_INDEX_NONE;
+ return true;
+ }
+
+ if (*optarg != ':')
+ return false;
+
+ optarg++;
+
+ if (sscanf(optarg, "hci%d", index) == 1)
+ return true;
+
+ if (sscanf(optarg, "%d", index) == 1)
+ return true;
+
+ return false;
+ }
+
+ return false;
+}
+
int main(int argc, char *argv[])
{
int status;
bool detached = true;
bool dbus_debug = false;
struct l_dbus *dbus = NULL;
+ char *io = NULL;
if (!l_main_init())
return -1;
@@ -153,7 +194,6 @@ int main(int argc, char *argv[])
for (;;) {
int opt;
- const char *str;
opt = getopt_long(argc, argv, "i:c:f:ndbh", main_options, NULL);
if (opt < 0)
@@ -161,18 +201,20 @@ int main(int argc, char *argv[])
switch (opt) {
case 'i':
- if (strlen(optarg) > 3 && !strncmp(optarg, "hci", 3))
- str = optarg + 3;
- else
- str = optarg;
- if (!isdigit(*str)) {
- l_error("Invalid controller index value");
- status = EXIT_FAILURE;
+ if (io) {
+ l_error("Use either --index or --io, not both");
+ status = EXIT_SUCCESS;
goto done;
}
-
- ctlr_index = atoi(str);
-
+ io = l_strdup_printf("generic:%s", optarg);
+ break;
+ case 'I':
+ if (io) {
+ l_error("Use either --index or --io, not both");
+ status = EXIT_SUCCESS;
+ goto done;
+ }
+ io = l_strdup(optarg);
break;
case 'n':
detached = false;
@@ -200,6 +242,21 @@ int main(int argc, char *argv[])
}
}
+ if (!io)
+ io = l_strdup_printf("generic");
+
+ if (!parse_io(io, &io_type, &io_opts)) {
+ l_error("Invalid io: %s", io);
+ status = EXIT_FAILURE;
+ goto done;
+ }
+
+ if ((io_type == MESH_IO_TYPE_NONE) && !io_opts) {
+ int *index = l_new(int, 1);
+ *index = MGMT_INDEX_NONE;
+ io_type = MESH_IO_TYPE_GENERIC;
+ io_opts = index;
+ }
if (!detached)
umask(0077);
@@ -225,6 +282,12 @@ int main(int argc, char *argv[])
status = l_main_run_with_signal(signal_handler, NULL);
done:
+ if (io)
+ l_free(io);
+
+ if (io_opts)
+ l_free(io_opts);
+
mesh_cleanup();
l_dbus_destroy(dbus);
l_main_exit();
--
2.20.1
next prev parent reply other threads:[~2020-01-13 12:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 12:27 [PATCH RESEND BlueZ 0/1] Select mesh-io from command line Michał Lowas-Rzechonek
2020-01-13 12:27 ` Michał Lowas-Rzechonek [this message]
2020-01-14 19:38 ` [PATCH RESEND BlueZ 1/1] mesh: Add --io option Stotland, Inga
2020-01-14 20:09 ` michal.lowas-rzechonek
2020-01-14 22:25 ` Stotland, Inga
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200113122726.768-2-michal.lowas-rzechonek@silvair.com \
--to=michal.lowas-rzechonek@silvair.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).