X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fserv_xmpp.c;h=b06d11aef107c4017d3849be24ecf9b932ccd44a;hb=85a4d8d0b5af0edda2a0fa27c66457b775eb1209;hp=e696069a171ece7b5cac38dc2cb25abe09335231;hpb=bd5270c4c5ddd7c132933542d9c5f24ef5708948;p=citadel.git

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index e696069a1..b06d11aef 100644
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <pwd.h>
@@ -42,6 +43,7 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+#define SHOW_ME_VAPPEND_PRINTF
 #include <libcitadel.h>
 #include <expat.h>
 #include "citadel.h"
@@ -65,171 +67,196 @@
 struct xmpp_event *xmpp_queue = NULL;
 HashList *XMPP_StartHandlers = NULL;
 HashList *XMPP_EndHandlers = NULL;
+HashList *XMPP_SupportedNamespaces = NULL;
+HashList *XMPP_NameSpaces = 0;
+HashList *FlatToken = NULL;
 
 int XMPPSrvDebugEnable = 0;
 
+void XUnbuffer(void)
+{
+	citxmpp *Xmpp = XMPP;
 
+	cputbuf(Xmpp->OutBuf);
+	FlushStrBuf(Xmpp->OutBuf);
+}
 
-#ifdef HAVE_XML_STOPPARSER
-/* Stop the parser if an entity declaration is hit. */
-static void xmpp_entity_declaration(void *userData, const XML_Char *entityName,
-				int is_parameter_entity, const XML_Char *value,
-				int value_length, const XML_Char *base,
-				const XML_Char *systemId, const XML_Char *publicId,
-				const XML_Char *notationName
-) {
-	XMPPM_syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser.");
-	XML_StopParser(XMPP->xp, XML_FALSE);
+void XPutBody(const char *Str, long Len)
+{
+	StrBufXMLEscAppend(XMPP->OutBuf, NULL, Str, Len, 0);
 }
-#endif
 
-static inline int XMPP_GetUtf8SequenceLength(const char *CharS, const char *CharE)
+void XPutProp(const char *Str, long Len)
 {
-	/* if this is is migrated to strbuf, remove this copy. */
-	int n = 0;
-        unsigned char test = (1<<7);
+	StrEscAppend(XMPP->OutBuf, NULL, Str, 0, 1);
+}
 
-	if ((*CharS & 0xC0) != 0xC0) 
-		return 1;
+void XPut(const char *Str, long Len)
+{
+	StrBufAppendBufPlain(XMPP->OutBuf, Str, Len, 0);
+}
 
-	while ((n < 8) && 
-	       ((test & ((unsigned char)*CharS)) != 0)) 
-	{
-		test = test >> 1;
-		n ++;
-	}
-	if ((n > 6) || ((CharE - CharS) < n))
-		n = 0;
-	return n;
+void XPrintf(const char *Format, ...)
+{
+        va_list arg_ptr;
+        va_start(arg_ptr, Format);
+	StrBufVAppendPrintf(XMPP->OutBuf, Format, arg_ptr);
+	va_end(arg_ptr);
 }
 
 
-/*
- * 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.
- *
- * BUG: this does not properly handle UTF-8
- */
-char *xmlesc(char *buf, char *str, int bufsiz)
-{
-	char *ptr;
-	char *eiptr;
-	unsigned char ch;
-	int inlen;
-	int len = 0;
-	int IsUtf8Sequence;
-
-	if (!buf) return(NULL);
-	buf[0] = 0;
-	len = 0;
-	if (!str) {
-		return(buf);
-	}
-
-	inlen = strlen(str);
-	eiptr = 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 {
-			char oct[32];
+void XPrint(const char *Token, long tlen,
+	    int Flags,
+	    ...)
 
-			IsUtf8Sequence =  XMPP_GetUtf8SequenceLength(&buf[len], eiptr);
-			if (IsUtf8Sequence)
-			{
-				while (IsUtf8Sequence > 0){
-					buf[len] = *ptr;
-					len ++;
-					if (--IsUtf8Sequence)
-						ptr++;
-				}
-				buf[len] = '\0';
-			}
-			else
+{
+	int BodySeen = 0;
+	int ArgType;
+	int Finished = 0;
+	char *PName;
+	long PLen;
+	char *Val;
+	long VLen;
+        va_list arg_ptr;
+
+	XPUT("<");
+	XPut(Token, tlen);
+
+        va_start(arg_ptr, Flags);
+	while (!Finished)
+	{
+		ArgType = va_arg(arg_ptr, int);
+		switch (ArgType)
+		{
+		case TYPE_STR:
+			PName = va_arg(arg_ptr, char*);
+			PLen  = va_arg(arg_ptr, long);
+			Val   = va_arg(arg_ptr, char*);
+			VLen  = va_arg(arg_ptr, long);
+			XPUT(" ");
+			XPut(PName, PLen);
+			XPUT("=\"");
+			XPutProp(Val, VLen);
+			XPUT("\"");
+			break;
+		case TYPE_OPTSTR:
+			PName = va_arg(arg_ptr, char*);
+			PLen  = va_arg(arg_ptr, long);
+			Val   = va_arg(arg_ptr, char*);
+			VLen  = va_arg(arg_ptr, long);
+			if (VLen > 0)
 			{
-				sprintf(oct, "&#%o;", ch);
-				strcpy(&buf[len], oct);
-				len += strlen(oct);
+				XPUT(" ");
+				XPut(PName, PLen);
+				XPUT("=\"");
+				XPutProp(Val, VLen);
+				XPUT("\"");
 			}
+			break;
+		case TYPE_INT:
+			PName = va_arg(arg_ptr, char*);
+			PLen  = va_arg(arg_ptr, long);
+			VLen  = va_arg(arg_ptr, long);
+			XPUT(" ");
+			XPut(PName, PLen);
+			XPUT("=\"");
+			XPrintf("%ld", VLen);
+			XPUT("\"");
+			break;
+		case TYPE_BODYSTR:
+			BodySeen = 1;
+			XPUT(">");
+			Val   = va_arg(arg_ptr, char*);
+			VLen  = va_arg(arg_ptr, long);
+			XPutBody(Val, VLen);
+			break;
+		case TYPE_ARGEND:
+			Finished = 1;
+			break;
 		}
-		if ((len + 6) > bufsiz) {
-			return(buf);
+	}
+	if (Flags == XCLOSED)
+	{
+		if (BodySeen)
+		{
+			XPUT("</");
+			XPut(Token, tlen);
+			XPUT(">");
+		}
+		else
+		{
+			XPUT("></");
+			XPut(Token, tlen);
+			XPUT(">");
 		}
 	}
-	return(buf);
+	else
+		XPUT(">");
+	va_end(arg_ptr);
 }
 
+#ifdef HAVE_XML_STOPPARSER
+/* Stop the parser if an entity declaration is hit. */
+static void xmpp_entity_declaration(void *userData, const XML_Char *entityName,
+				int is_parameter_entity, const XML_Char *value,
+				int value_length, const XML_Char *base,
+				const XML_Char *systemId, const XML_Char *publicId,
+				const XML_Char *notationName
+) {
+	XMPPM_syslog(LOG_WARNING, "Illegal entity declaration encountered; stopping parser.");
+	XML_StopParser(XMPP->xp, XML_FALSE);
+}
+#endif
 
 /*
  * 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)
 {
-	char xmlbuf[256];
+	citxmpp *Xmpp = XMPP;
 
 	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;
 	}
 
-	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("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
 
+   	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... */
-	cprintf("<stream:features>");
+	     "<stream:features>");
 
 	/*
 	 * TLS encryption (but only if it isn't already active)
 	 */ 
+/*
 #ifdef HAVE_OPENSSL
 	if (!CC->redirect_ssl) {
-		cprintf("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'></starttls>");
+		XPUT("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'></starttls>");
 	}
 #endif
-
+*/
 	if (!CC->logged_in) {
 		/* If we're not logged in yet, offer SASL as our feature set */
 		xmpp_output_auth_mechs();
 
 		/* Also offer non-SASL authentication */
-		cprintf("<auth xmlns=\"http://jabber.org/features/iq-auth\"/>");
+		XPUT("<auth xmlns=\"http://jabber.org/features/iq-auth\"/>");
 	}
 
 	/* Offer binding and sessions as part of our feature set */
-	cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\"/>");
-	cprintf("<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>");
-
-	cprintf("</stream:features>");
+	XPUT("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\"/>"
+		  "<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>"
+		  "</stream:features>");
 
 	CC->is_async = 1;		/* XMPP sessions are inherently async-capable */
 }
@@ -247,6 +274,7 @@ void xmpp_start_bind(void *data, const char *supplied_el, const char **attr)
 
 void xmpp_start_iq(void *data, const char *supplied_el, const char **attr)
 {
+/*
 	int i;
 	for (i=0; attr[i] != NULL; i+=2) {
 		if (!strcasecmp(attr[i], "type")) {
@@ -262,6 +290,7 @@ void xmpp_start_iq(void *data, const char *supplied_el, const char **attr)
 			safestrncpy(XMPP->iq_to, attr[i+1], sizeof XMPP->iq_to);
 		}
 	}
+*/
 }
 
 void xmpp_start_auth(void *data, const char *supplied_el, const char **attr)
@@ -294,21 +323,75 @@ void xmpp_start_html(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];
-	long newlen;
+	HashList *ThisNamespace = NULL;
+	const char *pToken;
+	const char *pch;
+	const char *NS = NULL;
+	long NSLen;
 	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)
