comparison libpurple/protocols/jabber/disco.c @ 26259:9d0bad6f4b0d

Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.

26258:b5fe3f47487b

static void
jabber_disco_service_info_cb(JabberStream *js, xmlnode *packet, gpointer data);

static void
jabber_disco_service_items_cb(JabberStream *js, xmlnode *packet, gpointer data)
{
	struct _disco_data *disco_data = data;
	struct jabber_disco_list_data *list_data;
	PurpleDiscoList *list;	
	PurpleDiscoService *parent = disco_data->parent;
	const char *parent_node = disco_data->node;
	xmlnode *query = xmlnode_get_child(packet, "query");
	const char *from = xmlnode_get_attrib(packet, "from");
	const char *result = xmlnode_get_attrib(packet, "type");
	xmlnode *child;
	gboolean has_items = FALSE;

	list_data = disco_data->list_data;
	list = list_data->list;

	--list_data->fetch_count;

			jabber_disco_list_data_destroy(list_data);

		return;
	}

	if (!from || !result || !query || strcmp(result, "result") != 0) {
		if (list_data->fetch_count == 0)
			purple_disco_list_set_in_progress(list, FALSE);

		purple_disco_list_unref(list);
		return;
	}

	query = xmlnode_get_child(packet, "query");

	for(child = xmlnode_get_child(query, "item"); child;
			child = xmlnode_get_next_twin(child)) {
		JabberIq *iq;
		xmlnode *q;
		const char *jid, *node;
		struct _disco_data *disco_data;
		char *full_node;

		if(!(jid = xmlnode_get_attrib(child, "jid")) || !purple_disco_list_get_protocol_data(list))
			continue;

		node = xmlnode_get_attrib(child, "node");

		if (parent_node) {
			if (node) {
				full_node = g_new0(char, strlen(parent_node) + 1 + strlen(node) + 1);
				strcat(full_node, parent_node);
				strcat(full_node, "/");
				strcat(full_node, node);
			} else {
				continue;
			}
		} else {
			full_node = g_strdup(node);
		}

		disco_data = g_new0(struct _disco_data, 1);
		disco_data->list_data = list_data;
		disco_data->parent = parent;
		disco_data->node = full_node;

		has_items = TRUE;
		++list_data->fetch_count;
		purple_disco_list_ref(list);
		iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
		xmlnode_set_attrib(iq->node, "to", jid);
		if (full_node && (q = xmlnode_get_child(iq->node, "query")))
			xmlnode_set_attrib(q, "node", full_node);
		jabber_iq_set_callback(iq, jabber_disco_service_info_cb, disco_data);

		jabber_iq_send(iq);
	}

	if (list_data->fetch_count == 0)
		purple_disco_list_set_in_progress(list, FALSE);

	purple_disco_list_unref(list);

