This commit is contained in:
psyc://psyced.org/~lynX 2010-02-14 16:44:10 +01:00
parent 5efdadab3e
commit 0a57f49341

View File

@ -61,12 +61,14 @@ removeGateway(gw, id) {
} }
} }
#ifdef BETA
static connectTimeOut() { static connectTimeOut() {
// should we do something more or else here? // should we do something more or else here?
remove_interactive(ME); remove_interactive(ME);
connect_failure("_timeout_dialback", connect_failure("_timeout_dialback",
"no dialback response received, timeout"); "no dialback response received, timeout");
} }
#endif
start_dialback() { start_dialback() {
string source_host, key; string source_host, key;
@ -79,7 +81,9 @@ 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));
#ifdef BETA
call_out(#'connectTimeOut, 120); call_out(#'connectTimeOut, 120);
#endif
} }
process_dialback_queue() { process_dialback_queue() {
@ -372,7 +376,9 @@ 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;
#ifdef BETA
remove_call_out(#'connectTimeOut); remove_call_out(#'connectTimeOut);
#endif
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); )