comparison libpurple/protocols/jabber/ping.c @ 25639:b5052c66701c

Jabber IQ handlers should handle non-query child nodes Historically, all IQ stanzas had a query child; this is no longer the case (XMPP Ping, Entity Time, etc). Instead, have the handlers use the first child of the IQ stanza. Also reduce some of the duplication in XMPP ping code (just use the one in ping.c)

25638:a73791d35fcc

#include "iq.h"

void
jabber_ping_parse(JabberStream *js, xmlnode *packet)
{
	JabberIq *iq;

	purple_debug_info("jabber", "jabber_ping_parse\n");

	iq = jabber_iq_new(js, JABBER_IQ_RESULT);

	xmlnode_set_attrib(iq->node, "to", xmlnode_get_attrib(packet, "from") );

	jabber_iq_set_id(iq, xmlnode_get_attrib(packet, "id"));

	jabber_iq_send(iq);
}

static void jabber_ping_result_cb(JabberStream *js, xmlnode *packet,
		gpointer data)
{

25639:b5052c66701c

#include "iq.h"

void
jabber_ping_parse(JabberStream *js, xmlnode *packet)
{
	const char *type, *id, *from;

	type = xmlnode_get_attrib(packet, "type");
	from = xmlnode_get_attrib(packet, "from");
	id   = xmlnode_get_attrib(packet, "id");

	if (!type) {
		purple_debug_warning("jabber", "jabber_ping with no type\n");
		return;
	}
	
	purple_debug_info("jabber", "jabber_ping_parse\n");

	if (!strcmp(type, "get")) {
		JabberIq *iq = jabber_iq_new(js, JABBER_IQ_RESULT);

		xmlnode_set_attrib(iq->node, "to", from);
		xmlnode_set_attrib(iq->node, "id", id);

		jabber_iq_send(iq);
	} else if (!strcmp(type, "set")) {
		/* XXX: error */
	}
}

static void jabber_ping_result_cb(JabberStream *js, xmlnode *packet,
		gpointer data)
{