jabber_disco_service_info_cb(JabberStream *js, xmlnode *packet, gpointer data)
{
	struct _disco_data *disco_data = data;
	struct jabber_disco_list_data *list_data;
	PurpleDiscoList *list;
	PurpleDiscoService *parent = disco_data->parent;
	char *node = g_strdup(disco_data->node);
	xmlnode *query, *ident, *child;
	const char *from = xmlnode_get_attrib(packet, "from");
	const char *result = xmlnode_get_attrib(packet, "type");
	const char *acat, *atype, *adesc, *anode;
	char *aname;

	PurpleDiscoServiceType type;
	PurpleDiscoServiceFlags flags = PURPLE_DISCO_ADD;

	list_data = disco_data->list_data;
	list = list_data->list;

	g_free(disco_data->node);
	g_free(disco_data);

	--list_data->fetch_count;

	if (list_data->list == NULL) {

	s = purple_disco_list_service_new(cat, aname, type, adesc, flags);
	purple_disco_list_service_add(list, s, parent);

	/* if (flags & PURPLE_DISCO_FLAG_BROWSE) - not all browsable services has this future */
	{
		xmlnode *q;
		JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");

		++list_data->fetch_count;
		purple_disco_list_ref(list);
		disco_data = g_new0(struct _disco_data, 1);
		disco_data->list_data = list_data;
		disco_data->parent = s;

		xmlnode_set_attrib(iq->node, "to", from);
		jabber_iq_set_callback(iq, jabber_disco_service_items_cb, disco_data);
		if (anode && (q = xmlnode_get_child(iq->node, "query")))
			xmlnode_set_attrib(q, "node", node);
		jabber_iq_send(iq);
	}

	if (list_data->fetch_count == 0)
		purple_disco_list_set_in_progress(list, FALSE);

jabber_disco_items_cb(JabberStream *js, xmlnode *packet, gpointer data)
{
	struct _jabber_disco_items_cb_data *jdicd;
	xmlnode *query, *child;
	const char *from;
	const char *type;
	GSList *items = NULL;

	jdicd = data;

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

	if (!from || !strcmp(type, "error") || !query) {
		jdicd->callback(js, NULL, jdicd->data);
		g_free(jdicd);
		return;
	}

	for (child = xmlnode_get_child(query, "item"); child;

		items = g_slist_prepend(items, item);
	}

	items = g_slist_reverse(items);
	jdicd->callback(js, items, jdicd->data);
	g_free(jdicd);
}

void jabber_disco_items_do(JabberStream *js, const char *who,
		JabberDiscoItemsCallback *callback, gpointer data)
{
	struct _jabber_disco_items_cb_data *jdicd;
	JabberIq *iq;

	jdicd = g_new0(struct _jabber_disco_items_cb_data, 1);
	jdicd->data = data;
	jdicd->callback = callback;

	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");
	xmlnode_set_attrib(iq->node, "to", who);

	jabber_iq_set_callback(iq, jabber_disco_items_cb, jdicd);
	jabber_iq_send(iq);
}

26259:9d0bad6f4b0d

static void
jabber_disco_service_info_cb(JabberStream *js, xmlnode *packet, gpointer data);

static void
jabber_disco_service_items_cb(JabberStream *js, const char *who, const char *node,
                              GSList *items, gpointer data)
{
	GSList *l;
	struct _disco_data *disco_data;
	struct jabber_disco_list_data *list_data;
	PurpleDiscoList *list;	
	PurpleDiscoService *parent;
	const char *parent_node;
	gboolean has_items = FALSE;

	disco_data = data;
	list_data = disco_data->list_data;
	list = list_data->list;

	--list_data->fetch_count;

			jabber_disco_list_data_destroy(list_data);

		return;
	}

	if (items == NULL) {
		if (list_data->fetch_count == 0)
			purple_disco_list_set_in_progress(list, FALSE);

		purple_disco_list_unref(list);
		return;
	}

	parent = disco_data->parent;
	parent_node = disco_data->node;

	for (l = items; l; l = l->next) {
		JabberDiscoItem *item = l->data;
		JabberIq *iq;
		struct _disco_data *req_data;
		char *full_node;

		if (parent_node) {
			if (item->node) {
				full_node = g_strdup_printf("%s/%s", parent_node, item->node);
			} else {
				continue;
			}
		} else {
			full_node = g_strdup(item->node);
		}

		req_data = g_new0(struct _disco_data, 1);
		req_data->list_data = list_data;
		req_data->parent = parent;
		req_data->node = full_node;

		has_items = TRUE;

		++list_data->fetch_count;
		purple_disco_list_ref(list);

		iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
		xmlnode_set_attrib(iq->node, "to", item->jid);
		if (full_node)
			xmlnode_set_attrib(xmlnode_get_child(iq->node, "query"),
			                   "node", full_node);
		jabber_iq_set_callback(iq, jabber_disco_service_info_cb, req_data);

		jabber_iq_send(iq);
	}

	g_slist_foreach(items, (GFunc)jabber_disco_item_free, NULL);
	g_slist_free(items);

	if (list_data->fetch_count == 0)
		purple_disco_list_set_in_progress(list, FALSE);

	purple_disco_list_unref(list);

jabber_disco_service_info_cb(JabberStream *js, xmlnode *packet, gpointer data)
{
	struct _disco_data *disco_data = data;
	struct jabber_disco_list_data *list_data;
	PurpleDiscoList *list;
	PurpleDiscoService *parent;
	char *node;
	xmlnode *query, *ident, *child;
	const char *from = xmlnode_get_attrib(packet, "from");
	const char *result = xmlnode_get_attrib(packet, "type");
	const char *acat, *atype, *adesc, *anode;
	char *aname;

	PurpleDiscoServiceType type;
	PurpleDiscoServiceFlags flags = PURPLE_DISCO_ADD;

	list_data = disco_data->list_data;
	list = list_data->list;
	parent = disco_data->parent;

	node = disco_data->node;
	disco_data->node = NULL;
	g_free(disco_data);

	--list_data->fetch_count;

	if (list_data->list == NULL) {

	s = purple_disco_list_service_new(cat, aname, type, adesc, flags);
	purple_disco_list_service_add(list, s, parent);

	/* if (flags & PURPLE_DISCO_FLAG_BROWSE) - not all browsable services has this future */
	{
		++list_data->fetch_count;
		purple_disco_list_ref(list);
		disco_data = g_new0(struct _disco_data, 1);
		disco_data->list_data = list_data;
		disco_data->parent = s;

		jabber_disco_items_do(js, from, node, jabber_disco_service_items_cb,
		                      disco_data);
	}

	if (list_data->fetch_count == 0)
		purple_disco_list_set_in_progress(list, FALSE);

jabber_disco_items_cb(JabberStream *js, xmlnode *packet, gpointer data)
{
	struct _jabber_disco_items_cb_data *jdicd;
	xmlnode *query, *child;
	const char *from;
	const char *node = NULL;
	const char *type;
	GSList *items = NULL;

	jdicd = data;

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

	if (query)
		node = xmlnode_get_attrib(query, "node");

	if (!from || !strcmp(type, "error") || !query) {
		jdicd->callback(js, from, node, NULL, jdicd->data);
		g_free(jdicd);
		return;
	}

	for (child = xmlnode_get_child(query, "item"); child;

		items = g_slist_prepend(items, item);
	}

	items = g_slist_reverse(items);
	jdicd->callback(js, from, node, items, jdicd->data);
	g_free(jdicd);
}

void jabber_disco_items_do(JabberStream *js, const char *who, const char *node,
		JabberDiscoItemsCallback *callback, gpointer data)
{
	struct _jabber_disco_items_cb_data *jdicd;
	JabberIq *iq;

	jdicd = g_new0(struct _jabber_disco_items_cb_data, 1);
	jdicd->data = data;
	jdicd->callback = callback;

	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");
	if (node)
		xmlnode_set_attrib(xmlnode_get_child(iq->node, "query"), "node", node);

	xmlnode_set_attrib(iq->node, "to", who);

	jabber_iq_set_callback(iq, jabber_disco_items_cb, jdicd);
	jabber_iq_send(iq);
}