From f8f494cb4880fa6a3f8b641bf6676acfce659753 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 12 Jan 2009 15:25:30 +0200 Subject: Move l2raw_connect over to device.c (since it's not needed anywhere else) --- src/dbus-common.c | 56 ------------------------------------------------------- 1 file changed, 56 deletions(-) (limited to 'src/dbus-common.c') diff --git a/src/dbus-common.c b/src/dbus-common.c index 7c26a8f7..b5969096 100644 --- a/src/dbus-common.c +++ b/src/dbus-common.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -54,61 +53,6 @@ #define RECONNECT_RETRY_TIMEOUT 5000 -int l2raw_connect(const bdaddr_t *src, const bdaddr_t *dst, - struct bt_security *sec) -{ - struct sockaddr_l2 addr; - long arg; - int sk; - - sk = socket(PF_BLUETOOTH, SOCK_RAW, BTPROTO_L2CAP); - if (sk < 0) { - error("Can't create socket: %s (%d)", strerror(errno), errno); - return sk; - } - - memset(&addr, 0, sizeof(addr)); - addr.l2_family = AF_BLUETOOTH; - bacpy(&addr.l2_bdaddr, src); - - if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - error("Can't bind socket: %s (%d)", strerror(errno), errno); - goto failed; - } - - if (sec) - setsockopt(sk, SOL_BLUETOOTH, BT_SECURITY, sec, sizeof(*sec)); - - arg = fcntl(sk, F_GETFL); - if (arg < 0) { - error("Can't get file flags: %s (%d)", strerror(errno), errno); - goto failed; - } - - arg |= O_NONBLOCK; - if (fcntl(sk, F_SETFL, arg) < 0) { - error("Can't set file flags: %s (%d)", strerror(errno), errno); - goto failed; - } - - memset(&addr, 0, sizeof(addr)); - addr.l2_family = AF_BLUETOOTH; - bacpy(&addr.l2_bdaddr, dst); - - if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - if (errno == EAGAIN || errno == EINPROGRESS) - return sk; - error("Can't connect socket: %s (%d)", strerror(errno), errno); - goto failed; - } - - return sk; - -failed: - close(sk); - return -1; -} - static gboolean system_bus_reconnect(void *data) { DBusConnection *conn = get_dbus_connection(); -- cgit