psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

Merge branch 'master' of git://git.psyced.org/git/psyced

Browse source
This commit is contained in:
Gabor Adam Toth 2010-02-14 16:53:24 +01:00
commit 3b837b2f1f
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
world/net/jabber/active.c
View file

@ -61,6 +61,15 @@ removeGateway(gw, id) {
}
}
#ifdef BETA
static connectTimeOut() {
// should we do something more or else here?
remove_interactive(ME);
connect_failure("_timeout_dialback",
"no dialback response received, timeout");
}
#endif
start_dialback() {
string source_host, key;
@ -72,7 +81,9 @@ start_dialback() {
dialback_outgoing = 1;
emit(sprintf("<db:result to='%s' from='%s'>%s</db:result>",
hostname, source_host, key));
call_out(120, #'connect_failure, "_timeout_dialback", "no dialback response received, timeout");
#ifdef BETA
call_out(#'connectTimeOut, 120);
#endif
}
process_dialback_queue() {
@ -365,7 +376,9 @@ jabberMsg(XMLNode node) {
* we are originating server and are informed of the result
*/
dialback_outgoing = 0;
remove_call_out(#'connect_failure);
#ifdef BETA
remove_call_out(#'connectTimeOut);
#endif
if (node["@type"] == "valid") {
#ifdef LOG_XMPP_AUTH
D0( log_file("XMPP_AUTH", "\n%O auth dialback", ME); )