* [PATCH] bluetooth: single SDP record for all adapters
@ 2011-02-11 9:31 =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Dalleau
2011-02-15 19:23 ` Denis Kenzior
0 siblings, 1 reply; 2+ messages in thread
From: =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Dalleau @ 2011-02-11 9:31 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 10007 bytes --]
---
plugins/bluetooth.c | 140 +++++++++++++++++++++++---------------------------
1 files changed, 64 insertions(+), 76 deletions(-)
diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index d38006b..8443f90 100644
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -43,14 +43,16 @@ static GHashTable *uuid_hash = NULL;
static GHashTable *adapter_address_hash = NULL;
static gint bluetooth_refcount;
static GSList *server_list = NULL;
+static const char *adapter_any_name = "any";
+static char *adapter_any_path;
#define TIMEOUT 60 /* Timeout for user response (seconds) */
struct server {
guint8 channel;
char *sdp_record;
+ guint32 handle;
GIOChannel *io;
- GHashTable *adapter_hash;
ConnectFunc connect_cb;
gpointer user_data;
};
@@ -437,11 +439,11 @@ static void get_adapter_properties(const char *path, const char *handle,
g_strdup(path), g_free, -1, DBUS_TYPE_INVALID);
}
-static void remove_record(char *path, guint handle, struct server *server)
+static void remove_record(struct server *server)
{
DBusMessage *msg;
- msg = dbus_message_new_method_call(BLUEZ_SERVICE, path,
+ msg = dbus_message_new_method_call(BLUEZ_SERVICE, adapter_any_path,
BLUEZ_SERVICE_INTERFACE,
"RemoveRecord");
if (msg == NULL) {
@@ -449,24 +451,12 @@ static void remove_record(char *path, guint handle, struct server *server)
return;
}
- dbus_message_append_args(msg, DBUS_TYPE_UINT32, &handle,
+ dbus_message_append_args(msg, DBUS_TYPE_UINT32, &server->handle,
DBUS_TYPE_INVALID);
g_dbus_send_message(connection, msg);
- ofono_info("Unregistered handle for %s, channel %d: 0x%x", path,
- server->channel, handle);
-}
-
-static void server_stop(struct server *server)
-{
- g_hash_table_foreach_remove(server->adapter_hash,
- (GHRFunc) remove_record, server);
-
- if (server->io != NULL) {
- g_io_channel_shutdown(server->io, TRUE, NULL);
- g_io_channel_unref(server->io);
- server->io = NULL;
- }
+ ofono_info("Unregistered handle for channel %d: 0x%x",
+ server->channel, server->handle);
}
static void cb_data_destroy(gpointer data)
@@ -542,7 +532,6 @@ static void new_connection(GIOChannel *io, gpointer user_data)
{
struct server *server = user_data;
struct cb_data *cbd;
- guint handle;
const char *addr;
GError *err = NULL;
char laddress[18], raddress[18];
@@ -550,7 +539,6 @@ static void new_connection(GIOChannel *io, gpointer user_data)
GHashTableIter iter;
gpointer key, value;
const char *path;
- gpointer handlep;
bt_io_get(io, BT_IO_RFCOMM, &err, BT_IO_OPT_SOURCE, laddress,
BT_IO_OPT_DEST, raddress,
@@ -578,10 +566,6 @@ static void new_connection(GIOChannel *io, gpointer user_data)
if (path == NULL)
return;
- handlep = g_hash_table_lookup(server->adapter_hash, path);
- if (handlep == NULL)
- return;
-
cbd = g_try_new0(struct cb_data, 1);
if (cbd == NULL) {
ofono_error("Unable to allocate client cb_data structure");
@@ -593,19 +577,18 @@ static void new_connection(GIOChannel *io, gpointer user_data)
cbd->io = io;
addr = raddress;
- handle = GPOINTER_TO_UINT(handlep);
if (bluetooth_send_with_reply(path, BLUEZ_SERVICE_INTERFACE,
"RequestAuthorization",
auth_cb, cbd, cb_data_destroy,
TIMEOUT, DBUS_TYPE_STRING, &addr,
- DBUS_TYPE_UINT32, &handle,
+ DBUS_TYPE_UINT32, &server->handle,
DBUS_TYPE_INVALID) < 0) {
ofono_error("Request Bluetooth authorization failed");
return;
}
- ofono_info("RequestAuthorization(%s, 0x%x)", raddress, handle);
+ ofono_info("RequestAuthorization(%s, 0x%x)", raddress, server->handle);
cbd->source = g_io_add_watch(io, G_IO_HUP | G_IO_ERR | G_IO_NVAL,
client_event, cbd);
@@ -613,10 +596,9 @@ static void new_connection(GIOChannel *io, gpointer user_data)
static void add_record_cb(DBusPendingCall *call, gpointer user_data)
{
- struct cb_data *cb_data = user_data;
+ struct server *server = user_data;
DBusMessage *reply = dbus_pending_call_steal_reply(call);
DBusError derr;
- guint32 handle;
dbus_error_init(&derr);
@@ -624,47 +606,31 @@ static void add_record_cb(DBusPendingCall *call, gpointer user_data)
ofono_error("Replied with an error: %s, %s",
derr.name, derr.message);
dbus_error_free(&derr);
- g_free(cb_data->path);
goto done;
}
- dbus_message_get_args(reply, NULL, DBUS_TYPE_UINT32, &handle,
+ dbus_message_get_args(reply, NULL, DBUS_TYPE_UINT32, &server->handle,
DBUS_TYPE_INVALID);
- g_hash_table_insert(cb_data->server->adapter_hash, cb_data->path,
- GUINT_TO_POINTER(handle));
-
- ofono_info("Registered handle for %s, channel %d: 0x%x", cb_data->path,
- cb_data->server->channel, handle);
+ ofono_info("Registered handle for channel %d: 0x%x",
+ server->channel, server->handle);
done:
- /* Do not free cb_data->path, it is used in adapter_hash */
- g_free(cb_data);
dbus_message_unref(reply);
}
static void add_record(gpointer data, gpointer user_data)
{
struct server *server = data;
- const char *path = user_data;
- struct cb_data *cb_data;
if (server->sdp_record == NULL)
return;
- cb_data = g_try_new0(struct cb_data, 1);
- if (cb_data == NULL) {
- ofono_error("Unable to allocate cb_data structure");
- return;
- }
-
- cb_data->server = server;
- cb_data->path = g_strdup(path);
-
- bluetooth_send_with_reply(path, BLUEZ_SERVICE_INTERFACE, "AddRecord",
- add_record_cb, cb_data, NULL, -1,
- DBUS_TYPE_STRING, &server->sdp_record,
- DBUS_TYPE_INVALID);
+ bluetooth_send_with_reply(adapter_any_path,
+ BLUEZ_SERVICE_INTERFACE, "AddRecord",
+ add_record_cb, server, NULL, -1,
+ DBUS_TYPE_STRING, &server->sdp_record,
+ DBUS_TYPE_INVALID);
}
static gboolean adapter_added(DBusConnection *connection, DBusMessage *message,
@@ -680,8 +646,6 @@ static gboolean adapter_added(DBusConnection *connection, DBusMessage *message,
"GetProperties", adapter_properties_cb, g_strdup(path),
g_free, -1, DBUS_TYPE_INVALID);
- g_slist_foreach(server_list, add_record, (gpointer) path);
-
return TRUE;
}
@@ -689,19 +653,11 @@ static gboolean adapter_removed(DBusConnection *connection,
DBusMessage *message, void *user_data)
{
const char *path;
- GSList *l;
if (dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID) == TRUE)
g_hash_table_remove(adapter_address_hash, path);
- for (l = server_list; l; l = l->next) {
- struct server *server = l->data;
-
- /* Handle have already been removed, so removing related path */
- g_hash_table_remove(server->adapter_hash, path);
- }
-
return TRUE;
}
@@ -728,8 +684,6 @@ static void parse_adapters(DBusMessageIter *array, gpointer user_data)
"GetProperties", adapter_properties_cb,
g_strdup(path), g_free, -1, DBUS_TYPE_INVALID);
- g_slist_foreach(server_list, add_record, (gpointer) path);
-
dbus_message_iter_next(&value);
}
}
@@ -770,6 +724,32 @@ static void bluetooth_disconnect(DBusConnection *connection, void *user_data)
g_hash_table_foreach(uuid_hash, bluetooth_remove_all_modem, NULL);
}
+static void find_adapter_cb(DBusPendingCall *call, gpointer user_data)
+{
+ DBusMessage *reply = dbus_pending_call_steal_reply(call);
+ DBusError derr;
+ const char *path;
+
+ dbus_error_init(&derr);
+
+ if (dbus_set_error_from_message(&derr, reply)) {
+ ofono_error("Replied with an error: %s, %s",
+ derr.name, derr.message);
+ dbus_error_free(&derr);
+ goto done;
+ }
+
+ dbus_message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, &path,
+ DBUS_TYPE_INVALID);
+
+ adapter_any_path = g_strdup(path);
+
+ g_slist_foreach(server_list, (GFunc)add_record, NULL);
+
+done:
+ dbus_message_unref(reply);
+}
+
static guint bluetooth_watch;
static guint adapter_added_watch;
static guint adapter_removed_watch;
@@ -815,6 +795,11 @@ static void bluetooth_ref(void)
manager_properties_cb, NULL, NULL, -1,
DBUS_TYPE_INVALID);
+ bluetooth_send_with_reply("/", BLUEZ_MANAGER_INTERFACE, "FindAdapter",
+ find_adapter_cb, NULL, NULL, -1,
+ DBUS_TYPE_STRING, &adapter_any_name,
+ DBUS_TYPE_INVALID);
+
increment:
g_atomic_int_inc(&bluetooth_refcount);
@@ -832,6 +817,8 @@ static void bluetooth_unref(void)
if (g_atomic_int_dec_and_test(&bluetooth_refcount) == FALSE)
return;
+ g_free(adapter_any_path);
+
g_dbus_remove_watch(connection, bluetooth_watch);
g_dbus_remove_watch(connection, adapter_added_watch);
g_dbus_remove_watch(connection, adapter_removed_watch);
@@ -865,8 +852,6 @@ struct server *bluetooth_register_server(guint8 channel, const char *sdp_record,
{
struct server *server;
GError *err;
- GHashTableIter iter;
- gpointer key, value;
server = g_try_new0(struct server, 1);
if (!server)
@@ -892,24 +877,27 @@ struct server *bluetooth_register_server(guint8 channel, const char *sdp_record,
server->connect_cb = cb;
server->user_data = user_data;
- server->adapter_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
- g_free, NULL);
-
- g_hash_table_iter_init(&iter, adapter_address_hash);
-
- while (g_hash_table_iter_next(&iter, &key, &value))
- add_record(server, key);
server_list = g_slist_prepend(server_list, server);
+ if(adapter_any_path != NULL)
+ add_record(server, NULL);
+
return server;
}
void bluetooth_unregister_server(struct server *server)
{
server_list = g_slist_remove(server_list, server);
- server_stop(server);
- g_hash_table_destroy(server->adapter_hash);
+
+ remove_record(server);
+
+ if (server->io != NULL) {
+ g_io_channel_shutdown(server->io, TRUE, NULL);
+ g_io_channel_unref(server->io);
+ server->io = NULL;
+ }
+
g_free(server->sdp_record);
g_free(server);
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-15 19:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-11 9:31 [PATCH] bluetooth: single SDP record for all adapters =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Dalleau
2011-02-15 19:23 ` Denis Kenzior
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.