mirror of
git://git.psyced.org/git/psyced
synced 2024-08-15 03:25:10 +00:00
redundant D0s
This commit is contained in:
parent
532f78205b
commit
673eacd099
6 changed files with 13 additions and 13 deletions
|
@ -40,7 +40,7 @@ tls_logon(); // prototype
|
||||||
quit() {
|
quit() {
|
||||||
emitraw("</stream:stream>");
|
emitraw("</stream:stream>");
|
||||||
#ifdef _flag_log_sockets_XMPP
|
#ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\n%O: shutting down, quit called\n", ME); )
|
log_file("RAW_XMPP", "\n%O: shutting down, quit called\n", ME);
|
||||||
#endif
|
#endif
|
||||||
remove_interactive(ME); // not XEP-0190 conformant, but shouldn't
|
remove_interactive(ME); // not XEP-0190 conformant, but shouldn't
|
||||||
// matter on an outgoing-only socket
|
// matter on an outgoing-only socket
|
||||||
|
@ -88,7 +88,7 @@ handle_starttls(XMLNode node) {
|
||||||
P0(("%O: expecting xmpp-tls proceed or failure, got %O:%O\n",
|
P0(("%O: expecting xmpp-tls proceed or failure, got %O:%O\n",
|
||||||
ME, node[Tag], node["@xmlns"]))
|
ME, node[Tag], node["@xmlns"]))
|
||||||
#ifdef _flag_log_sockets_XMPP
|
#ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\n%O: expecting xmpp-tls proceed or failure, got %O:%O\t%O", ME, node[Tag], node["@xmlns"], ctime()); )
|
log_file("RAW_XMPP", "\n%O: expecting xmpp-tls proceed or failure, got %O:%O\t%O", ME, node[Tag], node["@xmlns"], ctime());
|
||||||
#endif
|
#endif
|
||||||
nodeHandler = #'jabberMsg;
|
nodeHandler = #'jabberMsg;
|
||||||
return jabberMsg(node);
|
return jabberMsg(node);
|
||||||
|
@ -114,7 +114,7 @@ handle_stream_features(XMLNode node) {
|
||||||
start_dialback();
|
start_dialback();
|
||||||
process_dialback_queue();
|
process_dialback_queue();
|
||||||
#ifdef _flag_log_sockets_XMPP
|
#ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\nprocessing dialback queue, expecting stream features but not found" ); )
|
log_file("RAW_XMPP", "\nprocessing dialback queue, expecting stream features but not found");
|
||||||
#endif
|
#endif
|
||||||
return jabberMsg(node);
|
return jabberMsg(node);
|
||||||
}
|
}
|
||||||
|
@ -214,7 +214,7 @@ handle_stream_features(XMLNode node) {
|
||||||
disconnected(remainder) {
|
disconnected(remainder) {
|
||||||
P2(("active %O disconnected\n", ME))
|
P2(("active %O disconnected\n", ME))
|
||||||
#ifdef _flag_log_sockets_XMPP
|
#ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\n%O disc\t%O", ME, ctime()); )
|
log_file("RAW_XMPP", "\n%O disc\t%O", ME, ctime());
|
||||||
#endif
|
#endif
|
||||||
authenticated = 0;
|
authenticated = 0;
|
||||||
ready = 0;
|
ready = 0;
|
||||||
|
@ -224,7 +224,7 @@ disconnected(remainder) {
|
||||||
P0(("%O got disconnected with dialback outgoing != 0\n", ME))
|
P0(("%O got disconnected with dialback outgoing != 0\n", ME))
|
||||||
// TODO: reconnect koennte sinnvoll sein
|
// TODO: reconnect koennte sinnvoll sein
|
||||||
#ifdef _flag_log_sockets_XMPP
|
#ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\n%O disconnected with dialback outgoing != 0\t%O", ME, ctime()); )
|
log_file("RAW_XMPP", "\n%O disconnected with dialback outgoing != 0\t%O", ME, ctime());
|
||||||
#endif
|
#endif
|
||||||
dialback_outgoing = 0;
|
dialback_outgoing = 0;
|
||||||
}
|
}
|
||||||
|
@ -254,7 +254,7 @@ static int logon(int failure) {
|
||||||
#endif
|
#endif
|
||||||
sTextPath(0, "en", "jabber");
|
sTextPath(0, "en", "jabber");
|
||||||
#ifdef _flag_log_sockets_XMPP
|
#ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime()); )
|
log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime());
|
||||||
#endif
|
#endif
|
||||||
/* 2. Originating Server sends a stream header to Receiving Server */
|
/* 2. Originating Server sends a stream header to Receiving Server */
|
||||||
emit("<stream:stream xmlns:stream='http://etherx.jabber.org/streams' "
|
emit("<stream:stream xmlns:stream='http://etherx.jabber.org/streams' "
|
||||||
|
|
|
@ -67,7 +67,7 @@ int emit(string message) {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef _flag_log_sockets_XMPP
|
#ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\n« %O\t%s", ME, message); )
|
log_file("RAW_XMPP", "\n« %O\t%s", ME, message);
|
||||||
#endif
|
#endif
|
||||||
return ::emit(message);
|
return ::emit(message);
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ int emit(string message) {
|
||||||
// to be sending safe data
|
// to be sending safe data
|
||||||
int emitraw(string message) {
|
int emitraw(string message) {
|
||||||
#ifdef _flag_log_sockets_XMPP
|
#ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\n« %O\t%s", ME, message); )
|
log_file("RAW_XMPP", "\n« %O\t%s", ME, message);
|
||||||
#endif
|
#endif
|
||||||
return ::emit(message);
|
return ::emit(message);
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ volatile int authenticated;
|
||||||
|
|
||||||
logon(arg) {
|
logon(arg) {
|
||||||
#ifdef _flag_log_sockets_XMPP
|
#ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime()); )
|
log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime());
|
||||||
#endif
|
#endif
|
||||||
#ifdef INPUT_NO_TELNET
|
#ifdef INPUT_NO_TELNET
|
||||||
input_to(#'feed, INPUT_IGNORE_BANG | INPUT_CHARMODE | INPUT_NO_TELNET);
|
input_to(#'feed, INPUT_IGNORE_BANG | INPUT_CHARMODE | INPUT_NO_TELNET);
|
||||||
|
|
|
@ -64,7 +64,7 @@ disconnected(remainder) {
|
||||||
#endif
|
#endif
|
||||||
if (objectp(active)) active -> removeGateway(streamid);
|
if (objectp(active)) active -> removeGateway(streamid);
|
||||||
#ifdef _flag_log_sockets_XMPP
|
#ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\n%O disc\t%O", ME, ctime()); )
|
log_file("RAW_XMPP", "\n%O disc\t%O", ME, ctime());
|
||||||
#endif
|
#endif
|
||||||
destruct(ME);
|
destruct(ME);
|
||||||
// expected or unexpected disconnect? flags shall tell
|
// expected or unexpected disconnect? flags shall tell
|
||||||
|
@ -121,7 +121,7 @@ logon(a) {
|
||||||
input_to(#'feed, INPUT_IGNORE_BANG | INPUT_CHARMODE);
|
input_to(#'feed, INPUT_IGNORE_BANG | INPUT_CHARMODE);
|
||||||
#endif
|
#endif
|
||||||
#ifdef _flag_log_sockets_XMPP
|
#ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime()); )
|
log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime());
|
||||||
#endif
|
#endif
|
||||||
// return ::logon(a);
|
// return ::logon(a);
|
||||||
}
|
}
|
||||||
|
|
|
@ -89,7 +89,7 @@ promptForPassword(user) {
|
||||||
|
|
||||||
logon(a) {
|
logon(a) {
|
||||||
#ifdef _flag_log_sockets_XMPP
|
#ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime()); )
|
log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime());
|
||||||
#endif
|
#endif
|
||||||
P3(("logon(%O) beim jabber:server.c\n", a))
|
P3(("logon(%O) beim jabber:server.c\n", a))
|
||||||
set_combine_charset(COMBINE_CHARSET);
|
set_combine_charset(COMBINE_CHARSET);
|
||||||
|
|
|
@ -44,7 +44,7 @@ xmlparse(a) {
|
||||||
|
|
||||||
#ifdef JABBER_PARSE
|
#ifdef JABBER_PARSE
|
||||||
# ifdef _flag_log_sockets_XMPP
|
# ifdef _flag_log_sockets_XMPP
|
||||||
D0( log_file("RAW_XMPP", "\n» %O\t%s", ME, a); )
|
log_file("RAW_XMPP", "\n» %O\t%s", ME, a);
|
||||||
# endif
|
# endif
|
||||||
length += sizeof(a);
|
length += sizeof(a);
|
||||||
pos = index(a, '<', pos) + 1;
|
pos = index(a, '<', pos) + 1;
|
||||||
|
|
Loading…
Reference in a new issue