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