From 18d68b3755ffaafcfc74da9a5412b3c62baeadd4 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 26 Apr 2013 16:38:50 +0300 Subject: [PATCH] core: Remove useless attrib server confirm callback --- src/attrib-server.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/attrib-server.c b/src/attrib-server.c index 99656e380..81697ce21 100644 --- a/src/attrib-server.c +++ b/src/attrib-server.c @@ -1212,6 +1212,8 @@ static void connect_event(GIOChannel *io, GError *gerr, void *user_data) { GAttrib *attrib; + DBG(""); + if (gerr) { error("%s", gerr->message); return; @@ -1222,19 +1224,6 @@ static void connect_event(GIOChannel *io, GError *gerr, void *user_data) g_attrib_unref(attrib); } -static void confirm_event(GIOChannel *io, void *user_data) -{ - GError *gerr = NULL; - - if (bt_io_accept(io, connect_event, user_data, NULL, &gerr) == FALSE) { - error("bt_io_accept: %s", gerr->message); - g_error_free(gerr); - g_io_channel_unref(io); - } - - return; -} - static gboolean register_core_services(struct gatt_server *server) { uint8_t atval[256]; @@ -1312,8 +1301,7 @@ int btd_adapter_gatt_server_start(struct btd_adapter *adapter) addr = adapter_get_address(server->adapter); /* BR/EDR socket */ - server->l2cap_io = bt_io_listen(NULL, confirm_event, - NULL, NULL, &gerr, + server->l2cap_io = bt_io_listen(connect_event, NULL, NULL, NULL, &gerr, BT_IO_OPT_SOURCE_BDADDR, addr, BT_IO_OPT_PSM, ATT_PSM, BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW, @@ -1332,7 +1320,7 @@ int btd_adapter_gatt_server_start(struct btd_adapter *adapter) } /* LE socket */ - server->le_io = bt_io_listen(NULL, confirm_event, + server->le_io = bt_io_listen(connect_event, NULL, &server->le_io, NULL, &gerr, BT_IO_OPT_SOURCE_BDADDR, addr, BT_IO_OPT_CID, ATT_CID, -- 2.47.3