mirrors
/
gattlib
mirror of https://github.com/labapart/gattlib
1
0
Fork 0
Code Issues Releases Wiki Activity

bluez5/btio: Added option BT_IO_OPT_TIMEOUT

pull/8/head
Olivier Martin 2017-01-31 16:34:00 +01:00
parent e802d4ab50
commit f152b8d04e
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bluez5/btio/btio.c
View File

@ -79,6 +79,7 @@ struct set_opts {
int flushable;
uint32_t priority;
uint16_t voice;
int timeout;
};
struct connect {
@ -344,11 +345,27 @@ static int l2cap_bind(int sock, const bdaddr_t *src, uint8_t src_type,
}
static int l2cap_connect(int sock, const bdaddr_t *dst, uint8_t dst_type,
uint16_t psm, uint16_t cid)
uint16_t psm, uint16_t cid, uint16_t timeout)
{
int err;
struct sockaddr_l2 addr;
if (timeout > 0) {
struct timeval timeout;
timeout.tv_sec = 2;
timeout.tv_usec = 0;
if (setsockopt (sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout)) < 0) {
fprintf(stderr, "l2cap_connect: Failed to setsockopt for receive timeout.\n");
return -1;
}
if (setsockopt (sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout, sizeof(timeout)) < 0) {
fprintf(stderr, "l2cap_connect: Failed to setsockopt for sending timeout.\n");
return -1;
}
}
memset(&addr, 0, sizeof(addr));
addr.l2_family = AF_BLUETOOTH;
bacpy(&addr.l2_bdaddr, dst);
@ -805,6 +822,7 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err,
opts->priority = 0;
opts->src_type = BDADDR_BREDR;
opts->dst_type = BDADDR_BREDR;
opts->timeout = 0;
while (opt != BT_IO_OPT_INVALID) {
switch (opt) {
@ -872,6 +890,9 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err,
case BT_IO_OPT_PRIORITY:
opts->priority = va_arg(args, int);
break;
case BT_IO_OPT_TIMEOUT:
opts->timeout = va_arg(args, int);
break;
case BT_IO_OPT_VOICE:
opts->voice = va_arg(args, int);
break;
@ -1612,7 +1633,7 @@ GIOChannel *bt_io_connect(BtIOConnect connect, gpointer user_data,
switch (opts.type) {
case BT_IO_L2CAP:
err = l2cap_connect(sock, &opts.dst, opts.dst_type,
opts.psm, opts.cid);
opts.psm, opts.cid, opts.timeout);
break;
case BT_IO_RFCOMM:
err = rfcomm_connect(sock, &opts.dst, opts.channel);

1
bluez5/btio/btio.h
View File

@ -56,6 +56,7 @@ typedef enum {
BT_IO_OPT_FLUSHABLE,
BT_IO_OPT_PRIORITY,
BT_IO_OPT_VOICE,
BT_IO_OPT_TIMEOUT,
} BtIOOption;
typedef enum {

4
src/gattlib_connect.c
View File

@ -240,9 +240,7 @@ static gatt_connection_t *initialize_gattlib_connection(const gchar *src, const
BT_IO_OPT_DEST_TYPE, dest_type,
BT_IO_OPT_CID, ATT_CID,
BT_IO_OPT_SEC_LEVEL, sec_level,
#if BLUEZ_VERSION_MAJOR == 4
BT_IO_OPT_TIMEOUT, CONNECTION_TIMEOUT,
#endif
BT_IO_OPT_INVALID);
else
conn->io = bt_io_connect(
@ -258,9 +256,7 @@ static gatt_connection_t *initialize_gattlib_connection(const gchar *src, const
BT_IO_OPT_PSM, psm,
BT_IO_OPT_IMTU, mtu,
BT_IO_OPT_SEC_LEVEL, sec_level,
#if BLUEZ_VERSION_MAJOR == 4
BT_IO_OPT_TIMEOUT, CONNECTION_TIMEOUT,
#endif
BT_IO_OPT_INVALID);
if (err) {