comparison libpurple/protocols/jabber/ping.c @ 26567:d00a8111e479

Send XMPP keepalive pings to our server, not our bare JID. jabberd doesn't seem to follow the same semantics for a non-existent 'to' on a stanza; the response comes from our own full JID. Addressing the pings to the server's JID should sidestep that problem.

26566:8c3b1a059ecc

static void jabber_ping_result_cb(JabberStream *js, const char *from,
                                  JabberIqType type, const char *id,
                                  xmlnode *packet, gpointer data)
{
	char *own_bare_jid = g_strdup_printf("%s@%s", js->user->node,
	                                     js->user->domain);

	if (!from || !strcmp(from, own_bare_jid)) {
		/* If the pong is from our bare JID, treat it as a return from the
		 * keepalive functions */
		jabber_keepalive_pong_cb(js);
	}
	g_free(own_bare_jid);

	if (type == JABBER_IQ_RESULT) {
		purple_debug_info("jabber", "PONG!\n");
	} else {
		purple_debug_info("jabber", "(not supported)\n");

26567:d00a8111e479

static void jabber_ping_result_cb(JabberStream *js, const char *from,
                                  JabberIqType type, const char *id,
                                  xmlnode *packet, gpointer data)
{
	if (purple_strequal(from, js->user->domain))
		/* If the pong is from the server, assume it's a result of the
		 * keepalive functions */
		jabber_keepalive_pong_cb(js);

	if (type == JABBER_IQ_RESULT) {
		purple_debug_info("jabber", "PONG!\n");
	} else {
		purple_debug_info("jabber", "(not supported)\n");