X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=plugins%2Fbluetooth.c;h=200c3ff3a7e168c814afbff43cb171093e8c8afa;hb=8024e614794792da8f346d34ff329ba2d244b37e;hp=8993ca6634424c3ba9bf45429addf8b4aed658b7;hpb=6877247bb62d3492570a4ee4c134f495cb680e92;p=connman diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c index 8993ca6..200c3ff 100644 --- a/plugins/bluetooth.c +++ b/plugins/bluetooth.c @@ -2,7 +2,7 @@ * * 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 @@ -28,15 +28,19 @@ #include +#define CONNMAN_API_SUBJECT_TO_CHANGE #include #include #include #include +#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" @@ -46,6 +50,9 @@ #define GET_PROPERTIES "GetProperties" #define SET_PROPERTY "SetProperty" +#define CONNECT "Connect" +#define DISCONNECT "Disconnect" + #define TIMEOUT 5000 typedef void (* properties_callback_t) (DBusConnection *connection, @@ -122,6 +129,201 @@ struct adapter_data { 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; + } + + 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_STRING, &data->interface, + 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; + } + + 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; @@ -202,7 +404,7 @@ static int change_powered(DBusConnection *connection, const char *path, 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); @@ -212,7 +414,7 @@ static int bluetooth_enable(struct connman_device *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); @@ -263,7 +465,8 @@ static struct connman_device *find_adapter(const char *path) 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; @@ -288,10 +491,13 @@ static void device_properties(DBusConnection *connection, const char *path, 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_string(network, "Node", path); + connman_device_add_network(device, network); } @@ -409,9 +615,9 @@ static void adapter_properties(DBusConnection *connection, const char *path, 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); @@ -422,7 +628,7 @@ static void adapter_properties(DBusConnection *connection, const char *path, connman_device_set_interface(adapter, node); connman_device_set_policy(adapter, CONNMAN_DEVICE_POLICY_MANUAL); - connman_device_set_mode(adapter, CONNMAN_DEVICE_MODE_MULTIPLE_NETWORKS); + connman_device_set_mode(adapter, CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE); if (connman_device_register(adapter) < 0) { connman_device_unref(adapter); @@ -584,14 +790,21 @@ static int bluetooth_init(void) 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; } @@ -627,6 +840,7 @@ static void bluetooth_exit(void) free_adapters(); connman_device_driver_unregister(&bluetooth_driver); + connman_network_driver_unregister(&pan_driver); dbus_connection_remove_filter(connection, bluetooth_signal, NULL);