#endif
#include <errno.h>
+#include <stdlib.h>
#include <gdbus.h>
#include <connman/plugin.h>
-#include <connman/driver.h>
+#include <connman/device.h>
#include <connman/dbus.h>
#include <connman/log.h>
#define BLUEZ_SERVICE "org.bluez"
#define BLUEZ_MANAGER_INTERFACE BLUEZ_SERVICE ".Manager"
#define BLUEZ_ADAPTER_INTERFACE BLUEZ_SERVICE ".Adapter"
+#define BLUEZ_DEVICE_INTERFACE BLUEZ_SERVICE ".Device"
#define LIST_ADAPTERS "ListAdapters"
#define ADAPTER_ADDED "AdapterAdded"
#define ADAPTER_REMOVED "AdapterRemoved"
#define PROPERTY_CHANGED "PropertyChanged"
+#define GET_PROPERTIES "GetProperties"
#define SET_PROPERTY "SetProperty"
#define TIMEOUT 5000
+typedef void (* properties_callback_t) (DBusConnection *connection,
+ const char *path,
+ DBusMessage *message,
+ void *user_data);
+
+struct properties_data {
+ DBusConnection *connection;
+ DBusMessage *message;
+ properties_callback_t callback;
+ void *user_data;
+};
+
+static void get_properties_reply(DBusPendingCall *call, void *user_data)
+{
+ struct properties_data *data = user_data;
+ DBusMessage *reply;
+ const char *path;
+
+ reply = dbus_pending_call_steal_reply(call);
+ if (reply == NULL)
+ goto done;
+
+ path = dbus_message_get_path(data->message);
+
+ data->callback(data->connection, path, reply, data->user_data);
+
+ dbus_message_unref(reply);
+
+done:
+ dbus_message_unref(data->message);
+ g_free(data);
+}
+
+static void get_properties(DBusConnection *connection,
+ const char *path, const char *interface,
+ properties_callback_t callback, void *user_data)
+{
+ struct properties_data *data;
+ DBusMessage *message;
+ DBusPendingCall *call;
+
+ DBG("path %s interface %s", path, interface);
+
+ data = g_try_new0(struct properties_data, 1);
+ if (data == NULL)
+ return;
+
+ message = dbus_message_new_method_call(BLUEZ_SERVICE, path,
+ interface, GET_PROPERTIES);
+ if (message == NULL) {
+ g_free(data);
+ return;
+ }
+
+ if (dbus_connection_send_with_reply(connection, message,
+ &call, TIMEOUT) == FALSE) {
+ connman_error("Failed to get properties for %s", interface);
+ dbus_message_unref(message);
+ g_free(data);
+ return;
+ }
+
+ data->connection = connection;
+ data->message = message;
+ data->callback = callback;
+ data->user_data = user_data;
+
+ dbus_pending_call_set_notify(call, get_properties_reply, data, NULL);
+}
+
struct adapter_data {
DBusConnection *connection;
};
-static int bluetooth_probe(struct connman_element *adapter)
+static int bluetooth_probe(struct connman_device *adapter)
{
struct adapter_data *data;
- DBG("adapter %p name %s", adapter, adapter->name);
+ DBG("adapter %p", adapter);
data = g_try_new0(struct adapter_data, 1);
if (data == NULL)
return -EIO;
}
- connman_element_set_data(adapter, data);
+ connman_device_set_data(adapter, data);
return 0;
}
-static void bluetooth_remove(struct connman_element *adapter)
+static void bluetooth_remove(struct connman_device *adapter)
{
- struct adapter_data *data = connman_element_get_data(adapter);
+ struct adapter_data *data = connman_device_get_data(adapter);
- DBG("adapter %p name %s", adapter, adapter->name);
+ DBG("adapter %p", adapter);
- connman_element_set_data(adapter, NULL);
+ connman_device_set_data(adapter, NULL);
dbus_connection_unref(data->connection);
return -EINPROGRESS;
}
-static int bluetooth_enable(struct connman_element *adapter)
+static int bluetooth_enable(struct connman_device *adapter)
{
- struct adapter_data *data = connman_element_get_data(adapter);
+ struct adapter_data *data = connman_device_get_data(adapter);
+ const char *path = connman_device_get_path(adapter);
- DBG("adapter %p name %s", adapter, adapter->name);
+ DBG("adapter %p", adapter);
- return change_powered(data->connection, adapter->devpath, TRUE);
+ return change_powered(data->connection, path, TRUE);
}
-static int bluetooth_disable(struct connman_element *adapter)
+static int bluetooth_disable(struct connman_device *adapter)
{
- struct adapter_data *data = connman_element_get_data(adapter);
+ struct adapter_data *data = connman_device_get_data(adapter);
+ const char *path = connman_device_get_path(adapter);
+
+ DBG("adapter %p", adapter);
+
+ return change_powered(data->connection, path, FALSE);
+}
- DBG("adapter %p name %s", adapter, adapter->name);
+static int bluetooth_scan(struct connman_device *adapter)
+{
+ DBG("adapter %p", adapter);
- return change_powered(data->connection, adapter->devpath, FALSE);
+ return -EIO;
}
-static struct connman_driver bluetooth_driver = {
+static struct connman_device_driver bluetooth_driver = {
.name = "bluetooth",
- .type = CONNMAN_ELEMENT_TYPE_DEVICE,
- .subtype = CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH,
+ .type = CONNMAN_DEVICE_TYPE_BLUETOOTH,
.probe = bluetooth_probe,
.remove = bluetooth_remove,
.enable = bluetooth_enable,
.disable = bluetooth_disable,
+ .scan = bluetooth_scan,
};
-static GSList *device_list = NULL;
+static GSList *adapter_list = NULL;
+
+static void free_adapters(void)
+{
+ GSList *list;
+
+ DBG("");
+
+ for (list = adapter_list; list; list = list->next) {
+ struct connman_device *adapter = list->data;
+
+ connman_device_unregister(adapter);
+ connman_device_unref(adapter);
+ }
+
+ g_slist_free(adapter_list);
+ adapter_list = NULL;
+}
-static struct connman_element *find_adapter(const char *path)
+static struct connman_device *find_adapter(const char *path)
{
GSList *list;
DBG("path %s", path);
- for (list = device_list; list; list = list->next) {
- struct connman_element *device = list->data;
+ for (list = adapter_list; list; list = list->next) {
+ struct connman_device *adapter = list->data;
+ const char *adapter_path = connman_device_get_path(adapter);
+
+ if (adapter_path == NULL)
+ continue;
- if (g_str_equal(device->devpath, path) == TRUE)
- return device;
+ if (g_str_equal(adapter_path, path) == TRUE)
+ return adapter;
}
return NULL;
}
+static void device_properties(DBusConnection *connection, const char *path,
+ DBusMessage *message, void *user_data)
+{
+ struct connman_device *device = user_data;
+ const char *node = g_basename(path);
+ struct connman_network *network;
+
+ DBG("path %s", path);
+
+ network = connman_device_get_network(device, node);
+ if (network != NULL)
+ return;
+
+ network = connman_network_create(node, CONNMAN_NETWORK_TYPE_WIFI);
+ if (network == NULL)
+ return;
+
+ connman_device_add_network(device, network);
+}
+
+static void check_devices(struct connman_device *adapter,
+ DBusConnection *connection, DBusMessageIter *array)
+{
+ DBusMessageIter value;
+
+ if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
+ return;
+
+ dbus_message_iter_recurse(array, &value);
+
+ while (dbus_message_iter_get_arg_type(&value) == DBUS_TYPE_OBJECT_PATH) {
+ const char *path;
+
+ dbus_message_iter_get_basic(&value, &path);
+
+ get_properties(connection, path, BLUEZ_DEVICE_INTERFACE,
+ device_properties, adapter);
+
+ dbus_message_iter_next(&value);
+ }
+}
+
static void property_changed(DBusConnection *connection, DBusMessage *message)
{
const char *path = dbus_message_get_path(message);
- struct connman_element *device;
+ struct connman_device *adapter;
DBusMessageIter iter, value;
const char *key;
DBG("path %s", path);
- device = find_adapter(path);
- if (device == NULL)
+ adapter = find_adapter(path);
+ if (adapter == NULL)
return;
if (dbus_message_iter_init(message, &iter) == FALSE)
gboolean val;
dbus_message_iter_get_basic(&value, &val);
- connman_element_set_enabled(device, val);
+ connman_device_set_powered(adapter, val);
} else if (g_str_equal(key, "Discovering") == TRUE) {
gboolean val;
dbus_message_iter_get_basic(&value, &val);
- connman_element_set_scanning(device, val);
+ connman_device_set_scanning(adapter, val);
}
}
-static void properties_reply(DBusPendingCall *call, void *user_data)
+static void parse_adapter_properties(struct connman_device *adapter,
+ DBusConnection *connection,
+ DBusMessage *reply)
{
- DBusMessage *message = user_data;
- const char *path = dbus_message_get_path(message);
- struct connman_element *device;
DBusMessageIter array, dict;
- DBusMessage *reply;
-
- DBG("path %s", path);
-
- device = find_adapter(path);
-
- dbus_message_unref(message);
-
- reply = dbus_pending_call_steal_reply(call);
-
- if (device == NULL)
- goto done;
if (dbus_message_iter_init(reply, &array) == FALSE)
- goto done;
+ return;
if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY)
- goto done;
+ return;
dbus_message_iter_recurse(&array, &dict);
+
while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
DBusMessageIter entry, value;
const char *key;
gboolean val;
dbus_message_iter_get_basic(&value, &val);
- connman_element_set_enabled(device, val);
+ connman_device_set_powered(adapter, val);
} else if (g_str_equal(key, "Discovering") == TRUE) {
gboolean val;
dbus_message_iter_get_basic(&value, &val);
- connman_element_set_scanning(device, val);
+ connman_device_set_scanning(adapter, val);
+ } else if (g_str_equal(key, "Devices") == TRUE) {
+ check_devices(adapter, connection, &value);
}
dbus_message_iter_next(&dict);
}
-
-done:
- dbus_message_unref(reply);
}
-static void devices_reply(DBusPendingCall *call, void *user_data)
+static void adapter_properties(DBusConnection *connection, const char *path,
+ DBusMessage *message, void *user_data)
{
- DBusMessage *message = user_data;
- const char *path = dbus_message_get_path(message);
- DBusMessage *reply;
- DBusError error;
- char **devices;
- int i, num_devices;
+ const char *node = g_basename(path);
+ struct connman_device *adapter;
DBG("path %s", path);
- dbus_message_unref(message);
-
- reply = dbus_pending_call_steal_reply(call);
-
- dbus_error_init(&error);
-
- if (dbus_message_get_args(reply, &error,
- DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH,
- &devices, &num_devices,
- DBUS_TYPE_INVALID) == FALSE) {
- if (dbus_error_is_set(&error) == TRUE) {
- connman_error("%s", error.message);
- dbus_error_free(&error);
- } else
- connman_error("Wrong arguments for device list");
+ adapter = find_adapter(path);
+ if (adapter != NULL)
goto done;
- }
-
- for (i = 0; i < num_devices; i++) {
- DBG("device %s", devices[i]);
- }
- g_strfreev(devices);
-
-done:
- dbus_message_unref(reply);
-}
-
-static void add_adapter(DBusConnection *connection, const char *path)
-{
- struct connman_element *device;
- DBusMessage *message;
- DBusPendingCall *call;
-
- DBG("path %s", path);
-
- device = find_adapter(path);
- if (device != NULL)
+ adapter = connman_device_create(node, CONNMAN_DEVICE_TYPE_BLUETOOTH);
+ if (adapter == NULL)
return;
- device = connman_element_create(NULL);
- device->type = CONNMAN_ELEMENT_TYPE_DEVICE;
- device->subtype = CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH;
- device->policy = CONNMAN_ELEMENT_POLICY_IGNORE;
-
- device->name = g_path_get_basename(path);
- device->devpath = g_strdup(path);
+ connman_device_set_path(adapter, path);
- if (connman_element_register(device, NULL) < 0) {
- connman_element_unref(device);
- return;
+ if (g_str_has_prefix(node, "hci") == TRUE) {
+ int index;
+ errno = 0;
+ index = atoi(node + 3);
+ if (errno == 0)
+ connman_device_set_index(adapter, index);
}
- device_list = g_slist_append(device_list, device);
+ connman_device_set_interface(adapter, node);
- message = dbus_message_new_method_call(BLUEZ_SERVICE, path,
- BLUEZ_ADAPTER_INTERFACE, "GetProperties");
- if (message == NULL)
- return;
+ connman_device_set_policy(adapter, CONNMAN_DEVICE_POLICY_MANUAL);
+ connman_device_set_mode(adapter, CONNMAN_DEVICE_MODE_MULTIPLE_NETWORKS);
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get adapter properties");
- dbus_message_unref(message);
+ if (connman_device_register(adapter) < 0) {
+ connman_device_unref(adapter);
return;
}
- dbus_pending_call_set_notify(call, properties_reply, message, NULL);
+ adapter_list = g_slist_append(adapter_list, adapter);
- message = dbus_message_new_method_call(BLUEZ_SERVICE, path,
- BLUEZ_ADAPTER_INTERFACE, "ListDevices");
- if (message == NULL)
- return;
+done:
+ parse_adapter_properties(adapter, connection, message);
+}
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get Bluetooth devices");
- dbus_message_unref(message);
- return;
- }
+static void add_adapter(DBusConnection *connection, const char *path)
+{
+ DBG("path %s", path);
- dbus_pending_call_set_notify(call, devices_reply, message, NULL);
+ get_properties(connection, path, BLUEZ_ADAPTER_INTERFACE,
+ adapter_properties, NULL);
}
static void remove_adapter(DBusConnection *connection, const char *path)
{
- struct connman_element *device;
+ struct connman_device *adapter;
DBG("path %s", path);
- device = find_adapter(path);
- if (device == NULL)
+ adapter = find_adapter(path);
+ if (adapter == NULL)
return;
- device_list = g_slist_remove(device_list, device);
+ adapter_list = g_slist_remove(adapter_list, adapter);
- connman_element_unregister(device);
- connman_element_unref(device);
+ connman_device_unregister(adapter);
+ connman_device_unref(adapter);
}
-static void adapters_reply(DBusPendingCall *call, void *user_data)
+static void list_adapters_reply(DBusPendingCall *call, void *user_data)
{
DBusConnection *connection = user_data;
DBusMessage *reply;
}
for (i = 0; i < num_adapters; i++)
- add_adapter(connection, adapters[i]);
+ get_properties(connection, adapters[i],
+ BLUEZ_ADAPTER_INTERFACE,
+ adapter_properties, NULL);
g_strfreev(adapters);
return;
}
- dbus_pending_call_set_notify(call, adapters_reply, connection, NULL);
+ dbus_pending_call_set_notify(call, list_adapters_reply,
+ connection, NULL);
dbus_message_unref(message);
}
static void bluetooth_disconnect(DBusConnection *connection, void *user_data)
{
- GSList *list;
-
DBG("connection %p", connection);
- for (list = device_list; list; list = list->next) {
- struct connman_element *device = list->data;
-
- connman_element_unregister(device);
- connman_element_unref(device);
- }
-
- g_slist_free(device_list);
- device_list = NULL;
+ free_adapters();
}
static DBusHandlerResult bluetooth_signal(DBusConnection *connection,
DBusMessage *message, void *user_data)
{
+ if (dbus_message_has_interface(message,
+ BLUEZ_MANAGER_INTERFACE) == FALSE &&
+ dbus_message_has_interface(message,
+ BLUEZ_ADAPTER_INTERFACE) == FALSE)
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
DBG("connection %p", connection);
if (dbus_message_is_signal(message, BLUEZ_ADAPTER_INTERFACE,
NULL, NULL) == FALSE)
goto unref;
- err = connman_driver_register(&bluetooth_driver);
+ err = connman_device_driver_register(&bluetooth_driver);
if (err < 0)
goto remove;
watch = g_dbus_add_service_watch(connection, BLUEZ_SERVICE,
bluetooth_connect, bluetooth_disconnect, NULL, NULL);
if (watch == 0) {
- connman_driver_unregister(&bluetooth_driver);
+ connman_device_driver_unregister(&bluetooth_driver);
err = -EIO;
goto remove;
}
g_dbus_remove_watch(connection, watch);
- bluetooth_disconnect(connection, NULL);
+ free_adapters();
- connman_driver_unregister(&bluetooth_driver);
+ connman_device_driver_unregister(&bluetooth_driver);
dbus_connection_remove_filter(connection, bluetooth_signal, NULL);
projects / connman / blobdiff