comparison libpurple/protocols/jabber/presence.c @ 27363:eff7db4db632

Various minor changes to jabber_presence_parse. No functionality changes. This will spit out a few more warnings and refuse to handle a presence with a non-standard type. There is no actual 'available' type, so don't bother checking for it in the last chunk in presence.c

27362:c4196cd47602

	gboolean signal_return;

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

	if(!(jb = jabber_buddy_find(js, from, TRUE)))
		return;

	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
			"jabber-receiving-presence", js->gc, type, from, packet));
	if (signal_return)
		return;

	if(!(jid = jabber_id_new(from)))
		return;

	if(jb->error_msg) {
		g_free(jb->error_msg);
		jb->error_msg = NULL;
	}

	if(type && !strcmp(type, "error")) {
		char *msg = jabber_parse_error(js, packet, NULL);

		state = JABBER_BUDDY_STATE_ERROR;
		jb->error_msg = msg ? msg : g_strdup(_("Unknown Error in presence"));
	} else if(type && !strcmp(type, "subscribe")) {
		struct _jabber_add_permit *jap = g_new0(struct _jabber_add_permit, 1);
		gboolean onlist = FALSE;
		PurpleBuddy *buddy = purple_find_buddy(purple_connection_get_account(js->gc), from);
		JabberBuddy *jb = NULL;
		xmlnode *nick;

		nick = xmlnode_get_child_with_namespace(packet, "nick", "http://jabber.org/protocol/nick");
		if (nick)
			nickname = xmlnode_get_data(nick);

		if (buddy) {

		jap->gc = js->gc;
		jap->who = g_strdup(from);
		jap->js = js;

		purple_account_request_authorization(purple_connection_get_account(js->gc), from, NULL, nickname, NULL, onlist,
				authorize_add_cb, deny_add_cb, jap);
		g_free(nickname);
		jabber_id_free(jid);
		return;
	} else if(type && !strcmp(type, "subscribed")) {
		/* we've been allowed to see their presence, but we don't care */
		jabber_id_free(jid);
		return;
	} else if(type && !strcmp(type, "unsubscribe")) {
		/* XXX I'm not sure this is the right way to handle this, it
		 * might be better to add "unsubscribe" to the presence status
		 * if lower down, but I'm not sure. */
		/* they are unsubscribing from our presence, we don't care */
		/* Well, maybe just a little, we might want/need to start
		 * acknowledging this (and the others) at some point. */
		jabber_id_free(jid);
		return;
	} else {
		if((y = xmlnode_get_child(packet, "show"))) {
			char *show = xmlnode_get_data(y);
			state = jabber_buddy_show_get_state(show);
			g_free(show);
		} else {
			state = JABBER_BUDDY_STATE_ONLINE;
		}
	}


	for(y = packet->child; y; y = y->next) {
		const char *xmlns;

			g_free(nickname);
			return;
		}


		if(type && !strcmp(type, "unavailable")) {
			gboolean nick_change = FALSE;
			gboolean kick = FALSE;
			gboolean is_our_resource = FALSE; /* Is the presence about us? */

			/* If the chat nick is invalid, we haven't yet joined, or we've

				}
			}
		}

		if(state == JABBER_BUDDY_STATE_ERROR ||
				(type && (!strcmp(type, "unavailable") ||
						  !strcmp(type, "unsubscribed")))) {
			PurpleConversation *conv;

			jabber_buddy_remove_resource(jb, jid->resource);
			if((conv = jabber_find_unnormalized_conv(from, js->gc->account)))
				purple_conversation_set_name(conv, buddy_name);

			purple_prpl_got_user_status(js->gc->account, buddy_name, "offline", status ? "message" : NULL, status, NULL);
		}
		g_free(buddy_name);
	}

	if (caps && (!type || g_str_equal(type, "available"))) {
		/* handle Entity Capabilities (XEP-0115) */
		const char *node = xmlnode_get_attrib(caps, "node");
		const char *ver  = xmlnode_get_attrib(caps, "ver");
		const char *hash = xmlnode_get_attrib(caps, "hash");
		const char *ext  = xmlnode_get_attrib(caps, "ext");

27363:eff7db4db632

	gboolean signal_return;

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

	jb = jabber_buddy_find(js, from, TRUE);
	g_return_if_fail(jb != NULL);

	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
			"jabber-receiving-presence", js->gc, type, from, packet));
	if (signal_return)
		return;

	jid = jabber_id_new(from);
	if (jid == NULL) {
		purple_debug_error("jabber", "Ignoring presence with malformed 'from' "
		                   "JID: %s\n", from);
		return;
	}

	if(jb->error_msg) {
		g_free(jb->error_msg);
		jb->error_msg = NULL;
	}

	if (type == NULL) {
		xmlnode *show;
		char *show_data = NULL;

		state = JABBER_BUDDY_STATE_ONLINE;

		show = xmlnode_get_child(packet, "show");
		if (show) {
			show_data = xmlnode_get_data(show);
			if (show_data) {
				state = jabber_buddy_show_get_state(show_data);
				g_free(show_data);
			} else
				purple_debug_warning("jabber", "<show/> present on presence, "
				                     "but no contents!\n");
		}
	} else if (g_str_equal(type, "error")) {
		char *msg = jabber_parse_error(js, packet, NULL);

		state = JABBER_BUDDY_STATE_ERROR;
		jb->error_msg = msg ? msg : g_strdup(_("Unknown Error in presence"));
	} else if (g_str_equal(type, "subscribe")) {
		struct _jabber_add_permit *jap = g_new0(struct _jabber_add_permit, 1);
		gboolean onlist = FALSE;
		PurpleAccount *account;
		PurpleBuddy *buddy;
		JabberBuddy *jb = NULL;
		xmlnode *nick;

		account = purple_connection_get_account(js->gc);
		buddy = purple_find_buddy(account, from);
		nick = xmlnode_get_child_with_namespace(packet, "nick", "http://jabber.org/protocol/nick");
		if (nick)
			nickname = xmlnode_get_data(nick);

		if (buddy) {

		jap->gc = js->gc;
		jap->who = g_strdup(from);
		jap->js = js;

		purple_account_request_authorization(account, from, NULL, nickname,
				NULL, onlist, authorize_add_cb, deny_add_cb, jap);

		g_free(nickname);
		jabber_id_free(jid);
		return;
	} else if (g_str_equal(type, "subscribed")) {
		/* we've been allowed to see their presence, but we don't care */
		jabber_id_free(jid);
		return;
	} else if (g_str_equal(type, "unsubscribe")) {
		/* XXX I'm not sure this is the right way to handle this, it
		 * might be better to add "unsubscribe" to the presence status
		 * if lower down, but I'm not sure. */
		/* they are unsubscribing from our presence, we don't care */
		/* Well, maybe just a little, we might want/need to start
		 * acknowledging this (and the others) at some point. */
		jabber_id_free(jid);
		return;
	} else {
		purple_debug_warning("jabber", "Ignoring presence with invalid type "
		                     "'%s'\n", type);
		jabber_id_free(jid);
		return;
	}


	for(y = packet->child; y; y = y->next) {
		const char *xmlns;

			g_free(nickname);
			return;
		}


		if (type && g_str_equal(type, "unavailable")) {
			gboolean nick_change = FALSE;
			gboolean kick = FALSE;
			gboolean is_our_resource = FALSE; /* Is the presence about us? */

			/* If the chat nick is invalid, we haven't yet joined, or we've

				}
			}
		}

		if(state == JABBER_BUDDY_STATE_ERROR ||
				(type && (g_str_equal(type, "unavailable") ||
				          g_str_equal(type, "unsubscribed")))) {
			PurpleConversation *conv;

			jabber_buddy_remove_resource(jb, jid->resource);
			if((conv = jabber_find_unnormalized_conv(from, js->gc->account)))
				purple_conversation_set_name(conv, buddy_name);

			purple_prpl_got_user_status(js->gc->account, buddy_name, "offline", status ? "message" : NULL, status, NULL);
		}
		g_free(buddy_name);
	}

	if (caps && !type) {
		/* handle Entity Capabilities (XEP-0115) */
		const char *node = xmlnode_get_attrib(caps, "node");
		const char *ver  = xmlnode_get_attrib(caps, "ver");
		const char *hash = xmlnode_get_attrib(caps, "hash");
		const char *ext  = xmlnode_get_attrib(caps, "ext");