psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

connectTimeOut for xmpp

This commit is contained in:
psyc://psyced.org/~lynX 2010-02-14 16:35:59 +01:00
parent 69c1a1e2f5
commit 5efdadab3e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGESTODO
View File

@ -338,6 +338,7 @@ ________________________________________________________________________
been redirected using SRV. x-net.hu's A record is still being checked. been redirected using SRV. x-net.hu's A record is still being checked.
_psyc._tcp.x-net.hu has SRV record 0 0 14404 psyc.x-net.hu. _psyc._tcp.x-net.hu has SRV record 0 0 14404 psyc.x-net.hu.
+ XEP-0227: Portable Import/Export Format for XMPP-IM Servers
________________________________________________________________________ ________________________________________________________________________
== MINOR DELEGATES ===================================================== == MINOR DELEGATES =====================================================
¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
@ -1040,7 +1041,6 @@ ________________________________________________________________________
- wenn man im client einen alias ("name" feld im xml code) setzt beim - wenn man im client einen alias ("name" feld im xml code) setzt beim
buddymachen, dann geht der im laufe der transaktion verloren und man buddymachen, dann geht der im laufe der transaktion verloren und man
muss ihn später nochmal setzen! muss ihn später nochmal setzen!
________________________________________________________________________ ________________________________________________________________________
== JABBER FILE TRANSFERS =============================================== == JABBER FILE TRANSFERS ===============================================
¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯

11
world/net/jabber/active.c
View File

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