* [Bluez-devel] Input service signals
@ 2007-06-15 13:45 Frederic Danis
2007-06-16 7:31 ` Marcel Holtmann
2007-06-19 12:45 ` Frederic Danis
0 siblings, 2 replies; 9+ messages in thread
From: Frederic Danis @ 2007-06-15 13:45 UTC (permalink / raw)
To: bluez-devel
[-- Attachment #1: Type: text/plain, Size: 799 bytes --]
Hello,
I am using the Input service. It is very helpful.
But Connected/Disconnected signals from Device interface are currently
only sent when connection/disconnection are done through the Device
interface methods. They are not sent when remote device
connects/disconnects.
I wrote a patch that move common code between server.c and device.c into
a new file session.c. This allows to send those signals for all
connect/disconnect.
Hope this is OK.
Fred
--
-----------------------------------------------
It is not by improving the oil lamp that one invents the electric bulb!
-----------------------------------------------
Danis Frederic Access Company
Software engineer
Mail : mailto:frederic.danis@access-company.com
-----------------------------------------------
[-- Attachment #2: signals_input.patch --]
[-- Type: text/x-patch, Size: 21748 bytes --]
? utils/input/Makefile.in
Index: utils/input/Makefile.am
===================================================================
RCS file: /cvsroot/bluez/utils/input/Makefile.am,v
retrieving revision 1.17
diff -d -u -p -r1.17 Makefile.am
--- utils/input/Makefile.am 9 May 2007 07:09:58 -0000 1.17
+++ utils/input/Makefile.am 15 Jun 2007 12:38:44 -0000
@@ -12,7 +12,7 @@ service_PROGRAMS = bluetoothd-service-in
bluetoothd_service_input_SOURCES = main.c \
manager.h manager.c error.h error.c \
- server.h server.c device.h device.c storage.h storage.c
+ server.h server.c device.h device.c storage.h storage.c session.c session.h
LDADD = $(top_builddir)/common/libhelper.a \
@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
Index: utils/input/device.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/device.c,v
retrieving revision 1.52
diff -d -u -p -r1.52 device.c
--- utils/input/device.c 29 May 2007 03:58:10 -0000 1.52
+++ utils/input/device.c 15 Jun 2007 12:38:45 -0000
@@ -52,6 +52,7 @@
#include "error.h"
#include "manager.h"
#include "storage.h"
+#include "session.h"
#define INPUT_DEVICE_INTERFACE "org.bluez.input.Device"
@@ -77,9 +78,11 @@ struct device {
char *name;
uint8_t major;
uint8_t minor;
- struct hidp_connadd_req hidp; /* FIXME: Use dynamic alloc? */
+ uint16_t vendor;
+ uint16_t product;
struct fake_input *fake;
struct pending_connect *pending_connect;
+ struct session_data *session;
};
static struct device *device_new(bdaddr_t *src, bdaddr_t *dst)
@@ -98,9 +101,6 @@ static struct device *device_new(bdaddr_
idev->major = (cls >> 8) & 0x1f;
idev->minor = (cls >> 2) & 0x3f;
- /* FIXME: hidp could be alloc dynamically */
- snprintf(idev->hidp.name, 128, "%s", idev->name);
-
return idev;
}
@@ -121,8 +121,6 @@ static void device_free(struct device *i
return;
if (idev->name)
g_free(idev->name);
- if (idev->hidp.rd_data)
- g_free(idev->hidp.rd_data);
if (idev->fake)
g_free(idev->fake);
if (idev->pending_connect)
@@ -512,8 +510,7 @@ failed:
static gboolean interrupt_connect_cb(GIOChannel *chan,
GIOCondition cond, struct device *idev)
{
- int ctl, isk, ret, err;
- const char *path;
+ int isk, ret, err;
socklen_t len;
isk = g_io_channel_unix_get_fd(chan);
@@ -531,9 +528,6 @@ static gboolean interrupt_connect_cb(GIO
}
- idev->hidp.intr_sock = isk;
- idev->hidp.idle_to = 30 * 60; /* 30 minutes */
-
len = sizeof(ret);
if (getsockopt(isk, SOL_SOCKET, SO_ERROR, &ret, &len) < 0) {
err = errno;
@@ -547,54 +541,24 @@ static gboolean interrupt_connect_cb(GIO
goto failed;
}
- ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HIDP);
- if (ctl < 0) {
- err = errno;
- error("Can't open HIDP control socket");
- goto failed;
- }
-
- if (idev->hidp.subclass & 0x40) {
- int ret;
- ret = encrypt_link(&idev->src, &idev->dst);
- if (ret < 0 && ret != -ENOKEY) {
- err = -ret;
- close(ctl);
- goto failed;
- }
- }
-
- if (ioctl(ctl, HIDPCONNADD, &idev->hidp) < 0) {
- err = errno;
- close(ctl);
- goto failed;
- }
+ create_device(idev->session);
/* Replying to the requestor */
send_message_and_unref(idev->pending_connect->conn,
dbus_message_new_method_return(idev->pending_connect->msg));
- /* Sending the Connected signal */
- path = dbus_message_get_path(idev->pending_connect->msg);
- dbus_connection_emit_signal(idev->pending_connect->conn, path,
- INPUT_DEVICE_INTERFACE, "Connected" ,
- DBUS_TYPE_INVALID);
-
- close (ctl);
goto cleanup;
+
failed:
err_connection_failed(idev->pending_connect->conn,
idev->pending_connect->msg, strerror(err));
-cleanup:
if (isk > 0)
close(isk);
- close(idev->hidp.ctrl_sock);
-
- idev->hidp.intr_sock = -1;
- idev->hidp.ctrl_sock = -1;
+ remove_session(idev->session);
+cleanup:
pending_connect_free(idev->pending_connect);
idev->pending_connect = NULL;
@@ -604,7 +568,7 @@ cleanup:
static gboolean control_connect_cb(GIOChannel *chan,
GIOCondition cond, struct device *idev)
{
- int ret, csk, err;
+ int ret, csk, isk, err;
socklen_t len;
csk = g_io_channel_unix_get_fd(chan);
@@ -621,9 +585,6 @@ static gboolean control_connect_cb(GIOCh
goto failed;
}
- /* Set HID control channel */
- idev->hidp.ctrl_sock = csk;
-
len = sizeof(ret);
if (getsockopt(csk, SOL_SOCKET, SO_ERROR, &ret, &len) < 0) {
err = errno;
@@ -638,12 +599,14 @@ static gboolean control_connect_cb(GIOCh
}
/* Connect to the HID interrupt channel */
- if (l2cap_connect(&idev->src, &idev->dst, L2CAP_PSM_HIDP_INTR,
- (GIOFunc) interrupt_connect_cb, idev) < 0) {
+ if ((isk = l2cap_connect(&idev->src, &idev->dst, L2CAP_PSM_HIDP_INTR,
+ (GIOFunc) interrupt_connect_cb, idev)) < 0) {
err = errno;
error("L2CAP connect failed:%s (%d)", strerror(errno), errno);
goto failed;
+ } else {
+ add_intr_sk(idev->session, isk);
}
return FALSE;
@@ -652,7 +615,6 @@ failed:
if (csk > 0)
close(csk);
- idev->hidp.ctrl_sock = -1;
err_connection_failed(idev->pending_connect->conn,
idev->pending_connect->msg, strerror(err));
pending_connect_free(idev->pending_connect);
@@ -666,6 +628,7 @@ static int disconnect(struct device *ide
struct fake_input *fake = idev->fake;
struct hidp_conndel_req req;
struct hidp_conninfo ci;
+ struct session_data *session;
int ctl, err;
/* Fake input disconnect */
@@ -713,15 +676,16 @@ static int disconnect(struct device *ide
close(ctl);
+ session = find_session(&idev->src, &idev->dst);
+ if (session)
+ remove_session(session);
+
return 0;
fail:
err = errno;
close(ctl);
errno = err;
- idev->hidp.intr_sock = -1;
- idev->hidp.ctrl_sock = -1;
-
return -err;
}
@@ -766,10 +730,14 @@ static DBusHandlerResult device_connect(
DBusMessage *msg, void *data)
{
struct device *idev = data;
+ int csk;
if (idev->pending_connect)
return err_connection_failed(conn, msg, "Connection in progress");
+ if (find_session(&idev->src, &idev->dst) != NULL)
+ return err_connection_failed(conn, msg, "Connection in progress");
+
if (is_connected(idev))
return err_already_connected(conn, msg);
@@ -795,14 +763,16 @@ static DBusHandlerResult device_connect(
}
/* HID devices */
- if (l2cap_connect(&idev->src, &idev->dst, L2CAP_PSM_HIDP_CTRL,
- (GIOFunc) control_connect_cb, idev) < 0) {
+ if ((csk = l2cap_connect(&idev->src, &idev->dst, L2CAP_PSM_HIDP_CTRL,
+ (GIOFunc) control_connect_cb, idev)) < 0) {
int err = errno;
error("L2CAP connect failed: %s(%d)", strerror(err), err);
pending_connect_free(idev->pending_connect);
idev->pending_connect = NULL;
return err_connection_failed(conn, msg, strerror(err));
+ } else {
+ idev->session = create_session(&idev->src, &idev->dst, csk, idev->pending_connect->conn, dbus_message_get_path(idev->pending_connect->msg));
}
return DBUS_HANDLER_RESULT_HANDLED;
@@ -812,7 +782,6 @@ static DBusHandlerResult device_disconne
DBusMessage *msg, void *data)
{
struct device *idev = data;
- const char *path;
if (disconnect(idev, 0) < 0)
return err_failed(conn, msg, strerror(errno));
@@ -821,12 +790,6 @@ static DBusHandlerResult device_disconne
send_message_and_unref(conn,
dbus_message_new_method_return(msg));
- /* Sending the Disconnect signal */
- path = dbus_message_get_path(msg);
- dbus_connection_emit_signal(conn, path,
- INPUT_DEVICE_INTERFACE, "Disconnected",
- DBUS_TYPE_INVALID);
-
return DBUS_HANDLER_RESULT_HANDLED;
}
@@ -896,14 +859,13 @@ static DBusHandlerResult device_get_name
{
struct device *idev = data;
DBusMessage *reply;
- const char *pname = idev->hidp.name;
reply = dbus_message_new_method_return(msg);
if (!reply)
return DBUS_HANDLER_RESULT_NEED_MEMORY;
dbus_message_append_args(reply,
- DBUS_TYPE_STRING, &pname,
+ DBUS_TYPE_STRING, &idev->name,
DBUS_TYPE_INVALID);
return send_message_and_unref(conn, reply);
@@ -920,7 +882,7 @@ static DBusHandlerResult device_get_prod
return DBUS_HANDLER_RESULT_NEED_MEMORY;
dbus_message_append_args(reply,
- DBUS_TYPE_UINT16, &idev->hidp.product,
+ DBUS_TYPE_UINT16, &idev->product,
DBUS_TYPE_INVALID);
return send_message_and_unref(conn, reply);
@@ -937,7 +899,7 @@ static DBusHandlerResult device_get_vend
return DBUS_HANDLER_RESULT_NEED_MEMORY;
dbus_message_append_args(reply,
- DBUS_TYPE_UINT16, &idev->hidp.vendor,
+ DBUS_TYPE_UINT16, &idev->vendor,
DBUS_TYPE_INVALID);
return send_message_and_unref(conn, reply);
@@ -1011,8 +973,8 @@ int input_device_register(DBusConnection
idev = device_new(src, dst);
path = create_input_path(idev->major, idev->minor);
- /* rd_data must not be deallocated since the memory address is copied */
- memcpy(&idev->hidp, hid, sizeof(struct hidp_connadd_req));
+ idev->vendor = hid->vendor;
+ idev->product = hid->product;
err = register_path(conn, path, idev);
@@ -1139,7 +1101,7 @@ int l2cap_connect(bdaddr_t *src, bdaddr_
g_io_channel_unref(io);
- return 0;
+ return sk;
failed:
err = errno;
Index: utils/input/manager.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/manager.c,v
retrieving revision 1.25
diff -d -u -p -r1.25 manager.c
--- utils/input/manager.c 9 May 2007 14:53:34 -0000 1.25
+++ utils/input/manager.c 15 Jun 2007 12:38:45 -0000
@@ -68,7 +68,7 @@ struct pending_req {
int ctrl_sock;
};
-static GSList *device_paths = NULL; /* Input registered paths */
+GSList *device_paths = NULL; /* Input registered paths */
static DBusConnection *connection = NULL;
@@ -323,6 +323,9 @@ cleanup:
close(pr->ctrl_sock);
pending_req_free(pr);
+ if (hidp.rd_data)
+ g_free(hidp.rd_data);
+
return FALSE;
}
@@ -778,7 +781,7 @@ done:
dbus_message_unref(reply);
}
-static int path_bdaddr_cmp(const char *path, const bdaddr_t *bdaddr)
+int path_bdaddr_cmp(const char *path, const bdaddr_t *bdaddr)
{
bdaddr_t src, dst;
@@ -954,9 +957,13 @@ static void stored_input(char *key, char
* acceptable since the source is different.
*/
if (input_device_register(connection, src, &dst, &hidp, &path) < 0)
- return;
+ goto cleanup;
device_paths = g_slist_append(device_paths, g_strdup(path));
+
+cleanup:
+ if (hidp.rd_data)
+ g_free(hidp.rd_data);
}
static void register_stored_inputs(void)
Index: utils/input/server.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/server.c,v
retrieving revision 1.13
diff -d -u -p -r1.13 server.c
--- utils/input/server.c 10 May 2007 13:57:15 -0000 1.13
+++ utils/input/server.c 15 Jun 2007 12:38:45 -0000
@@ -44,100 +44,12 @@
#include "server.h"
#include "storage.h"
+#include "session.h"
-struct session_data {
- bdaddr_t src;
- bdaddr_t dst;
- int ctrl_sk;
- int intr_sk;
-};
-
-static GSList *sessions = NULL;
static DBusConnection *connection = NULL;
-static struct session_data *find_session(bdaddr_t *src, bdaddr_t *dst)
-{
- GSList *list;
-
- for (list = sessions; list != NULL; list = list->next) {
- struct session_data *session = list->data;
-
- if (!bacmp(&session->src, src) && !bacmp(&session->dst, dst))
- return session;
- }
-
- return NULL;
-}
-
-static gboolean session_event(GIOChannel *chan, GIOCondition cond, gpointer data)
-{
- if (cond & G_IO_NVAL)
- return FALSE;
-
- if (cond & (G_IO_HUP | G_IO_ERR)) {
- g_io_channel_close(chan);
- return FALSE;
- }
-
- return TRUE;
-}
-
-static void create_device(struct session_data *session)
-{
- struct hidp_connadd_req req;
- char addr[18];
- int ctl, err, timeout = 30;
-
- ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HIDP);
- if (ctl < 0) {
- error("Can't open HIDP interface");
- goto cleanup;
- }
-
- ba2str(&session->dst, addr);
-
- memset(&req, 0, sizeof(req));
- req.ctrl_sock = session->ctrl_sk;
- req.intr_sock = session->intr_sk;
- req.flags = 0;
- req.idle_to = timeout * 60;
-
- if (get_stored_device_info(&session->src, &session->dst, &req) < 0) {
- error("Rejected connection from unknown device %s", addr);
- goto cleanup;
- }
-
- if (req.subclass & 0x40) {
- err = encrypt_link(&session->src, &session->dst);
- if (err < 0 && err != -ENOKEY) {
- if (req.rd_data)
- free(req.rd_data);
- goto cleanup;
- }
- }
-
- info("New input device %s (%s)", addr, req.name);
-
- if (req.vendor == 0x054c && req.product == 0x0268) {
- unsigned char buf[] = { 0x53, 0xf4, 0x42, 0x03, 0x00, 0x00 };
- err = write(session->ctrl_sk, buf, sizeof(buf));
- }
-
- err = ioctl(ctl, HIDPCONNADD, &req);
-
- close(ctl);
-
- if (req.rd_data)
- free(req.rd_data);
-
-cleanup:
- sessions = g_slist_remove(sessions, session);
-
- close(session->intr_sk);
- close(session->ctrl_sk);
-
- g_free(session);
-}
+extern GSList *device_paths; /* Input registered paths */
+int path_bdaddr_cmp(const char *path, const bdaddr_t *bdaddr);
static void cancel_authorization(const char *addr)
{
@@ -177,12 +89,7 @@ static void authorization_callback(DBusP
}
dbus_error_free(&derr);
- sessions = g_slist_remove(sessions, session);
-
- close(session->intr_sk);
- close(session->ctrl_sk);
-
- g_free(session);
+ remove_session(session);
} else {
create_device(session);
}
@@ -223,18 +130,6 @@ static int authorize_device(struct sessi
return 0;
}
-static void create_watch(int sk, struct session_data *session)
-{
- GIOChannel *io;
-
- io = g_io_channel_unix_new(sk);
-
- g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
- session_event, session);
-
- g_io_channel_unref(io);
-}
-
static gboolean connect_event(GIOChannel *chan, GIOCondition cond, gpointer data)
{
struct session_data *session;
@@ -243,6 +138,7 @@ static gboolean connect_event(GIOChannel
bdaddr_t src, dst;
unsigned char psm;
int sk, nsk;
+ GSList *l;
sk = g_io_channel_unix_get_fd(chan);
@@ -271,15 +167,10 @@ static gboolean connect_event(GIOChannel
session = find_session(&src, &dst);
if (session) {
if (psm == 19) {
- session->intr_sk = nsk;
+ add_intr_sk(session, nsk);
if (authorize_device(session) < 0) {
error("Authorization request failed");
- sessions = g_slist_remove(sessions, session);
-
- close(session->intr_sk);
- close(session->ctrl_sk);
-
- g_free(session);
+ remove_session(session);
return TRUE;
}
@@ -290,16 +181,17 @@ static gboolean connect_event(GIOChannel
}
} else {
if (psm == 17) {
- session = g_new0(struct session_data, 1);
-
- bacpy(&session->src, &src);
- bacpy(&session->dst, &dst);
- session->ctrl_sk = nsk;
- session->intr_sk = -1;
-
- sessions = g_slist_append(sessions, session);
-
- create_watch(nsk, session);
+ l = g_slist_find_custom(device_paths, &dst, (GCompareFunc) path_bdaddr_cmp);
+ if (!l) {
+ error("Unknown remote");
+ close(nsk);
+ } else {
+ session = create_session(&src, &dst, nsk, connection, l->data);
+ if (session == NULL) {
+ error("Session exists");
+ close(nsk);
+ }
+ }
} else {
error("No control channel available");
close(nsk);
Index: utils/input/session.c
===================================================================
RCS file: utils/input/session.c
diff -N utils/input/session.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ utils/input/session.c 15 Jun 2007 12:38:45 -0000
@@ -0,0 +1,197 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hidp.h>
+
+#include <glib.h>
+
+#include "logging.h"
+#include "dbus.h"
+#include "dbus-helper.h"
+
+#include "session.h"
+#include "storage.h"
+
+#define INPUT_DEVICE_INTERFACE "org.bluez.input.Device"
+
+static GSList *sessions = NULL;
+
+struct session_data *find_session(bdaddr_t *src, bdaddr_t *dst)
+{
+ GSList *list;
+
+ for (list = sessions; list != NULL; list = list->next) {
+ struct session_data *session = list->data;
+
+ if (!bacmp(&session->src, src) && !bacmp(&session->dst, dst))
+ return session;
+ }
+
+ return NULL;
+}
+
+static gboolean session_event(GIOChannel *chan, GIOCondition cond, gpointer data)
+{
+ struct session_data *session = (struct session_data *)data;
+ gboolean result = TRUE;
+
+ if (cond & G_IO_NVAL)
+ result = FALSE;
+ else if (cond & (G_IO_HUP | G_IO_ERR)) {
+ g_io_channel_close(chan);
+ result = FALSE;
+ }
+
+ if ((result == FALSE) && (session != NULL)) {
+ dbus_connection_emit_signal(session->connection, session->path,
+ INPUT_DEVICE_INTERFACE, "Disconnected" ,
+ DBUS_TYPE_INVALID);
+
+ remove_session(session);
+ sessions = g_slist_remove(sessions, session);
+ g_free(session);
+ }
+
+ return result;
+}
+
+void create_device(struct session_data *session)
+{
+ struct hidp_connadd_req req;
+ char addr[18];
+ int ctl, err, timeout = 30;
+
+ ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HIDP);
+ if (ctl < 0) {
+ error("Can't open HIDP interface");
+ goto cleanup;
+ }
+
+ ba2str(&session->dst, addr);
+
+ memset(&req, 0, sizeof(req));
+ req.ctrl_sock = session->ctrl_sk;
+ req.intr_sock = session->intr_sk;
+ req.flags = 0;
+ req.idle_to = timeout * 60;
+
+ if (get_stored_device_info(&session->src, &session->dst, &req) < 0) {
+ error("Rejected connection from unknown device %s", addr);
+ goto cleanup;
+ }
+
+ if (req.subclass & 0x40) {
+ err = encrypt_link(&session->src, &session->dst);
+ if (err < 0 && err != -ENOKEY) {
+ if (req.rd_data)
+ free(req.rd_data);
+ goto cleanup;
+ }
+ }
+
+ info("New input device %s (%s)", addr, req.name);
+
+ if (req.vendor == 0x054c && req.product == 0x0268) {
+ unsigned char buf[] = { 0x53, 0xf4, 0x42, 0x03, 0x00, 0x00 };
+ err = write(session->ctrl_sk, buf, sizeof(buf));
+ }
+
+ err = ioctl(ctl, HIDPCONNADD, &req);
+
+ close(ctl);
+
+ dbus_connection_emit_signal(session->connection, session->path,
+ INPUT_DEVICE_INTERFACE, "Connected" ,
+ DBUS_TYPE_INVALID);
+
+ if (req.rd_data)
+ free(req.rd_data);
+
+ return;
+
+cleanup:
+ remove_session(session);
+}
+
+static void create_watch(int sk, struct session_data *session)
+{
+ GIOChannel *io;
+
+ io = g_io_channel_unix_new(sk);
+
+ g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+ session_event, session);
+
+ g_io_channel_unref(io);
+}
+
+struct session_data* create_session(bdaddr_t *src, bdaddr_t *dst, int ctrl_sk, DBusConnection *connection, const char *path)
+{
+ struct session_data *session = NULL;
+
+ if (find_session(src, dst) != NULL)
+ return NULL;
+
+ session = g_new0(struct session_data, 1);
+
+ bacpy(&session->src, src);
+ bacpy(&session->dst, dst);
+ session->ctrl_sk = ctrl_sk;
+ session->intr_sk = -1;
+ session->connection = connection;
+ session->path = path;
+
+ sessions = g_slist_append(sessions, session);
+
+ create_watch(ctrl_sk, session);
+
+ return session;
+}
+
+void add_intr_sk(struct session_data *session, int intr_sk)
+{
+ session->intr_sk = intr_sk;
+}
+
+void remove_session(struct session_data *session)
+{
+ if (!session)
+ return;
+
+ if (session->intr_sk != -1)
+ close(session->intr_sk);
+ if (session->ctrl_sk != -1)
+ close(session->ctrl_sk);
+}
+
Index: utils/input/session.h
===================================================================
RCS file: utils/input/session.h
diff -N utils/input/session.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ utils/input/session.h 15 Jun 2007 12:38:45 -0000
@@ -0,0 +1,40 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#include <bluetooth/bluetooth.h>
+
+struct session_data {
+ bdaddr_t src;
+ bdaddr_t dst;
+ int ctrl_sk;
+ int intr_sk;
+ DBusConnection *connection;
+ const char *path;
+};
+
+struct session_data *find_session(bdaddr_t *src, bdaddr_t *dst);
+void create_device(struct session_data *session);
+struct session_data* create_session(bdaddr_t *src, bdaddr_t *dst, int ctrl_sk, DBusConnection *connection, const char *path);
+void add_intr_sk(struct session_data *session, int intr_sk);
+void remove_session(struct session_data *session);
+
[-- Attachment #3: Type: text/plain, Size: 286 bytes --]
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
[-- Attachment #4: Type: text/plain, Size: 164 bytes --]
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Bluez-devel] Input service signals
2007-06-15 13:45 [Bluez-devel] Input service signals Frederic Danis
@ 2007-06-16 7:31 ` Marcel Holtmann
2007-06-19 12:45 ` Frederic Danis
1 sibling, 0 replies; 9+ messages in thread
From: Marcel Holtmann @ 2007-06-16 7:31 UTC (permalink / raw)
To: BlueZ development
Hi Frederic,
> I am using the Input service. It is very helpful.
>
> But Connected/Disconnected signals from Device interface are currently
> only sent when connection/disconnection are done through the Device
> interface methods. They are not sent when remote device
> connects/disconnects.
>
> I wrote a patch that move common code between server.c and device.c into
> a new file session.c. This allows to send those signals for all
> connect/disconnect.
I haven't looked at your patch, but I agree that we should send the
signals when the remote device re-connects. I wait for Claudio's or
Johan's comments on that patch.
Regards
Marcel
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Bluez-devel] Input service signals
2007-06-15 13:45 [Bluez-devel] Input service signals Frederic Danis
2007-06-16 7:31 ` Marcel Holtmann
@ 2007-06-19 12:45 ` Frederic Danis
2007-06-19 14:44 ` Claudio Takahasi
1 sibling, 1 reply; 9+ messages in thread
From: Frederic Danis @ 2007-06-19 12:45 UTC (permalink / raw)
To: BlueZ development
[-- Attachment #1: Type: text/plain, Size: 890 bytes --]
Frederic Danis wrote:
> But Connected/Disconnected signals from Device interface are currently
> only sent when connection/disconnection are done through the Device
> interface methods. They are not sent when remote device
> connects/disconnects.
>
> I wrote a patch that move common code between server.c and device.c into
> a new file session.c. This allows to send those signals for all
> connect/disconnect.
>
In previous patch, I removed the disconnected signal for fake input. This is corrected in this one.
Hope this is OK.
Regards
Fred
--
-----------------------------------------------
It is not by improving the oil lamp that one invents the electric bulb!
-----------------------------------------------
Danis Frederic Access Company
Software engineer
Mail : mailto:frederic.danis@access-company.com
-----------------------------------------------
[-- Attachment #2: signals_input.patch --]
[-- Type: text/x-patch, Size: 22712 bytes --]
? utils/input/Makefile.in
Index: utils/input/Makefile.am
===================================================================
RCS file: /cvsroot/bluez/utils/input/Makefile.am,v
retrieving revision 1.17
diff -d -u -p -r1.17 Makefile.am
--- utils/input/Makefile.am 9 May 2007 07:09:58 -0000 1.17
+++ utils/input/Makefile.am 19 Jun 2007 12:40:56 -0000
@@ -12,7 +12,7 @@ service_PROGRAMS = bluetoothd-service-in
bluetoothd_service_input_SOURCES = main.c \
manager.h manager.c error.h error.c \
- server.h server.c device.h device.c storage.h storage.c
+ server.h server.c device.h device.c storage.h storage.c session.c session.h
LDADD = $(top_builddir)/common/libhelper.a \
@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
Index: utils/input/device.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/device.c,v
retrieving revision 1.52
diff -d -u -p -r1.52 device.c
--- utils/input/device.c 29 May 2007 03:58:10 -0000 1.52
+++ utils/input/device.c 19 Jun 2007 12:40:56 -0000
@@ -52,6 +52,7 @@
#include "error.h"
#include "manager.h"
#include "storage.h"
+#include "session.h"
#define INPUT_DEVICE_INTERFACE "org.bluez.input.Device"
@@ -69,6 +70,8 @@ struct fake_input {
int rfcomm; /* RFCOMM socket */
int uinput; /* uinput socket */
uint8_t ch; /* RFCOMM channel number */
+ DBusConnection *conn;
+ char *path;
};
struct device {
@@ -77,9 +80,11 @@ struct device {
char *name;
uint8_t major;
uint8_t minor;
- struct hidp_connadd_req hidp; /* FIXME: Use dynamic alloc? */
+ uint16_t vendor;
+ uint16_t product;
struct fake_input *fake;
struct pending_connect *pending_connect;
+ struct session_data *session;
};
static struct device *device_new(bdaddr_t *src, bdaddr_t *dst)
@@ -98,9 +103,6 @@ static struct device *device_new(bdaddr_
idev->major = (cls >> 8) & 0x1f;
idev->minor = (cls >> 2) & 0x3f;
- /* FIXME: hidp could be alloc dynamically */
- snprintf(idev->hidp.name, 128, "%s", idev->name);
-
return idev;
}
@@ -121,8 +123,6 @@ static void device_free(struct device *i
return;
if (idev->name)
g_free(idev->name);
- if (idev->hidp.rd_data)
- g_free(idev->hidp.rd_data);
if (idev->fake)
g_free(idev->fake);
if (idev->pending_connect)
@@ -331,7 +331,7 @@ static gboolean rfcomm_io_cb(GIOChannel
uint16_t key;
if (cond & G_IO_NVAL)
- return FALSE;
+ goto disconnected;
if (cond & (G_IO_HUP | G_IO_ERR)) {
error("Hangup or error on rfcomm server socket");
@@ -364,6 +364,11 @@ failed:
fake->uinput = -1;
g_io_channel_unref(fake->io);
+disconnected:
+ /* Sending the Disconnected signal */
+ dbus_connection_emit_signal(fake->conn, fake->path,
+ INPUT_DEVICE_INTERFACE, "Disconnected",
+ DBUS_TYPE_INVALID);
return FALSE;
}
@@ -512,8 +517,7 @@ failed:
static gboolean interrupt_connect_cb(GIOChannel *chan,
GIOCondition cond, struct device *idev)
{
- int ctl, isk, ret, err;
- const char *path;
+ int isk, ret, err;
socklen_t len;
isk = g_io_channel_unix_get_fd(chan);
@@ -531,9 +535,6 @@ static gboolean interrupt_connect_cb(GIO
}
- idev->hidp.intr_sock = isk;
- idev->hidp.idle_to = 30 * 60; /* 30 minutes */
-
len = sizeof(ret);
if (getsockopt(isk, SOL_SOCKET, SO_ERROR, &ret, &len) < 0) {
err = errno;
@@ -547,54 +548,24 @@ static gboolean interrupt_connect_cb(GIO
goto failed;
}
- ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HIDP);
- if (ctl < 0) {
- err = errno;
- error("Can't open HIDP control socket");
- goto failed;
- }
-
- if (idev->hidp.subclass & 0x40) {
- int ret;
- ret = encrypt_link(&idev->src, &idev->dst);
- if (ret < 0 && ret != -ENOKEY) {
- err = -ret;
- close(ctl);
- goto failed;
- }
- }
-
- if (ioctl(ctl, HIDPCONNADD, &idev->hidp) < 0) {
- err = errno;
- close(ctl);
- goto failed;
- }
+ create_device(idev->session);
/* Replying to the requestor */
send_message_and_unref(idev->pending_connect->conn,
dbus_message_new_method_return(idev->pending_connect->msg));
- /* Sending the Connected signal */
- path = dbus_message_get_path(idev->pending_connect->msg);
- dbus_connection_emit_signal(idev->pending_connect->conn, path,
- INPUT_DEVICE_INTERFACE, "Connected" ,
- DBUS_TYPE_INVALID);
-
- close (ctl);
goto cleanup;
+
failed:
err_connection_failed(idev->pending_connect->conn,
idev->pending_connect->msg, strerror(err));
-cleanup:
if (isk > 0)
close(isk);
- close(idev->hidp.ctrl_sock);
-
- idev->hidp.intr_sock = -1;
- idev->hidp.ctrl_sock = -1;
+ remove_session(idev->session);
+cleanup:
pending_connect_free(idev->pending_connect);
idev->pending_connect = NULL;
@@ -604,7 +575,7 @@ cleanup:
static gboolean control_connect_cb(GIOChannel *chan,
GIOCondition cond, struct device *idev)
{
- int ret, csk, err;
+ int ret, csk, isk, err;
socklen_t len;
csk = g_io_channel_unix_get_fd(chan);
@@ -621,9 +592,6 @@ static gboolean control_connect_cb(GIOCh
goto failed;
}
- /* Set HID control channel */
- idev->hidp.ctrl_sock = csk;
-
len = sizeof(ret);
if (getsockopt(csk, SOL_SOCKET, SO_ERROR, &ret, &len) < 0) {
err = errno;
@@ -638,12 +606,14 @@ static gboolean control_connect_cb(GIOCh
}
/* Connect to the HID interrupt channel */
- if (l2cap_connect(&idev->src, &idev->dst, L2CAP_PSM_HIDP_INTR,
- (GIOFunc) interrupt_connect_cb, idev) < 0) {
+ if ((isk = l2cap_connect(&idev->src, &idev->dst, L2CAP_PSM_HIDP_INTR,
+ (GIOFunc) interrupt_connect_cb, idev)) < 0) {
err = errno;
error("L2CAP connect failed:%s (%d)", strerror(errno), errno);
goto failed;
+ } else {
+ add_intr_sk(idev->session, isk);
}
return FALSE;
@@ -652,7 +622,6 @@ failed:
if (csk > 0)
close(csk);
- idev->hidp.ctrl_sock = -1;
err_connection_failed(idev->pending_connect->conn,
idev->pending_connect->msg, strerror(err));
pending_connect_free(idev->pending_connect);
@@ -666,6 +635,7 @@ static int disconnect(struct device *ide
struct fake_input *fake = idev->fake;
struct hidp_conndel_req req;
struct hidp_conninfo ci;
+ struct session_data *session;
int ctl, err;
/* Fake input disconnect */
@@ -713,15 +683,16 @@ static int disconnect(struct device *ide
close(ctl);
+ session = find_session(&idev->src, &idev->dst);
+ if (session)
+ remove_session(session);
+
return 0;
fail:
err = errno;
close(ctl);
errno = err;
- idev->hidp.intr_sock = -1;
- idev->hidp.ctrl_sock = -1;
-
return -err;
}
@@ -766,10 +737,14 @@ static DBusHandlerResult device_connect(
DBusMessage *msg, void *data)
{
struct device *idev = data;
+ int csk;
if (idev->pending_connect)
return err_connection_failed(conn, msg, "Connection in progress");
+ if (find_session(&idev->src, &idev->dst) != NULL)
+ return err_connection_failed(conn, msg, "Connection in progress");
+
if (is_connected(idev))
return err_already_connected(conn, msg);
@@ -795,14 +770,16 @@ static DBusHandlerResult device_connect(
}
/* HID devices */
- if (l2cap_connect(&idev->src, &idev->dst, L2CAP_PSM_HIDP_CTRL,
- (GIOFunc) control_connect_cb, idev) < 0) {
+ if ((csk = l2cap_connect(&idev->src, &idev->dst, L2CAP_PSM_HIDP_CTRL,
+ (GIOFunc) control_connect_cb, idev)) < 0) {
int err = errno;
error("L2CAP connect failed: %s(%d)", strerror(err), err);
pending_connect_free(idev->pending_connect);
idev->pending_connect = NULL;
return err_connection_failed(conn, msg, strerror(err));
+ } else {
+ idev->session = create_session(&idev->src, &idev->dst, csk, idev->pending_connect->conn, dbus_message_get_path(idev->pending_connect->msg));
}
return DBUS_HANDLER_RESULT_HANDLED;
@@ -812,7 +789,6 @@ static DBusHandlerResult device_disconne
DBusMessage *msg, void *data)
{
struct device *idev = data;
- const char *path;
if (disconnect(idev, 0) < 0)
return err_failed(conn, msg, strerror(errno));
@@ -821,12 +797,6 @@ static DBusHandlerResult device_disconne
send_message_and_unref(conn,
dbus_message_new_method_return(msg));
- /* Sending the Disconnect signal */
- path = dbus_message_get_path(msg);
- dbus_connection_emit_signal(conn, path,
- INPUT_DEVICE_INTERFACE, "Disconnected",
- DBUS_TYPE_INVALID);
-
return DBUS_HANDLER_RESULT_HANDLED;
}
@@ -896,14 +866,13 @@ static DBusHandlerResult device_get_name
{
struct device *idev = data;
DBusMessage *reply;
- const char *pname = idev->hidp.name;
reply = dbus_message_new_method_return(msg);
if (!reply)
return DBUS_HANDLER_RESULT_NEED_MEMORY;
dbus_message_append_args(reply,
- DBUS_TYPE_STRING, &pname,
+ DBUS_TYPE_STRING, &idev->name,
DBUS_TYPE_INVALID);
return send_message_and_unref(conn, reply);
@@ -920,7 +889,7 @@ static DBusHandlerResult device_get_prod
return DBUS_HANDLER_RESULT_NEED_MEMORY;
dbus_message_append_args(reply,
- DBUS_TYPE_UINT16, &idev->hidp.product,
+ DBUS_TYPE_UINT16, &idev->product,
DBUS_TYPE_INVALID);
return send_message_and_unref(conn, reply);
@@ -937,7 +906,7 @@ static DBusHandlerResult device_get_vend
return DBUS_HANDLER_RESULT_NEED_MEMORY;
dbus_message_append_args(reply,
- DBUS_TYPE_UINT16, &idev->hidp.vendor,
+ DBUS_TYPE_UINT16, &idev->vendor,
DBUS_TYPE_INVALID);
return send_message_and_unref(conn, reply);
@@ -1011,8 +980,8 @@ int input_device_register(DBusConnection
idev = device_new(src, dst);
path = create_input_path(idev->major, idev->minor);
- /* rd_data must not be deallocated since the memory address is copied */
- memcpy(&idev->hidp, hid, sizeof(struct hidp_connadd_req));
+ idev->vendor = hid->vendor;
+ idev->product = hid->product;
err = register_path(conn, path, idev);
@@ -1034,6 +1003,8 @@ int fake_input_register(DBusConnection *
idev->fake = g_new0(struct fake_input, 1);
idev->fake->ch = ch;
+ idev->fake->conn = conn;
+ idev->fake->path = path;
err = register_path(conn, path, idev);
@@ -1139,7 +1110,7 @@ int l2cap_connect(bdaddr_t *src, bdaddr_
g_io_channel_unref(io);
- return 0;
+ return sk;
failed:
err = errno;
Index: utils/input/manager.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/manager.c,v
retrieving revision 1.25
diff -d -u -p -r1.25 manager.c
--- utils/input/manager.c 9 May 2007 14:53:34 -0000 1.25
+++ utils/input/manager.c 19 Jun 2007 12:40:57 -0000
@@ -68,7 +68,7 @@ struct pending_req {
int ctrl_sock;
};
-static GSList *device_paths = NULL; /* Input registered paths */
+GSList *device_paths = NULL; /* Input registered paths */
static DBusConnection *connection = NULL;
@@ -323,6 +323,9 @@ cleanup:
close(pr->ctrl_sock);
pending_req_free(pr);
+ if (hidp.rd_data)
+ g_free(hidp.rd_data);
+
return FALSE;
}
@@ -778,7 +781,7 @@ done:
dbus_message_unref(reply);
}
-static int path_bdaddr_cmp(const char *path, const bdaddr_t *bdaddr)
+int path_bdaddr_cmp(const char *path, const bdaddr_t *bdaddr)
{
bdaddr_t src, dst;
@@ -954,9 +957,13 @@ static void stored_input(char *key, char
* acceptable since the source is different.
*/
if (input_device_register(connection, src, &dst, &hidp, &path) < 0)
- return;
+ goto cleanup;
device_paths = g_slist_append(device_paths, g_strdup(path));
+
+cleanup:
+ if (hidp.rd_data)
+ g_free(hidp.rd_data);
}
static void register_stored_inputs(void)
Index: utils/input/server.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/server.c,v
retrieving revision 1.13
diff -d -u -p -r1.13 server.c
--- utils/input/server.c 10 May 2007 13:57:15 -0000 1.13
+++ utils/input/server.c 19 Jun 2007 12:40:57 -0000
@@ -44,100 +44,12 @@
#include "server.h"
#include "storage.h"
+#include "session.h"
-struct session_data {
- bdaddr_t src;
- bdaddr_t dst;
- int ctrl_sk;
- int intr_sk;
-};
-
-static GSList *sessions = NULL;
static DBusConnection *connection = NULL;
-static struct session_data *find_session(bdaddr_t *src, bdaddr_t *dst)
-{
- GSList *list;
-
- for (list = sessions; list != NULL; list = list->next) {
- struct session_data *session = list->data;
-
- if (!bacmp(&session->src, src) && !bacmp(&session->dst, dst))
- return session;
- }
-
- return NULL;
-}
-
-static gboolean session_event(GIOChannel *chan, GIOCondition cond, gpointer data)
-{
- if (cond & G_IO_NVAL)
- return FALSE;
-
- if (cond & (G_IO_HUP | G_IO_ERR)) {
- g_io_channel_close(chan);
- return FALSE;
- }
-
- return TRUE;
-}
-
-static void create_device(struct session_data *session)
-{
- struct hidp_connadd_req req;
- char addr[18];
- int ctl, err, timeout = 30;
-
- ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HIDP);
- if (ctl < 0) {
- error("Can't open HIDP interface");
- goto cleanup;
- }
-
- ba2str(&session->dst, addr);
-
- memset(&req, 0, sizeof(req));
- req.ctrl_sock = session->ctrl_sk;
- req.intr_sock = session->intr_sk;
- req.flags = 0;
- req.idle_to = timeout * 60;
-
- if (get_stored_device_info(&session->src, &session->dst, &req) < 0) {
- error("Rejected connection from unknown device %s", addr);
- goto cleanup;
- }
-
- if (req.subclass & 0x40) {
- err = encrypt_link(&session->src, &session->dst);
- if (err < 0 && err != -ENOKEY) {
- if (req.rd_data)
- free(req.rd_data);
- goto cleanup;
- }
- }
-
- info("New input device %s (%s)", addr, req.name);
-
- if (req.vendor == 0x054c && req.product == 0x0268) {
- unsigned char buf[] = { 0x53, 0xf4, 0x42, 0x03, 0x00, 0x00 };
- err = write(session->ctrl_sk, buf, sizeof(buf));
- }
-
- err = ioctl(ctl, HIDPCONNADD, &req);
-
- close(ctl);
-
- if (req.rd_data)
- free(req.rd_data);
-
-cleanup:
- sessions = g_slist_remove(sessions, session);
-
- close(session->intr_sk);
- close(session->ctrl_sk);
-
- g_free(session);
-}
+extern GSList *device_paths; /* Input registered paths */
+int path_bdaddr_cmp(const char *path, const bdaddr_t *bdaddr);
static void cancel_authorization(const char *addr)
{
@@ -177,12 +89,7 @@ static void authorization_callback(DBusP
}
dbus_error_free(&derr);
- sessions = g_slist_remove(sessions, session);
-
- close(session->intr_sk);
- close(session->ctrl_sk);
-
- g_free(session);
+ remove_session(session);
} else {
create_device(session);
}
@@ -223,18 +130,6 @@ static int authorize_device(struct sessi
return 0;
}
-static void create_watch(int sk, struct session_data *session)
-{
- GIOChannel *io;
-
- io = g_io_channel_unix_new(sk);
-
- g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
- session_event, session);
-
- g_io_channel_unref(io);
-}
-
static gboolean connect_event(GIOChannel *chan, GIOCondition cond, gpointer data)
{
struct session_data *session;
@@ -243,6 +138,7 @@ static gboolean connect_event(GIOChannel
bdaddr_t src, dst;
unsigned char psm;
int sk, nsk;
+ GSList *l;
sk = g_io_channel_unix_get_fd(chan);
@@ -271,15 +167,10 @@ static gboolean connect_event(GIOChannel
session = find_session(&src, &dst);
if (session) {
if (psm == 19) {
- session->intr_sk = nsk;
+ add_intr_sk(session, nsk);
if (authorize_device(session) < 0) {
error("Authorization request failed");
- sessions = g_slist_remove(sessions, session);
-
- close(session->intr_sk);
- close(session->ctrl_sk);
-
- g_free(session);
+ remove_session(session);
return TRUE;
}
@@ -290,16 +181,17 @@ static gboolean connect_event(GIOChannel
}
} else {
if (psm == 17) {
- session = g_new0(struct session_data, 1);
-
- bacpy(&session->src, &src);
- bacpy(&session->dst, &dst);
- session->ctrl_sk = nsk;
- session->intr_sk = -1;
-
- sessions = g_slist_append(sessions, session);
-
- create_watch(nsk, session);
+ l = g_slist_find_custom(device_paths, &dst, (GCompareFunc) path_bdaddr_cmp);
+ if (!l) {
+ error("Unknown remote");
+ close(nsk);
+ } else {
+ session = create_session(&src, &dst, nsk, connection, l->data);
+ if (session == NULL) {
+ error("Session exists");
+ close(nsk);
+ }
+ }
} else {
error("No control channel available");
close(nsk);
Index: utils/input/session.c
===================================================================
RCS file: utils/input/session.c
diff -N utils/input/session.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ utils/input/session.c 19 Jun 2007 12:40:57 -0000
@@ -0,0 +1,197 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hidp.h>
+
+#include <glib.h>
+
+#include "logging.h"
+#include "dbus.h"
+#include "dbus-helper.h"
+
+#include "session.h"
+#include "storage.h"
+
+#define INPUT_DEVICE_INTERFACE "org.bluez.input.Device"
+
+static GSList *sessions = NULL;
+
+struct session_data *find_session(bdaddr_t *src, bdaddr_t *dst)
+{
+ GSList *list;
+
+ for (list = sessions; list != NULL; list = list->next) {
+ struct session_data *session = list->data;
+
+ if (!bacmp(&session->src, src) && !bacmp(&session->dst, dst))
+ return session;
+ }
+
+ return NULL;
+}
+
+static gboolean session_event(GIOChannel *chan, GIOCondition cond, gpointer data)
+{
+ struct session_data *session = (struct session_data *)data;
+ gboolean result = TRUE;
+
+ if (cond & G_IO_NVAL)
+ result = FALSE;
+ else if (cond & (G_IO_HUP | G_IO_ERR)) {
+ g_io_channel_close(chan);
+ result = FALSE;
+ }
+
+ if ((result == FALSE) && (session != NULL)) {
+ dbus_connection_emit_signal(session->connection, session->path,
+ INPUT_DEVICE_INTERFACE, "Disconnected" ,
+ DBUS_TYPE_INVALID);
+
+ remove_session(session);
+ sessions = g_slist_remove(sessions, session);
+ g_free(session);
+ }
+
+ return result;
+}
+
+void create_device(struct session_data *session)
+{
+ struct hidp_connadd_req req;
+ char addr[18];
+ int ctl, err, timeout = 30;
+
+ ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HIDP);
+ if (ctl < 0) {
+ error("Can't open HIDP interface");
+ goto cleanup;
+ }
+
+ ba2str(&session->dst, addr);
+
+ memset(&req, 0, sizeof(req));
+ req.ctrl_sock = session->ctrl_sk;
+ req.intr_sock = session->intr_sk;
+ req.flags = 0;
+ req.idle_to = timeout * 60;
+
+ if (get_stored_device_info(&session->src, &session->dst, &req) < 0) {
+ error("Rejected connection from unknown device %s", addr);
+ goto cleanup;
+ }
+
+ if (req.subclass & 0x40) {
+ err = encrypt_link(&session->src, &session->dst);
+ if (err < 0 && err != -ENOKEY) {
+ if (req.rd_data)
+ free(req.rd_data);
+ goto cleanup;
+ }
+ }
+
+ info("New input device %s (%s)", addr, req.name);
+
+ if (req.vendor == 0x054c && req.product == 0x0268) {
+ unsigned char buf[] = { 0x53, 0xf4, 0x42, 0x03, 0x00, 0x00 };
+ err = write(session->ctrl_sk, buf, sizeof(buf));
+ }
+
+ err = ioctl(ctl, HIDPCONNADD, &req);
+
+ close(ctl);
+
+ dbus_connection_emit_signal(session->connection, session->path,
+ INPUT_DEVICE_INTERFACE, "Connected" ,
+ DBUS_TYPE_INVALID);
+
+ if (req.rd_data)
+ free(req.rd_data);
+
+ return;
+
+cleanup:
+ remove_session(session);
+}
+
+static void create_watch(int sk, struct session_data *session)
+{
+ GIOChannel *io;
+
+ io = g_io_channel_unix_new(sk);
+
+ g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+ session_event, session);
+
+ g_io_channel_unref(io);
+}
+
+struct session_data* create_session(bdaddr_t *src, bdaddr_t *dst, int ctrl_sk, DBusConnection *connection, const char *path)
+{
+ struct session_data *session = NULL;
+
+ if (find_session(src, dst) != NULL)
+ return NULL;
+
+ session = g_new0(struct session_data, 1);
+
+ bacpy(&session->src, src);
+ bacpy(&session->dst, dst);
+ session->ctrl_sk = ctrl_sk;
+ session->intr_sk = -1;
+ session->connection = connection;
+ session->path = path;
+
+ sessions = g_slist_append(sessions, session);
+
+ create_watch(ctrl_sk, session);
+
+ return session;
+}
+
+void add_intr_sk(struct session_data *session, int intr_sk)
+{
+ session->intr_sk = intr_sk;
+}
+
+void remove_session(struct session_data *session)
+{
+ if (!session)
+ return;
+
+ if (session->intr_sk != -1)
+ close(session->intr_sk);
+ if (session->ctrl_sk != -1)
+ close(session->ctrl_sk);
+}
+
Index: utils/input/session.h
===================================================================
RCS file: utils/input/session.h
diff -N utils/input/session.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ utils/input/session.h 19 Jun 2007 12:40:57 -0000
@@ -0,0 +1,40 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#include <bluetooth/bluetooth.h>
+
+struct session_data {
+ bdaddr_t src;
+ bdaddr_t dst;
+ int ctrl_sk;
+ int intr_sk;
+ DBusConnection *connection;
+ const char *path;
+};
+
+struct session_data *find_session(bdaddr_t *src, bdaddr_t *dst);
+void create_device(struct session_data *session);
+struct session_data* create_session(bdaddr_t *src, bdaddr_t *dst, int ctrl_sk, DBusConnection *connection, const char *path);
+void add_intr_sk(struct session_data *session, int intr_sk);
+void remove_session(struct session_data *session);
+
[-- Attachment #3: Type: text/plain, Size: 286 bytes --]
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
[-- Attachment #4: Type: text/plain, Size: 164 bytes --]
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Bluez-devel] Input service signals
2007-06-19 12:45 ` Frederic Danis
@ 2007-06-19 14:44 ` Claudio Takahasi
2007-06-19 15:16 ` Frederic Danis
0 siblings, 1 reply; 9+ messages in thread
From: Claudio Takahasi @ 2007-06-19 14:44 UTC (permalink / raw)
To: BlueZ development
SGkgRnJlZGVyaWMsCgpJIGdvdCBhIHNlZ21lbnRhdGlvbiBmYXVsdCB3aGVuIGNhbGxpbmcgRGV2
aWNlLkNvbm5lY3QgKyBEZXZpY2UuRGlzY29ubmVjdAoKVGhlIHBhdGggY29udGVudCBpcyB3cm9u
ZyhpdCBjb250YWlucyB0aGUgYnVzIGlkKS4KCihnZGIpIGJhY2t0cmFjZQojMCAgMHgwODA1Mjg1
YiBpbiBkYnVzX2Nvbm5lY3Rpb25fZW1pdF9zaWduYWxfdmFsaXN0IChjb25uPTB4ODA1N2FjOCwK
cGF0aD0weDgwNTdkYjggIjoxLjM0IiwgaW50ZXJmYWNlPTB4ODA1M2RmNSAib3JnLmJsdWV6Lmlu
cHV0LkRldmljZSIsCiAgICBuYW1lPTB4ODA1M2U3OCAiRGlzY29ubmVjdGVkIiwgZmlyc3Q9MCwg
dmFyX2FyZ3M9MHhiZmUzOTM0NAoiSFfvv73vv71oXDIyM++/ve+/vVxyXDIwNO+/ve+/vUhcMjM3
XDAwNVxiICIpIGF0IGRidXMtaGVscGVyLmM6NDc4CiMxICAweDA4MDUyOWU3IGluIGRidXNfY29u
bmVjdGlvbl9lbWl0X3NpZ25hbCAoY29ubj0weDgwNTdhYzgsCnBhdGg9MHg4MDU3ZGI4ICI6MS4z
NCIsIGludGVyZmFjZT0weDgwNTNkZjUgIm9yZy5ibHVlei5pbnB1dC5EZXZpY2UiLAogICAgbmFt
ZT0weDgwNTNlNzggIkRpc2Nvbm5lY3RlZCIsIGZpcnN0PTApIGF0IGRidXMtaGVscGVyLmM6NTMx
CgpDb3VsZCB5b3UgcGxlYXNlIGZpeCBpdD8KCkJyLApDbGF1ZGlvLgoKT24gNi8xOS8wNywgRnJl
ZGVyaWMgRGFuaXMgPGZyZWRlcmljLmRhbmlzQGFjY2Vzcy1jb21wYW55LmNvbT4gd3JvdGU6Cj4g
RnJlZGVyaWMgRGFuaXMgd3JvdGU6Cj4gPiBCdXQgQ29ubmVjdGVkL0Rpc2Nvbm5lY3RlZCBzaWdu
YWxzIGZyb20gRGV2aWNlIGludGVyZmFjZSBhcmUgY3VycmVudGx5Cj4gPiBvbmx5IHNlbnQgd2hl
biBjb25uZWN0aW9uL2Rpc2Nvbm5lY3Rpb24gYXJlIGRvbmUgdGhyb3VnaCB0aGUgRGV2aWNlCj4g
PiBpbnRlcmZhY2UgbWV0aG9kcy4gVGhleSBhcmUgbm90IHNlbnQgd2hlbiByZW1vdGUgZGV2aWNl
Cj4gPiBjb25uZWN0cy9kaXNjb25uZWN0cy4KPiA+Cj4gPiBJIHdyb3RlIGEgcGF0Y2ggdGhhdCBt
b3ZlIGNvbW1vbiBjb2RlIGJldHdlZW4gc2VydmVyLmMgYW5kIGRldmljZS5jIGludG8KPiA+IGEg
bmV3IGZpbGUgc2Vzc2lvbi5jLiBUaGlzIGFsbG93cyB0byBzZW5kIHRob3NlIHNpZ25hbHMgZm9y
IGFsbAo+ID4gY29ubmVjdC9kaXNjb25uZWN0Lgo+ID4KPgo+IEluIHByZXZpb3VzIHBhdGNoLCBJ
IHJlbW92ZWQgdGhlIGRpc2Nvbm5lY3RlZCBzaWduYWwgZm9yIGZha2UgaW5wdXQuIFRoaXMgaXMg
Y29ycmVjdGVkIGluIHRoaXMgb25lLgo+Cj4gSG9wZSB0aGlzIGlzIE9LLgo+Cj4gUmVnYXJkcwo+
Cj4gRnJlZAo+Cj4gLS0KPiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLQo+IEl0IGlzIG5vdCBieSBpbXByb3ZpbmcgdGhlIG9pbCBsYW1wIHRoYXQgb25lIGlu
dmVudHMgdGhlIGVsZWN0cmljIGJ1bGIhCj4gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0KPiBEYW5pcyBGcmVkZXJpYyAgICAgICAgICAgICAgICAgICBBY2Nl
c3MgQ29tcGFueQo+IFNvZnR3YXJlIGVuZ2luZWVyCj4gTWFpbCA6IG1haWx0bzpmcmVkZXJpYy5k
YW5pc0BhY2Nlc3MtY29tcGFueS5jb20KPiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLQotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tClRoaXMgU0YubmV0IGVtYWlsIGlzIHNw
b25zb3JlZCBieSBEQjIgRXhwcmVzcwpEb3dubG9hZCBEQjIgRXhwcmVzcyBDIC0gdGhlIEZSRUUg
dmVyc2lvbiBvZiBEQjIgZXhwcmVzcyBhbmQgdGFrZQpjb250cm9sIG9mIHlvdXIgWE1MLiBObyBs
aW1pdHMuIEp1c3QgZGF0YS4gQ2xpY2sgdG8gZ2V0IGl0IG5vdy4KaHR0cDovL3NvdXJjZWZvcmdl
Lm5ldC9wb3dlcmJhci9kYjIvCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fCkJsdWV6LWRldmVsIG1haWxpbmcgbGlzdApCbHVlei1kZXZlbEBsaXN0cy5zb3Vy
Y2Vmb3JnZS5uZXQKaHR0cHM6Ly9saXN0cy5zb3VyY2Vmb3JnZS5uZXQvbGlzdHMvbGlzdGluZm8v
Ymx1ZXotZGV2ZWwK
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Bluez-devel] Input service signals
2007-06-19 14:44 ` Claudio Takahasi
@ 2007-06-19 15:16 ` Frederic Danis
2007-06-19 16:32 ` Claudio Takahasi
0 siblings, 1 reply; 9+ messages in thread
From: Frederic Danis @ 2007-06-19 15:16 UTC (permalink / raw)
To: BlueZ development
Q2xhdWRpbyBUYWthaGFzaSB3cm90ZToKPiBIaSBGcmVkZXJpYywKPiAKPiBJIGdvdCBhIHNlZ21l
bnRhdGlvbiBmYXVsdCB3aGVuIGNhbGxpbmcgRGV2aWNlLkNvbm5lY3QgKyBEZXZpY2UuRGlzY29u
bmVjdAo+IAo+IFRoZSBwYXRoIGNvbnRlbnQgaXMgd3JvbmcoaXQgY29udGFpbnMgdGhlIGJ1cyBp
ZCkuCj4gCj4gKGdkYikgYmFja3RyYWNlCj4gIzAgIDB4MDgwNTI4NWIgaW4gZGJ1c19jb25uZWN0
aW9uX2VtaXRfc2lnbmFsX3ZhbGlzdCAoY29ubj0weDgwNTdhYzgsCj4gcGF0aD0weDgwNTdkYjgg
IjoxLjM0IiwgaW50ZXJmYWNlPTB4ODA1M2RmNSAib3JnLmJsdWV6LmlucHV0LkRldmljZSIsCj4g
ICAgIG5hbWU9MHg4MDUzZTc4ICJEaXNjb25uZWN0ZWQiLCBmaXJzdD0wLCB2YXJfYXJncz0weGJm
ZTM5MzQ0Cj4gIkhX77+977+9aFwyMjPvv73vv71cclwyMDTvv73vv71IXDIzN1wwMDVcYiAiKSBh
dCBkYnVzLWhlbHBlci5jOjQ3OAo+ICMxICAweDA4MDUyOWU3IGluIGRidXNfY29ubmVjdGlvbl9l
bWl0X3NpZ25hbCAoY29ubj0weDgwNTdhYzgsCj4gcGF0aD0weDgwNTdkYjggIjoxLjM0IiwgaW50
ZXJmYWNlPTB4ODA1M2RmNSAib3JnLmJsdWV6LmlucHV0LkRldmljZSIsCj4gICAgIG5hbWU9MHg4
MDUzZTc4ICJEaXNjb25uZWN0ZWQiLCBmaXJzdD0wKSBhdCBkYnVzLWhlbHBlci5jOjUzMQo+IAo+
IENvdWxkIHlvdSBwbGVhc2UgZml4IGl0PwoKSGVsbG8gQ2xhdWRpbywKCldoZW4gZG8geW91IGdl
dCB0aGlzIGNyYXNoID8gdXNpbmcgSElEIGRldmljZSBvciBmYWtlIGlucHV0ID8KClRoYW5rcwoK
RnJlZAoKLS0gCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
Ckl0IGlzIG5vdCBieSBpbXByb3ZpbmcgdGhlIG9pbCBsYW1wIHRoYXQgb25lIGludmVudHMgdGhl
IGVsZWN0cmljIGJ1bGIhCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tCkRhbmlzIEZyZWRlcmljICAgICAgICAgICAgICAgICAgIEFjY2VzcyBDb21wYW55ClNv
ZnR3YXJlIGVuZ2luZWVyCk1haWwgOiBtYWlsdG86ZnJlZGVyaWMuZGFuaXNAYWNjZXNzLWNvbXBh
bnkuY29tCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCgot
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tClRoaXMgU0YubmV0IGVtYWlsIGlzIHNwb25zb3JlZCBieSBEQjIgRXhw
cmVzcwpEb3dubG9hZCBEQjIgRXhwcmVzcyBDIC0gdGhlIEZSRUUgdmVyc2lvbiBvZiBEQjIgZXhw
cmVzcyBhbmQgdGFrZQpjb250cm9sIG9mIHlvdXIgWE1MLiBObyBsaW1pdHMuIEp1c3QgZGF0YS4g
Q2xpY2sgdG8gZ2V0IGl0IG5vdy4KaHR0cDovL3NvdXJjZWZvcmdlLm5ldC9wb3dlcmJhci9kYjIv
Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkJsdWV6LWRl
dmVsIG1haWxpbmcgbGlzdApCbHVlei1kZXZlbEBsaXN0cy5zb3VyY2Vmb3JnZS5uZXQKaHR0cHM6
Ly9saXN0cy5zb3VyY2Vmb3JnZS5uZXQvbGlzdHMvbGlzdGluZm8vYmx1ZXotZGV2ZWwK
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Bluez-devel] Input service signals
2007-06-19 15:16 ` Frederic Danis
@ 2007-06-19 16:32 ` Claudio Takahasi
2007-06-20 16:06 ` Frederic Danis
0 siblings, 1 reply; 9+ messages in thread
From: Claudio Takahasi @ 2007-06-19 16:32 UTC (permalink / raw)
To: BlueZ development
SGkgRnJlZGVyaWMsCgpsYXRlc3QgY3ZzICsgeW91ciBwYXRjaCB1c2luZyB0aGUgSElEIGRldmlj
ZS4KCkJSLApDbGF1ZGlvLgpPbiA2LzE5LzA3LCBGcmVkZXJpYyBEYW5pcyA8ZnJlZGVyaWMuZGFu
aXNAYWNjZXNzLWNvbXBhbnkuY29tPiB3cm90ZToKPiBDbGF1ZGlvIFRha2FoYXNpIHdyb3RlOgo+
ID4gSGkgRnJlZGVyaWMsCj4gPgo+ID4gSSBnb3QgYSBzZWdtZW50YXRpb24gZmF1bHQgd2hlbiBj
YWxsaW5nIERldmljZS5Db25uZWN0ICsgRGV2aWNlLkRpc2Nvbm5lY3QKPiA+Cj4gPiBUaGUgcGF0
aCBjb250ZW50IGlzIHdyb25nKGl0IGNvbnRhaW5zIHRoZSBidXMgaWQpLgo+ID4KPiA+IChnZGIp
IGJhY2t0cmFjZQo+ID4gIzAgIDB4MDgwNTI4NWIgaW4gZGJ1c19jb25uZWN0aW9uX2VtaXRfc2ln
bmFsX3ZhbGlzdCAoY29ubj0weDgwNTdhYzgsCj4gPiBwYXRoPTB4ODA1N2RiOCAiOjEuMzQiLCBp
bnRlcmZhY2U9MHg4MDUzZGY1ICJvcmcuYmx1ZXouaW5wdXQuRGV2aWNlIiwKPiA+ICAgICBuYW1l
PTB4ODA1M2U3OCAiRGlzY29ubmVjdGVkIiwgZmlyc3Q9MCwgdmFyX2FyZ3M9MHhiZmUzOTM0NAo+
ID4gIkhX77+977+9aFwyMjPvv73vv71cclwyMDTvv73vv71IXDIzN1wwMDVcYiAiKSBhdCBkYnVz
LWhlbHBlci5jOjQ3OAo+ID4gIzEgIDB4MDgwNTI5ZTcgaW4gZGJ1c19jb25uZWN0aW9uX2VtaXRf
c2lnbmFsIChjb25uPTB4ODA1N2FjOCwKPiA+IHBhdGg9MHg4MDU3ZGI4ICI6MS4zNCIsIGludGVy
ZmFjZT0weDgwNTNkZjUgIm9yZy5ibHVlei5pbnB1dC5EZXZpY2UiLAo+ID4gICAgIG5hbWU9MHg4
MDUzZTc4ICJEaXNjb25uZWN0ZWQiLCBmaXJzdD0wKSBhdCBkYnVzLWhlbHBlci5jOjUzMQo+ID4K
PiA+IENvdWxkIHlvdSBwbGVhc2UgZml4IGl0Pwo+Cj4gSGVsbG8gQ2xhdWRpbywKPgo+IFdoZW4g
ZG8geW91IGdldCB0aGlzIGNyYXNoID8gdXNpbmcgSElEIGRldmljZSBvciBmYWtlIGlucHV0ID8K
Pgo+IFRoYW5rcwo+Cj4gRnJlZAo+Cj4gLS0KPiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLQo+IEl0IGlzIG5vdCBieSBpbXByb3ZpbmcgdGhlIG9pbCBsYW1w
IHRoYXQgb25lIGludmVudHMgdGhlIGVsZWN0cmljIGJ1bGIhCj4gLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiBEYW5pcyBGcmVkZXJpYyAgICAgICAgICAg
ICAgICAgICBBY2Nlc3MgQ29tcGFueQo+IFNvZnR3YXJlIGVuZ2luZWVyCj4gTWFpbCA6IG1haWx0
bzpmcmVkZXJpYy5kYW5pc0BhY2Nlc3MtY29tcGFueS5jb20KPiAtLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+Cj4gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+IFRoaXMg
U0YubmV0IGVtYWlsIGlzIHNwb25zb3JlZCBieSBEQjIgRXhwcmVzcwo+IERvd25sb2FkIERCMiBF
eHByZXNzIEMgLSB0aGUgRlJFRSB2ZXJzaW9uIG9mIERCMiBleHByZXNzIGFuZCB0YWtlCj4gY29u
dHJvbCBvZiB5b3VyIFhNTC4gTm8gbGltaXRzLiBKdXN0IGRhdGEuIENsaWNrIHRvIGdldCBpdCBu
b3cuCj4gaHR0cDovL3NvdXJjZWZvcmdlLm5ldC9wb3dlcmJhci9kYjIvCj4gX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBCbHVlei1kZXZlbCBtYWlsaW5n
IGxpc3QKPiBCbHVlei1kZXZlbEBsaXN0cy5zb3VyY2Vmb3JnZS5uZXQKPiBodHRwczovL2xpc3Rz
LnNvdXJjZWZvcmdlLm5ldC9saXN0cy9saXN0aW5mby9ibHVlei1kZXZlbAo+CgoKLS0gCi0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpDbGF1
ZGlvIFRha2FoYXNpCkluc3RpdHV0byBOb2tpYSBkZSBUZWNub2xvZ2lhIC0gSU5kVAotLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tClRoaXMgU0YubmV0IGVtYWlsIGlzIHNwb25zb3JlZCBieSBEQjIgRXhwcmVzcwpE
b3dubG9hZCBEQjIgRXhwcmVzcyBDIC0gdGhlIEZSRUUgdmVyc2lvbiBvZiBEQjIgZXhwcmVzcyBh
bmQgdGFrZQpjb250cm9sIG9mIHlvdXIgWE1MLiBObyBsaW1pdHMuIEp1c3QgZGF0YS4gQ2xpY2sg
dG8gZ2V0IGl0IG5vdy4KaHR0cDovL3NvdXJjZWZvcmdlLm5ldC9wb3dlcmJhci9kYjIvCl9fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkJsdWV6LWRldmVsIG1h
aWxpbmcgbGlzdApCbHVlei1kZXZlbEBsaXN0cy5zb3VyY2Vmb3JnZS5uZXQKaHR0cHM6Ly9saXN0
cy5zb3VyY2Vmb3JnZS5uZXQvbGlzdHMvbGlzdGluZm8vYmx1ZXotZGV2ZWwK
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Bluez-devel] Input service signals
2007-06-19 16:32 ` Claudio Takahasi
@ 2007-06-20 16:06 ` Frederic Danis
2007-06-21 12:36 ` Claudio Takahasi
0 siblings, 1 reply; 9+ messages in thread
From: Frederic Danis @ 2007-06-20 16:06 UTC (permalink / raw)
To: BlueZ development
[-- Attachment #1: Type: text/plain, Size: 1504 bytes --]
Claudio Takahasi wrote:
> Hi Frederic,
>
> latest cvs + your patch using the HID device.
>
> BR,
> Claudio.
> On 6/19/07, Frederic Danis <frederic.danis@access-company.com> wrote:
>> Claudio Takahasi wrote:
>>> Hi Frederic,
>>>
>>> I got a segmentation fault when calling Device.Connect + Device.Disconnect
>>>
>>> The path content is wrong(it contains the bus id).
>>>
>>> (gdb) backtrace
>>> #0 0x0805285b in dbus_connection_emit_signal_valist (conn=0x8057ac8,
>>> path=0x8057db8 ":1.34", interface=0x8053df5 "org.bluez.input.Device",
>>> name=0x8053e78 "Disconnected", first=0, var_args=0xbfe39344
>>> "HW��h\223��\r\204��H\237\005\b ") at dbus-helper.c:478
>>> #1 0x080529e7 in dbus_connection_emit_signal (conn=0x8057ac8,
>>> path=0x8057db8 ":1.34", interface=0x8053df5 "org.bluez.input.Device",
>>> name=0x8053e78 "Disconnected", first=0) at dbus-helper.c:531
>>>
>>> Could you please fix it?
>> Hello Claudio,
>>
>> When do you get this crash ? using HID device or fake input ?
>>
Hello Claudio,
Here is a new version of the patch, fixing the crash (I do not understand how I had test it before without this error, sorry ;-[)
BR
Fred
--
-----------------------------------------------
It is not by improving the oil lamp that one invents the electric bulb!
-----------------------------------------------
Danis Frederic Access Company
Software engineer
Mail : mailto:frederic.danis@access-company.com
-----------------------------------------------
[-- Attachment #2: signals_input.patch --]
[-- Type: text/x-patch, Size: 22817 bytes --]
? utils/input/Makefile.in
Index: utils/input/Makefile.am
===================================================================
RCS file: /cvsroot/bluez/utils/input/Makefile.am,v
retrieving revision 1.17
diff -d -u -p -r1.17 Makefile.am
--- utils/input/Makefile.am 9 May 2007 07:09:58 -0000 1.17
+++ utils/input/Makefile.am 20 Jun 2007 16:03:02 -0000
@@ -12,7 +12,7 @@ service_PROGRAMS = bluetoothd-service-in
bluetoothd_service_input_SOURCES = main.c \
manager.h manager.c error.h error.c \
- server.h server.c device.h device.c storage.h storage.c
+ server.h server.c device.h device.c storage.h storage.c session.c session.h
LDADD = $(top_builddir)/common/libhelper.a \
@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
Index: utils/input/device.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/device.c,v
retrieving revision 1.52
diff -d -u -p -r1.52 device.c
--- utils/input/device.c 29 May 2007 03:58:10 -0000 1.52
+++ utils/input/device.c 20 Jun 2007 16:03:02 -0000
@@ -52,6 +52,7 @@
#include "error.h"
#include "manager.h"
#include "storage.h"
+#include "session.h"
#define INPUT_DEVICE_INTERFACE "org.bluez.input.Device"
@@ -69,6 +70,8 @@ struct fake_input {
int rfcomm; /* RFCOMM socket */
int uinput; /* uinput socket */
uint8_t ch; /* RFCOMM channel number */
+ DBusConnection *conn;
+ const char *path;
};
struct device {
@@ -77,9 +80,11 @@ struct device {
char *name;
uint8_t major;
uint8_t minor;
- struct hidp_connadd_req hidp; /* FIXME: Use dynamic alloc? */
+ uint16_t vendor;
+ uint16_t product;
struct fake_input *fake;
struct pending_connect *pending_connect;
+ struct session_data *session;
};
static struct device *device_new(bdaddr_t *src, bdaddr_t *dst)
@@ -98,9 +103,6 @@ static struct device *device_new(bdaddr_
idev->major = (cls >> 8) & 0x1f;
idev->minor = (cls >> 2) & 0x3f;
- /* FIXME: hidp could be alloc dynamically */
- snprintf(idev->hidp.name, 128, "%s", idev->name);
-
return idev;
}
@@ -121,8 +123,8 @@ static void device_free(struct device *i
return;
if (idev->name)
g_free(idev->name);
- if (idev->hidp.rd_data)
- g_free(idev->hidp.rd_data);
+ if (idev->fake->path)
+ g_free(idev->fake->path);
if (idev->fake)
g_free(idev->fake);
if (idev->pending_connect)
@@ -331,7 +333,7 @@ static gboolean rfcomm_io_cb(GIOChannel
uint16_t key;
if (cond & G_IO_NVAL)
- return FALSE;
+ goto disconnected;
if (cond & (G_IO_HUP | G_IO_ERR)) {
error("Hangup or error on rfcomm server socket");
@@ -364,6 +366,11 @@ failed:
fake->uinput = -1;
g_io_channel_unref(fake->io);
+disconnected:
+ /* Sending the Disconnected signal */
+ dbus_connection_emit_signal(fake->conn, fake->path,
+ INPUT_DEVICE_INTERFACE, "Disconnected",
+ DBUS_TYPE_INVALID);
return FALSE;
}
@@ -512,8 +519,7 @@ failed:
static gboolean interrupt_connect_cb(GIOChannel *chan,
GIOCondition cond, struct device *idev)
{
- int ctl, isk, ret, err;
- const char *path;
+ int isk, ret, err;
socklen_t len;
isk = g_io_channel_unix_get_fd(chan);
@@ -531,9 +537,6 @@ static gboolean interrupt_connect_cb(GIO
}
- idev->hidp.intr_sock = isk;
- idev->hidp.idle_to = 30 * 60; /* 30 minutes */
-
len = sizeof(ret);
if (getsockopt(isk, SOL_SOCKET, SO_ERROR, &ret, &len) < 0) {
err = errno;
@@ -547,54 +550,24 @@ static gboolean interrupt_connect_cb(GIO
goto failed;
}
- ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HIDP);
- if (ctl < 0) {
- err = errno;
- error("Can't open HIDP control socket");
- goto failed;
- }
-
- if (idev->hidp.subclass & 0x40) {
- int ret;
- ret = encrypt_link(&idev->src, &idev->dst);
- if (ret < 0 && ret != -ENOKEY) {
- err = -ret;
- close(ctl);
- goto failed;
- }
- }
-
- if (ioctl(ctl, HIDPCONNADD, &idev->hidp) < 0) {
- err = errno;
- close(ctl);
- goto failed;
- }
+ create_device(idev->session);
/* Replying to the requestor */
send_message_and_unref(idev->pending_connect->conn,
dbus_message_new_method_return(idev->pending_connect->msg));
- /* Sending the Connected signal */
- path = dbus_message_get_path(idev->pending_connect->msg);
- dbus_connection_emit_signal(idev->pending_connect->conn, path,
- INPUT_DEVICE_INTERFACE, "Connected" ,
- DBUS_TYPE_INVALID);
-
- close (ctl);
goto cleanup;
+
failed:
err_connection_failed(idev->pending_connect->conn,
idev->pending_connect->msg, strerror(err));
-cleanup:
if (isk > 0)
close(isk);
- close(idev->hidp.ctrl_sock);
-
- idev->hidp.intr_sock = -1;
- idev->hidp.ctrl_sock = -1;
+ remove_session(idev->session);
+cleanup:
pending_connect_free(idev->pending_connect);
idev->pending_connect = NULL;
@@ -604,7 +577,7 @@ cleanup:
static gboolean control_connect_cb(GIOChannel *chan,
GIOCondition cond, struct device *idev)
{
- int ret, csk, err;
+ int ret, csk, isk, err;
socklen_t len;
csk = g_io_channel_unix_get_fd(chan);
@@ -621,9 +594,6 @@ static gboolean control_connect_cb(GIOCh
goto failed;
}
- /* Set HID control channel */
- idev->hidp.ctrl_sock = csk;
-
len = sizeof(ret);
if (getsockopt(csk, SOL_SOCKET, SO_ERROR, &ret, &len) < 0) {
err = errno;
@@ -638,12 +608,14 @@ static gboolean control_connect_cb(GIOCh
}
/* Connect to the HID interrupt channel */
- if (l2cap_connect(&idev->src, &idev->dst, L2CAP_PSM_HIDP_INTR,
- (GIOFunc) interrupt_connect_cb, idev) < 0) {
+ if ((isk = l2cap_connect(&idev->src, &idev->dst, L2CAP_PSM_HIDP_INTR,
+ (GIOFunc) interrupt_connect_cb, idev)) < 0) {
err = errno;
error("L2CAP connect failed:%s (%d)", strerror(errno), errno);
goto failed;
+ } else {
+ add_intr_sk(idev->session, isk);
}
return FALSE;
@@ -652,7 +624,6 @@ failed:
if (csk > 0)
close(csk);
- idev->hidp.ctrl_sock = -1;
err_connection_failed(idev->pending_connect->conn,
idev->pending_connect->msg, strerror(err));
pending_connect_free(idev->pending_connect);
@@ -666,6 +637,7 @@ static int disconnect(struct device *ide
struct fake_input *fake = idev->fake;
struct hidp_conndel_req req;
struct hidp_conninfo ci;
+ struct session_data *session;
int ctl, err;
/* Fake input disconnect */
@@ -713,15 +685,16 @@ static int disconnect(struct device *ide
close(ctl);
+ session = find_session(&idev->src, &idev->dst);
+ if (session)
+ remove_session(session);
+
return 0;
fail:
err = errno;
close(ctl);
errno = err;
- idev->hidp.intr_sock = -1;
- idev->hidp.ctrl_sock = -1;
-
return -err;
}
@@ -766,10 +739,14 @@ static DBusHandlerResult device_connect(
DBusMessage *msg, void *data)
{
struct device *idev = data;
+ int csk;
if (idev->pending_connect)
return err_connection_failed(conn, msg, "Connection in progress");
+ if (find_session(&idev->src, &idev->dst) != NULL)
+ return err_connection_failed(conn, msg, "Connection in progress");
+
if (is_connected(idev))
return err_already_connected(conn, msg);
@@ -795,14 +772,16 @@ static DBusHandlerResult device_connect(
}
/* HID devices */
- if (l2cap_connect(&idev->src, &idev->dst, L2CAP_PSM_HIDP_CTRL,
- (GIOFunc) control_connect_cb, idev) < 0) {
+ if ((csk = l2cap_connect(&idev->src, &idev->dst, L2CAP_PSM_HIDP_CTRL,
+ (GIOFunc) control_connect_cb, idev)) < 0) {
int err = errno;
error("L2CAP connect failed: %s(%d)", strerror(err), err);
pending_connect_free(idev->pending_connect);
idev->pending_connect = NULL;
return err_connection_failed(conn, msg, strerror(err));
+ } else {
+ idev->session = create_session(&idev->src, &idev->dst, csk, idev->pending_connect->conn, dbus_message_get_path(idev->pending_connect->msg));
}
return DBUS_HANDLER_RESULT_HANDLED;
@@ -812,7 +791,6 @@ static DBusHandlerResult device_disconne
DBusMessage *msg, void *data)
{
struct device *idev = data;
- const char *path;
if (disconnect(idev, 0) < 0)
return err_failed(conn, msg, strerror(errno));
@@ -821,12 +799,6 @@ static DBusHandlerResult device_disconne
send_message_and_unref(conn,
dbus_message_new_method_return(msg));
- /* Sending the Disconnect signal */
- path = dbus_message_get_path(msg);
- dbus_connection_emit_signal(conn, path,
- INPUT_DEVICE_INTERFACE, "Disconnected",
- DBUS_TYPE_INVALID);
-
return DBUS_HANDLER_RESULT_HANDLED;
}
@@ -896,14 +868,13 @@ static DBusHandlerResult device_get_name
{
struct device *idev = data;
DBusMessage *reply;
- const char *pname = idev->hidp.name;
reply = dbus_message_new_method_return(msg);
if (!reply)
return DBUS_HANDLER_RESULT_NEED_MEMORY;
dbus_message_append_args(reply,
- DBUS_TYPE_STRING, &pname,
+ DBUS_TYPE_STRING, &idev->name,
DBUS_TYPE_INVALID);
return send_message_and_unref(conn, reply);
@@ -920,7 +891,7 @@ static DBusHandlerResult device_get_prod
return DBUS_HANDLER_RESULT_NEED_MEMORY;
dbus_message_append_args(reply,
- DBUS_TYPE_UINT16, &idev->hidp.product,
+ DBUS_TYPE_UINT16, &idev->product,
DBUS_TYPE_INVALID);
return send_message_and_unref(conn, reply);
@@ -937,7 +908,7 @@ static DBusHandlerResult device_get_vend
return DBUS_HANDLER_RESULT_NEED_MEMORY;
dbus_message_append_args(reply,
- DBUS_TYPE_UINT16, &idev->hidp.vendor,
+ DBUS_TYPE_UINT16, &idev->vendor,
DBUS_TYPE_INVALID);
return send_message_and_unref(conn, reply);
@@ -1011,8 +982,8 @@ int input_device_register(DBusConnection
idev = device_new(src, dst);
path = create_input_path(idev->major, idev->minor);
- /* rd_data must not be deallocated since the memory address is copied */
- memcpy(&idev->hidp, hid, sizeof(struct hidp_connadd_req));
+ idev->vendor = hid->vendor;
+ idev->product = hid->product;
err = register_path(conn, path, idev);
@@ -1034,6 +1005,8 @@ int fake_input_register(DBusConnection *
idev->fake = g_new0(struct fake_input, 1);
idev->fake->ch = ch;
+ idev->fake->conn = conn;
+ idev->fake->path = g_strdup(path);
err = register_path(conn, path, idev);
@@ -1139,7 +1112,7 @@ int l2cap_connect(bdaddr_t *src, bdaddr_
g_io_channel_unref(io);
- return 0;
+ return sk;
failed:
err = errno;
Index: utils/input/manager.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/manager.c,v
retrieving revision 1.25
diff -d -u -p -r1.25 manager.c
--- utils/input/manager.c 9 May 2007 14:53:34 -0000 1.25
+++ utils/input/manager.c 20 Jun 2007 16:03:02 -0000
@@ -68,7 +68,7 @@ struct pending_req {
int ctrl_sock;
};
-static GSList *device_paths = NULL; /* Input registered paths */
+GSList *device_paths = NULL; /* Input registered paths */
static DBusConnection *connection = NULL;
@@ -323,6 +323,9 @@ cleanup:
close(pr->ctrl_sock);
pending_req_free(pr);
+ if (hidp.rd_data)
+ g_free(hidp.rd_data);
+
return FALSE;
}
@@ -778,7 +781,7 @@ done:
dbus_message_unref(reply);
}
-static int path_bdaddr_cmp(const char *path, const bdaddr_t *bdaddr)
+int path_bdaddr_cmp(const char *path, const bdaddr_t *bdaddr)
{
bdaddr_t src, dst;
@@ -954,9 +957,13 @@ static void stored_input(char *key, char
* acceptable since the source is different.
*/
if (input_device_register(connection, src, &dst, &hidp, &path) < 0)
- return;
+ goto cleanup;
device_paths = g_slist_append(device_paths, g_strdup(path));
+
+cleanup:
+ if (hidp.rd_data)
+ g_free(hidp.rd_data);
}
static void register_stored_inputs(void)
Index: utils/input/server.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/server.c,v
retrieving revision 1.13
diff -d -u -p -r1.13 server.c
--- utils/input/server.c 10 May 2007 13:57:15 -0000 1.13
+++ utils/input/server.c 20 Jun 2007 16:03:02 -0000
@@ -44,100 +44,12 @@
#include "server.h"
#include "storage.h"
+#include "session.h"
-struct session_data {
- bdaddr_t src;
- bdaddr_t dst;
- int ctrl_sk;
- int intr_sk;
-};
-
-static GSList *sessions = NULL;
static DBusConnection *connection = NULL;
-static struct session_data *find_session(bdaddr_t *src, bdaddr_t *dst)
-{
- GSList *list;
-
- for (list = sessions; list != NULL; list = list->next) {
- struct session_data *session = list->data;
-
- if (!bacmp(&session->src, src) && !bacmp(&session->dst, dst))
- return session;
- }
-
- return NULL;
-}
-
-static gboolean session_event(GIOChannel *chan, GIOCondition cond, gpointer data)
-{
- if (cond & G_IO_NVAL)
- return FALSE;
-
- if (cond & (G_IO_HUP | G_IO_ERR)) {
- g_io_channel_close(chan);
- return FALSE;
- }
-
- return TRUE;
-}
-
-static void create_device(struct session_data *session)
-{
- struct hidp_connadd_req req;
- char addr[18];
- int ctl, err, timeout = 30;
-
- ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HIDP);
- if (ctl < 0) {
- error("Can't open HIDP interface");
- goto cleanup;
- }
-
- ba2str(&session->dst, addr);
-
- memset(&req, 0, sizeof(req));
- req.ctrl_sock = session->ctrl_sk;
- req.intr_sock = session->intr_sk;
- req.flags = 0;
- req.idle_to = timeout * 60;
-
- if (get_stored_device_info(&session->src, &session->dst, &req) < 0) {
- error("Rejected connection from unknown device %s", addr);
- goto cleanup;
- }
-
- if (req.subclass & 0x40) {
- err = encrypt_link(&session->src, &session->dst);
- if (err < 0 && err != -ENOKEY) {
- if (req.rd_data)
- free(req.rd_data);
- goto cleanup;
- }
- }
-
- info("New input device %s (%s)", addr, req.name);
-
- if (req.vendor == 0x054c && req.product == 0x0268) {
- unsigned char buf[] = { 0x53, 0xf4, 0x42, 0x03, 0x00, 0x00 };
- err = write(session->ctrl_sk, buf, sizeof(buf));
- }
-
- err = ioctl(ctl, HIDPCONNADD, &req);
-
- close(ctl);
-
- if (req.rd_data)
- free(req.rd_data);
-
-cleanup:
- sessions = g_slist_remove(sessions, session);
-
- close(session->intr_sk);
- close(session->ctrl_sk);
-
- g_free(session);
-}
+extern GSList *device_paths; /* Input registered paths */
+int path_bdaddr_cmp(const char *path, const bdaddr_t *bdaddr);
static void cancel_authorization(const char *addr)
{
@@ -177,12 +89,7 @@ static void authorization_callback(DBusP
}
dbus_error_free(&derr);
- sessions = g_slist_remove(sessions, session);
-
- close(session->intr_sk);
- close(session->ctrl_sk);
-
- g_free(session);
+ remove_session(session);
} else {
create_device(session);
}
@@ -223,18 +130,6 @@ static int authorize_device(struct sessi
return 0;
}
-static void create_watch(int sk, struct session_data *session)
-{
- GIOChannel *io;
-
- io = g_io_channel_unix_new(sk);
-
- g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
- session_event, session);
-
- g_io_channel_unref(io);
-}
-
static gboolean connect_event(GIOChannel *chan, GIOCondition cond, gpointer data)
{
struct session_data *session;
@@ -243,6 +138,7 @@ static gboolean connect_event(GIOChannel
bdaddr_t src, dst;
unsigned char psm;
int sk, nsk;
+ GSList *l;
sk = g_io_channel_unix_get_fd(chan);
@@ -271,15 +167,10 @@ static gboolean connect_event(GIOChannel
session = find_session(&src, &dst);
if (session) {
if (psm == 19) {
- session->intr_sk = nsk;
+ add_intr_sk(session, nsk);
if (authorize_device(session) < 0) {
error("Authorization request failed");
- sessions = g_slist_remove(sessions, session);
-
- close(session->intr_sk);
- close(session->ctrl_sk);
-
- g_free(session);
+ remove_session(session);
return TRUE;
}
@@ -290,16 +181,17 @@ static gboolean connect_event(GIOChannel
}
} else {
if (psm == 17) {
- session = g_new0(struct session_data, 1);
-
- bacpy(&session->src, &src);
- bacpy(&session->dst, &dst);
- session->ctrl_sk = nsk;
- session->intr_sk = -1;
-
- sessions = g_slist_append(sessions, session);
-
- create_watch(nsk, session);
+ l = g_slist_find_custom(device_paths, &dst, (GCompareFunc) path_bdaddr_cmp);
+ if (!l) {
+ error("Unknown remote");
+ close(nsk);
+ } else {
+ session = create_session(&src, &dst, nsk, connection, l->data);
+ if (session == NULL) {
+ error("Session exists");
+ close(nsk);
+ }
+ }
} else {
error("No control channel available");
close(nsk);
Index: utils/input/session.c
===================================================================
RCS file: utils/input/session.c
diff -N utils/input/session.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ utils/input/session.c 20 Jun 2007 16:03:02 -0000
@@ -0,0 +1,198 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hidp.h>
+
+#include <glib.h>
+
+#include "logging.h"
+#include "dbus.h"
+#include "dbus-helper.h"
+
+#include "session.h"
+#include "storage.h"
+
+#define INPUT_DEVICE_INTERFACE "org.bluez.input.Device"
+
+static GSList *sessions = NULL;
+
+struct session_data *find_session(bdaddr_t *src, bdaddr_t *dst)
+{
+ GSList *list;
+
+ for (list = sessions; list != NULL; list = list->next) {
+ struct session_data *session = list->data;
+
+ if (!bacmp(&session->src, src) && !bacmp(&session->dst, dst))
+ return session;
+ }
+
+ return NULL;
+}
+
+static gboolean session_event(GIOChannel *chan, GIOCondition cond, gpointer data)
+{
+ struct session_data *session = (struct session_data *)data;
+ gboolean result = TRUE;
+
+ if (cond & G_IO_NVAL)
+ result = FALSE;
+ else if (cond & (G_IO_HUP | G_IO_ERR)) {
+ g_io_channel_close(chan);
+ result = FALSE;
+ }
+
+ if ((result == FALSE) && (session != NULL)) {
+ dbus_connection_emit_signal(session->connection, session->path,
+ INPUT_DEVICE_INTERFACE, "Disconnected" ,
+ DBUS_TYPE_INVALID);
+
+ remove_session(session);
+ sessions = g_slist_remove(sessions, session);
+ g_free(session->path);
+ g_free(session);
+ }
+
+ return result;
+}
+
+void create_device(struct session_data *session)
+{
+ struct hidp_connadd_req req;
+ char addr[18];
+ int ctl, err, timeout = 30;
+
+ ctl = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HIDP);
+ if (ctl < 0) {
+ error("Can't open HIDP interface");
+ goto cleanup;
+ }
+
+ ba2str(&session->dst, addr);
+
+ memset(&req, 0, sizeof(req));
+ req.ctrl_sock = session->ctrl_sk;
+ req.intr_sock = session->intr_sk;
+ req.flags = 0;
+ req.idle_to = timeout * 60;
+
+ if (get_stored_device_info(&session->src, &session->dst, &req) < 0) {
+ error("Rejected connection from unknown device %s", addr);
+ goto cleanup;
+ }
+
+ if (req.subclass & 0x40) {
+ err = encrypt_link(&session->src, &session->dst);
+ if (err < 0 && err != -ENOKEY) {
+ if (req.rd_data)
+ free(req.rd_data);
+ goto cleanup;
+ }
+ }
+
+ info("New input device %s (%s)", addr, req.name);
+
+ if (req.vendor == 0x054c && req.product == 0x0268) {
+ unsigned char buf[] = { 0x53, 0xf4, 0x42, 0x03, 0x00, 0x00 };
+ err = write(session->ctrl_sk, buf, sizeof(buf));
+ }
+
+ err = ioctl(ctl, HIDPCONNADD, &req);
+
+ close(ctl);
+
+ dbus_connection_emit_signal(session->connection, session->path,
+ INPUT_DEVICE_INTERFACE, "Connected" ,
+ DBUS_TYPE_INVALID);
+
+ if (req.rd_data)
+ free(req.rd_data);
+
+ return;
+
+cleanup:
+ remove_session(session);
+}
+
+static void create_watch(int sk, struct session_data *session)
+{
+ GIOChannel *io;
+
+ io = g_io_channel_unix_new(sk);
+
+ g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+ session_event, session);
+
+ g_io_channel_unref(io);
+}
+
+struct session_data* create_session(bdaddr_t *src, bdaddr_t *dst, int ctrl_sk, DBusConnection *connection, const char *path)
+{
+ struct session_data *session = NULL;
+
+ if (find_session(src, dst) != NULL)
+ return NULL;
+
+ session = g_new0(struct session_data, 1);
+
+ bacpy(&session->src, src);
+ bacpy(&session->dst, dst);
+ session->ctrl_sk = ctrl_sk;
+ session->intr_sk = -1;
+ session->connection = connection;
+ session->path = g_strdup(path);
+
+ sessions = g_slist_append(sessions, session);
+
+ create_watch(ctrl_sk, session);
+
+ return session;
+}
+
+void add_intr_sk(struct session_data *session, int intr_sk)
+{
+ session->intr_sk = intr_sk;
+}
+
+void remove_session(struct session_data *session)
+{
+ if (!session)
+ return;
+
+ if (session->intr_sk != -1)
+ close(session->intr_sk);
+ if (session->ctrl_sk != -1)
+ close(session->ctrl_sk);
+}
+
Index: utils/input/session.h
===================================================================
RCS file: utils/input/session.h
diff -N utils/input/session.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ utils/input/session.h 20 Jun 2007 16:03:02 -0000
@@ -0,0 +1,40 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#include <bluetooth/bluetooth.h>
+
+struct session_data {
+ bdaddr_t src;
+ bdaddr_t dst;
+ int ctrl_sk;
+ int intr_sk;
+ DBusConnection *connection;
+ const char *path;
+};
+
+struct session_data *find_session(bdaddr_t *src, bdaddr_t *dst);
+void create_device(struct session_data *session);
+struct session_data* create_session(bdaddr_t *src, bdaddr_t *dst, int ctrl_sk, DBusConnection *connection, const char *path);
+void add_intr_sk(struct session_data *session, int intr_sk);
+void remove_session(struct session_data *session);
+
[-- Attachment #3: Type: text/plain, Size: 286 bytes --]
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
[-- Attachment #4: Type: text/plain, Size: 164 bytes --]
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Bluez-devel] Input service signals
2007-06-20 16:06 ` Frederic Danis
@ 2007-06-21 12:36 ` Claudio Takahasi
2007-06-22 17:32 ` Claudio Takahasi
0 siblings, 1 reply; 9+ messages in thread
From: Claudio Takahasi @ 2007-06-21 12:36 UTC (permalink / raw)
To: BlueZ development
T24gNi8yMC8wNywgRnJlZGVyaWMgRGFuaXMgPGZyZWRlcmljLmRhbmlzQGFjY2Vzcy1jb21wYW55
LmNvbT4gd3JvdGU6Cj4gQ2xhdWRpbyBUYWthaGFzaSB3cm90ZToKPiA+IEhpIEZyZWRlcmljLAo+
ID4KPiA+IGxhdGVzdCBjdnMgKyB5b3VyIHBhdGNoIHVzaW5nIHRoZSBISUQgZGV2aWNlLgo+ID4K
PiA+IEJSLAo+ID4gQ2xhdWRpby4KPiA+IE9uIDYvMTkvMDcsIEZyZWRlcmljIERhbmlzIDxmcmVk
ZXJpYy5kYW5pc0BhY2Nlc3MtY29tcGFueS5jb20+IHdyb3RlOgo+ID4+IENsYXVkaW8gVGFrYWhh
c2kgd3JvdGU6Cj4gPj4+IEhpIEZyZWRlcmljLAo+ID4+Pgo+ID4+PiBJIGdvdCBhIHNlZ21lbnRh
dGlvbiBmYXVsdCB3aGVuIGNhbGxpbmcgRGV2aWNlLkNvbm5lY3QgKyBEZXZpY2UuRGlzY29ubmVj
dAo+ID4+Pgo+ID4+PiBUaGUgcGF0aCBjb250ZW50IGlzIHdyb25nKGl0IGNvbnRhaW5zIHRoZSBi
dXMgaWQpLgo+ID4+Pgo+ID4+PiAoZ2RiKSBiYWNrdHJhY2UKPiA+Pj4gIzAgIDB4MDgwNTI4NWIg
aW4gZGJ1c19jb25uZWN0aW9uX2VtaXRfc2lnbmFsX3ZhbGlzdCAoY29ubj0weDgwNTdhYzgsCj4g
Pj4+IHBhdGg9MHg4MDU3ZGI4ICI6MS4zNCIsIGludGVyZmFjZT0weDgwNTNkZjUgIm9yZy5ibHVl
ei5pbnB1dC5EZXZpY2UiLAo+ID4+PiAgICAgbmFtZT0weDgwNTNlNzggIkRpc2Nvbm5lY3RlZCIs
IGZpcnN0PTAsIHZhcl9hcmdzPTB4YmZlMzkzNDQKPiA+Pj4gIkhX77+977+9aFwyMjPvv73vv71c
clwyMDTvv73vv71IXDIzN1wwMDVcYiAiKSBhdCBkYnVzLWhlbHBlci5jOjQ3OAo+ID4+PiAjMSAg
MHgwODA1MjllNyBpbiBkYnVzX2Nvbm5lY3Rpb25fZW1pdF9zaWduYWwgKGNvbm49MHg4MDU3YWM4
LAo+ID4+PiBwYXRoPTB4ODA1N2RiOCAiOjEuMzQiLCBpbnRlcmZhY2U9MHg4MDUzZGY1ICJvcmcu
Ymx1ZXouaW5wdXQuRGV2aWNlIiwKPiA+Pj4gICAgIG5hbWU9MHg4MDUzZTc4ICJEaXNjb25uZWN0
ZWQiLCBmaXJzdD0wKSBhdCBkYnVzLWhlbHBlci5jOjUzMQo+ID4+Pgo+ID4+PiBDb3VsZCB5b3Ug
cGxlYXNlIGZpeCBpdD8KPiA+PiBIZWxsbyBDbGF1ZGlvLAo+ID4+Cj4gPj4gV2hlbiBkbyB5b3Ug
Z2V0IHRoaXMgY3Jhc2ggPyB1c2luZyBISUQgZGV2aWNlIG9yIGZha2UgaW5wdXQgPwo+ID4+Cj4K
PiBIZWxsbyBDbGF1ZGlvLAo+Cj4gSGVyZSBpcyBhIG5ldyB2ZXJzaW9uIG9mIHRoZSBwYXRjaCwg
Zml4aW5nIHRoZSBjcmFzaCAoSSBkbyBub3QgdW5kZXJzdGFuZCBob3cgSSBoYWQgdGVzdCBpdCBi
ZWZvcmUgd2l0aG91dCB0aGlzIGVycm9yLCBzb3JyeSA7LVspCj4KPiBCUgo+Cj4gRnJlZAo+Cj4g
LS0KPiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+IEl0
IGlzIG5vdCBieSBpbXByb3ZpbmcgdGhlIG9pbCBsYW1wIHRoYXQgb25lIGludmVudHMgdGhlIGVs
ZWN0cmljIGJ1bGIhCj4gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0KPiBEYW5pcyBGcmVkZXJpYyAgICAgICAgICAgICAgICAgICBBY2Nlc3MgQ29tcGFueQo+
IFNvZnR3YXJlIGVuZ2luZWVyCj4gTWFpbCA6IG1haWx0bzpmcmVkZXJpYy5kYW5pc0BhY2Nlc3Mt
Y29tcGFueS5jb20KPiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLQoKSGkgRnJlZGVyaWMsCgpHZW5lcmFsbHkgSSB0ZXN0IHVzaW5nIGRidXMtc2VuZCwgeW91
IGNhbiBmaW5kIHNvbWUgZXhhbXBsZXMgaGVyZToKaHR0cDovL3dpa2kuYmx1ZXoub3JnL3dpa2kv
SE9XVE8vSW5wdXREZXZpY2VzCgpUbyByZXByb2R1Y2UgdGhlIHJlcG9ydGVkIGJ1ZyBJIHdhcyBj
YWxsaW5nOgoxLiBDcmVhdGVEZXZpY2UKMi4gQ29ubmVjdAozLiBEaXNjb25uZWN0CgoKWW91ciBs
YXN0IHBhdGNoIGlzIHdvcmtpbmcgZmluZS4gIFdlIGNvdWxkIHRyeSByZW1vdmUgdGhlICJzdHJ1
Y3QKc2Vzc2lvbiIgYW5kIHB1dCBldmVyeXRoaW5nIGluc2lkZSB0aGUgInN0cnVjdCBkZXZpY2Ui
IHNpbmNlIGZvciBlYWNoCmlucHV0IGRldmljZSByZWdpc3RlcmVkIHRoZXJlIGlzIGEgRC1CdXMg
ZGF0YSBhc3NpZ25lZChJdCBpcyBhcHBsaWVkCnRvIGRldmljZSBhbmQgaG9zdCBpbml0aWF0ZWQg
Y29ubmVjdGlvbnMpLiBTbyB0aGUgInN0cnVjdCBzZXNzaW9uIgpjb250YWlucyBkdXBsaWNhdGVk
IGRhdGEuCgpJIHdpbGwgdHJ5IGNoYW5nZSB0aGUgY29kZSBhbmQgcHJvcG9zZSBhbm90aGVyIGFw
cHJvYWNoIHVzaW5nIHlvdXIKY29kZSBhcyBiYXNlbGluZS4KCkJSLApDbGF1ZGlvLgotLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tClRoaXMgU0YubmV0IGVtYWlsIGlzIHNwb25zb3JlZCBieSBEQjIgRXhwcmVzcwpE
b3dubG9hZCBEQjIgRXhwcmVzcyBDIC0gdGhlIEZSRUUgdmVyc2lvbiBvZiBEQjIgZXhwcmVzcyBh
bmQgdGFrZQpjb250cm9sIG9mIHlvdXIgWE1MLiBObyBsaW1pdHMuIEp1c3QgZGF0YS4gQ2xpY2sg
dG8gZ2V0IGl0IG5vdy4KaHR0cDovL3NvdXJjZWZvcmdlLm5ldC9wb3dlcmJhci9kYjIvCl9fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkJsdWV6LWRldmVsIG1h
aWxpbmcgbGlzdApCbHVlei1kZXZlbEBsaXN0cy5zb3VyY2Vmb3JnZS5uZXQKaHR0cHM6Ly9saXN0
cy5zb3VyY2Vmb3JnZS5uZXQvbGlzdHMvbGlzdGluZm8vYmx1ZXotZGV2ZWwK
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Bluez-devel] Input service signals
2007-06-21 12:36 ` Claudio Takahasi
@ 2007-06-22 17:32 ` Claudio Takahasi
0 siblings, 0 replies; 9+ messages in thread
From: Claudio Takahasi @ 2007-06-22 17:32 UTC (permalink / raw)
To: BlueZ development
T24gNi8yMS8wNywgQ2xhdWRpbyBUYWthaGFzaSA8Y2t0YWthaGFzaUBnbWFpbC5jb20+IHdyb3Rl
Ogo+IE9uIDYvMjAvMDcsIEZyZWRlcmljIERhbmlzIDxmcmVkZXJpYy5kYW5pc0BhY2Nlc3MtY29t
cGFueS5jb20+IHdyb3RlOgo+ID4gQ2xhdWRpbyBUYWthaGFzaSB3cm90ZToKPiA+ID4gSGkgRnJl
ZGVyaWMsCj4gPiA+Cj4gPiA+IGxhdGVzdCBjdnMgKyB5b3VyIHBhdGNoIHVzaW5nIHRoZSBISUQg
ZGV2aWNlLgo+ID4gPgo+ID4gPiBCUiwKPiA+ID4gQ2xhdWRpby4KPiA+ID4gT24gNi8xOS8wNywg
RnJlZGVyaWMgRGFuaXMgPGZyZWRlcmljLmRhbmlzQGFjY2Vzcy1jb21wYW55LmNvbT4gd3JvdGU6
Cj4gPiA+PiBDbGF1ZGlvIFRha2FoYXNpIHdyb3RlOgo+ID4gPj4+IEhpIEZyZWRlcmljLAo+ID4g
Pj4+Cj4gPiA+Pj4gSSBnb3QgYSBzZWdtZW50YXRpb24gZmF1bHQgd2hlbiBjYWxsaW5nIERldmlj
ZS5Db25uZWN0ICsgRGV2aWNlLkRpc2Nvbm5lY3QKPiA+ID4+Pgo+ID4gPj4+IFRoZSBwYXRoIGNv
bnRlbnQgaXMgd3JvbmcoaXQgY29udGFpbnMgdGhlIGJ1cyBpZCkuCj4gPiA+Pj4KPiA+ID4+PiAo
Z2RiKSBiYWNrdHJhY2UKPiA+ID4+PiAjMCAgMHgwODA1Mjg1YiBpbiBkYnVzX2Nvbm5lY3Rpb25f
ZW1pdF9zaWduYWxfdmFsaXN0IChjb25uPTB4ODA1N2FjOCwKPiA+ID4+PiBwYXRoPTB4ODA1N2Ri
OCAiOjEuMzQiLCBpbnRlcmZhY2U9MHg4MDUzZGY1ICJvcmcuYmx1ZXouaW5wdXQuRGV2aWNlIiwK
PiA+ID4+PiAgICAgbmFtZT0weDgwNTNlNzggIkRpc2Nvbm5lY3RlZCIsIGZpcnN0PTAsIHZhcl9h
cmdzPTB4YmZlMzkzNDQKPiA+ID4+PiAiSFfvv73vv71oXDIyM++/ve+/vVxyXDIwNO+/ve+/vUhc
MjM3XDAwNVxiICIpIGF0IGRidXMtaGVscGVyLmM6NDc4Cj4gPiA+Pj4gIzEgIDB4MDgwNTI5ZTcg
aW4gZGJ1c19jb25uZWN0aW9uX2VtaXRfc2lnbmFsIChjb25uPTB4ODA1N2FjOCwKPiA+ID4+PiBw
YXRoPTB4ODA1N2RiOCAiOjEuMzQiLCBpbnRlcmZhY2U9MHg4MDUzZGY1ICJvcmcuYmx1ZXouaW5w
dXQuRGV2aWNlIiwKPiA+ID4+PiAgICAgbmFtZT0weDgwNTNlNzggIkRpc2Nvbm5lY3RlZCIsIGZp
cnN0PTApIGF0IGRidXMtaGVscGVyLmM6NTMxCj4gPiA+Pj4KPiA+ID4+PiBDb3VsZCB5b3UgcGxl
YXNlIGZpeCBpdD8KPiA+ID4+IEhlbGxvIENsYXVkaW8sCj4gPiA+Pgo+ID4gPj4gV2hlbiBkbyB5
b3UgZ2V0IHRoaXMgY3Jhc2ggPyB1c2luZyBISUQgZGV2aWNlIG9yIGZha2UgaW5wdXQgPwo+ID4g
Pj4KPiA+Cj4gPiBIZWxsbyBDbGF1ZGlvLAo+ID4KPiA+IEhlcmUgaXMgYSBuZXcgdmVyc2lvbiBv
ZiB0aGUgcGF0Y2gsIGZpeGluZyB0aGUgY3Jhc2ggKEkgZG8gbm90IHVuZGVyc3RhbmQgaG93IEkg
aGFkIHRlc3QgaXQgYmVmb3JlIHdpdGhvdXQgdGhpcyBlcnJvciwgc29ycnkgOy1bKQo+ID4KPiA+
IEJSCj4gPgo+ID4gRnJlZAo+ID4KPiA+IC0tCj4gPiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ID4gSXQgaXMgbm90IGJ5IGltcHJvdmluZyB0aGUgb2ls
IGxhbXAgdGhhdCBvbmUgaW52ZW50cyB0aGUgZWxlY3RyaWMgYnVsYiEKPiA+IC0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gPiBEYW5pcyBGcmVkZXJpYyAg
ICAgICAgICAgICAgICAgICBBY2Nlc3MgQ29tcGFueQo+ID4gU29mdHdhcmUgZW5naW5lZXIKPiA+
IE1haWwgOiBtYWlsdG86ZnJlZGVyaWMuZGFuaXNAYWNjZXNzLWNvbXBhbnkuY29tCj4gPiAtLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+Cj4gSGkgRnJlZGVy
aWMsCj4KPiBHZW5lcmFsbHkgSSB0ZXN0IHVzaW5nIGRidXMtc2VuZCwgeW91IGNhbiBmaW5kIHNv
bWUgZXhhbXBsZXMgaGVyZToKPiBodHRwOi8vd2lraS5ibHVlei5vcmcvd2lraS9IT1dUTy9JbnB1
dERldmljZXMKPgo+IFRvIHJlcHJvZHVjZSB0aGUgcmVwb3J0ZWQgYnVnIEkgd2FzIGNhbGxpbmc6
Cj4gMS4gQ3JlYXRlRGV2aWNlCj4gMi4gQ29ubmVjdAo+IDMuIERpc2Nvbm5lY3QKPgo+Cj4gWW91
ciBsYXN0IHBhdGNoIGlzIHdvcmtpbmcgZmluZS4gIFdlIGNvdWxkIHRyeSByZW1vdmUgdGhlICJz
dHJ1Y3QKPiBzZXNzaW9uIiBhbmQgcHV0IGV2ZXJ5dGhpbmcgaW5zaWRlIHRoZSAic3RydWN0IGRl
dmljZSIgc2luY2UgZm9yIGVhY2gKPiBpbnB1dCBkZXZpY2UgcmVnaXN0ZXJlZCB0aGVyZSBpcyBh
IEQtQnVzIGRhdGEgYXNzaWduZWQoSXQgaXMgYXBwbGllZAo+IHRvIGRldmljZSBhbmQgaG9zdCBp
bml0aWF0ZWQgY29ubmVjdGlvbnMpLiBTbyB0aGUgInN0cnVjdCBzZXNzaW9uIgo+IGNvbnRhaW5z
IGR1cGxpY2F0ZWQgZGF0YS4KPgo+IEkgd2lsbCB0cnkgY2hhbmdlIHRoZSBjb2RlIGFuZCBwcm9w
b3NlIGFub3RoZXIgYXBwcm9hY2ggdXNpbmcgeW91cgo+IGNvZGUgYXMgYmFzZWxpbmUuCj4KPiBC
UiwKPiBDbGF1ZGlvLgo+CgpIaSBGcmVkZXJpYywKClRoZSBzaWduYWxzIGFyZSBub3cgc2VudCBw
cm9wZXJseS4KClBsZWFzZSB0ZXN0IGlmIGl0IGlzIHdvcmtpbmcuCgpUaGVyZSBpcyBqdXN0IG9u
ZSBzY2VuYXJpbyB0aGF0IEkgYW0gZml4aW5nOiBEaXNjb25uZWN0IHNpZ25hbCBpcyBub3QKc2Vu
dCBpZiBSZW1vdmVEZXZpY2UgaXMgY2FsbGVkKGFuZCB0aGUgZGV2aWNlIGlzIGNvbm5lY3RlZCku
CgpCUiwKQ2xhdWRpby4KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpUaGlzIFNGLm5ldCBlbWFpbCBpcyBzcG9u
c29yZWQgYnkgREIyIEV4cHJlc3MKRG93bmxvYWQgREIyIEV4cHJlc3MgQyAtIHRoZSBGUkVFIHZl
cnNpb24gb2YgREIyIGV4cHJlc3MgYW5kIHRha2UKY29udHJvbCBvZiB5b3VyIFhNTC4gTm8gbGlt
aXRzLiBKdXN0IGRhdGEuIENsaWNrIHRvIGdldCBpdCBub3cuCmh0dHA6Ly9zb3VyY2Vmb3JnZS5u
ZXQvcG93ZXJiYXIvZGIyLwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fXwpCbHVlei1kZXZlbCBtYWlsaW5nIGxpc3QKQmx1ZXotZGV2ZWxAbGlzdHMuc291cmNl
Zm9yZ2UubmV0Cmh0dHBzOi8vbGlzdHMuc291cmNlZm9yZ2UubmV0L2xpc3RzL2xpc3RpbmZvL2Js
dWV6LWRldmVsCg==
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2007-06-22 17:32 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-15 13:45 [Bluez-devel] Input service signals Frederic Danis
2007-06-16 7:31 ` Marcel Holtmann
2007-06-19 12:45 ` Frederic Danis
2007-06-19 14:44 ` Claudio Takahasi
2007-06-19 15:16 ` Frederic Danis
2007-06-19 16:32 ` Claudio Takahasi
2007-06-20 16:06 ` Frederic Danis
2007-06-21 12:36 ` Claudio Takahasi
2007-06-22 17:32 ` Claudio Takahasi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox