58 lines
1.3 KiB
Diff
58 lines
1.3 KiB
Diff
diff --git a/src/security.c b/src/security.c
|
|
index fd2535f..6a9a5c4 100644
|
|
--- a/src/security.c
|
|
+++ b/src/security.c
|
|
@@ -46,6 +46,7 @@
|
|
|
|
#include <dbus/dbus.h>
|
|
|
|
+#include "hcid.h"
|
|
#include "logging.h"
|
|
#include "textfile.h"
|
|
|
|
@@ -789,6 +790,27 @@ static inline void conn_request(int dev, bdaddr_t *sba, void *ptr)
|
|
write_remote_class(sba, &evt->bdaddr, class);
|
|
}
|
|
|
|
+static void delete_channel(GIOChannel *chan)
|
|
+{
|
|
+ gint i, found;
|
|
+
|
|
+ /* Look for the GIOChannel in the table */
|
|
+ found = -1;
|
|
+ for (i = 0; i < HCI_MAX_DEV; i++) {
|
|
+ if (io_data[i].channel == chan) {
|
|
+ found = i;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (found == -1) {
|
|
+ g_warning("IO channel not found in the io_data table");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ stop_security_manager(i);
|
|
+}
|
|
+
|
|
static gboolean io_security_event(GIOChannel *chan, GIOCondition cond, gpointer data)
|
|
{
|
|
unsigned char buf[HCI_MAX_EVENT_SIZE], *ptr = buf;
|
|
@@ -799,14 +821,14 @@ static gboolean io_security_event(GIOChannel *chan, GIOCondition cond, gpointer
|
|
GIOError err;
|
|
|
|
if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR)) {
|
|
- g_io_channel_unref(chan);
|
|
+ delete_channel(chan);
|
|
return FALSE;
|
|
}
|
|
|
|
if ((err = g_io_channel_read(chan, (gchar *) buf, sizeof(buf), &len))) {
|
|
if (err == G_IO_ERROR_AGAIN)
|
|
return TRUE;
|
|
- g_io_channel_unref(chan);
|
|
+ delete_channel(chan);
|
|
return FALSE;
|
|
}
|
|
|