+	pToken = supplied_el;
+	pch = strchr(pToken, ':');
+	while (pch != NULL)
 	{
-		newlen -= ++sep - el;
-		memmove(el, sep, newlen + 1);
-		len = newlen;
+		pToken = pch;
+		pch = strchr(pToken  + 1, ':');
 	}
 
+	if (*pToken == ':')
+	{
+		NS = supplied_el;
+		NSLen = pToken - supplied_el;
+		if (GetHash(XMPP_NameSpaces, NS, NSLen, &pv))
+		{
+			ThisNamespace = pv;
+
+		}
+		
+		pToken ++;
+	}
+
+	len = strlen(pToken);
+
+
+	if (ThisNamespace != NULL)
+	{
+		if (GetHash(ThisNamespace, pToken, len, &pv))
+		{
+			TokenHandler *th;
+			void *value;
+			long i = 0;
+
+			th = (TokenHandler*) pv;
+			value = th->GetToken();
+
+			while (attr[i] != NULL)
+			{
+
+				if (GetHash(th->Properties, attr[i], strlen(attr[i]), &pv))
+				{
+					PropertyHandler* ph = pv;
+					char *val;
+					StrBuf **pVal;
+					long len;
+
+					len = strlen(attr[i+1]);
+					val = value;
+					val += ph->offset;
+					pVal = (StrBuf**) val;
+					if (*pVal != NULL)
+						StrBufPlain(*pVal, attr[i+1], len);
+					else
+						*pVal = NewStrBufPlain(attr[i+1], len);
+				}
+				i+=2;
+			}
+			return;
+		}
+
+	}
 	/*
 	XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT START: <%s>\n", el);
 	for (i=0; attr[i] != NULL; i+=2) {
@@ -316,13 +399,12 @@ void xmpp_xml_start(void *data, const char *supplied_el, const char **attr)
 	}
 	uncomment for more verbosity */
 
