ChronosXYZ/psyced
1
0
Fork 0
mirror of https://github.com/ChronosX88/psyced.git synced 2024-12-05 00:22:19 +00:00
Code Issues Projects 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
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.
_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 =====================================================
¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
@ -1040,7 +1041,6 @@ ________________________________________________________________________
- wenn man im client einen alias ("name" feld im xml code) setzt beim
buddymachen, dann geht der im laufe der transaktion verloren und man
muss ihn später nochmal setzen!
________________________________________________________________________
== JABBER FILE TRANSFERS ===============================================
¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯

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); )