OSDN Git Service
(root)
/
android-x86
/
external-bluetooth-bluez.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ccd67f6
)
gobex: Fix asserting when resending connect request
author
Luiz Augusto von Dentz
<luiz.von.dentz@intel.com>
Tue, 1 Apr 2014 07:33:25 +0000
(10:33 +0300)
committer
Luiz Augusto von Dentz
<luiz.von.dentz@intel.com>
Wed, 2 Apr 2014 11:25:39 +0000
(14:25 +0300)
In case connect requests needs to be resent to authenticate the timeout
handle should be removed otherwise it may end up asserting:
ERROR:gobex/gobex.c:251:req_timeout: assertion failed: (p != NULL)
gobex/gobex.c
patch
|
blob
|
history
diff --git
a/gobex/gobex.c
b/gobex/gobex.c
index
880ed91
..
4185ed1
100644
(file)
--- a/
gobex/gobex.c
+++ b/
gobex/gobex.c
@@
-1016,6
+1016,8
@@
static void auth_challenge(GObex *obex)
/* Remove it as pending and add it back to the queue so it gets sent
* again */
+ g_source_remove(p->timeout);
+ p->timeout_id = 0;
obex->pending_req = NULL;
g_obex_send_internal(obex, p, NULL);
}