diff src/protocols/jabber/parser.c @ 13806:25e63008d3bb

[gaim-migrate @ 16229] Use libxml2 for XML parsing, if available. The biggest benefit from this is actual support for XML namespaces. This fixes a handful of Google Talk integration problems, including typing notifications and buddy icons. committer: Tailor Script <[e-mail]>

--- a/src/protocols/jabber/parser.c	Wed Jun 07 15:58:27 2006 +0000
+++ b/src/protocols/jabber/parser.c	Thu Jun 08 01:03:51 2006 +0000
@@ -20,12 +20,17 @@
  */
 #include "internal.h"
 
+#ifdef HAVE_LIBXML
+#include <libxml/parser.h>
+#endif
+
 #include "connection.h"
-
+#include "debug.h"
 #include "jabber.h"
 #include "parser.h"
 #include "xmlnode.h"
 
+#ifndef HAVE_LIBXML
 static void
 jabber_parser_element_start(GMarkupParseContext *context,
 		const char *element_name, const char **attrib_names,
@@ -104,6 +109,136 @@
 	xmlnode_insert_data(js->current, text, text_len);
 }
 
+#else  /* HAVE_LIBXML */
+
+static void
+jabber_parser_element_start_libxml(void *user_data,
+				   const xmlChar *element_name, const xmlChar *prefix, const xmlChar *namespace,
+				   int nb_namespaces, const xmlChar **namespaces,
+				   int nb_attributes, int nb_defaulted, const xmlChar **attributes)
+{
+	JabberStream *js = user_data;
+	xmlnode *node;
+	int i;
+
+	if(!element_name) {
+		return;
+	} else if(!strcmp(element_name, "stream")) {
+		js->protocol_version = JABBER_PROTO_0_9;
+		for(i=0; i < nb_attributes * 5; i += 5) {
+			int attrib_len = attributes[i+4] - attributes[i+3];
+			char *attrib = g_malloc(attrib_len + 1);
+			memcpy(attrib, attributes[i+3], attrib_len);
+			attrib[attrib_len] = '\0';
+			       
+			if(!strcmp(attributes[i], "version")
+					&& !strcmp(attrib, "1.0")) {
+				js->protocol_version = JABBER_PROTO_1_0;
+			} else if(!strcmp(attributes[i], "id")) {
+				if(js->stream_id)
+					g_free(js->stream_id);
+				js->stream_id = g_strdup(attrib);
+			}
+			g_free(attrib);
+		}
+		if(js->protocol_version == JABBER_PROTO_0_9)
+			js->auth_type = JABBER_AUTH_IQ_AUTH;
+
+		if(js->state == JABBER_STREAM_INITIALIZING)
+			jabber_stream_set_state(js, JABBER_STREAM_AUTHENTICATING);
+	} else {
+
+		if(js->current)
+			node = xmlnode_new_child(js->current, element_name);
+		else
+			node = xmlnode_new(element_name);
+		xmlnode_set_namespace(node, namespace);
+
+		for(i=0; i < nb_attributes * 5; i+=5) {
+			int attrib_len = attributes[i+4] - attributes[i+3];
+			char *attrib = g_malloc(attrib_len + 1);
+			memcpy(attrib, attributes[i+3], attrib_len);
+			attrib[attrib_len] = '\0';
+			xmlnode_set_attrib(node, attributes[i], attrib);
+			g_free(attrib);
+		}
+
+		js->current = node;
+	}
+}
+
+static void
+jabber_parser_element_end_libxml(void *user_data, const xmlChar *element_name, 
+				 const xmlChar *prefix, const xmlChar *namespace)
+{
+	JabberStream *js = user_data;
+
+	if(!js->current)
+		return;
+
+	if(js->current->parent) {
+		if(!strcmp(js->current->name, element_name))
+			js->current = js->current->parent;
+	} else {
+		xmlnode *packet = js->current;
+		js->current = NULL;
+		jabber_process_packet(js, packet);
+		xmlnode_free(packet);
+	}
+}
+
+static void
+jabber_parser_element_text_libxml(void *user_data, const xmlChar *text, int text_len)
+{
+	JabberStream *js = user_data;
+
+	if(!js->current)
+		return;
+
+	if(!text || !text_len)
+		return;
+
+	xmlnode_insert_data(js->current, text, text_len);
+}
+#endif  /* HAVE_LIBXML */
+
+
+#ifdef HAVE_LIBXML
+static xmlSAXHandler jabber_parser_libxml = {
+	.internalSubset         = NULL,
+	.isStandalone           = NULL,
+	.hasInternalSubset      = NULL,
+	.hasExternalSubset      = NULL,
+	.resolveEntity          = NULL,
+	.getEntity              = NULL,
+	.entityDecl             = NULL,
+	.notationDecl           = NULL,
+	.attributeDecl          = NULL,
+	.elementDecl            = NULL,
+	.unparsedEntityDecl     = NULL,
+	.setDocumentLocator     = NULL,
+	.startDocument          = NULL,
+	.endDocument            = NULL,
+	.startElement           = NULL,
+	.endElement             = NULL,
+	.reference              = NULL,
+	.characters             = jabber_parser_element_text_libxml,
+	.ignorableWhitespace    = NULL,
+	.processingInstruction  = NULL,
+	.comment                = NULL,
+	.warning                = NULL,
+	.error                  = NULL,
+	.fatalError             = NULL,
+	.getParameterEntity     = NULL,
+	.cdataBlock             = NULL,
+	.externalSubset         = NULL,
+	.initialized            = XML_SAX2_MAGIC,
+	._private               = NULL,
+	.startElementNs         = jabber_parser_element_start_libxml,
+	.endElementNs           = jabber_parser_element_end_libxml,
+	.serror                 = NULL
+};
+#else
 static GMarkupParser jabber_parser = {
 	jabber_parser_element_start,
 	jabber_parser_element_end,
@@ -111,24 +246,47 @@
 	NULL,
 	NULL
 };
+#endif
 
 void
 jabber_parser_setup(JabberStream *js)
 {
+#ifdef HAVE_LIBXML
+	/* This seems backwards, but it makes sense. The libxml code creates the parser
+	 * context when you try to use it (this way, it can figure out the encoding at
+	 * creation time. So, setting up the parser is just a matter of destroying any
+	 * current parser. */
+	if (js->context) {
+		xmlParseChunk(js->context, NULL,0,1);
+		xmlFreeParserCtxt(js->context);
+		js->context = NULL;
+	}
+#else
 	if(!js->context)
 		js->context = g_markup_parse_context_new(&jabber_parser, 0, js, NULL);
+#endif
 }
 
 
 void jabber_parser_process(JabberStream *js, const char *buf, int len)
 {
 
+#ifndef HAVE_LIBXML
 	/* May need to check for other encodings and do the conversion here */
-
 	if(!g_markup_parse_context_parse(js->context, buf, len, NULL)) {
 		g_markup_parse_context_free(js->context);
 		js->context = NULL;
 		gaim_connection_error(js->gc, _("XML Parse error"));
 	}
+#else
+	if (js->context ==  NULL) {
+		/* libxml inconsistently starts parsing on creating the parser, so so a ParseChunk
+		 * right afterwards to force it. */
+		js->context = xmlCreatePushParserCtxt(&jabber_parser_libxml, js, buf, len, NULL);
+		xmlParseChunk(js->context, NULL, 0, 0);
+	} else if (xmlParseChunk(js->context, buf, len, 0) < 0) {
+		gaim_connection_error(js->gc, _("XML Parse error"));
+	}
+#endif
 }