-	if (GetHash(XMPP_StartHandlers, el, len, &pv))
+	if (GetHash(XMPP_StartHandlers, pToken, len, &pv))
 	{
 		xmpp_handler *h;
 		h = (xmpp_handler*) pv;
 		h->Handler(data, supplied_el, attr);
 	}
-
 }
 
 void xmpp_end_resource(void *data, const char *supplied_el, const char **attr)
@@ -355,32 +437,38 @@ void xmpp_end_password(void *data, const char *supplied_el, const char **attr)
 
 void xmpp_end_iq(void *data, const char *supplied_el, const char **attr)
 {
-	char xmlbuf[256];
+	citxmpp *Xmpp = XMPP;
+
 	/*
 	 * iq type="get" (handle queries)
 	 */
-	if (!strcasecmp(XMPP->iq_type, "get"))
+	if (!strcasecmp(ChrPtr(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_query_xmlns)) {
+			xmpp_query_namespace(&Xmpp->IQ, Xmpp->iq_query_xmlns);
 		}
 		
 		/*
 		 * 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));
+		else if (Xmpp->ping_requested) {
+			XPUT("<iq type=\"result\" ");
+			if (StrLength(Xmpp->IQ.from) > 0) {
+				XPUT("to=\"");
+				XPutSProp(Xmpp->IQ.from);
+				XPUT("\" ");
 			}
-			if (!IsEmptyStr(XMPP->iq_to)) {
-				cprintf("from=\"%s\" ", xmlesc(xmlbuf, XMPP->iq_to, sizeof xmlbuf));
+			if (StrLength(Xmpp->IQ.to)>0) {
+				XPUT("from=\"");
+				XPutSProp(Xmpp->IQ.to);
+				XPUT("\" ");
 			}
-			cprintf("id=\"%s\"/>", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
+			XPUT("id=\"");
+			XPutSProp(Xmpp->IQ.id);
+			XPUT("\"/>");
 		}
 
 		/*
@@ -388,17 +476,18 @@ void xmpp_end_iq(void *data, const char *supplied_el, const char **attr)
 		 */
 		else {
 /*
-			XMPP_syslog(LOG_DEBUG,
+			Xmpp_syslog(LOG_DEBUG,
 				    "Unknown query <%s> - returning <service-unavailable/>\n",
 				    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>"
-				);
-			cprintf("</iq>");
+			XPUT("<iq type=\"error\" id=\"");
+			XPutSProp(Xmpp->IQ.id);
+			XPUT("\">"
+			     "<error code=\"503\" type=\"cancel\">"
+			     "<service-unavailable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
+			     "</error>"
+			     "</iq>");
 		}
 	}
 
@@ -406,15 +495,15 @@ void xmpp_end_iq(void *data, const char *supplied_el, const char **attr)
 	 * Non SASL authentication
 	 */
 	else if (
-		(!strcasecmp(XMPP->iq_type, "set"))
-		&& (!strcasecmp(XMPP->iq_query_xmlns, "jabber:iq:auth:query"))
+		(!strcasecmp(ChrPtr(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
+			Xmpp->IQ.id,
+			Xmpp->iq_client_username,
+			Xmpp->iq_client_password,
+			Xmpp->iq_client_resource
 			);
 	}
 
@@ -422,50 +511,60 @@ void xmpp_end_iq(void *data, const char *supplied_el, const char **attr)
 	 * If this <iq> stanza was a "bind" attempt, process it ...
 	 */
 	else if (
-		(XMPP->bind_requested)
-		&& (!IsEmptyStr(XMPP->iq_id))
-		&& (!IsEmptyStr(XMPP->iq_client_resource))
+		(Xmpp->bind_requested)
+		&& (StrLength(Xmpp->IQ.id)>0)
+		&& (!IsEmptyStr(Xmpp->iq_client_resource))
 		&& (CC->logged_in)
 		) {
 
 		/* Generate the "full JID" of the client resource */
 
-		snprintf(XMPP->client_jid, sizeof XMPP->client_jid,
+		snprintf(Xmpp->client_jid, sizeof Xmpp->client_jid,
 			 "%s/%s",
 			 CC->cs_inet_email,
-			 XMPP->iq_client_resource
+			 Xmpp->iq_client_resource
 			);
 
 		/* Tell the client what its JID is */
 
-		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>");
+		XPUT("<iq type=\"result\" id=\"");
+		XPutSProp(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>");
 	}
 
-	else if (XMPP->iq_session) {
-		cprintf("<iq type=\"result\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
-		cprintf("</iq>");
+	else if (Xmpp->iq_session) {
+		XPUT("<iq type=\"result\" id=\"");
+		XPutSProp(Xmpp->IQ.id);
+		XPUT("\">"
+		     "</iq>");
 	}
 
 	else {
-		cprintf("<iq type=\"error\" id=\"%s\">", xmlesc(xmlbuf, XMPP->iq_id, sizeof xmlbuf));
-		cprintf("<error>Don't know howto do '%s'!</error>", xmlesc(xmlbuf, XMPP->iq_type, sizeof xmlbuf));
-		cprintf("</iq>");
+		XPUT("<iq type=\"error\" id=\"");
+		XPutSProp(Xmpp->IQ.id);
+		XPUT("\">");
+		XPUT("<error>Don't know howto do '");
+		XPutBody(SKEY(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;
+	FlushStrBuf(Xmpp->IQ.id);
+	FlushStrBuf(Xmpp->IQ.from);
+	FlushStrBuf(Xmpp->IQ.to);
+	FlushStrBuf(Xmpp->IQ.type);
+	Xmpp->iq_client_resource[0] = 0;
+	Xmpp->iq_session = 0;
+	Xmpp->iq_query_xmlns[0] = 0;
+	Xmpp->bind_requested = 0;
+	Xmpp->ping_requested = 0;
 }
 
 
@@ -483,14 +582,6 @@ void xmpp_end_session(void *data, const char *supplied_el, const char **attr)
 	XMPP->iq_session = 1;
 }
 
-void xmpp_end_presence(void *data, const char *supplied_el, const char **attr)
-{
-	/* 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();
-}
-
 void xmpp_end_body(void *data, const char *supplied_el, const char **attr)
 {
 	if (XMPP->html_tag_level == 0)
@@ -506,12 +597,6 @@ void xmpp_end_body(void *data, const char *supplied_el, const char **attr)
 	}
 }
 
-void xmpp_end_message(void *data, const char *supplied_el, const char **attr)
-{
-	xmpp_send_message(XMPP->message_to, XMPP->message_body);
-	XMPP->html_tag_level = 0;
-}
-
 void xmpp_end_html(void *data, const char *supplied_el, const char **attr)
 {
 	--XMPP->html_tag_level;
@@ -520,11 +605,12 @@ void xmpp_end_html(void *data, const char *supplied_el, const char **attr)
 void xmpp_end_starttls(void *data, const char *supplied_el, const char **attr)
 {
 #ifdef HAVE_OPENSSL
-	cprintf("<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+	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;
 #else
-	cprintf("<failure xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+	XPUT("<failure xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
 	CC->kill_me = KILLME_NO_CRYPTO;
 #endif
 }
@@ -538,27 +624,31 @@ 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();
-	cprintf("</stream>\n");
+	XPUT("</stream>\n");
 	CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
 }
 
 void xmpp_xml_end(void *data, const char *supplied_el)
 {
-	char el[256];
+	const char *pToken;
+	const char *pch;
 	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) {
-
-		newlen -= ++sep - el;
-		memmove(el, sep, newlen + 1);
-		len = newlen;
+	pToken = supplied_el;
+	pch = strchr(pToken, ':');
+	while (pch != NULL)
+	{
+		pToken = pch;
+		pch = strchr(pToken  + 1, ':');
 	}
 
+	if (*pToken == ':')
+		pToken ++;
+
+	len = strlen(pToken);
+
 	/*
 	XMPP_syslog(LOG_DEBUG, "XMPP ELEMENT END  : <%s>\n", el);
 	if (XMPP->chardata_len > 0) {
@@ -566,7 +656,7 @@ void xmpp_xml_end(void *data, const char *supplied_el)
 	}
 	uncomment for more verbosity */
 
-	if (GetHash(XMPP_EndHandlers, el, len, &pv))
+	if (GetHash(XMPP_EndHandlers, pToken, len, &pv))
 	{
 		xmpp_handler *h;
 		h = (xmpp_handler*) pv;
@@ -574,7 +664,7 @@ void xmpp_xml_end(void *data, const char *supplied_el)
 	}
 	else
 	{
-		XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
+		XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", pToken);
 	}
 
 	XMPP->chardata_len = 0;
@@ -619,7 +709,10 @@ void xmpp_cleanup_function(void) {
 			free(XMPP->message_body);
 		}
 	}
+	free_buf_iq(&XMPP->IQ);
+
 	XML_ParserFree(XMPP->xp);
+	FreeStrBuf(&XMPP->OutBuf);
 	free(XMPP);
 }
 
@@ -634,7 +727,7 @@ 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", ':');
@@ -660,6 +753,7 @@ void xmpp_greeting(void) {
 #endif
 
 	CC->can_receive_im = 1;		/* This protocol is capable of receiving instant messages */
+	XUnbuffer();
 }
 
 
@@ -680,6 +774,7 @@ void xmpp_command_loop(void) {
 		CC->kill_me = KILLME_CLIENT_DISCONNECTED;
 	}
 	FreeStrBuf(&stream_input);
+	XUnbuffer();
 }
 
 
@@ -745,6 +840,78 @@ void AddXMPPEndHandler(const char *key,
 	Put(XMPP_EndHandlers, key, len, h, NULL);
 }
 
+void HFreePropertyHandler(void *FreeMe)
+{
+	free(FreeMe);
+}
+
+void HDeleteTokenHandler(void *FreeMe)
+{
+	TokenHandler *th = (TokenHandler *) FreeMe;
+	DeleteHash(&th->Properties);
+	free(th);
+}
+
+void XMPP_RegisterTokenProperty(const char *NS, long NSLen,
+				const char *Token, long TLen,
+				const char *Property, long PLen,
+				GetTokenDataFunc GetToken,
+				long offset)
+{
+	void *pv;
+	HashList *ThisNamespace = NULL;
+	PropertyHandler *h;
+	TokenHandler *th;
+
+	h = (PropertyHandler*) malloc(sizeof(PropertyHandler));
+	h->NameSpace = NS;
+	h->NameSpaceLen = NSLen;
+	h->Token = Token;
+	h->TokenLen = TLen;
+	h->Property = Property;
+	h->PropertyLen = PLen;
+	h->offset = offset;
+
+	if (!GetHash(XMPP_SupportedNamespaces, NS, NSLen, &pv))
+	{
+		Put(XMPP_SupportedNamespaces, NS, NSLen, NewStrBufPlain(NS, NSLen), HFreeStrBuf);
+	}
+		
+	
+	if (GetHash(XMPP_NameSpaces, NS, NSLen, &pv))
+	{
+		ThisNamespace = pv;
+	}
+	else
+	{
+		ThisNamespace = NewHash(1, NULL);
+		Put(XMPP_NameSpaces, NS, NSLen, ThisNamespace, HDeleteHash);
+	}
+
+	if (GetHash(ThisNamespace, Token, TLen, &pv))
+	{
+		th = pv;
+	}
+	else
+	{
+		th = (TokenHandler*) malloc (sizeof(TokenHandler));
+		th->GetToken = GetToken;
+		th->Properties = NewHash(1, NULL);
+		Put(ThisNamespace, Token, TLen, th, HDeleteTokenHandler);
+	}
+
+	Put(th->Properties, Property, PLen, h, HFreePropertyHandler);
+	/*
+	if (!GetHash(FlatToken, Token, TLen, &pv))
+	{
+		// todo mark pv as non uniq
+		Put(FlatToken, Token, TLen, ThisToken, reference_free_handler);
+	}	
+	*/
+}
+
+
+
 CTDL_MODULE_INIT(xmpp)
 {
 	if (!threading) {
@@ -758,6 +925,9 @@ CTDL_MODULE_INIT(xmpp)
 
 		XMPP_StartHandlers = NewHash(1, NULL);
 		XMPP_EndHandlers = NewHash(1, NULL);
+		XMPP_NameSpaces = NewHash(1, NULL);
+		XMPP_SupportedNamespaces = NewHash(1, NULL);
+		FlatToken = NewHash(1, NULL);
 
 		AddXMPPEndHandler(HKEY("resource"),	 xmpp_end_resource, 0);
 		AddXMPPEndHandler(HKEY("username"),	 xmpp_end_username, 0);
@@ -765,15 +935,12 @@ CTDL_MODULE_INIT(xmpp)
 		AddXMPPEndHandler(HKEY("iq"),		 xmpp_end_iq, 0);
 		AddXMPPEndHandler(HKEY("auth"),		 xmpp_end_auth, 0);
 		AddXMPPEndHandler(HKEY("session"),	 xmpp_end_session, 0);
-		AddXMPPEndHandler(HKEY("presence"),	 xmpp_end_presence, 0);
 		AddXMPPEndHandler(HKEY("body"),		 xmpp_end_body, 0);
-		AddXMPPEndHandler(HKEY("message"),	 xmpp_end_message, 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);
@@ -790,9 +957,10 @@ CTDL_MODULE_INIT(xmpp)
                 CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH, PRIO_UNSTEALTH + 1);
                 CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH, PRIO_STEALTH + 1);
 		CtdlRegisterCleanupHook(xmpp_cleanup_events);
-
 	}
 
 	/* return our module name for the log */
 	return "xmpp";
 }
+
+