From b29dca089a36130f5d989cc35435613b698aa3eb Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Sat, 21 Mar 2009 12:22:45 +0100 Subject: [PATCH 1/3] don't err on jabber iq requests --- world/net/jabber/user.c | 10 ++++------ world/net/user.c | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/world/net/jabber/user.c b/world/net/jabber/user.c index 088ccf2..3f91137 100644 --- a/world/net/jabber/user.c +++ b/world/net/jabber/user.c @@ -571,17 +571,14 @@ iq(XMLNode node) { P3(("%O IQ node %O\n", ME, node)) firstchild = getfirstchild(node); - unless(firstchild) { - switch(node["@type"]) { + unless(firstchild) switch(node["@type"]) { case "get": - break; case "set": - break; case "result": - break; case "error": break; - } + default: + P1(("%O got invalid iq %O\n", ME, node)) return; } helper = firstchild; @@ -1016,6 +1013,7 @@ iq(XMLNode node) { break; #endif default: + P1(("%O got IQ with unknown namespace: %O\n", ME, node)) switch(node["@type"]) { case "get": if (node["@to"]) { diff --git a/world/net/user.c b/world/net/user.c index cfcbcb7..f18fce2 100644 --- a/world/net/user.c +++ b/world/net/user.c @@ -598,6 +598,7 @@ msg(source, mc, data, mapping vars, showingLog) { P3(("%O time %O data %O from %O\n", ME, t, data, vars)) } PSYC_TRY(mc) { +#ifndef ALPHA case "_jabber_iq_error": // DONT reply P2(("%O got %O", ME, mc)) break; @@ -610,6 +611,7 @@ case "_jabber_iq_set": sendmsg(source, "_error_unsupported_method", 0, ([ "_tag_reply" : vars["_tag"] ])); break; +#endif case "_jabber": P1(("%O got %O", ME, mc)) break; From de6cf786f39412e2f9f83f29fdb20225bb62796d Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Mon, 23 Mar 2009 14:12:39 +0100 Subject: [PATCH 2/3] create log and data dirs --- install.sh | 6 +++++- world/net/usercmd.i | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index eec2df8..19dc788 100755 --- a/install.sh +++ b/install.sh @@ -1077,7 +1077,11 @@ then echo "Creating $BASE_DIR..." if mkdir -m $BASE_PERM -p $BASE_DIR 2> /dev/null then - : + mkdir -m $BASE_PERM -p $LOG_DIR 2> /dev/null + mkdir -m $BASE_PERM -p $LOG_DIR/place 2> /dev/null + mkdir -m $BASE_PERM -p $DATA_DIR 2> /dev/null + mkdir -m $BASE_PERM -p $DATA_DIR/person 2> /dev/null + mkdir -m $BASE_PERM -p $DATA_DIR/place 2> /dev/null else if test "x$userid" = "xroot" then diff --git a/world/net/usercmd.i b/world/net/usercmd.i index 6249eec..fd5e22a 100644 --- a/world/net/usercmd.i +++ b/world/net/usercmd.i @@ -1771,6 +1771,9 @@ case "_unlink": unlink(vars["_service"]); return 1; case "_exit": + // so this is some kind of ugly hack not to be used.. huh? + announce(AVAILABILITY_OFFLINE); + // fall thru case "_quit": // bye(vars["_reason"]); quit(); From 577b7e41877e4432b26cfa538ae2f5985823e737 Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Mon, 23 Mar 2009 16:00:48 +0100 Subject: [PATCH 3/3] the symlinks that cvs could not to provide --- world/local | 1 + world/log | 1 + 2 files changed, 2 insertions(+) create mode 120000 world/local create mode 120000 world/log diff --git a/world/local b/world/local new file mode 120000 index 0000000..c820590 --- /dev/null +++ b/world/local @@ -0,0 +1 @@ +../local \ No newline at end of file diff --git a/world/log b/world/log new file mode 120000 index 0000000..033579f --- /dev/null +++ b/world/log @@ -0,0 +1 @@ +../log \ No newline at end of file