X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fserv_xmpp.c;h=2d8ef9d0fa42bbc95d0b780a343809953a4770b9;hb=2bcd29b7be1638c9b3038556a2f2eabd4b0e3af3;hp=1e0f704b4a7a75f9bf2a30a6ee67172c709aa689;hpb=57231d9bfac327b0754787f097be79bc83cf24c6;p=citadel.git

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index 1e0f704b4..2d8ef9d0f 100644
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -1,6 +1,6 @@
 /*
  * XMPP (Jabber) service for the Citadel system
- * Copyright (c) 2007-2011 by Art Cancro
+ * Copyright (c) 2007-2018 by Art Cancro and citadel.org
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <stdarg.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <pwd.h>
@@ -43,7 +42,6 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
-#define SHOW_ME_VAPPEND_PRINTF
 #include <libcitadel.h>
 #include <expat.h>
 #include "citadel.h"
@@ -59,48 +57,15 @@
 #include "ctdl_module.h"
 #include "serv_xmpp.h"
 
+/* uncomment for more verbosity - it will log all received XML tags */
+#define XMPP_XML_DEBUG
+
 /* XML_StopParser is present in expat 2.x */
 #if XML_MAJOR_VERSION > 1
 #define HAVE_XML_STOPPARSER
 #endif
 
 struct xmpp_event *xmpp_queue = NULL;
-HashList *XMPP_StartHandlers = NULL;
-HashList *XMPP_EndHandlers = NULL;
-
-int XMPPSrvDebugEnable = 0;
-
-void XUnbuffer(void)
-{
-	citxmpp *Xmpp = XMPP;
-
-	cputbuf(Xmpp->OutBuf);
-	FlushStrBuf(Xmpp->OutBuf);
-}
-
-void XPutBody(const char *Str, long Len)
-{
-	StrBufXMLEscAppend(XMPP->OutBuf, NULL, Str, Len, 0);
-}
-
-void XPutProp(const char *Str, long Len)
-{
-	StrEscAppend(XMPP->OutBuf, NULL, Str, 0, 1);
-}
-
-void XPut(const char *Str, long Len)
-{
-	StrBufAppendBufPlain(XMPP->OutBuf, Str, Len, 0);
-}
-#define XPUT(CONSTSTR) XPut(CONSTSTR, sizeof(CONSTSTR) -1)
-
-void XPrintf(const char *Format, ...)
-{
-        va_list arg_ptr;
-        va_start(arg_ptr, Format);
-	StrBufVAppendPrintf(XMPP->OutBuf, Format, arg_ptr);
-	va_end(arg_ptr);
-}
 
 
 #ifdef HAVE_XML_STOPPARSER
@@ -111,44 +76,137 @@ static void xmpp_entity_declaration(void *userData, const XML_Char *entityName,
 				const XML_Char *systemId, const XML_Char *publicId,
 				const XML_Char *notationName
 ) {
-	XMPPM_syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser.");
+	syslog(LOG_WARNING, "xmpp: illegal entity declaration encountered; stopping parser.");
 	XML_StopParser(XMPP->xp, XML_FALSE);
 }
 #endif
 
