comparison libpurple/protocols/msn/notification.c @ 25886:1a1765a87336

More MSN fixes to go along with f0df27a299120baecf9ea88a9fb24ffe1dbe72fd: Add an FQY error handler so we don't disconnect if something incorrect was sent (unless the server kicked us itself). Decrement the ADL/FQY count when we receive an error about a FQY for a user so that we can continue to login even with bogus email addresses. applied changes from 54f9b89abccda90d90bcd15d12fd091279a7f54e through a1d92d07631246e44303c044d75179ba68158e8b

25884:b9a90f34b780

}

static void
update_contact_network(MsnSession *session, const char *passport, MsnNetwork network)
{
	MsnUser *user = msn_userlist_find_user(session->userlist, passport);
	/* TODO: Also figure out how to update membership lists */
	if (user) {
		xmlnode *adl_node;
		char *payload;
		int payload_len;

	if (root == NULL) {
		purple_debug_info("msn", "Invalid XML in ADL!\n");
		return;
	}
	for (domain_node = xmlnode_get_child(root, "d"); domain_node; domain_node = xmlnode_get_next_twin(domain_node)) {
		const gchar * domain = NULL;
		xmlnode *contact_node = NULL;

		domain = xmlnode_get_attrib(domain_node, "n");

		for (contact_node = xmlnode_get_child(domain_node, "c"); contact_node; contact_node = xmlnode_get_next_twin(contact_node)) {
			const gchar *list;
			gint list_op = 0;

			list = xmlnode_get_attrib(contact_node, "l");
			if (list != NULL) {

			local = xmlnode_get_attrib(c, "n");
			type = xmlnode_get_attrib(c, "t");

			passport = g_strdup_printf("%s@%s", local, domain);

			if (type != NULL)
				network = (MsnNetwork)strtoul(type, NULL, 10);
			else
				network = MSN_NETWORK_PASSPORT;

			purple_debug_info("msn", "FQY response says %s is from network %d\n",
			                  passport, network);
			if (cmd->trans->data)
				((MsnFqyCb)cmd->trans->data)(session, passport, network);

			g_free(passport);
		}
	}

	xmlnode_free(ml);
}

static void
fqy_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
{

	msn_table_add_cmd(cbs_table, NULL, "241", adl_241_error_cmd);

	msn_table_add_error(cbs_table, "ADD", add_error);
	msn_table_add_error(cbs_table, "ADL", adl_error);
	msn_table_add_error(cbs_table, "REG", reg_error);
	msn_table_add_error(cbs_table, "RMG", rmg_error);
	msn_table_add_error(cbs_table, "USR", usr_error);

	msn_table_add_msg_type(cbs_table,

25886:1a1765a87336

}

static void
update_contact_network(MsnSession *session, const char *passport, MsnNetwork network)
{
	MsnUser *user;

	if (network == MSN_NETWORK_UNKNOWN)
	{
		purple_debug_warning("msn",
		                     "Ignoring user %s about which server knows nothing.\n",
		                     passport);
		session->adl_fqy--;
		return;
	}

	/* TODO: Also figure out how to update membership lists */
	user = msn_userlist_find_user(session->userlist, passport);
	if (user) {
		xmlnode *adl_node;
		char *payload;
		int payload_len;

	if (root == NULL) {
		purple_debug_info("msn", "Invalid XML in ADL!\n");
		return;
	}
	for (domain_node = xmlnode_get_child(root, "d");
	     domain_node;
	     domain_node = xmlnode_get_next_twin(domain_node)) {
		const gchar * domain = NULL;
		xmlnode *contact_node = NULL;

		domain = xmlnode_get_attrib(domain_node, "n");

		for (contact_node = xmlnode_get_child(domain_node, "c");
		     contact_node;
		     contact_node = xmlnode_get_next_twin(contact_node)) {
			const gchar *list;
			gint list_op = 0;

			list = xmlnode_get_attrib(contact_node, "l");
			if (list != NULL) {

			local = xmlnode_get_attrib(c, "n");
			type = xmlnode_get_attrib(c, "t");

			passport = g_strdup_printf("%s@%s", local, domain);

			if (!g_ascii_isdigit(cmd->command[0]) && type != NULL)
				network = (MsnNetwork)strtoul(type, NULL, 10);
			else
				network = MSN_NETWORK_UNKNOWN;

			purple_debug_info("msn", "FQY response says %s is from network %d\n",
			                  passport, network);
			if (cmd->trans->data)
				((MsnFqyCb)cmd->trans->data)(session, passport, network);

			g_free(passport);
		}
	}

	xmlnode_free(ml);
}

static void
fqy_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
{
	MsnCommand *cmd = cmdproc->last_cmd;

	purple_debug_warning("msn", "FQY error %d\n", error);
	if (cmd->param_count > 1) {
		cmd->payload_cb = fqy_cmd_post;
		cmd->payload_len = atoi(cmd->params[1]);
		cmd->payload_cbdata = GINT_TO_POINTER(error);
	}
#if 0
	/* If the server didn't send us a corresponding email address for this
	   FQY error, it's probably going to disconnect us. So it isn't necessary
	   to tell the handler about it. */
	else if (trans->data)
		((MsnFqyCb)trans->data)(session, NULL, MSN_NETWORK_UNKNOWN); */
#endif
}

static void
fqy_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
{

	msn_table_add_cmd(cbs_table, NULL, "241", adl_241_error_cmd);

	msn_table_add_error(cbs_table, "ADD", add_error);
	msn_table_add_error(cbs_table, "ADL", adl_error);
	msn_table_add_error(cbs_table, "FQY", fqy_error);
	msn_table_add_error(cbs_table, "REG", reg_error);
	msn_table_add_error(cbs_table, "RMG", rmg_error);
	msn_table_add_error(cbs_table, "USR", usr_error);

	msn_table_add_msg_type(cbs_table,