aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/yahoo/libyahoo2.c
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/yahoo/libyahoo2.c')
-rw-r--r--protocols/yahoo/libyahoo2.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/protocols/yahoo/libyahoo2.c b/protocols/yahoo/libyahoo2.c
index bd111654..9e0d705b 100644
--- a/protocols/yahoo/libyahoo2.c
+++ b/protocols/yahoo/libyahoo2.c
@@ -4829,6 +4829,9 @@ static void yahoo_add_active_transfer(struct send_file_data *sfd)
static void yahoo_remove_active_transfer(struct send_file_data *sfd)
{
+ if (sfd == NULL)
+ return;
+
active_file_transfers = y_list_remove(active_file_transfers, sfd);
free(sfd->id);
free(sfd->who);
@@ -4989,7 +4992,7 @@ static void yahoo_process_filetransferaccept(struct yahoo_input_data *yid,
else {
YAHOO_CALLBACK(ext_yahoo_file_transfer_done)
(yid->yd->client_id, YAHOO_FILE_TRANSFER_UNKNOWN,
- sfd->data);
+ sfd ? sfd->data : NULL);
yahoo_remove_active_transfer(sfd);
}
@@ -5045,7 +5048,7 @@ static void yahoo_process_filetransferinfo(struct yahoo_input_data *yid,
else {
YAHOO_CALLBACK(ext_yahoo_file_transfer_done)
(yid->yd->client_id, YAHOO_FILE_TRANSFER_UNKNOWN,
- sfd->data);
+ sfd ? sfd->data : NULL);
yahoo_remove_active_transfer(sfd);
}
@@ -5160,7 +5163,7 @@ static void yahoo_process_filetransfer(struct yahoo_input_data *yid,
else if (!sfd || action == YAHOO_FILE_TRANSFER_REJECT) {
YAHOO_CALLBACK(ext_yahoo_file_transfer_done)
(yd->client_id, YAHOO_FILE_TRANSFER_REJECT,
- sfd->data);
+ sfd ? sfd->data : NULL);
yahoo_remove_active_transfer(sfd);
}
light .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
#include <stdlib.h>
#include <glib.h>
#include <gmodule.h>
#include <check.h>
#include <string.h>
#include <stdio.h>
#include "jabber/jabber.h"

static struct im_connection *ic;

static void check_buddy_add(int l)
{
	struct jabber_buddy *budw1, *budw2, *budw3, *budn, *bud;

	budw1 = jabber_buddy_add(ic, "wilmer@gaast.net/BitlBee");
	budw1->last_msg = time(NULL) - 100;
	budw2 = jabber_buddy_add(ic, "WILMER@gaast.net/Telepathy");
	budw2->priority = 2;
	budw2->last_msg = time(NULL);
	budw3 = jabber_buddy_add(ic, "wilmer@GAAST.NET/bitlbee");
	budw3->last_msg = time(NULL) - 200;
	budw3->priority = 4;
	/* TODO(wilmer): Shouldn't this just return budw3? */
	fail_if(jabber_buddy_add(ic, "wilmer@gaast.net/Telepathy") != NULL);

	budn = jabber_buddy_add(ic, "nekkid@lamejab.net");
	/* Shouldn't be allowed if there's already a bare JID. */
	fail_if(jabber_buddy_add(ic, "nekkid@lamejab.net/Illegal"));

	/* Case sensitivity: Case only matters after the / */
	fail_if(jabber_buddy_by_jid(ic, "wilmer@gaast.net/BitlBee", 0) ==
	        jabber_buddy_by_jid(ic, "wilmer@gaast.net/bitlbee", 0));
	fail_if(jabber_buddy_by_jid(ic, "wilmer@gaast.net/telepathy", 0));

	fail_unless(jabber_buddy_by_jid(ic, "wilmer@gaast.net/BitlBee", 0) == budw1);
	fail_unless(jabber_buddy_by_jid(ic, "WILMER@GAAST.NET/BitlBee", GET_BUDDY_EXACT) == budw1);
	fail_unless(jabber_buddy_by_jid(ic, "wilmer@GAAST.NET/BitlBee", GET_BUDDY_CREAT) == budw1);

	fail_if(jabber_buddy_by_jid(ic, "wilmer@gaast.net", GET_BUDDY_EXACT));
	fail_unless(jabber_buddy_by_jid(ic, "WILMER@gaast.net", 0) == budw3);

	/* Check O_FIRST and see if it's indeed the first item from the list. */
	fail_unless((bud = jabber_buddy_by_jid(ic, "wilmer@gaast.net", GET_BUDDY_FIRST)) == budw1);
	fail_unless(bud->next == budw2 && bud->next->next == budw3 && bud->next->next->next == NULL);

	/* Change the resource_select setting, now we should get a different resource. */
	set_setstr(&ic->acc->set, "resource_select", "activity");
	fail_unless(jabber_buddy_by_jid(ic, "wilmer@GAAST.NET", 0) == budw2);

	/* Some testing of bare JID handling (which is horrible). */
	fail_if(jabber_buddy_by_jid(ic, "nekkid@lamejab.net/Illegal", 0));
	fail_if(jabber_buddy_by_jid(ic, "NEKKID@LAMEJAB.NET/Illegal", GET_BUDDY_CREAT));
	fail_unless(jabber_buddy_by_jid(ic, "nekkid@lamejab.net", 0) == budn);
	fail_unless(jabber_buddy_by_jid(ic, "NEKKID@lamejab.net", GET_BUDDY_EXACT) == budn);
	fail_unless(jabber_buddy_by_jid(ic, "nekkid@LAMEJAB.NET", GET_BUDDY_CREAT) == budn);

	/* More case sensitivity testing, and see if remove works properly. */
	fail_if(jabber_buddy_remove(ic, "wilmer@gaast.net/telepathy"));
	fail_if(jabber_buddy_by_jid(ic, "wilmer@GAAST.NET/telepathy", GET_BUDDY_CREAT) == budw2);
	fail_unless(jabber_buddy_remove(ic, "wilmer@gaast.net/Telepathy"));
	fail_unless(jabber_buddy_remove(ic, "wilmer@gaast.net/telepathy"));

	/* Test activity_timeout and GET_BUDDY_BARE_OK. */
	fail_unless(jabber_buddy_by_jid(ic, "wilmer@gaast.net", GET_BUDDY_BARE_OK) == budw1);
	budw1->last_msg -= 50;
	fail_unless((bud = jabber_buddy_by_jid(ic, "wilmer@gaast.net", GET_BUDDY_BARE_OK)) != NULL);
	fail_unless(strcmp(bud->full_jid, "wilmer@gaast.net") == 0);

	fail_if(jabber_buddy_remove(ic, "wilmer@gaast.net"));
	fail_unless(jabber_buddy_by_jid(ic, "wilmer@gaast.net", 0) == budw1);

	fail_if(jabber_buddy_remove(ic, "wilmer@gaast.net"));
	fail_unless(jabber_buddy_remove(ic, "wilmer@gaast.net/bitlbee"));
	fail_unless(jabber_buddy_remove(ic, "wilmer@gaast.net/BitlBee"));
	fail_if(jabber_buddy_by_jid(ic, "wilmer@gaast.net", GET_BUDDY_BARE_OK));

	/* Check if remove_bare() indeed gets rid of all. */
	/* disable this one for now.
	fail_unless( jabber_buddy_remove_bare( ic, "wilmer@gaast.net" ) );
	fail_if( jabber_buddy_by_jid( ic, "wilmer@gaast.net", 0 ) );
	*/

	fail_if(jabber_buddy_remove(ic, "nekkid@lamejab.net/Illegal"));
	fail_unless(jabber_buddy_remove(ic, "nekkid@lamejab.net"));
	fail_if(jabber_buddy_by_jid(ic, "nekkid@lamejab.net", 0));

	/* Fixing a bug in this branch that caused information to get lost when
	   removing the first full JID from a list. */
	jabber_buddy_add(ic, "bugtest@google.com/A");
	jabber_buddy_add(ic, "bugtest@google.com/B");
	jabber_buddy_add(ic, "bugtest@google.com/C");
	fail_unless(jabber_buddy_remove(ic, "bugtest@google.com/A"));
	fail_unless(jabber_buddy_remove(ic, "bugtest@google.com/B"));
	fail_unless(jabber_buddy_remove(ic, "bugtest@google.com/C"));
}

static void check_compareJID(int l)
{
	fail_unless(jabber_compare_jid("bugtest@google.com/B", "bugtest@google.com/A"));
	fail_if(jabber_compare_jid("bugtest1@google.com/B", "bugtest@google.com/A"));
	fail_if(jabber_compare_jid("bugtest@google.com/B", "bugtest1@google.com/A"));
	fail_if(jabber_compare_jid("bugtest1@google.com/B", "bugtest2@google.com/A"));
	fail_unless(jabber_compare_jid("bugtest@google.com/A", "bugtest@google.com/A"));
	fail_if(jabber_compare_jid("", "bugtest@google.com/A"));
}

Suite *jabber_util_suite(void)
{
	Suite *s = suite_create("jabber/util");
	TCase *tc_core = tcase_create("Buddy");
	struct jabber_data *jd;

	ic = g_new0(struct im_connection, 1);
	ic->acc = g_new0(account_t, 1);
	ic->proto_data = jd = g_new0(struct jabber_data, 1);
	jd->buddies = g_hash_table_new(g_str_hash, g_str_equal);
	set_add(&ic->acc->set, "resource_select", "priority", NULL, ic->acc);
	set_add(&ic->acc->set, "activity_timeout", "120", NULL, ic->acc);

	suite_add_tcase(s, tc_core);
	tcase_add_test(tc_core, check_buddy_add);
	tcase_add_test(tc_core, check_compareJID);
	return s;
}