korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-17 17:24:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

serial: handle the pending connects list properly when connect() in the first try happens

Browse Source
This commit is contained in:
Claudio Takahasi 2007-05-09 19:33:49 +00:00
parent 1dd87340fa
commit 9e824dd2ce
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
serial/manager.c
View File

@ -513,7 +513,6 @@ static int rfcomm_connect(struct pending_connect *pc)
debug("Connect in progress");
g_io_add_watch(io, G_IO_OUT, (GIOFunc) rfcomm_connect_cb, pc);
pending_connects = g_slist_append(pending_connects, pc);
} else {
debug("Connect succeeded with first try");
(void) rfcomm_connect_cb(io, G_IO_OUT, pc);
@ -829,11 +828,15 @@ static DBusHandlerResult connect_service(DBusConnection *conn,
"invalid RFCOMM channel");
}
/* Add here since connect() in the first try can happen */
pending_connects = g_slist_append(pending_connects, pc);
pc->channel = val;
err = rfcomm_connect(pc);
if (err < 0) {
const char *strerr = strerror(-err);
error("RFCOMM connect failed: %s(%d)", strerr, -err);
pending_connects = g_slist_remove(pending_connects, pc);
pending_connect_free(pc);
return err_connection_failed(conn, msg, strerr);
}