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

handle dialback timeouts.. thx fip

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2010-01-30 23:39:47 +01:00
parent ecc5bd32e6
commit b3a307095b
4 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
world/default/de/plain.textdb
View file

@ -843,6 +843,9 @@ _failure_unsuccessful_delivery_resolve
_failure_unsuccessful_delivery_self
|Die Adresse [_host] zeigt auf [_source_origin], ist dort aber nicht vorgesehen.
_failure_unsuccessful_delivery_timeout_dialback
|Konnte kein XMPP dialback zu [_host] herstellen um [_method_relay] an [_source] auszuliefern.
_failure_unavailable_service
|Solch ein Dienst wird hier derzeit nicht angeboten.

3
world/default/en/plain.textdb
View file

@ -664,6 +664,9 @@ _failure_unsuccessful_delivery_resolve
_failure_unsuccessful_delivery_self
|The [_host] address points to [_source_origin] which however wasn't instructed to handle that.
_failure_unsuccessful_delivery_timeout_dialback
|Could not establish an XMPP dialback to [_host] to deliver a [_method_relay] to [_source].
_failure_unavailable_service_version
|Requesting version from [_nick_target] is not possible.

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

@ -72,6 +72,7 @@ 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");
}
process_dialback_queue() {
@ -364,6 +365,7 @@ jabberMsg(XMLNode node) {
* we are originating server and are informed of the result
*/
dialback_outgoing = 0;
remove_call_out(#'connect_failure);
if (node["@type"] == "valid") {
#ifdef LOG_XMPP_AUTH
D0( log_file("XMPP_AUTH", "\n%O auth dialback", ME); )