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

redundant D0s

This commit is contained in:
psyc://psyced.org/~lynX 2009-02-25 14:28:21 +01:00
parent 532f78205b
commit 673eacd099
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ tls_logon(); // prototype
quit() {
emitraw("</stream:stream>");
#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
remove_interactive(ME); // not XEP-0190 conformant, but shouldn't
// 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",
ME, node[Tag], node["@xmlns"]))
#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
nodeHandler = #'jabberMsg;
return jabberMsg(node);
@ -114,7 +114,7 @@ handle_stream_features(XMLNode node) {
start_dialback();
process_dialback_queue();
#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
return jabberMsg(node);
}
@ -214,7 +214,7 @@ handle_stream_features(XMLNode node) {
disconnected(remainder) {
P2(("active %O disconnected\n", ME))
#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
authenticated = 0;
ready = 0;
@ -224,7 +224,7 @@ disconnected(remainder) {
P0(("%O got disconnected with dialback outgoing != 0\n", ME))
// TODO: reconnect koennte sinnvoll sein
#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
dialback_outgoing = 0;
}
@ -254,7 +254,7 @@ static int logon(int failure) {
#endif
sTextPath(0, "en", "jabber");
#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
/* 2. Originating Server sends a stream header to Receiving Server */
emit("<stream:stream xmlns:stream='http://etherx.jabber.org/streams' "

4
world/net/jabber/common.c
View File

@ -67,7 +67,7 @@ int emit(string message) {
}
#endif
#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
return ::emit(message);
}
@ -76,7 +76,7 @@ int emit(string message) {
// to be sending safe data
int emitraw(string message) {
#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
return ::emit(message);
}

2
world/net/jabber/component.c
View File

@ -23,7 +23,7 @@ volatile int authenticated;
logon(arg) {
#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
#ifdef INPUT_NO_TELNET
input_to(#'feed, INPUT_IGNORE_BANG | INPUT_CHARMODE | INPUT_NO_TELNET);

4
world/net/jabber/gateway.c
View File

@ -64,7 +64,7 @@ disconnected(remainder) {
#endif
if (objectp(active)) active -> removeGateway(streamid);
#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
destruct(ME);
// expected or unexpected disconnect? flags shall tell
@ -121,7 +121,7 @@ logon(a) {
input_to(#'feed, INPUT_IGNORE_BANG | INPUT_CHARMODE);
#endif
#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
// return ::logon(a);
}

2
world/net/jabber/server.c
View File

@ -89,7 +89,7 @@ promptForPassword(user) {
logon(a) {
#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
P3(("logon(%O) beim jabber:server.c\n", a))
set_combine_charset(COMBINE_CHARSET);

2
world/net/xml/parse.c
View File

@ -44,7 +44,7 @@ xmlparse(a) {
#ifdef JABBER_PARSE
# 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
length += sizeof(a);
pos = index(a, '<', pos) + 1;