+
+/*
+ * Given a source string and a target buffer, returns the string
+ * properly escaped for insertion into an XML stream.  Returns a
+ * pointer to the target buffer for convenience.
+ */
+static inline int Ctdl_GetUtf8SequenceLength(const char *CharS, const char *CharE)
+{
+	int n = 0;
+        unsigned char test = (1<<7);
+
+	if ((*CharS & 0xC0) != 0xC0) 
+		return 1;
+
+	while ((n < 8) && 
+	       ((test & ((unsigned char)*CharS)) != 0)) 
+	{
+		test = test >> 1;
+		n ++;
+	}
+	if ((n > 6) || ((CharE - CharS) < n))
+		n = 0;
+	return n;
+}
+
+
+char *xmlesc(char *buf, char *str, int bufsiz)
+{
+	int IsUtf8Sequence;
+	char *ptr, *pche;
+	unsigned char ch;
+	int inlen;
+	int len = 0;
+
+	if (!buf) return(NULL);
+	buf[0] = 0;
+	len = 0;
+	if (!str) {
+		return(buf);
+	}
+	inlen = strlen(str);
+	pche = str + inlen;
+
+	for (ptr=str; *ptr; ptr++) {
+		ch = *ptr;
+		if (ch == '<') {
+			strcpy(&buf[len], "&lt;");
+			len += 4;
+		}
+		else if (ch == '>') {
+			strcpy(&buf[len], "&gt;");
+			len += 4;
+		}
+		else if (ch == '&') {
+			strcpy(&buf[len], "&amp;");
+			len += 5;
+		}
+		else if ((ch >= 0x20) && (ch <= 0x7F)) {
+			buf[len++] = ch;
+			buf[len] = 0;
+		}
+		else if (ch < 0x20) {
+			/* we probably shouldn't be doing this */
+			buf[len++] = '_';
+			buf[len] = 0;
+		}
+		else {
+			IsUtf8Sequence =  Ctdl_GetUtf8SequenceLength(ptr, pche);
+			if (IsUtf8Sequence)
+			{
+				while ((IsUtf8Sequence > 0) && 
+				       (ptr < pche))
+				{
+					buf[len] = *ptr;
+					ptr ++;
+					--IsUtf8Sequence;
+				}
+			}
+			else
+			{
+				char oct[10];
+				sprintf(oct, "&#%o;", ch);
+				strcpy(&buf[len], oct);
+				len += strlen(oct);
+			}
+		}
+		if ((len + 6) > bufsiz) {
+			return(buf);
+		}
+	}
+	return(buf);
+}
+
+
 /*
  * We have just received a <stream> tag from the client, so send them ours
  */
 void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
 {
-	citxmpp *Xmpp = XMPP;
+	char xmlbuf[256];
 
 	while (*attr) {
 		if (!strcasecmp(attr[0], "to")) {
-			safestrncpy(Xmpp->server_name, attr[1], sizeof Xmpp->server_name);
+			safestrncpy(XMPP->server_name, attr[1], sizeof XMPP->server_name);
 		}
 		attr += 2;
 	}
 
-	XPUT("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+	cprintf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+
+   	cprintf("<stream:stream ");
+	cprintf("from=\"%s\" ", xmlesc(xmlbuf, XMPP->server_name, sizeof xmlbuf));
+	cprintf("id=\"%08x\" ", CC->cs_pid);
+	cprintf("version=\"1.0\" ");
+	cprintf("xmlns:stream=\"http://etherx.jabber.org/streams\" ");
+	cprintf("xmlns=\"jabber:client\">");
 
-   	XPUT("<stream:stream ");
-	XPUT("from=\"");
-	XPutProp(Xmpp->server_name, strlen(Xmpp->server_name));
-	XPUT("\" id=\"");
-	XPrintf("%08x\" ", CC->cs_pid);
-	XPUT("version=\"1.0\" "
-		  "xmlns:stream=\"http://etherx.jabber.org/streams\" "
-		  "xmlns=\"jabber:client\">"
 	/* The features of this stream are... */
-	     "<stream:features>");
+	cprintf("<stream:features>");
 
 	/*
 	 * TLS encryption (but only if it isn't already active)
 	 */ 
 #ifdef HAVE_OPENSSL
 	if (!CC->redirect_ssl) {
-		XPUT("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'></starttls>");
+		cprintf("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'></starttls>");
 	}
 #endif
 
@@ -157,289 +215,262 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
 		xmpp_output_auth_mechs();
 
 		/* Also offer non-SASL authentication */
-		XPUT("<auth xmlns=\"http://jabber.org/features/iq-auth\"/>");
+		cprintf("<auth xmlns=\"http://jabber.org/features/iq-auth\"/>");
 	}
 
 	/* Offer binding and sessions as part of our feature set */
-	XPUT("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\"/>"
-		  "<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>"
-		  "</stream:features>");
+	cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\"/>");
+	cprintf("<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>");
 
-	CC->is_async = 1;		/* XMPP sessions are inherently async-capable */
-}
+	cprintf("</stream:features>");
 
-void xmpp_start_query(void *data, const char *supplied_el, const char **attr)
-{
-	XMPP->iq_query_xmlns[0] = 0;
-	safestrncpy(XMPP->iq_query_xmlns, supplied_el, sizeof XMPP->iq_query_xmlns);
+	CC->is_async = 1;		/* XMPP sessions are inherently async-capable */
 }
 
-void xmpp_start_bind(void *data, const char *supplied_el, const char **attr)
-{
-	XMPP->bind_requested = 1;
-}
 
