From: Brian Gix <brian.gix@intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: johan.hedberg@gmail.com, inga.stotland@intel.com,
marcel@holtmann.org, brian.gix@intel.com
Subject: [PATCH BlueZ v6 22/26] mesh: Update for DBus API and multi-node support
Date: Fri, 28 Dec 2018 14:07:41 -0800 [thread overview]
Message-ID: <20181228220745.25147-23-brian.gix@intel.com> (raw)
In-Reply-To: <20181228220745.25147-1-brian.gix@intel.com>
From: Inga Stotland <inga.stotland@intel.com>
Main function with high level plumbing for incoming D-Bus
messaging, and optional control of storage locations.
---
mesh/main.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 67 insertions(+), 8 deletions(-)
diff --git a/mesh/main.c b/mesh/main.c
index 173f57a8f..93a646895 100644
--- a/mesh/main.c
+++ b/mesh/main.c
@@ -15,7 +15,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- *
*/
#ifdef HAVE_CONFIG_H
@@ -33,11 +32,15 @@
#include <sys/stat.h>
#include <ell/ell.h>
+#include <dbus/dbus.h>
+#include <json-c/json.h>
+
#include "lib/bluetooth.h"
#include "lib/mgmt.h"
#include "mesh/mesh.h"
#include "mesh/net.h"
+#include "mesh/dbus.h"
#include "mesh/storage.h"
static const struct option main_options[] = {
@@ -56,12 +59,46 @@ static void usage(void)
"\tmeshd [options]\n");
l_info("Options:\n"
"\t--index <hcinum> Use specified controller\n"
- "\t--config Configuration file\n"
+ "\t--config Configuration directory\n"
"\t--nodetach Run in foreground\n"
"\t--debug Enable debug output\n"
"\t--help Show %s information\n", __func__);
}
+static void do_debug(const char *str, void *user_data)
+{
+ const char *prefix = user_data;
+
+ l_info("%s%s", prefix, str);
+}
+
+static void request_name_callback(struct l_dbus *dbus, bool success,
+ bool queued, void *user_data)
+{
+ l_info("Request name %s",
+ success ? "success": "failed");
+
+ if (success)
+ dbus_init(dbus);
+ else
+ l_main_quit();
+}
+
+static void ready_callback(void *user_data)
+{
+ struct l_dbus *dbus = user_data;
+
+ l_info("D-Bus ready");
+ l_dbus_name_acquire(dbus, BLUEZ_MESH_NAME, false, false, false,
+ request_name_callback, NULL);
+
+}
+
+static void disconnect_callback(void *user_data)
+{
+ l_main_quit();
+}
+
static void signal_handler(uint32_t signo, void *user_data)
{
static bool terminated;
@@ -78,8 +115,9 @@ int main(int argc, char *argv[])
{
int status;
bool detached = true;
- struct bt_mesh *mesh = NULL;
- const char *config_file = NULL;
+ bool dbus_debug = false;
+ struct l_dbus *dbus = NULL;
+ const char *config_dir = NULL;
int index = MGMT_INDEX_NONE;
if (!l_main_init())
@@ -91,7 +129,7 @@ int main(int argc, char *argv[])
int opt;
const char *str;
- opt = getopt_long(argc, argv, "i:c:ndh", main_options, NULL);
+ opt = getopt_long(argc, argv, "i:c:ndbh", main_options, NULL);
if (opt < 0)
break;
@@ -117,7 +155,10 @@ int main(int argc, char *argv[])
l_debug_enable("*");
break;
case 'c':
- config_file = optarg;
+ config_dir = optarg;
+ break;
+ case 'b':
+ dbus_debug = true;
break;
case 'h':
usage();
@@ -130,7 +171,7 @@ int main(int argc, char *argv[])
}
}
- if (!mesh_new(index, config_file)) {
+ if (!mesh_init(index, config_dir)) {
l_error("Failed to initialize mesh");
status = EXIT_FAILURE;
goto done;
@@ -138,6 +179,24 @@ int main(int argc, char *argv[])
umask(0077);
+ dbus = l_dbus_new_default(L_DBUS_SYSTEM_BUS);
+ if (!dbus) {
+ l_error("unable to connect to D-Bus");
+ status = EXIT_FAILURE;
+ goto done;
+ }
+
+ if (dbus_debug)
+ l_dbus_set_debug(dbus, do_debug, "[DBUS] ", NULL);
+ l_dbus_set_ready_handler(dbus, ready_callback, dbus, NULL);
+ l_dbus_set_disconnect_handler(dbus, disconnect_callback, NULL, NULL);
+
+ if (!l_dbus_object_manager_enable(dbus)) {
+ l_error("Failed to enable Object Manager");
+ status = EXIT_FAILURE;
+ goto done;
+ }
+
if (detached) {
if (daemon(0, 0)) {
perror("Failed to start meshd daemon");
@@ -149,8 +208,8 @@ int main(int argc, char *argv[])
status = l_main_run_with_signal(signal_handler, NULL);
done:
- mesh_unref(mesh);
mesh_cleanup();
+ l_dbus_destroy(dbus);
l_main_exit();
return status;
--
2.14.5
next prev parent reply other threads:[~2018-12-28 22:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-28 22:07 [PATCH BlueZ v6 00/26] Major rewrite for Multi-Node and DBus Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 01/26] mesh: Structural changes for mesh Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 02/26] mesh: Utilities for DBus support Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 03/26] mesh: Internal errors Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 04/26] mesh: Rewrite storage for Multiple Nodes Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 05/26] mesh: Rewrite Node handling for multiple nodes Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 06/26] mesh: Rewrite Network layer " Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 07/26] mesh: Direction agnostic PB-ADV implementation Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 08/26] mesh: Acceptor side provisioning implementation Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 09/26] mesh: Initiator " Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 10/26] mesh: Rewrite Controler interface for full init Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 11/26] mesh: Unchanged variables set to const Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 12/26] mesh: Hex-String manipulation, and debug logging Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 13/26] mesh: re-arrange provisioning for DBus API Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 14/26] mesh: Re-architect " Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 15/26] mesh: Multi node Config Server model Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 16/26] mesh: restructure I/O for multiple nodes Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 17/26] mesh: Restructure DB to support " Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 18/26] mesh: Restructure model services for " Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 19/26] mesh: DBUS interface for Provisioning Agent Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 20/26] mesh: restructure App Key storage Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 21/26] mesh: Clean-up Comment style Brian Gix
2018-12-28 22:07 ` Brian Gix [this message]
2018-12-28 22:07 ` [PATCH BlueZ v6 23/26] mesh: Add default location for Mesh Node storage Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 24/26] mesh: Sample Provisioning Agent Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 25/26] mesh: Sample On/Off Client and Server Brian Gix
2018-12-28 22:07 ` [PATCH BlueZ v6 26/26] mesh: Sample Mesh Joiner (provision acceptor) Brian Gix
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=20181228220745.25147-23-brian.gix@intel.com \
--to=brian.gix@intel.com \
--cc=inga.stotland@intel.com \
--cc=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=marcel@holtmann.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).