*
* Connection Manager
*
- * Copyright (C) 2007-2008 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2009 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include <gdbus.h>
+#define CONNMAN_API_SUBJECT_TO_CHANGE
#include <connman/plugin.h>
#include <connman/device.h>
#include <connman/dbus.h>
#include <connman/log.h>
+#include "inet.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 BLUEZ_NETWORK_INTERFACE BLUEZ_SERVICE ".Network"
#define LIST_ADAPTERS "ListAdapters"
#define ADAPTER_ADDED "AdapterAdded"
#define GET_PROPERTIES "GetProperties"
#define SET_PROPERTY "SetProperty"
+#define CONNECT "Connect"
+#define DISCONNECT "Disconnect"
+
#define TIMEOUT 5000
typedef void (* properties_callback_t) (DBusConnection *connection,
return;
}
+ if (call == NULL) {
+ connman_error("D-Bus connection not available");
+ dbus_message_unref(message);
+ g_free(data);
+ return;
+ }
+
data->connection = connection;
data->message = message;
data->callback = callback;
DBusConnection *connection;
};
+struct network_data {
+ DBusConnection *connection;
+ char *interface;
+};
+
+static int pan_probe(struct connman_network *network)
+{
+ struct connman_device *device = connman_network_get_device(network);
+ struct adapter_data *adapter;
+ struct network_data *data;
+
+ DBG("network %p", network);
+
+ if (device == NULL)
+ return -EINVAL;
+
+ adapter = connman_device_get_data(device);
+ if (adapter == NULL)
+ return -EINVAL;
+
+ data = g_try_new0(struct network_data, 1);
+ if (data == NULL)
+ return -ENOMEM;
+
+ data->connection = adapter->connection;
+
+ connman_network_set_data(network, data);
+
+ return 0;
+}
+
+static void pan_remove(struct connman_network *network)
+{
+ struct network_data *data = connman_network_get_data(network);
+
+ DBG("network %p", network);
+
+ connman_network_set_data(network, NULL);
+
+ g_free(data);
+}
+
+static void connect_reply(DBusPendingCall *call, void *user_data)
+{
+ struct connman_network *network = user_data;
+ struct network_data *data = connman_network_get_data(network);
+ DBusMessage *reply;
+ DBusError error;
+ const char *interface = NULL;
+ int index;
+
+ DBG("network %p", network);
+
+ reply = dbus_pending_call_steal_reply(call);
+ if (reply == NULL)
+ return;
+
+ dbus_error_init(&error);
+
+ if (dbus_message_get_args(reply, &error,
+ DBUS_TYPE_STRING, &interface,
+ 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 connect");
+ goto done;
+ }
+
+ if (interface == NULL)
+ goto done;
+
+ DBG("interface %s", interface);
+
+ data->interface = g_strdup(interface);
+
+ index = inet_name2index(interface);
+
+ connman_network_set_index(network, index);
+ connman_network_set_connected(network, TRUE);
+
+done:
+ dbus_message_unref(reply);
+}
+
+static int pan_connect(struct connman_network *network)
+{
+ struct network_data *data = connman_network_get_data(network);
+ const char *path = connman_network_get_string(network, "Node");
+ const char *uuid = "nap";
+ DBusMessage *message;
+ DBusPendingCall *call;
+
+ DBG("network %p", network);
+
+ message = dbus_message_new_method_call(BLUEZ_SERVICE, path,
+ BLUEZ_NETWORK_INTERFACE, CONNECT);
+ if (message == NULL)
+ return -ENOMEM;
+
+ dbus_message_append_args(message, DBUS_TYPE_STRING, &uuid,
+ DBUS_TYPE_INVALID);
+
+ if (dbus_connection_send_with_reply(data->connection, message,
+ &call, TIMEOUT * 10) == FALSE) {
+ connman_error("Failed to connect service");
+ dbus_message_unref(message);
+ return -EINVAL;
+ }
+
+ if (call == NULL) {
+ connman_error("D-Bus connection not available");
+ dbus_message_unref(message);
+ return -EINVAL;
+ }
+
+ dbus_pending_call_set_notify(call, connect_reply, network, NULL);
+
+ dbus_message_unref(message);
+
+ return -EINPROGRESS;
+}
+
+static void disconnect_reply(DBusPendingCall *call, void *user_data)
+{
+ struct connman_network *network = user_data;
+ struct network_data *data = connman_network_get_data(network);
+ DBusMessage *reply;
+ DBusError error;
+
+ DBG("network %p", network);
+
+ reply = dbus_pending_call_steal_reply(call);
+ if (reply == NULL)
+ return;
+
+ dbus_error_init(&error);
+
+ if (dbus_message_get_args(reply, &error, 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 disconnect");
+ goto done;
+ }
+
+ g_free(data->interface);
+ data->interface = NULL;
+
+ connman_network_set_connected(network, FALSE);
+ connman_network_set_index(network, -1);
+
+done:
+ dbus_message_unref(reply);
+}
+
+static int pan_disconnect(struct connman_network *network)
+{
+ struct network_data *data = connman_network_get_data(network);
+ const char *path = connman_network_get_string(network, "Node");
+ DBusMessage *message;
+ DBusPendingCall *call;
+
+ DBG("network %p", network);
+
+ if (data->interface == NULL)
+ return -EINVAL;
+
+ message = dbus_message_new_method_call(BLUEZ_SERVICE, path,
+ BLUEZ_NETWORK_INTERFACE, DISCONNECT);
+ if (message == NULL)
+ return -ENOMEM;
+
+ dbus_message_append_args(message, DBUS_TYPE_INVALID);
+
+ if (dbus_connection_send_with_reply(data->connection, message,
+ &call, TIMEOUT) == FALSE) {
+ connman_error("Failed to disconnect service");
+ dbus_message_unref(message);
+ return -EINVAL;
+ }
+
+ if (call == NULL) {
+ connman_error("D-Bus connection not available");
+ dbus_message_unref(message);
+ return -EINVAL;
+ }
+
+ dbus_pending_call_set_notify(call, disconnect_reply, network, NULL);
+
+ dbus_message_unref(message);
+
+ return -EINPROGRESS;
+}
+
+static struct connman_network_driver pan_driver = {
+ .name = "bluetooth-pan",
+ .type = CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN,
+ .probe = pan_probe,
+ .remove = pan_remove,
+ .connect = pan_connect,
+ .disconnect = pan_disconnect,
+};
+
static int bluetooth_probe(struct connman_device *adapter)
{
struct adapter_data *data;
return -EINVAL;
}
+ if (call == NULL) {
+ connman_error("D-Bus connection not available");
+ dbus_message_unref(message);
+ return -EINVAL;
+ }
+
dbus_pending_call_set_notify(call, powered_reply, NULL, NULL);
dbus_message_unref(message);
static int bluetooth_enable(struct connman_device *adapter)
{
struct adapter_data *data = connman_device_get_data(adapter);
- const char *path = connman_device_get_path(adapter);
+ const char *path = connman_device_get_string(adapter, "Node");
DBG("adapter %p", adapter);
static int bluetooth_disable(struct connman_device *adapter)
{
struct adapter_data *data = connman_device_get_data(adapter);
- const char *path = connman_device_get_path(adapter);
+ const char *path = connman_device_get_string(adapter, "Node");
DBG("adapter %p", adapter);
for (list = adapter_list; list; list = list->next) {
struct connman_device *adapter = list->data;
- const char *adapter_path = connman_device_get_path(adapter);
+ const char *adapter_path = connman_device_get_string(adapter,
+ "Node");
if (adapter_path == NULL)
continue;
if (network != NULL)
return;
- network = connman_network_create(node, CONNMAN_NETWORK_TYPE_WIFI);
+ network = connman_network_create(node,
+ CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN);
if (network == NULL)
return;
+ connman_network_set_protocol(network, CONNMAN_NETWORK_PROTOCOL_IP);
+
+ connman_network_set_string(network, "Node", path);
+
connman_device_add_network(device, network);
}
if (adapter == NULL)
return;
- connman_device_set_path(adapter, path);
+ connman_device_set_string(adapter, "Node", path);
- if (g_str_has_prefix(node, "hci") == TRUE) {
+ if (node != NULL && g_str_has_prefix(node, "hci") == TRUE) {
int index;
errno = 0;
index = atoi(node + 3);
connman_device_set_interface(adapter, node);
- connman_device_set_mode(adapter, CONNMAN_DEVICE_MODE_MULTIPLE_NETWORKS);
+ connman_device_set_policy(adapter, CONNMAN_DEVICE_POLICY_MANUAL);
+ connman_device_set_mode(adapter, CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE);
if (connman_device_register(adapter) < 0) {
connman_device_unref(adapter);
if (dbus_connection_send_with_reply(connection, message,
&call, TIMEOUT) == FALSE) {
connman_error("Failed to get Bluetooth adapters");
- dbus_message_unref(message);
- return;
+ goto done;
+ }
+
+ if (call == NULL) {
+ connman_error("D-Bus connection not available");
+ goto done;
}
dbus_pending_call_set_notify(call, list_adapters_reply,
connection, NULL);
+done:
dbus_message_unref(message);
}
NULL, NULL) == FALSE)
goto unref;
- err = connman_device_driver_register(&bluetooth_driver);
+ err = connman_network_driver_register(&pan_driver);
if (err < 0)
goto remove;
+ err = connman_device_driver_register(&bluetooth_driver);
+ if (err < 0) {
+ connman_network_driver_unregister(&pan_driver);
+ goto remove;
+ }
+
watch = g_dbus_add_service_watch(connection, BLUEZ_SERVICE,
bluetooth_connect, bluetooth_disconnect, NULL, NULL);
if (watch == 0) {
connman_device_driver_unregister(&bluetooth_driver);
+ connman_network_driver_unregister(&pan_driver);
err = -EIO;
goto remove;
}
free_adapters();
connman_device_driver_unregister(&bluetooth_driver);
+ connman_network_driver_unregister(&pan_driver);
dbus_connection_remove_filter(connection, bluetooth_signal, NULL);
}
CONNMAN_PLUGIN_DEFINE(bluetooth, "Bluetooth technology plugin", VERSION,
- bluetooth_init, bluetooth_exit)
+ CONNMAN_PLUGIN_PRIORITY_DEFAULT, bluetooth_init, bluetooth_exit)
projects / connman / blobdiff