More cleanup. Move common dbus stuff to common/dbus.c. hcid/dbus.c -> hcid/dbus-hci.c

1 files changed, 158 insertions, 272 deletions

diff --git a/hcid/dbus-common.c b/hcid/dbus-common.c
index 0c8d0339..c25156af 100644
--- a/hcid/dbus-common.c
+++ b/hcid/dbus-common.c
@@ -35,6 +35,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/ioctl.h>
 
 #include <arpa/inet.h>
 
@@ -49,288 +50,24 @@
 #include "list.h"
 #include "dbus.h"
 #include "dbus-error.h"
+#include "dbus-hci.h"
+#include "dbus-manager.h"
 #include "dbus-adapter.h"
+#include "dbus-service.h"
 #include "dbus-security.h"
 #include "dbus-test.h"
 #include "dbus-rfcomm.h"
 #include "dbus-sdp.h"
 #include "dbus-common.h"
 
-static int name_listener_initialized = 0;
+#define BLUEZ_NAME "org.bluez"
 
-struct name_callback {
-	name_cb_t func;
-	void *user_data;
-};
-
-struct name_data {
-	char *name;
-	struct slist *callbacks;
-};
-
-static struct slist *name_listeners = NULL;
-
-static struct name_data *name_data_find(const char *name)
-{
-	struct slist *current;
-
-	for (current = name_listeners; current != NULL; current = current->next) {
-		struct name_data *data = current->data;
-		if (strcmp(name, data->name) == 0)
-			return data;
-	}
-
-	return NULL;
-}
-
-static struct name_callback *name_callback_find(struct slist *callbacks,
-						name_cb_t func, void *user_data)
-{
-	struct slist *current;
-
-	for (current = callbacks; current != NULL; current = current->next) {
-		struct name_callback *cb = current->data;
-		if (cb->func == func && cb->user_data == user_data)
-			return cb;
-	}
-
-	return NULL;
-}
-
-static void name_data_free(struct name_data *data)
-{
-	struct slist *l;
-
-	for (l = data->callbacks; l != NULL; l = l->next)
-		free(l->data);
-
-	slist_free(data->callbacks);
-
-	if (data->name)
-		free(data->name);
-
-	free(data);
-}
-
-static int name_data_add(const char *name, name_cb_t func, void *user_data)
-{
-	int first = 1;
-	struct name_data *data = NULL;
-	struct name_callback *cb = NULL;
-
-	cb = malloc(sizeof(struct name_callback));
-	if (!cb)
-		goto failed;
-
-	cb->func = func;
-	cb->user_data = user_data;
-
-	data = name_data_find(name);
-	if (data) {
-		first = 0;
-		goto done;
-	}
-
-	data = malloc(sizeof(struct name_data));
-	if (!data)
-		goto failed;
-
-	memset(data, 0, sizeof(struct name_data));
-
-	data->name = strdup(name);
-	if (!data->name)
-		goto failed;
-
-	name_listeners = slist_append(name_listeners, data);
-
-done:
-	data->callbacks = slist_append(data->callbacks, cb);
-	return first;
-
-failed:
-	if (data)
-		name_data_free(data);
-
-	if (cb)
-		free(cb);
-
-	return 0;
-}
-
-static void name_data_remove(const char *name, name_cb_t func, void *user_data)
-{
-	struct name_data *data;
-	struct name_callback *cb = NULL;
-
-	data = name_data_find(name);
-	if (!data)
-		return;
-
-	cb = name_callback_find(data->callbacks, func, user_data);
-	if (cb) {
-		data->callbacks = slist_remove(data->callbacks, cb);
-		free(cb);
-	}
-
-	if (!data->callbacks) {
-		name_listeners = slist_remove(name_listeners, data);
-		name_data_free(data);
-	}
-}
-
-static DBusHandlerResult name_exit_filter(DBusConnection *connection,
-					DBusMessage *message, void *user_data)
-{
-	struct slist *l;
-	struct name_data *data;
-	char *name, *old, *new;
-
-	if (!dbus_message_is_signal(message, DBUS_INTERFACE_DBUS,
-							"NameOwnerChanged"))
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	if (!dbus_message_get_args(message, NULL,
-				DBUS_TYPE_STRING, &name,
-				DBUS_TYPE_STRING, &old,
-				DBUS_TYPE_STRING, &new,
-				DBUS_TYPE_INVALID)) {
-		error("Invalid arguments for NameOwnerChanged signal");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	/* We are not interested of service creations */
-	if (*new != '\0')
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	data = name_data_find(name);
-	if (!data) {
-		error("Got NameOwnerChanged signal for %s which has no listeners", name);
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	for (l = data->callbacks; l != NULL; l = l->next) {
-		struct name_callback *cb = l->data;
-		cb->func(name, cb->user_data);
-	}
-
-	name_listeners = slist_remove(name_listeners, data);
-	name_data_free(data);
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-int name_listener_add(DBusConnection *connection, const char *name,
-					name_cb_t func, void *user_data)
-{
-	DBusError err;
-	char match_string[128];
-	int first;
-
-	if (!name_listener_initialized) {
-		if (!dbus_connection_add_filter(connection, name_exit_filter, NULL, NULL)) {
-			error("dbus_connection_add_filter() failed");
-			return -1;
-		}
-		name_listener_initialized = 1;
-	}
-
-	first = name_data_add(name, func, user_data);
-	/* The filter is already added if this is not the first callback
-	 * registration for the name */
-	if (!first)
-		return 0;
-
-	debug("name_listener_add(%s)", name);
-
-	snprintf(match_string, sizeof(match_string),
-			"interface=%s,member=NameOwnerChanged,arg0=%s",
-			DBUS_INTERFACE_DBUS, name);
-
-	dbus_error_init(&err);
-	dbus_bus_add_match(connection, match_string, &err);
-
-	if (dbus_error_is_set(&err)) {
-		error("Adding match rule \"%s\" failed: %s", match_string,
-				err.message);
-		dbus_error_free(&err);
-		name_data_remove(name, func, user_data);
-		return -1;
-	}
-
-	return 0;
-}
-
-int name_listener_remove(DBusConnection *connection, const char *name,
-				name_cb_t func, void *user_data)
-{
-	struct name_data *data;
-	struct name_callback *cb;
-	DBusError err;
-	char match_string[128];
-
-	debug("name_listener_remove(%s)", name);
-
-	data = name_data_find(name);
-	if (!data) {
-		error("remove_name_listener: no listener for %s", name);
-		return -1;
-	}
-
-	cb = name_callback_find(data->callbacks, func, user_data);
-	if (!cb) {
-		error("No matching callback found for %s", name);
-		return -1;
-	}
-
-	data->callbacks = slist_remove(data->callbacks, cb);
-	free(cb);
+#define MAX_CONN_NUMBER		10
+#define RECONNECT_RETRY_TIMEOUT	5000
 
-	/* Don't remove the filter if other callbacks exist */
-	if (data->callbacks)
-		return 0;
+static DBusConnection *conn = NULL;
 
-	snprintf(match_string, sizeof(match_string),
-			"interface=%s,member=NameOwnerChanged,arg0=%s",
-			DBUS_INTERFACE_DBUS, name);
-
-	dbus_error_init(&err);
-	dbus_bus_remove_match(connection, match_string, &err);
-
-	if (dbus_error_is_set(&err)) {
-		error("Removing owner match rule for %s failed: %s",
-							name, err.message);
-		dbus_error_free(&err);
-		return -1;
-	}
-
-	name_data_remove(name, func, user_data);
-
-	return 0;
-}
-
-static char simple_xml[] = DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<node></node>";
-
-DBusHandlerResult simple_introspect(DBusConnection *conn, DBusMessage *msg, void *data)
-{
-	DBusMessage *reply;
-	const char *path, *ptr = simple_xml;
-
-	path = dbus_message_get_path(msg);
-
-	info("Introspect path:%s", path);
-
-	if (!dbus_message_has_signature(msg, DBUS_TYPE_INVALID_AS_STRING))
-		return error_invalid_arguments(conn, msg);
-
-	reply = dbus_message_new_method_return(msg);
-	if (!reply)
-		return DBUS_HANDLER_RESULT_NEED_MEMORY;
-
-	dbus_message_append_args(reply, DBUS_TYPE_STRING, &ptr,
-					DBUS_TYPE_INVALID);
-
-	return send_message_and_unref(conn, reply);
-}
+static int experimental = 0;
 
 service_handler_func_t find_service_handler(struct service_data *handlers, DBusMessage *msg)
 {
@@ -501,3 +238,152 @@ DBusHandlerResult handle_method_call(DBusConnection *conn, DBusMessage *msg, voi
 		return error_unknown_method(conn, msg);
 }
 
+void hcid_dbus_set_experimental(void)
+{
+	experimental = 1;
+}
+
+int hcid_dbus_use_experimental(void)
+{
+	return experimental;
+}
+
+static gboolean system_bus_reconnect(void *data)
+{
+	struct hci_dev_list_req *dl = NULL;
+	struct hci_dev_req *dr;
+	int sk, i;
+	gboolean ret_val = TRUE;
+
+	if (dbus_connection_get_is_connected(conn))
+		return FALSE;
+
+	if (hcid_dbus_init() < 0)
+		return TRUE;
+
+	/* Create and bind HCI socket */
+	sk = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
+	if (sk < 0) {
+		error("Can't open HCI socket: %s (%d)",
+				strerror(errno), errno);
+		return TRUE;
+	}
+
+	dl = malloc(HCI_MAX_DEV * sizeof(*dr) + sizeof(*dl));
+	if (!dl) {
+		error("Can't allocate memory");
+		goto failed;
+	}
+
+	dl->dev_num = HCI_MAX_DEV;
+	dr = dl->dev_req;
+
+	if (ioctl(sk, HCIGETDEVLIST, (void *) dl) < 0) {
+		info("Can't get device list: %s (%d)",
+			strerror(errno), errno);
+		goto failed;
+	}
+
+	/* reset the default device */
+	set_default_adapter(-1);
+
+	for (i = 0; i < dl->dev_num; i++, dr++)
+		hcid_dbus_register_device(dr->dev_id);
+
+	ret_val = FALSE;
+
+failed:
+	if (sk >= 0)
+		close(sk);
+
+	if (dl)
+		free(dl);
+
+	return ret_val;
+}
+
+static void disconnect_callback(void *user_data)
+{
+	set_dbus_connection(NULL);
+	g_timeout_add(RECONNECT_RETRY_TIMEOUT, system_bus_reconnect,
+			NULL);
+}
+
+static const DBusObjectPathVTable manager_vtable = {
+	.message_function	= &handle_manager_method,
+	.unregister_function	= NULL
+};
+
+void hcid_dbus_exit(void)
+{
+	char **children;
+	DBusConnection *conn = get_dbus_connection();
+	int i;
+
+	if (!conn || !dbus_connection_get_is_connected(conn))
+		return;
+
+	release_default_agent();
+	release_default_auth_agent();
+	release_service_agents(conn);
+
+	/* Unregister all paths in Adapter path hierarchy */
+	if (!dbus_connection_list_registered(conn, BASE_PATH, &children))
+		goto done;
+
+	for (i = 0; children[i]; i++) {
+		char dev_path[MAX_PATH_LENGTH];
+
+		snprintf(dev_path, sizeof(dev_path), "%s/%s", BASE_PATH,
+				children[i]);
+
+		unregister_adapter_path(dev_path);
+	}
+
+	dbus_free_string_array(children);
+
+done:
+	unregister_adapter_path(BASE_PATH);
+
+	dbus_connection_unref(conn);
+	set_dbus_connection(NULL);
+}
+
+int hcid_dbus_init(void)
+{
+	DBusError err;
+	DBusConnection *conn;
+	int ret_val;
+
+	conn = init_dbus(disconnect_callback, NULL);
+	if (!conn)
+		return -1;
+
+	dbus_error_init(&err);
+
+	ret_val = dbus_bus_request_name(conn, BLUEZ_NAME, 0, &err);
+
+	if (ret_val != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER ) {
+		error("Could not become the primary owner of %s.", BLUEZ_NAME);
+		return -1;
+	}
+
+	if (dbus_error_is_set(&err)) {
+		error("Can't get system bus name %s: %s", BLUEZ_NAME,
+				err.message);
+		dbus_error_free(&err);
+		return -1;
+	}
+
+	if (!dbus_connection_register_fallback(conn, BASE_PATH,
+						&manager_vtable, NULL)) {
+		error("D-Bus failed to register %s fallback", BASE_PATH);
+		return -1;
+	}
+
+	set_dbus_connection(conn);
+
+	dbus_connection_unref(conn);
+
+	return 0;
+}