-void xmpp_start_iq(void *data, const char *supplied_el, const char **attr)
-{
+void xmpp_xml_start(void *data, const char *supplied_el, const char **attr) {
+	char el[256];
+	char *sep = NULL;
 	int i;
+
+	/* Axe the namespace, we don't care about it */
+	safestrncpy(el, supplied_el, sizeof el);
+	while (sep = strchr(el, ':'), sep) {
+		strcpy(el, ++sep);
+	}
+
+#ifdef XMPP_XML_DEBUG
+	syslog(LOG_DEBUG, "xmpp: ELEMENT START: <%s>", el);
 	for (i=0; attr[i] != NULL; i+=2) {
-		if (!strcasecmp(attr[i], "type")) {
-			safestrncpy(XMPP->iq_type, attr[i+1], sizeof XMPP->iq_type);
-		}
-		else if (!strcasecmp(attr[i], "id")) {
-			safestrncpy(XMPP->iq_id, attr[i+1], sizeof XMPP->iq_id);
-		}
-		else if (!strcasecmp(attr[i], "from")) {
-			safestrncpy(XMPP->iq_from, attr[i+1], sizeof XMPP->iq_from);
-		}
-		else if (!strcasecmp(attr[i], "to")) {
-			safestrncpy(XMPP->iq_to, attr[i+1], sizeof XMPP->iq_to);
-		}
+		syslog(LOG_DEBUG, "xmpp: Attribute '%s' = '%s'", attr[i], attr[i+1]);
 	}
-}
+#endif
 
-void xmpp_start_auth(void *data, const char *supplied_el, const char **attr)
-{
-	int i;
+	if (!strcasecmp(el, "stream")) {
+		xmpp_stream_start(data, supplied_el, attr);
+	}
 
-	XMPP->sasl_auth_mech[0] = 0;
-	for (i=0; attr[i] != NULL; i+=2) {
-		if (!strcasecmp(attr[i], "mechanism")) {
-			safestrncpy(XMPP->sasl_auth_mech, attr[i+1], sizeof XMPP->sasl_auth_mech);
+	else if (!strcasecmp(el, "query")) {
+		XMPP->iq_query_xmlns[0] = 0;
+		safestrncpy(XMPP->iq_query_xmlns, supplied_el, sizeof XMPP->iq_query_xmlns);
+	}
+
+	else if (!strcasecmp(el, "bind")) {
+		XMPP->bind_requested = 1;
+	}
+
+	else if (!strcasecmp(el, "iq")) {
+		for (i=0; attr[i] != NULL; i+=2) {
+			if (!strcasecmp(attr[i], "type")) {
+				safestrncpy(XMPP->iq_type, attr[i+1], sizeof XMPP->iq_type);
+			}
+			else if (!strcasecmp(attr[i], "id")) {
+				safestrncpy(XMPP->iq_id, attr[i+1], sizeof XMPP->iq_id);
+			}
+			else if (!strcasecmp(attr[i], "from")) {
+				safestrncpy(XMPP->iq_from, attr[i+1], sizeof XMPP->iq_from);
+			}
+			else if (!strcasecmp(attr[i], "to")) {
+				safestrncpy(XMPP->iq_to, attr[i+1], sizeof XMPP->iq_to);
+			}
 		}
 	}
-}
 
-void xmpp_start_message(void *data, const char *supplied_el, const char **attr)
-{
-	int i;
+	else if (!strcasecmp(el, "auth")) {
+		XMPP->sasl_auth_mech[0] = 0;
+		for (i=0; attr[i] != NULL; i+=2) {
+			if (!strcasecmp(attr[i], "mechanism")) {
+				safestrncpy(XMPP->sasl_auth_mech, attr[i+1], sizeof XMPP->sasl_auth_mech);
+			}
+		}
+	}
 
-	for (i=0; attr[i] != NULL; i+=2) {
-		if (!strcasecmp(attr[i], "to")) {
-			safestrncpy(XMPP->message_to, attr[i+1], sizeof XMPP->message_to);
+	else if (!strcasecmp(el, "message")) {
+		for (i=0; attr[i] != NULL; i+=2) {
+			if (!strcasecmp(attr[i], "to")) {
+				safestrncpy(XMPP->message_to, attr[i+1], sizeof XMPP->message_to);
+			}
 		}
 	}
-}
 
-void xmpp_start_html(void *data, const char *supplied_el, const char **attr)
-{
-	++XMPP->html_tag_level;
+	else if (!strcasecmp(el, "html")) {
+		++XMPP->html_tag_level;
+	}
 }
 
-void xmpp_xml_start(void *data, const char *supplied_el, const char **attr)
-{
+
+
+void xmpp_xml_end(void *data, const char *supplied_el) {
 	char el[256];
-	long newlen;
-	long len;
 	char *sep = NULL;
-	void *pv;
-	
-	/* Axe the namespace, we don't care about it */
-	newlen = len = safestrncpy(el, supplied_el, sizeof el);
-	while (sep = strchr(el, ':'), sep)
-	{
-		newlen -= ++sep - el;
-		memmove(el, sep, newlen + 1);
-		len = newlen;
-	}
+	char xmlbuf[256];
 
-	/*
-	XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT START: <%s>\n", el);
-	for (i=0; attr[i] != NULL; i+=2) {
-		XMPP_syslog(LOG_DEBUG, "                    Attribute '%s' = '%s'\n", attr[i], attr[i+1]);
+	/* Axe the namespace, we don't care about it */
+	safestrncpy(el, supplied_el, sizeof el);
+	while (sep = strchr(el, ':'), sep) {
+		strcpy(el, ++sep);
 	}
-	uncomment for more verbosity */
 
-	if (GetHash(XMPP_StartHandlers, el, len, &pv))
-	{
-		xmpp_handler *h;
-		h = (xmpp_handler*) pv;
-		h->Handler(data, supplied_el, attr);
+#ifdef XMPP_XML_DEBUG
+	syslog(LOG_DEBUG, "xmpp: ELEMENT END  : <%s>", el);
+	if (XMPP->chardata_len > 0) {
+		syslog(LOG_DEBUG, "xmpp: chardata: %s", XMPP->chardata);
 	}
-}
+#endif
 
-void xmpp_end_resource(void *data, const char *supplied_el, const char **attr)
-{
-	if (XMPP->chardata_len > 0) {
-		safestrncpy(XMPP->iq_client_resource, XMPP->chardata,
-			    sizeof XMPP->iq_client_resource);
-		striplt(XMPP->iq_client_resource);
+	if (!strcasecmp(el, "resource")) {
+		if (XMPP->chardata_len > 0) {
+			safestrncpy(XMPP->iq_client_resource, XMPP->chardata, sizeof XMPP->iq_client_resource);
+			striplt(XMPP->iq_client_resource);
+		}
 	}
-}
 
-void xmpp_end_username(void *data, const char *supplied_el, const char **attr)
-{
-	/* NON SASL ONLY */
-	if (XMPP->chardata_len > 0) {
-		safestrncpy(XMPP->iq_client_username, XMPP->chardata,
-			    sizeof XMPP->iq_client_username);
-		striplt(XMPP->iq_client_username);
+	else if (!strcasecmp(el, "username")) {		/* NON SASL ONLY */
+		if (XMPP->chardata_len > 0) {
+			safestrncpy(XMPP->iq_client_username, XMPP->chardata, sizeof XMPP->iq_client_username);
+			striplt(XMPP->iq_client_username);
+		}
 	}
-}
 
-void xmpp_end_password(void *data, const char *supplied_el, const char **attr)
-{		/* NON SASL ONLY */
-	if (XMPP->chardata_len > 0) {
-		safestrncpy(XMPP->iq_client_password, XMPP->chardata,
-			    sizeof XMPP->iq_client_password);
-		striplt(XMPP->iq_client_password);
+	else if (!strcasecmp(el, "password")) {		/* NON SASL ONLY */
+		if (XMPP->chardata_len > 0) {
+			safestrncpy(XMPP->iq_client_password, XMPP->chardata, sizeof XMPP->iq_client_password);
+			striplt(XMPP->iq_client_password);
+		}
 	}
-}
 
-void xmpp_end_iq(void *data, const char *supplied_el, const char **attr)
-{
-	citxmpp *Xmpp = XMPP;
+	else if (!strcasecmp(el, "iq")) {
 
-	/*
-	 * iq type="get" (handle queries)
-	 */
-	if (!strcasecmp(Xmpp->iq_type, "get"))
-	{
 		/*
-		 * Query on a namespace
+		 * iq type="get" (handle queries)
 		 */
-		if (!IsEmptyStr(Xmpp->iq_query_xmlns)) {
-			xmpp_query_namespace(Xmpp->iq_id, Xmpp->iq_from,
-					     Xmpp->iq_to, Xmpp->iq_query_xmlns);
-		}
-		
-		/*
-		 * ping ( http://xmpp.org/extensions/xep-0199.html )
-		 */
-		else if (Xmpp->ping_requested) {
-			XPUT("<iq type=\"result\" ");
-			if (!IsEmptyStr(Xmpp->iq_from)) {
-				XPUT("to=\"");
-				XPutProp(Xmpp->iq_from, strlen(Xmpp->iq_from));
-				XPUT("\" ");
+		if (!strcasecmp(XMPP->iq_type, "get")) {
+
+			/*
+			 * Query on a namespace
+			 */
+			if (!IsEmptyStr(XMPP->iq_query_xmlns)) {
+				xmpp_query_namespace(XMPP->iq_id, XMPP->iq_from, XMPP->iq_to, XMPP->iq_query_xmlns);
 			}
-			if (!IsEmptyStr(Xmpp->iq_to)) {
-				XPUT("from=\"");
-				XPutProp(Xmpp->iq_to, strlen(Xmpp->iq_to));
-				XPUT("\" ");
+
+			/*
+			 * ping ( http://xmpp.org/extensions/xep-0199.html )
+			 */
+			else if (XMPP->ping_requested) {
+				cprintf("<iq type=\"result\" ");
+				if (!IsEmptyStr(XMPP->iq_from)) {
+					cprintf("to=\"%s\" ", xmlesc(xmlbuf, XMPP->iq_from, sizeof xmlbuf));
+				}
+				if (!IsEmptyStr(XMPP->iq_to)) {
+					cprintf("from=\"%s\" ", xmlesc(xmlbuf, XMPP->iq_to, sizeof xmlbuf));
+				}
+				cprintf("id=\"%s\"/>", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
 			}
-			XPUT("id=\"");
-			XPutProp(Xmpp->iq_id, strlen(Xmpp->iq_id));
-			XPUT("\"/>");
-		}
 
-		/*
-		 * Unknown query ... return the XML equivalent of a blank stare
-		 */
-		else {
-/*
-			Xmpp_syslog(LOG_DEBUG,
-				    "Unknown query <%s> - returning <service-unavailable/>\n",
-				    el
+			/*
+			 * Unknown query ... return the XML equivalent of a blank stare
+			 */
+			else {
+				syslog(LOG_DEBUG, "xmpp: Unknown query <%s> - returning <service-unavailable/>", el);
+				cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
+				cprintf("<error code=\"503\" type=\"cancel\">"
+					"<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
+					"</error>"
 				);
-*/
-			XPUT("<iq type=\"error\" id=\"");
-			XPutProp(Xmpp->iq_id, strlen(Xmpp->iq_id));
-			XPUT("\">"
-			     "<error code=\"503\" type=\"cancel\">"
-			     "<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
-			     "</error>"
-			     "</iq>");
+				cprintf("</iq>");
+			}
 		}
-	}
 
-	/*
-	 * Non SASL authentication
-	 */
-	else if (
-		(!strcasecmp(Xmpp->iq_type, "set"))
-		&& (!strcasecmp(Xmpp->iq_query_xmlns, "jabber:iq:auth:query"))
-		) {
-		
-		xmpp_non_sasl_authenticate(
-			Xmpp->iq_id,
-			Xmpp->iq_client_username,
-			Xmpp->iq_client_password,
-			Xmpp->iq_client_resource
+		/*
+		 * Non SASL authentication
+		 */
+		else if (
+			(!strcasecmp(XMPP->iq_type, "set"))
+			&& (!strcasecmp(XMPP->iq_query_xmlns, "jabber:iq:auth:query"))
+			) {
+
+			xmpp_non_sasl_authenticate(
+				XMPP->iq_id,
+				XMPP->iq_client_username,
+				XMPP->iq_client_password,
+				XMPP->iq_client_resource
 			);
-	}
+		}	
 
-	/*
-	 * If this <iq> stanza was a "bind" attempt, process it ...
-	 */
-	else if (
-		(Xmpp->bind_requested)
-		&& (!IsEmptyStr(Xmpp->iq_id))
-		&& (!IsEmptyStr(Xmpp->iq_client_resource))
-		&& (CC->logged_in)
+		/*
+		 * If this <iq> stanza was a "bind" attempt, process it ...
+		 */
+		else if (
+			(XMPP->bind_requested)
+			&& (!IsEmptyStr(XMPP->iq_id))
+			&& (CC->logged_in)
 		) {
 
-		/* Generate the "full JID" of the client resource */
+			/* If the client has not specified a client resource, generate one */
 
-		snprintf(Xmpp->client_jid, sizeof Xmpp->client_jid,
-			 "%s/%s",
-			 CC->cs_inet_email,
-			 Xmpp->iq_client_resource
-			);
+			if (IsEmptyStr(XMPP->iq_client_resource)) {
+				generate_uuid(XMPP->iq_client_resource);
+			}
 
-		/* Tell the client what its JID is */
+			/* Generate the "full JID" of the client resource */
+			snprintf(XMPP->client_jid, sizeof XMPP->client_jid, "%s/%s", CC->cs_inet_email, XMPP->iq_client_resource);
 
-		XPUT("<iq type=\"result\" id=\"");
-		XPutProp(Xmpp->iq_id, strlen(Xmpp->iq_id));
-		XPUT("\">"
-		     "<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\">");
-		XPUT("<jid>");
-		XPutBody(Xmpp->client_jid, strlen(Xmpp->client_jid));
-		XPUT("</jid>"
-		     "</bind>"
-		     "</iq>");
-	}
+			/* Tell the client what its JID is */
 
-	else if (Xmpp->iq_session) {
-		XPUT("<iq type=\"result\" id=\"");
-		XPutProp(Xmpp->iq_id, strlen(Xmpp->iq_id));
-		XPUT("\">"
-		     "</iq>");
+			cprintf("<iq type=\"result\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
+			cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\">");
+			cprintf("<jid>%s</jid>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
+			cprintf("</bind>");
+			cprintf("</iq>");
+		}
+
+		else if (XMPP->iq_session) {
+			cprintf("<iq type=\"result\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
+			cprintf("</iq>");
+		}
+
+		else {
+			cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
+			cprintf("<error>Don't know how to do '%s'!</error>", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf));
+			cprintf("</iq>");
+			syslog(LOG_DEBUG, "XMPP: don't know how to do iq_type='%s' with iq_query_xmlns='%s'", XMPP->iq_type, XMPP->iq_query_xmlns);
+		}
+
+		/* Now clear these fields out so they don't get used by a future stanza */
+		XMPP->iq_id[0] = 0;
+		XMPP->iq_from[0] = 0;
+		XMPP->iq_to[0] = 0;
+		XMPP->iq_type[0] = 0;
+		XMPP->iq_client_resource[0] = 0;
+		XMPP->iq_session = 0;
+		XMPP->iq_query_xmlns[0] = 0;
+		XMPP->bind_requested = 0;
+		XMPP->ping_requested = 0;
 	}
 
-	else {
-		XPUT("<iq type=\"error\" id=\"");
-		XPutProp(Xmpp->iq_id, strlen(Xmpp->iq_id));
-		XPUT("\">");
-		XPUT("<error>Don't know howto do '");
-		XPutBody(Xmpp->iq_type, strlen(Xmpp->iq_type));
-		XPUT("'!</error>"
-		     "</iq>");
-	}
-
-	/* Now clear these fields out so they don't get used by a future stanza */
-	Xmpp->iq_id[0] = 0;
-	Xmpp->iq_from[0] = 0;
-	Xmpp->iq_to[0] = 0;
-	Xmpp->iq_type[0] = 0;
-	Xmpp->iq_client_resource[0] = 0;
-	Xmpp->iq_session = 0;
-	Xmpp->iq_query_xmlns[0] = 0;
-	Xmpp->bind_requested = 0;
-	Xmpp->ping_requested = 0;
-}
+	else if (!strcasecmp(el, "auth")) {
 
+		/* Try to authenticate (this function is responsible for the output stanza) */
+		xmpp_sasl_auth(XMPP->sasl_auth_mech, (XMPP->chardata != NULL ? XMPP->chardata : "") );
 
-void xmpp_end_auth(void *data, const char *supplied_el, const char **attr)
-{
-	/* Try to authenticate (this function is responsible for the output stanza) */
-	xmpp_sasl_auth(XMPP->sasl_auth_mech, (XMPP->chardata != NULL ? XMPP->chardata : "") );
-	
-	/* Now clear these fields out so they don't get used by a future stanza */
-	XMPP->sasl_auth_mech[0] = 0;
-}
+		/* Now clear these fields out so they don't get used by a future stanza */
+		XMPP->sasl_auth_mech[0] = 0;
+	}
 
-void xmpp_end_session(void *data, const char *supplied_el, const char **attr)
-{
-	XMPP->iq_session = 1;
-}
+	else if (!strcasecmp(el, "session")) {
+		XMPP->iq_session = 1;
+	}
 
-void xmpp_end_body(void *data, const char *supplied_el, const char **attr)
-{
-	if (XMPP->html_tag_level == 0)
-	{
-		if (XMPP->message_body != NULL)
-		{
+	else if (!strcasecmp(el, "presence")) {
+
+		/* Respond to a <presence> update by firing back with presence information
+		 * on the entire wholist.  Check this assumption, it's probably wrong.
+		 */
+		xmpp_wholist_presence_dump();
+	}
+
+	else if ( (!strcasecmp(el, "body")) && (XMPP->html_tag_level == 0) ) {
+		if (XMPP->message_body != NULL) {
 			free(XMPP->message_body);
 			XMPP->message_body = NULL;
 		}
@@ -447,72 +478,48 @@ void xmpp_end_body(void *data, const char *supplied_el, const char **attr)
 			XMPP->message_body = strdup(XMPP->chardata);
 		}
 	}
-}
 
-void xmpp_end_html(void *data, const char *supplied_el, const char **attr)
-{
-	--XMPP->html_tag_level;
-}
+	else if (!strcasecmp(el, "message")) {
+		xmpp_send_message(XMPP->message_to, XMPP->message_body);
+		XMPP->html_tag_level = 0;
+	}
 
-void xmpp_end_starttls(void *data, const char *supplied_el, const char **attr)
-{
+	else if (!strcasecmp(el, "html")) {
+		--XMPP->html_tag_level;
+	}
+
+	else if (!strcasecmp(el, "starttls")) {
 #ifdef HAVE_OPENSSL
-	XPUT("<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
-	XUnbuffer();
-	CtdlModuleStartCryptoMsgs(NULL, NULL, NULL);
-	if (!CC->redirect_ssl) CC->kill_me = KILLME_NO_CRYPTO;
+		cprintf("<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+		CtdlModuleStartCryptoMsgs(NULL, NULL, NULL);
+		if (!CC->redirect_ssl) CC->kill_me = KILLME_NO_CRYPTO;
 #else
-	XPUT("<failure xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
-	CC->kill_me = KILLME_NO_CRYPTO;
+		cprintf("<failure xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+		CC->kill_me = KILLME_NO_CRYPTO;
 #endif
-}
-
-void xmpp_end_ping(void *data, const char *supplied_el, const char **attr)
-{
-	XMPP->ping_requested = 1;
-}
-
-void xmpp_end_stream(void *data, const char *supplied_el, const char **attr)
-{
-	XMPPM_syslog(LOG_DEBUG, "XMPP client shut down their stream\n");
-	xmpp_massacre_roster();
-	XPUT("</stream>\n");
-	CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
-}
-
-void xmpp_xml_end(void *data, const char *supplied_el)
-{
-	char el[256];
-	long len;
-	long newlen;
-	char *sep = NULL;
-	void *pv;
+	}
 
-	/* Axe the namespace, we don't care about it */
-	newlen = len = safestrncpy(el, supplied_el, sizeof el);
-	while (sep = strchr(el, ':'), sep) {
+	else if (!strcasecmp(el, "ping")) {
+		XMPP->ping_requested = 1;
+	}
 
-		newlen -= ++sep - el;
-		memmove(el, sep, newlen + 1);
-		len = newlen;
+	else if (!strcasecmp(el, "stream")) {
+		syslog(LOG_DEBUG, "xmpp: client shut down their stream");
+		xmpp_massacre_roster();
+		cprintf("</stream>\n");
+		CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
 	}
 
-	/*
-	XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT END  : <%s>\n", el);
-	if (XMPP->chardata_len > 0) {
-		XMPP_syslog(LOG_DEBUG, "          chardata: %s\n", XMPP->chardata);
+	else if (!strcasecmp(el, "query")) {
+		/* already processed , no further action needed here */
 	}
-	uncomment for more verbosity */
 
-	if (GetHash(XMPP_EndHandlers, el, len, &pv))
-	{
-		xmpp_handler *h;
-		h = (xmpp_handler*) pv;
-		h->Handler(data, supplied_el, NULL);
+	else if (!strcasecmp(el, "bind")) {
+		/* already processed , no further action needed here */
 	}
-	else
-	{
-		XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
+
+	else {
+		syslog(LOG_DEBUG, "xmpp: ignoring unknown tag <%s>", el);
 	}
 
 	XMPP->chardata_len = 0;
@@ -558,12 +565,10 @@ void xmpp_cleanup_function(void) {
 		}
 	}
 	XML_ParserFree(XMPP->xp);
-	FreeStrBuf(&XMPP->OutBuf);
 	free(XMPP);
 }
 
 
-
 /*
  * Here's where our XMPP session begins its happy day.
  */
@@ -573,12 +578,12 @@ void xmpp_greeting(void) {
 	CC->session_specific_data = malloc(sizeof(citxmpp));
 	memset(XMPP, 0, sizeof(citxmpp));
 	XMPP->last_event_processed = queue_event_seq;
-	XMPP->OutBuf = NewStrBufPlain(NULL, SIZ);
+
 	/* XMPP does not use a greeting, but we still have to initialize some things. */
 
 	XMPP->xp = XML_ParserCreateNS("UTF-8", ':');
 	if (XMPP->xp == NULL) {
-		XMPPM_syslog(LOG_ALERT, "Cannot create XML parser!\n");
+		syslog(LOG_ERR, "xmpp: cannot create XML parser");
 		CC->kill_me = KILLME_XML_PARSER;
 		return;
 	}
@@ -599,7 +604,6 @@ void xmpp_greeting(void) {
 #endif
 
 	CC->can_receive_im = 1;		/* This protocol is capable of receiving instant messages */
-	XUnbuffer();
 }
 
 
@@ -616,11 +620,10 @@ void xmpp_command_loop(void) {
 		XML_Parse(XMPP->xp, ChrPtr(stream_input), rc, 0);
 	}
 	else {
-		XMPPM_syslog(LOG_ERR, "client disconnected: ending session.\n");
+		syslog(LOG_ERR, "xmpp: client disconnected: ending session.");
 		CC->kill_me = KILLME_CLIENT_DISCONNECTED;
 	}
 	FreeStrBuf(&stream_input);
-	XUnbuffer();
 }
 
 
@@ -649,79 +652,18 @@ void xmpp_logout_hook(void) {
 }
 
 
-void LogXMPPSrvDebugEnable(const int n)
-{
-	XMPPSrvDebugEnable = n;
-}
 const char *CitadelServiceXMPP="XMPP";
 extern void xmpp_cleanup_events(void);
-
-
-
-/******************************************************************************
- *                    XMPP handler registering logic                           *
- ******************************************************************************/
-
-void AddXMPPStartHandler(const char *key,
-			 long len,
-			 xmpp_handler_func Handler,
-			 int Flags)
-{
-	xmpp_handler *h;
-	h = (xmpp_handler*) malloc(sizeof (xmpp_handler));
-	h->Flags = Flags;
-	h->Handler = Handler;
-	Put(XMPP_StartHandlers, key, len, h, NULL);
-}
-
-void AddXMPPEndHandler(const char *key,
-		       long len,
-		       xmpp_handler_func Handler,
-		       int Flags)
-{
-	xmpp_handler *h;
-	h = (xmpp_handler*) malloc(sizeof (xmpp_handler));
-	h->Flags = Flags;
-	h->Handler = Handler;
-	Put(XMPP_EndHandlers, key, len, h, NULL);
-}
-
 CTDL_MODULE_INIT(xmpp)
 {
 	if (!threading) {
-		CtdlRegisterServiceHook(config.c_xmpp_c2s_port,
+		CtdlRegisterServiceHook(CtdlGetConfigInt("c_xmpp_c2s_port"),
 					NULL,
 					xmpp_greeting,
 					xmpp_command_loop,
 					xmpp_async_loop,
-					CitadelServiceXMPP);
-
-
-		XMPP_StartHandlers = NewHash(1, NULL);
-		XMPP_EndHandlers = NewHash(1, NULL);
-
-		AddXMPPEndHandler(HKEY("resource"),	 xmpp_end_resource, 0);
-		AddXMPPEndHandler(HKEY("username"),	 xmpp_end_username, 0);
-		AddXMPPEndHandler(HKEY("password"),	 xmpp_end_password, 0);
-		AddXMPPEndHandler(HKEY("iq"),		 xmpp_end_iq, 0);
-		AddXMPPEndHandler(HKEY("auth"),		 xmpp_end_auth, 0);
-		AddXMPPEndHandler(HKEY("session"),	 xmpp_end_session, 0);
-		AddXMPPEndHandler(HKEY("body"),		 xmpp_end_body, 0);
-		AddXMPPEndHandler(HKEY("html"),		 xmpp_end_html, 0);
-		AddXMPPEndHandler(HKEY("starttls"),	 xmpp_end_starttls, 0);
-		AddXMPPEndHandler(HKEY("ping"),		 xmpp_end_ping, 0);
-		AddXMPPEndHandler(HKEY("stream"),	 xmpp_end_stream, 0);
-
-		AddXMPPStartHandler(HKEY("stream"),	xmpp_stream_start, 0);
-		AddXMPPStartHandler(HKEY("query"),	xmpp_start_query, 0);
-		AddXMPPStartHandler(HKEY("bind"),	xmpp_start_bind, 0);
-		AddXMPPStartHandler(HKEY("iq"),		xmpp_start_iq, 0);
-		AddXMPPStartHandler(HKEY("auth"),	xmpp_start_auth, 0);
-		AddXMPPStartHandler(HKEY("message"),	xmpp_start_message, 0);
-		AddXMPPStartHandler(HKEY("html"),	xmpp_start_html, 0);
-
-
-		CtdlRegisterDebugFlagHook(HKEY("serv_xmpp"), LogXMPPSrvDebugEnable, &XMPPSrvDebugEnable);
+					CitadelServiceXMPP
+		);
 		CtdlRegisterSessionHook(xmpp_cleanup_function, EVT_STOP, PRIO_STOP + 70);
                 CtdlRegisterSessionHook(xmpp_login_hook, EVT_LOGIN, PRIO_LOGIN + 90);
                 CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT, PRIO_LOGOUT + 90);