This email list is read-only. Emails sent to this list will be discarded ---------------------------------- include/network.h | 18 +++- plugins/Makefile.am | 2 +- plugins/bluetooth.c | 218 ++++++++++++++++++++++++++++++++++++++++++++++- src/detect.c | 2 + src/device.c | 17 +++- src/network.c | 123 ++++++++++++++++++++++++++- test/Makefile.am | 5 +- test/connect-network | 37 ++++++++ test/disconnect-network | 37 ++++++++ 9 files changed, 443 insertions(+), 16 deletions(-)
New commits: commit 403b9481d672d01c6e221968785bfa5ff25dd35d Author: Marcel Holtmann <[email protected]> Date: Tue Dec 30 23:42:10 2008 +0100 Add support for connecting Bluetooth NAP networks commit c8f5c35d5d577642dcd014f4d8294d8f38f498df Author: Marcel Holtmann <[email protected]> Date: Tue Dec 30 23:39:43 2008 +0100 Add test scripts for connecting and disconnecting networks commit 6601d98940b0d97b99afe71bcc2a8db90bd6a593 Author: Marcel Holtmann <[email protected]> Date: Tue Dec 30 23:33:55 2008 +0100 Add support for changing connection state commit 5dabfd89b01cd2dfe0af03c23684c6083d4647cf Author: Marcel Holtmann <[email protected]> Date: Tue Dec 30 22:59:31 2008 +0100 Add support for connecting and disconnecting networks commit 3cf39e356ec835dd019ed537fa5012efe61cf822 Author: Marcel Holtmann <[email protected]> Date: Tue Dec 30 22:58:41 2008 +0100 Set device before registering network commit 12e6a9a5778b17e758f9085bd9863226fcf39521 Author: Marcel Holtmann <[email protected]> Date: Tue Dec 30 22:46:03 2008 +0100 Add more debug messages for interface registration commit d0bb09fd8a90eba708c019ba0198e05dd2022e0a Author: Marcel Holtmann <[email protected]> Date: Tue Dec 30 21:56:32 2008 +0100 Free allocated path value commit 4167a753ea847d3733a736fc3f5c029662f3131a Author: Marcel Holtmann <[email protected]> Date: Tue Dec 30 21:55:51 2008 +0100 Add support for storing network specific path value commit 42dc3ed17eb90633b0b3a06dd9b1351ee28d73f3 Author: Marcel Holtmann <[email protected]> Date: Tue Dec 30 21:36:10 2008 +0100 Add network types for Bluetooth commit 627abec2e1c39d15a9a917c14a7923b6ab58cfd1 Author: Marcel Holtmann <[email protected]> Date: Tue Dec 30 21:27:22 2008 +0100 Check that device name is valid before using it commit 8f1eb1a308f2f7f65536b0a0224d1710afd8a1eb Author: Marcel Holtmann <[email protected]> Date: Tue Dec 30 21:25:04 2008 +0100 Fail if interface name can't be retrieved Diff in this email is a maximum of 400 lines. diff --git a/include/network.h b/include/network.h index 6d2f3b7..3fd266e 100644 --- a/include/network.h +++ b/include/network.h @@ -36,9 +36,11 @@ extern "C" { */ enum connman_network_type { - CONNMAN_NETWORK_TYPE_UNKNOWN = 0, - CONNMAN_NETWORK_TYPE_WIFI = 1, - CONNMAN_NETWORK_TYPE_HSO = 23, + CONNMAN_NETWORK_TYPE_UNKNOWN = 0, + CONNMAN_NETWORK_TYPE_WIFI = 1, + CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN = 8, + CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN = 9, + CONNMAN_NETWORK_TYPE_HSO = 23, }; struct connman_network; @@ -50,6 +52,16 @@ extern void connman_network_unref(struct connman_network *network); extern const char *connman_network_get_identifier(struct connman_network *network); +extern void connman_network_set_path(struct connman_network *network, + const char *path); +extern const char *connman_network_get_path(struct connman_network *network); +extern void connman_network_set_index(struct connman_network *network, + int index); +extern int connman_network_get_index(struct connman_network *network); + +extern int connman_network_set_connected(struct connman_network *network, + connman_bool_t connected); + extern struct connman_device *connman_network_get_device(struct connman_network *network); extern void *connman_network_get_data(struct connman_network *network); diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 44d510f..efcb5b7 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -14,7 +14,7 @@ ethernet_la_SOURCES = ethernet.c inet.h inet.c wifi_la_SOURCES = wifi.c inet.h inet.c supplicant.h supplicant.c wifi_la_LIBADD = @GDBUS_LIBS@ -bluetooth_la_SOURCES = bluetooth.c +bluetooth_la_SOURCES = bluetooth.c inet.h inet.c bluetooth_la_LIBADD = @GDBUS_LIBS@ hso_la_SOURCES = hso.c modem.h modem.c diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c index 1799f77..8f90a98 100644 --- a/plugins/bluetooth.c +++ b/plugins/bluetooth.c @@ -34,10 +34,13 @@ #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" @@ -47,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, @@ -123,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_path(network); + 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_path(network); + 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; @@ -289,10 +490,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_path(network, path); + connman_device_add_network(device, network); } @@ -412,7 +616,7 @@ static void adapter_properties(DBusConnection *connection, const char *path, connman_device_set_path(adapter, 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); @@ -585,14 +789,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; } @@ -628,6 +839,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); diff --git a/src/detect.c b/src/detect.c index e97e9df..781b8fa 100644 --- a/src/detect.c +++ b/src/detect.c @@ -140,6 +140,8 @@ static void detect_newlink(unsigned short type, int index, return; devname = index2name(index); + if (devname == NULL) + return; if (type == ARPHRD_ETHER) { char bridge_path[PATH_MAX], wimax_path[PATH_MAX]; diff --git a/src/device.c b/src/device.c index e466c0c..84be26e 100644 --- a/src/device.c +++ b/src/device.c @@ -426,6 +426,8 @@ static int register_interface(struct connman_element *element) { struct connman_device *device = element->device; + DBG("element %p name %s", element, element->name); + if (g_dbus_register_interface(connection, element->path, CONNMAN_DEVICE_INTERFACE, device_methods, device_signals, @@ -441,6 +443,8 @@ static int register_interface(struct connman_element *element) static void unregister_interface(struct connman_element *element) { + DBG("element %p name %s", element, element->name); + emit_devices_signal(); g_dbus_unregister_interface(connection, element->path, @@ -507,6 +511,7 @@ static void device_destruct(struct connman_element *element) DBG("element %p name %s", element, element->name); + g_free(device->path); g_free(device->interface); g_hash_table_destroy(device->networks); @@ -831,12 +836,14 @@ int connman_device_add_network(struct connman_device *device, if (device->mode == CONNMAN_DEVICE_MODE_NO_NETWORK) return -EINVAL; + __connman_network_set_device(network, device); + err = connman_element_register((struct connman_element *) network, &device->element); - if (err < 0) + if (err < 0) { + __connman_network_set_device(network, NULL); return err; - - __connman_network_set_device(network, device); + } g_hash_table_insert(device->networks, g_strdup(identifier), network); @@ -987,7 +994,7 @@ static int device_probe(struct connman_element *element) } } - if (!device->driver) _______________________________________________ Commits mailing list [email protected] https://lists.moblin.org/mailman/listinfo/commits
