diff options
Diffstat (limited to 'network')
| -rw-r--r-- | network/connection.c | 8 | ||||
| -rw-r--r-- | network/main.c | 14 | ||||
| -rw-r--r-- | network/manager.c | 5 | ||||
| -rw-r--r-- | network/server.c | 6 |
4 files changed, 16 insertions, 17 deletions
diff --git a/network/connection.c b/network/connection.c index 16d3e383..c17950bc 100644 --- a/network/connection.c +++ b/network/connection.c @@ -44,7 +44,7 @@ #include "error.h" #include "common.h" -#define NETWORK_PEER_INTERFACE "org.bluez.network.Peer" +#define NETWORK_PEER_INTERFACE "org.bluez.Network" typedef enum { CONNECTED, @@ -123,12 +123,6 @@ static inline DBusMessage *not_connected(DBusMessage *msg) "Device not connected"); } -static inline DBusMessage *no_pending_connect(DBusMessage *msg) -{ - return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed", - "Device has no pending connect"); -} - static inline DBusMessage *connection_attempt_failed(DBusMessage *msg, int err) { return g_dbus_create_error(msg, ERROR_INTERFACE ".ConnectionAttemptFailed", diff --git a/network/main.c b/network/main.c index 6efdb81d..b81c111b 100644 --- a/network/main.c +++ b/network/main.c @@ -32,16 +32,16 @@ #include "plugin.h" #include "manager.h" +static DBusConnection *connection; + static int network_init(void) { - DBusConnection *conn; - - conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); - if (conn == NULL) + connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); + if (connection == NULL) return -EIO; - if (network_manager_init(conn) < 0) { - dbus_connection_unref(conn); + if (network_manager_init(connection) < 0) { + dbus_connection_unref(connection); return -EIO; } @@ -51,6 +51,8 @@ static int network_init(void) static void network_exit(void) { network_manager_exit(); + + dbus_connection_unref(connection); } BLUETOOTH_PLUGIN_DEFINE("network", network_init, network_exit) diff --git a/network/manager.c b/network/manager.c index c9555285..cafb7442 100644 --- a/network/manager.c +++ b/network/manager.c @@ -368,7 +368,6 @@ int network_manager_init(DBusConnection *conn) return -1; /* Register PANU, GN and NAP servers if they don't exist */ - /* FIXME: server should be registered as adapter driver */ btd_register_adapter_driver(&network_panu_server_driver); btd_register_adapter_driver(&network_gn_server_driver); btd_register_adapter_driver(&network_nap_server_driver); @@ -397,6 +396,10 @@ void network_manager_exit(void) connection_exit(); } + btd_unregister_adapter_driver(&network_panu_server_driver); + btd_unregister_adapter_driver(&network_gn_server_driver); + btd_unregister_adapter_driver(&network_nap_server_driver); + dbus_connection_unref(connection); connection = NULL; diff --git a/network/server.c b/network/server.c index 00e8f0aa..e283a994 100644 --- a/network/server.c +++ b/network/server.c @@ -52,9 +52,9 @@ #include "bridge.h" #include "common.h" -#define NETWORK_PEER_INTERFACE "org.bluez.network.Peer" -#define NETWORK_HUB_INTERFACE "org.bluez.network.Hub" -#define NETWORK_ROUTER_INTERFACE "org.bluez.network.Router" +#define NETWORK_PEER_INTERFACE "org.bluez.NetworkPeer" +#define NETWORK_HUB_INTERFACE "org.bluez.NetworkHub" +#define NETWORK_ROUTER_INTERFACE "org.bluez.NetworkRouter" #define SETUP_TIMEOUT 1000 /* Pending Authorization */ |