Fri, 23 Apr 2010 22:38:13 +0000
Save remote nonce, and verify we get the same data when initiating the
direct connection.
Refs #247.
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1 | /** |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
2 | * @file msnslp.c MSNSLP support |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
3 | * |
| 15884 | 4 | * purple |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
5 | * |
| 15884 | 6 | * Purple is the legal property of its developers, whose names are too numerous |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
7 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
8 | * source distribution. |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
9 | * |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
10 | * This program is free software; you can redistribute it and/or modify |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
11 | * it under the terms of the GNU General Public License as published by |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
12 | * the Free Software Foundation; either version 2 of the License, or |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
13 | * (at your option) any later version. |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
14 | * |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
15 | * This program is distributed in the hope that it will be useful, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
18 | * GNU General Public License for more details. |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
19 | * |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
20 | * You should have received a copy of the GNU General Public License |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
21 | * along with this program; if not, write to the Free Software |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19747
diff
changeset
|
22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
23 | */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
24 | #include "msn.h" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
25 | #include "slp.h" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
26 | #include "slpcall.h" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
27 | #include "slpmsg.h" |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
28 | #include "msnutils.h" |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
29 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
30 | #include "object.h" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
31 | #include "user.h" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
32 | #include "switchboard.h" |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
33 | #include "directconn.h" |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
34 | |
|
22653
bed3d8152a58
The patch to msn to allow sending custom smileys. Doesn't send all the custom smileys correctly at the moment. References #1187.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
21066
diff
changeset
|
35 | #include "smiley.h" |
|
bed3d8152a58
The patch to msn to allow sending custom smileys. Doesn't send all the custom smileys correctly at the moment. References #1187.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
21066
diff
changeset
|
36 | |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
37 | /* ms to delay between sending buddy icon requests to the server. */ |
|
24619
5ece4c87ea96
Use purple_timeout_add_seconds() instead of purple_timeout_add() in a
Mark Doliner <markdoliner@pidgin.im>
parents:
24618
diff
changeset
|
38 | #define BUDDY_ICON_DELAY 20 |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
39 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
40 | static void request_user_display(MsnUser *user); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
41 | |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
42 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
43 | /************************************************************************** |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
44 | * Util |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
45 | **************************************************************************/ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
46 | |
|
11897
10853b830964
[gaim-migrate @ 14188]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11595
diff
changeset
|
47 | static char * |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
48 | get_token(const char *str, const char *start, const char *end) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
49 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
50 | const char *c, *c2; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
51 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
52 | if ((c = strstr(str, start)) == NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
53 | return NULL; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
54 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
55 | c += strlen(start); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
56 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
57 | if (end != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
58 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
59 | if ((c2 = strstr(c, end)) == NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
60 | return NULL; |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
61 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
62 | return g_strndup(c, c2 - c); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
63 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
64 | else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
65 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
66 | /* This has to be changed */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
67 | return g_strdup(c); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
68 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
69 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
70 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
71 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
72 | /************************************************************************** |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
73 | * Xfer |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
74 | **************************************************************************/ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
75 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
76 | static void |
| 15884 | 77 | msn_xfer_init(PurpleXfer *xfer) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
78 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
79 | MsnSlpCall *slpcall; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
80 | /* MsnSlpLink *slplink; */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
81 | char *content; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
82 | |
| 15884 | 83 | purple_debug_info("msn", "xfer_init\n"); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
84 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
85 | slpcall = xfer->data; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
86 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
87 | /* Send Ok */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
88 | content = g_strdup_printf("SessionID: %lu\r\n\r\n", |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
89 | slpcall->session_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
90 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
91 | msn_slp_send_ok(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody", |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
92 | content); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
93 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
94 | g_free(content); |
|
24620
96c993e8f462
Reame msn_slplink_unleash to msn_slplink_send_queued_slpmsgs, which I
Mark Doliner <markdoliner@pidgin.im>
parents:
24619
diff
changeset
|
95 | msn_slplink_send_queued_slpmsgs(slpcall->slplink); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
96 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
97 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
98 | void |
| 15884 | 99 | msn_xfer_cancel(PurpleXfer *xfer) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
100 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
101 | MsnSlpCall *slpcall; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
102 | char *content; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
103 | |
|
9788
ca43717a431b
[gaim-migrate @ 10656]
Dave West <kat@users.sourceforge.net>
parents:
9739
diff
changeset
|
104 | g_return_if_fail(xfer != NULL); |
|
ca43717a431b
[gaim-migrate @ 10656]
Dave West <kat@users.sourceforge.net>
parents:
9739
diff
changeset
|
105 | g_return_if_fail(xfer->data != NULL); |
|
ca43717a431b
[gaim-migrate @ 10656]
Dave West <kat@users.sourceforge.net>
parents:
9739
diff
changeset
|
106 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
107 | slpcall = xfer->data; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
108 | |
| 15884 | 109 | if (purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
110 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
111 | if (slpcall->started) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
112 | { |
|
24618
190103ba3381
For some reason the slpmsg and slplink functions don't have underscores
Mark Doliner <markdoliner@pidgin.im>
parents:
24612
diff
changeset
|
113 | msn_slpcall_close(slpcall); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
114 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
115 | else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
116 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
117 | content = g_strdup_printf("SessionID: %lu\r\n\r\n", |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
118 | slpcall->session_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
119 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
120 | msn_slp_send_decline(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody", |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
121 | content); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
122 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
123 | g_free(content); |
|
24620
96c993e8f462
Reame msn_slplink_unleash to msn_slplink_send_queued_slpmsgs, which I
Mark Doliner <markdoliner@pidgin.im>
parents:
24619
diff
changeset
|
124 | msn_slplink_send_queued_slpmsgs(slpcall->slplink); |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10602
diff
changeset
|
125 | |
|
29132
2eec61eb87e7
If we're sending a file, and libpurple tells us to cancel it, then just set
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29011
diff
changeset
|
126 | if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND) |
|
2eec61eb87e7
If we're sending a file, and libpurple tells us to cancel it, then just set
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29011
diff
changeset
|
127 | slpcall->wasted = TRUE; |
|
2eec61eb87e7
If we're sending a file, and libpurple tells us to cancel it, then just set
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29011
diff
changeset
|
128 | else |
|
2eec61eb87e7
If we're sending a file, and libpurple tells us to cancel it, then just set
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29011
diff
changeset
|
129 | msn_slpcall_destroy(slpcall); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
130 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
131 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
132 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
133 | |
|
28694
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
134 | gssize |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
135 | msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
136 | { |
|
28694
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
137 | MsnSlpCall *slpcall; |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
138 | |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
139 | g_return_val_if_fail(xfer != NULL, -1); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
140 | g_return_val_if_fail(data != NULL, -1); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
141 | g_return_val_if_fail(len > 0, -1); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
142 | |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
143 | g_return_val_if_fail(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND, -1); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
144 | |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
145 | slpcall = xfer->data; |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
146 | /* Not sure I trust it'll be there */ |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
147 | g_return_val_if_fail(slpcall != NULL, -1); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
148 | |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
149 | g_return_val_if_fail(slpcall->xfer_msg != NULL, -1); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
150 | |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
151 | slpcall->u.outgoing.len = len; |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
152 | slpcall->u.outgoing.data = data; |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
153 | msn_slplink_send_msgpart(slpcall->slplink, slpcall->xfer_msg); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
154 | return MIN(1202, len); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
155 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
156 | |
|
28694
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
157 | gssize |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
158 | msn_xfer_read(guchar **data, PurpleXfer *xfer) |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
159 | { |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
160 | MsnSlpCall *slpcall; |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
161 | gsize len; |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
162 | |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
163 | g_return_val_if_fail(xfer != NULL, -1); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
164 | g_return_val_if_fail(data != NULL, -1); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
165 | |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
166 | g_return_val_if_fail(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE, -1); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
167 | |
|
28694
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
168 | slpcall = xfer->data; |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
169 | /* Not sure I trust it'll be there */ |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
170 | g_return_val_if_fail(slpcall != NULL, -1); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
171 | |
|
28694
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
172 | /* Just pass up the whole GByteArray. We'll make another. */ |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
173 | *data = slpcall->u.incoming_data->data; |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
174 | len = slpcall->u.incoming_data->len; |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
175 | |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
176 | g_byte_array_free(slpcall->u.incoming_data, FALSE); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
177 | slpcall->u.incoming_data = g_byte_array_new(); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
178 | |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
179 | return len; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
180 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
181 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
182 | void |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
183 | msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
184 | { |
| 15884 | 185 | if ((purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_DONE) && |
| 186 | (purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_REMOTE) && | |
| 187 | (purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_LOCAL)) | |
|
9226
8eb466827540
[gaim-migrate @ 10022]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
188 | { |
| 15884 | 189 | purple_xfer_cancel_remote(slpcall->xfer); |
|
9226
8eb466827540
[gaim-migrate @ 10022]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9198
diff
changeset
|
190 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
191 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
192 | |
|
9259
03ac0392aa0b
[gaim-migrate @ 10058]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9231
diff
changeset
|
193 | void |
|
11138
b1672217321b
[gaim-migrate @ 13202]
Mark Doliner <markdoliner@pidgin.im>
parents:
11137
diff
changeset
|
194 | msn_xfer_completed_cb(MsnSlpCall *slpcall, const guchar *body, |
|
11137
cf40226ddff7
[gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents:
11127
diff
changeset
|
195 | gsize size) |
|
9259
03ac0392aa0b
[gaim-migrate @ 10058]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9231
diff
changeset
|
196 | { |
|
17089
b27c8579750b
Patch from sourceforge tracker 1652005 from wabz to fix displaying file
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16765
diff
changeset
|
197 | PurpleXfer *xfer = slpcall->xfer; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
198 | |
|
17089
b27c8579750b
Patch from sourceforge tracker 1652005 from wabz to fix displaying file
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16765
diff
changeset
|
199 | purple_xfer_set_completed(xfer, TRUE); |
|
b27c8579750b
Patch from sourceforge tracker 1652005 from wabz to fix displaying file
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16765
diff
changeset
|
200 | purple_xfer_end(xfer); |
|
9259
03ac0392aa0b
[gaim-migrate @ 10058]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9231
diff
changeset
|
201 | } |
|
03ac0392aa0b
[gaim-migrate @ 10058]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9231
diff
changeset
|
202 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
203 | /************************************************************************** |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
204 | * SLP Control |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
205 | **************************************************************************/ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
206 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
207 | void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
208 | msn_slp_send_ok(MsnSlpCall *slpcall, const char *branch, |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
209 | const char *type, const char *content) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
210 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
211 | MsnSlpLink *slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
212 | MsnSlpMessage *slpmsg; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
213 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
214 | slplink = slpcall->slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
215 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
216 | /* 200 OK */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
217 | slpmsg = msn_slpmsg_sip_new(slpcall, 1, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
218 | "MSNSLP/1.0 200 OK", |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
219 | branch, type, content); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
220 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
221 | slpmsg->info = "SLP 200 OK"; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
222 | slpmsg->text_body = TRUE; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
223 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
224 | msn_slplink_queue_slpmsg(slplink, slpmsg); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
225 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
226 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
227 | void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
228 | msn_slp_send_decline(MsnSlpCall *slpcall, const char *branch, |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
229 | const char *type, const char *content) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
230 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
231 | MsnSlpLink *slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
232 | MsnSlpMessage *slpmsg; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
233 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
234 | slplink = slpcall->slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
235 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
236 | /* 603 Decline */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
237 | slpmsg = msn_slpmsg_sip_new(slpcall, 1, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
238 | "MSNSLP/1.0 603 Decline", |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
239 | branch, type, content); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
240 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
241 | slpmsg->info = "SLP 603 Decline"; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
242 | slpmsg->text_body = TRUE; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
243 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
244 | msn_slplink_queue_slpmsg(slplink, slpmsg); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
245 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
246 | |
|
29034
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
247 | /* XXX: this could be improved if we tracked custom smileys |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
248 | * per-protocol, per-account, per-session or (ideally) per-conversation |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
249 | */ |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
250 | static PurpleStoredImage * |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
251 | find_valid_emoticon(PurpleAccount *account, const char *path) |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
252 | { |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
253 | GList *smileys; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
254 | |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
255 | if (!purple_account_get_bool(account, "custom_smileys", TRUE)) |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
256 | return NULL; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
257 | |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
258 | smileys = purple_smileys_get_all(); |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
259 | |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
260 | for (; smileys; smileys = g_list_delete_link(smileys, smileys)) { |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
261 | PurpleSmiley *smiley; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
262 | PurpleStoredImage *img; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
263 | |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
264 | smiley = smileys->data; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
265 | img = purple_smiley_get_stored_image(smiley); |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
266 | |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
267 | if (purple_strequal(path, purple_imgstore_get_filename(img))) { |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
268 | g_list_free(smileys); |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
269 | return img; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
270 | } |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
271 | |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
272 | purple_imgstore_unref(img); |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
273 | } |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
274 | |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
275 | purple_debug_error("msn", "Received illegal request for file %s\n", path); |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
276 | return NULL; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
277 | } |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
278 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
279 | static gboolean |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
280 | msn_slp_process_transresp(MsnSlpCall *slpcall, const char *content) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
281 | { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
282 | /* A direct connection negotiation response */ |
|
30080
027b2fee6941
Fix some double-frees and/or leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
283 | char *bridge; |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
284 | char *nonce; |
|
30080
027b2fee6941
Fix some double-frees and/or leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
285 | MsnDirectConn *dc = slpcall->slplink->dc; |
|
027b2fee6941
Fix some double-frees and/or leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
286 | gboolean result = FALSE; |
| 30067 | 287 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
288 | purple_debug_info("msn", "process_transresp\n"); |
| 30067 | 289 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
290 | g_return_val_if_fail(dc != NULL, FALSE); |
| 30067 | 291 | g_return_val_if_fail(dc->state == DC_STATE_CLOSED, FALSE); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
292 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
293 | bridge = get_token(content, "Bridge: ", "\r\n"); |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
294 | nonce = get_token(content, "Hashed-Nonce: {", "}\r\n"); |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
295 | if (nonce && bridge && !strcmp(bridge, "TCPv1")) { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
296 | /* Ok, the client supports direct TCP connection */ |
| 30067 | 297 | |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
298 | strncpy(dc->remote_nonce, nonce, 36); |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
299 | dc->remote_nonce[36] = '\0'; |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
300 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
301 | if (dc->listen_data != NULL || dc->listenfd != -1) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
302 | if (dc->listen_data != NULL) { |
| 30067 | 303 | /* |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
304 | * We'll listen for incoming connections but |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
305 | * the listening socket isn't ready yet so we cannot |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
306 | * send the INVITE packet now. Put the slpcall into waiting mode |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
307 | * and let the callback send the invite. |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
308 | */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
309 | slpcall->wait_for_socket = TRUE; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
310 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
311 | } else { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
312 | /* The listening socket is ready. Send the INVITE here. */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
313 | msn_dc_send_invite(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
314 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
315 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
316 | } else { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
317 | /* |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
318 | * We should connect to the client so parse |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
319 | * IP/port from response. |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
320 | */ |
|
30080
027b2fee6941
Fix some double-frees and/or leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
321 | char *ip, *port_str; |
|
027b2fee6941
Fix some double-frees and/or leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
322 | int port = 0; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
323 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
324 | /* Save external IP/port for later use. We'll try local connection first. */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
325 | dc->ext_ip = get_token(content, "IPv4External-Addrs: ", "\r\n"); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
326 | port_str = get_token(content, "IPv4External-Port: ", "\r\n"); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
327 | if (port_str) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
328 | dc->ext_port = atoi(port_str); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
329 | g_free(port_str); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
330 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
331 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
332 | ip = get_token(content, "IPv4Internal-Addrs: ", "\r\n"); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
333 | port_str = get_token(content, "IPv4Internal-Port: ", "\r\n"); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
334 | if (port_str) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
335 | port = atoi(port_str); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
336 | g_free(port_str); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
337 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
338 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
339 | if (ip && port) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
340 | /* Try internal address first */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
341 | dc->connect_data = purple_proxy_connect( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
342 | NULL, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
343 | slpcall->slplink->session->account, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
344 | ip, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
345 | port, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
346 | msn_dc_connected_to_peer_cb, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
347 | dc |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
348 | ); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
349 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
350 | if (dc->connect_data) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
351 | /* Add connect timeout handle */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
352 | dc->connect_timeout_handle = purple_timeout_add_seconds( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
353 | DC_CONNECT_TIMEOUT, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
354 | msn_dc_outgoing_connection_timeout_cb, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
355 | dc |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
356 | ); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
357 | } else { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
358 | /* |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
359 | * Connection failed |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
360 | * Try external IP/port (if specified) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
361 | */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
362 | msn_dc_outgoing_connection_timeout_cb(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
363 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
364 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
365 | } else { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
366 | /* |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
367 | * Omitted or invalid internal IP address / port |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
368 | * Try external IP/port (if specified) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
369 | */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
370 | msn_dc_outgoing_connection_timeout_cb(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
371 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
372 | |
|
30080
027b2fee6941
Fix some double-frees and/or leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
373 | g_free(ip); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
374 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
375 | |
|
30080
027b2fee6941
Fix some double-frees and/or leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
376 | result = TRUE; |
|
027b2fee6941
Fix some double-frees and/or leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
377 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
378 | } else { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
379 | /* |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
380 | * Invalid direct connect invitation or |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
381 | * TCP connection is not supported |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
382 | */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
383 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
384 | |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
385 | g_free(nonce); |
|
30080
027b2fee6941
Fix some double-frees and/or leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
386 | g_free(bridge); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
387 | |
|
30080
027b2fee6941
Fix some double-frees and/or leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
388 | return result; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
389 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
390 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
391 | static void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
392 | got_sessionreq(MsnSlpCall *slpcall, const char *branch, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
393 | const char *euf_guid, const char *context) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
394 | { |
|
28147
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
395 | gboolean accepted = FALSE; |
|
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
396 | |
|
23817
aff31c9b1fad
Clean up some #define's in msn.h and various supporting changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23811
diff
changeset
|
397 | if (!strcmp(euf_guid, MSN_OBJ_GUID)) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
398 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
399 | /* Emoticon or UserDisplay */ |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16536
diff
changeset
|
400 | char *content; |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16536
diff
changeset
|
401 | gsize len; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
402 | MsnSlpLink *slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
403 | MsnSlpMessage *slpmsg; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
404 | MsnObject *obj; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
405 | char *msnobj_data; |
|
29034
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
406 | PurpleStoredImage *img = NULL; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
407 | int type; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
408 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
409 | /* Send Ok */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
410 | content = g_strdup_printf("SessionID: %lu\r\n\r\n", |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
411 | slpcall->session_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
412 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
413 | msn_slp_send_ok(slpcall, branch, "application/x-msnmsgr-sessionreqbody", |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
414 | content); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
415 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
416 | g_free(content); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
417 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
418 | slplink = slpcall->slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
419 | |
| 15884 | 420 | msnobj_data = (char *)purple_base64_decode(context, &len); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
421 | obj = msn_object_new_from_string(msnobj_data); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
422 | type = msn_object_get_type(obj); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
423 | g_free(msnobj_data); |
|
22654
88039f87f479
Fix setting display picture/avatar in msnp14. Thanks to Twain28 for reporting the bug. References #1187.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22653
diff
changeset
|
424 | if (type == MSN_OBJECT_EMOTICON) { |
|
29034
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
425 | img = find_valid_emoticon(slplink->session->account, obj->location); |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
426 | } else if (type == MSN_OBJECT_USERTILE) { |
|
22654
88039f87f479
Fix setting display picture/avatar in msnp14. Thanks to Twain28 for reporting the bug. References #1187.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22653
diff
changeset
|
427 | img = msn_object_get_image(obj); |
|
88039f87f479
Fix setting display picture/avatar in msnp14. Thanks to Twain28 for reporting the bug. References #1187.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22653
diff
changeset
|
428 | if (img) |
|
88039f87f479
Fix setting display picture/avatar in msnp14. Thanks to Twain28 for reporting the bug. References #1187.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22653
diff
changeset
|
429 | purple_imgstore_ref(img); |
|
88039f87f479
Fix setting display picture/avatar in msnp14. Thanks to Twain28 for reporting the bug. References #1187.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22653
diff
changeset
|
430 | } |
|
22653
bed3d8152a58
The patch to msn to allow sending custom smileys. Doesn't send all the custom smileys correctly at the moment. References #1187.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
21066
diff
changeset
|
431 | msn_object_destroy(obj); |
|
22654
88039f87f479
Fix setting display picture/avatar in msnp14. Thanks to Twain28 for reporting the bug. References #1187.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22653
diff
changeset
|
432 | |
|
29034
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
433 | if (img != NULL) { |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
434 | /* DATA PREP */ |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
435 | slpmsg = msn_slpmsg_new(slplink); |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
436 | slpmsg->slpcall = slpcall; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
437 | slpmsg->session_id = slpcall->session_id; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
438 | msn_slpmsg_set_body(slpmsg, NULL, 4); |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
439 | slpmsg->info = "SLP DATA PREP"; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
440 | msn_slplink_queue_slpmsg(slplink, slpmsg); |
|
9858
66d36f26ae6b
[gaim-migrate @ 10737]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9788
diff
changeset
|
441 | |
|
29034
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
442 | /* DATA */ |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
443 | slpmsg = msn_slpmsg_new(slplink); |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
444 | slpmsg->slpcall = slpcall; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
445 | slpmsg->flags = 0x20; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
446 | slpmsg->info = "SLP DATA"; |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
447 | msn_slpmsg_set_image(slpmsg, img); |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
448 | msn_slplink_queue_slpmsg(slplink, slpmsg); |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
449 | purple_imgstore_unref(img); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
450 | |
|
29034
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
451 | accepted = TRUE; |
|
28147
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
452 | |
|
29034
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
453 | } else { |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
454 | purple_debug_error("msn", "Wrong object.\n"); |
|
267e218985d9
*** Plucked rev 4be2df4f72bd8a55cdae7f2554b73342a497c92f (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Daniel Atallah <datallah@pidgin.im>
parents:
28457
diff
changeset
|
455 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
456 | } |
|
28147
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
457 | |
|
23817
aff31c9b1fad
Clean up some #define's in msn.h and various supporting changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23811
diff
changeset
|
458 | else if (!strcmp(euf_guid, MSN_FT_GUID)) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
459 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
460 | /* File Transfer */ |
| 15884 | 461 | PurpleAccount *account; |
| 462 | PurpleXfer *xfer; | |
|
29773
ea94eb9e88de
I never liked randomly poking at offsets. Fortunately, I was able to find
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29376
diff
changeset
|
463 | MsnFileContext *header; |
|
11127
5e539d9d26a4
[gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents:
11020
diff
changeset
|
464 | gsize bin_len; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
465 | guint32 file_size; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
466 | char *file_name; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
467 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
468 | account = slpcall->slplink->session->account; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
469 | |
|
9259
03ac0392aa0b
[gaim-migrate @ 10058]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9231
diff
changeset
|
470 | slpcall->end_cb = msn_xfer_end_cb; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
471 | slpcall->branch = g_strdup(branch); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
472 | |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10226
diff
changeset
|
473 | slpcall->pending = TRUE; |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10226
diff
changeset
|
474 | |
| 15884 | 475 | xfer = purple_xfer_new(account, PURPLE_XFER_RECEIVE, |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
476 | slpcall->slplink->remote_user); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
477 | |
|
29773
ea94eb9e88de
I never liked randomly poking at offsets. Fortunately, I was able to find
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29376
diff
changeset
|
478 | header = (MsnFileContext *)purple_base64_decode(context, &bin_len); |
|
ea94eb9e88de
I never liked randomly poking at offsets. Fortunately, I was able to find
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29376
diff
changeset
|
479 | if (bin_len >= sizeof(MsnFileContext) - 1 && |
|
29774
61c80aebc63d
Fix FT context header length handling. The official client only seems to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29773
diff
changeset
|
480 | (header->version == 2 || |
|
61c80aebc63d
Fix FT context header length handling. The official client only seems to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29773
diff
changeset
|
481 | (header->version == 3 && header->length == sizeof(MsnFileContext) + 63))) { |
|
29773
ea94eb9e88de
I never liked randomly poking at offsets. Fortunately, I was able to find
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29376
diff
changeset
|
482 | file_size = GUINT64_FROM_LE(header->file_size); |
|
ea94eb9e88de
I never liked randomly poking at offsets. Fortunately, I was able to find
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29376
diff
changeset
|
483 | |
|
ea94eb9e88de
I never liked randomly poking at offsets. Fortunately, I was able to find
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29376
diff
changeset
|
484 | file_name = g_convert((const gchar *)&header->file_name, |
|
ea94eb9e88de
I never liked randomly poking at offsets. Fortunately, I was able to find
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29376
diff
changeset
|
485 | MAX_FILE_NAME_LEN * 2, |
|
ea94eb9e88de
I never liked randomly poking at offsets. Fortunately, I was able to find
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29376
diff
changeset
|
486 | "UTF-8", "UTF-16LE", |
|
28095
44a1e76da704
Somehow this bit got left in there. Should really compile this time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28085
diff
changeset
|
487 | NULL, NULL, NULL); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
488 | |
|
28206
784ad9a14ee3
Fix crashes when filenames end up being NULL in some prpls. Fixed a minor
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28147
diff
changeset
|
489 | purple_xfer_set_filename(xfer, file_name ? file_name : ""); |
|
22977
619a2612bb92
This is the way we plug the leaks, plug the leaks, plug the leaks...
Daniel Atallah <datallah@pidgin.im>
parents:
21066
diff
changeset
|
490 | g_free(file_name); |
| 15884 | 491 | purple_xfer_set_size(xfer, file_size); |
| 492 | purple_xfer_set_init_fnc(xfer, msn_xfer_init); | |
| 493 | purple_xfer_set_request_denied_fnc(xfer, msn_xfer_cancel); | |
| 494 | purple_xfer_set_cancel_recv_fnc(xfer, msn_xfer_cancel); | |
|
28694
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
495 | purple_xfer_set_read_fnc(xfer, msn_xfer_read); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
496 | purple_xfer_set_write_fnc(xfer, msn_xfer_write); |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
497 | |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28457
diff
changeset
|
498 | slpcall->u.incoming_data = g_byte_array_new(); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
499 | |
|
15345
797936e968ff
[gaim-migrate @ 18073]
Evan Schoenberg <evands@pidgin.im>
parents:
15049
diff
changeset
|
500 | slpcall->xfer = xfer; |
|
17135
f17d0ae4cbd0
slpcall now explicitlt references its xfer and unreferences it when it is destroyed. While it *looks* like this should *probably* have happened anyways due to the interactins between xfer_init, xfer_end, and xfer_cancel_remote, having the xfer's owner make this explicit makes the process less fragile and more obvious, and it may fix a crash as the slp is destroyed. Fixes #1070
Evan Schoenberg <evands@pidgin.im>
parents:
17134
diff
changeset
|
501 | purple_xfer_ref(slpcall->xfer); |
|
f17d0ae4cbd0
slpcall now explicitlt references its xfer and unreferences it when it is destroyed. While it *looks* like this should *probably* have happened anyways due to the interactins between xfer_init, xfer_end, and xfer_cancel_remote, having the xfer's owner make this explicit makes the process less fragile and more obvious, and it may fix a crash as the slp is destroyed. Fixes #1070
Evan Schoenberg <evands@pidgin.im>
parents:
17134
diff
changeset
|
502 | |
|
15345
797936e968ff
[gaim-migrate @ 18073]
Evan Schoenberg <evands@pidgin.im>
parents:
15049
diff
changeset
|
503 | xfer->data = slpcall; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
504 | |
| 15884 | 505 | purple_xfer_request(xfer); |
|
15345
797936e968ff
[gaim-migrate @ 18073]
Evan Schoenberg <evands@pidgin.im>
parents:
15049
diff
changeset
|
506 | } |
|
29773
ea94eb9e88de
I never liked randomly poking at offsets. Fortunately, I was able to find
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29376
diff
changeset
|
507 | g_free(header); |
|
28147
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
508 | |
|
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
509 | accepted = TRUE; |
|
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
510 | |
|
26738
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
511 | } else if (!strcmp(euf_guid, MSN_CAM_REQUEST_GUID)) { |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
512 | purple_debug_info("msn", "Cam request.\n"); |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
513 | if (slpcall && slpcall->slplink && |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
514 | slpcall->slplink->session) { |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
515 | PurpleConversation *conv; |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
516 | gchar *from = slpcall->slplink->remote_user; |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
517 | conv = purple_find_conversation_with_account( |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
518 | PURPLE_CONV_TYPE_IM, from, |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
519 | slpcall->slplink->session->account); |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
520 | if (conv) { |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
521 | char *buf; |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
522 | buf = g_strdup_printf( |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
523 | _("%s requests to view your " |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
524 | "webcam, but this request is " |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
525 | "not yet supported."), from); |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
526 | purple_conversation_write(conv, NULL, buf, |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
527 | PURPLE_MESSAGE_SYSTEM | |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
528 | PURPLE_MESSAGE_NOTIFY, |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
529 | time(NULL)); |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
530 | g_free(buf); |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
531 | } |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
532 | } |
|
28147
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
533 | |
|
26738
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
534 | } else if (!strcmp(euf_guid, MSN_CAM_GUID)) { |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
535 | purple_debug_info("msn", "Cam invite.\n"); |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
536 | if (slpcall && slpcall->slplink && |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
537 | slpcall->slplink->session) { |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
538 | PurpleConversation *conv; |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
539 | gchar *from = slpcall->slplink->remote_user; |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
540 | conv = purple_find_conversation_with_account( |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
541 | PURPLE_CONV_TYPE_IM, from, |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
542 | slpcall->slplink->session->account); |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
543 | if (conv) { |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
544 | char *buf; |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
545 | buf = g_strdup_printf( |
|
28306
abe71ce48289
I was missing a space!
Mark Doliner <markdoliner@pidgin.im>
parents:
28305
diff
changeset
|
546 | _("%s invited you to view his/her webcam, but " |
|
abe71ce48289
I was missing a space!
Mark Doliner <markdoliner@pidgin.im>
parents:
28305
diff
changeset
|
547 | "this is not yet supported."), from); |
|
26738
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
548 | purple_conversation_write(conv, NULL, buf, |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
549 | PURPLE_MESSAGE_SYSTEM | |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
550 | PURPLE_MESSAGE_NOTIFY, |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
551 | time(NULL)); |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
552 | g_free(buf); |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
553 | } |
|
b6314eb1f63d
Inform the user when someone tries to initiate a video call with them in msn.
Michael Ruprecht <maiku@pidgin.im>
parents:
24660
diff
changeset
|
554 | } |
|
28147
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
555 | |
|
23817
aff31c9b1fad
Clean up some #define's in msn.h and various supporting changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23811
diff
changeset
|
556 | } else |
|
aff31c9b1fad
Clean up some #define's in msn.h and various supporting changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23811
diff
changeset
|
557 | purple_debug_warning("msn", "SLP SessionReq with unknown EUF-GUID: %s\n", euf_guid); |
|
28147
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
558 | |
|
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
559 | if (!accepted) { |
|
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
560 | char *content = g_strdup_printf("SessionID: %lu\r\n\r\n", |
|
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
561 | slpcall->session_id); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
562 | msn_slp_send_decline(slpcall, branch, "application/x-msnmsgr-sessionreqbody", content); |
|
28147
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
563 | g_free(content); |
|
d4cf43b73dbe
Send a 603 Decline for any SLP invite that we do not support, so that your
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28095
diff
changeset
|
564 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
565 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
566 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
567 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
568 | send_bye(MsnSlpCall *slpcall, const char *type) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
569 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
570 | MsnSlpLink *slplink; |
|
24610
fcde2a7d204b
Get rid of slplink->local_user because it's a copy of
Mark Doliner <markdoliner@pidgin.im>
parents:
23999
diff
changeset
|
571 | PurpleAccount *account; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
572 | MsnSlpMessage *slpmsg; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
573 | char *header; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
574 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
575 | slplink = slpcall->slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
576 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
577 | g_return_if_fail(slplink != NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
578 | |
|
24610
fcde2a7d204b
Get rid of slplink->local_user because it's a copy of
Mark Doliner <markdoliner@pidgin.im>
parents:
23999
diff
changeset
|
579 | account = slplink->session->account; |
|
fcde2a7d204b
Get rid of slplink->local_user because it's a copy of
Mark Doliner <markdoliner@pidgin.im>
parents:
23999
diff
changeset
|
580 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
581 | header = g_strdup_printf("BYE MSNMSGR:%s MSNSLP/1.0", |
|
24610
fcde2a7d204b
Get rid of slplink->local_user because it's a copy of
Mark Doliner <markdoliner@pidgin.im>
parents:
23999
diff
changeset
|
582 | purple_account_get_username(account)); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
583 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
584 | slpmsg = msn_slpmsg_sip_new(slpcall, 0, header, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
585 | "A0D624A6-6C0C-4283-A9E0-BC97B4B46D32", |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
586 | type, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
587 | "\r\n"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
588 | g_free(header); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
589 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
590 | slpmsg->info = "SLP BYE"; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
591 | slpmsg->text_body = TRUE; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
592 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
593 | msn_slplink_queue_slpmsg(slplink, slpmsg); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
594 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
595 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
596 | static void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
597 | got_invite(MsnSlpCall *slpcall, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
598 | const char *branch, const char *type, const char *content) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
599 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
600 | MsnSlpLink *slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
601 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
602 | slplink = slpcall->slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
603 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
604 | if (!strcmp(type, "application/x-msnmsgr-sessionreqbody")) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
605 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
606 | char *euf_guid, *context; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
607 | char *temp; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
608 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
609 | euf_guid = get_token(content, "EUF-GUID: {", "}\r\n"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
610 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
611 | temp = get_token(content, "SessionID: ", "\r\n"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
612 | if (temp != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
613 | slpcall->session_id = atoi(temp); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
614 | g_free(temp); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
615 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
616 | temp = get_token(content, "AppID: ", "\r\n"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
617 | if (temp != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
618 | slpcall->app_id = atoi(temp); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
619 | g_free(temp); |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
620 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
621 | context = get_token(content, "Context: ", "\r\n"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
622 | |
|
14495
11435bfdcef9
[gaim-migrate @ 17147]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
623 | if (context != NULL) |
|
11435bfdcef9
[gaim-migrate @ 17147]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
624 | got_sessionreq(slpcall, branch, euf_guid, context); |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
625 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
626 | g_free(context); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
627 | g_free(euf_guid); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
628 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
629 | else if (!strcmp(type, "application/x-msnmsgr-transreqbody")) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
630 | { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
631 | /* A direct connection negotiation request */ |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30080
diff
changeset
|
632 | char *bridges; |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
633 | char *nonce; |
| 30067 | 634 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
635 | purple_debug_info("msn", "got_invite: transreqbody received\n"); |
| 30067 | 636 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
637 | /* Don't do anything if we already have a direct connection */ |
|
30082
37c5705f5d93
This doesn't appear to be a programming error.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30081
diff
changeset
|
638 | if (slpcall->slplink->dc != NULL) |
|
37c5705f5d93
This doesn't appear to be a programming error.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30081
diff
changeset
|
639 | return; |
| 30067 | 640 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
641 | bridges = get_token(content, "Bridges: ", "\r\n"); |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
642 | nonce = get_token(content, "Hashed-Nonce: {", "}\r\n"); |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
643 | if (nonce && bridges && strstr(bridges, "TCPv1") != NULL) { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
644 | /* |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
645 | * Ok, the client supports direct TCP connection |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
646 | * Try to create a listening port |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
647 | */ |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30080
diff
changeset
|
648 | MsnDirectConn *dc; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
649 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
650 | dc = msn_dc_new(slpcall); |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
651 | strncpy(dc->remote_nonce, nonce, 36); |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
652 | dc->remote_nonce[36] = '\0'; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
653 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
654 | dc->listen_data = purple_network_listen_range( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
655 | 0, 0, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
656 | SOCK_STREAM, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
657 | msn_dc_listen_socket_created_cb, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
658 | dc |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
659 | ); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
660 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
661 | if (dc->listen_data == NULL) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
662 | /* Listen socket creation failed */ |
| 30067 | 663 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
664 | purple_debug_info("msn", "got_invite: listening failed\n"); |
| 30067 | 665 | |
|
30083
7c1b5542cbe4
Remove one more unused code block, and unnecessary variable.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30082
diff
changeset
|
666 | msn_slp_send_ok(slpcall, branch, |
|
7c1b5542cbe4
Remove one more unused code block, and unnecessary variable.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30082
diff
changeset
|
667 | "application/x-msnmsgr-transrespbody", |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
668 | "Bridge: TCPv1\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
669 | "Listening: false\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
670 | "Hashed-Nonce: {00000000-0000-0000-0000-000000000000}\r\n" |
|
30083
7c1b5542cbe4
Remove one more unused code block, and unnecessary variable.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30082
diff
changeset
|
671 | "\r\n"); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
672 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
673 | } else { |
| 30067 | 674 | /* |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
675 | * Listen socket created successfully. |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
676 | * Don't send anything here because we don't know the parameters |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
677 | * of the created socket yet. msn_dc_send_ok will be called from |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
678 | * the callback function: dc_listen_socket_created_cb |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
679 | */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
680 | purple_debug_info("msn", "got_invite: listening socket created\n"); |
| 30067 | 681 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
682 | dc->send_connection_info_msg_cb = msn_dc_send_ok; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
683 | slpcall->wait_for_socket = TRUE; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
684 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
685 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
686 | } else { |
| 30067 | 687 | /* |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
688 | * Invalid direct connect invitation or |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
689 | * TCP connection is not supported. |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
690 | */ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
691 | } |
|
30088
0a3e7ea024c5
Fix some leaks, and simplify these branches.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30087
diff
changeset
|
692 | |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30088
diff
changeset
|
693 | g_free(nonce); |
|
30088
0a3e7ea024c5
Fix some leaks, and simplify these branches.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30087
diff
changeset
|
694 | g_free(bridges); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
695 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
696 | else if (!strcmp(type, "application/x-msnmsgr-transrespbody")) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
697 | { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
698 | /* A direct connection negotiation response */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
699 | msn_slp_process_transresp(slpcall, content); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
700 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
701 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
702 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
703 | static void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
704 | got_ok(MsnSlpCall *slpcall, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
705 | const char *type, const char *content) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
706 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
707 | g_return_if_fail(slpcall != NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
708 | g_return_if_fail(type != NULL); |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
709 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
710 | if (!strcmp(type, "application/x-msnmsgr-sessionreqbody")) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
711 | { |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30080
diff
changeset
|
712 | char *content; |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30080
diff
changeset
|
713 | char *header; |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30080
diff
changeset
|
714 | MsnSlpMessage *msg; |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30080
diff
changeset
|
715 | MsnDirectConn *dc; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
716 | |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30080
diff
changeset
|
717 | if (slpcall->slplink->dc != NULL) { |
| 30067 | 718 | /* |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30080
diff
changeset
|
719 | * If we already have an established direct connection |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
720 | * then just start the transfer. |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
721 | */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
722 | msn_slpcall_session_init(slpcall); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
723 | return; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
724 | } |
| 30067 | 725 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
726 | /* Try direct file transfer by sending a second INVITE */ |
| 30067 | 727 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
728 | dc = msn_dc_new(slpcall); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
729 | slpcall->branch = rand_guid(); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
730 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
731 | dc->listen_data = purple_network_listen_range( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
732 | 0, 0, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
733 | SOCK_STREAM, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
734 | msn_dc_listen_socket_created_cb, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
735 | dc |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
736 | ); |
| 30067 | 737 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
738 | header = g_strdup_printf( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
739 | "INVITE MSNMSGR:%s MSNSLP/1.0", |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
740 | slpcall->slplink->remote_user |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
741 | ); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
742 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
743 | if (dc->listen_data == NULL) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
744 | /* Listen socket creation failed */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
745 | purple_debug_info("msn", "got_ok: listening failed\n"); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
746 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
747 | content = g_strdup_printf( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
748 | "Bridges: TCPv1\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
749 | "NetID: %u\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
750 | "Conn-Type: IP-Restrict-NAT\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
751 | "UPnPNat: false\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
752 | "ICF: false\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
753 | "Hashed-Nonce: {%s}\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
754 | "\r\n", |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
755 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
756 | rand() % G_MAXUINT32, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
757 | dc->nonce_hash |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
758 | ); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
759 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
760 | } else { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
761 | /* Listen socket created successfully. */ |
| 30067 | 762 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
763 | purple_debug_info("msn", "got_ok: listening socket created\n"); |
| 30067 | 764 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
765 | content = g_strdup_printf( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
766 | "Bridges: TCPv1\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
767 | "NetID: 0\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
768 | "Conn-Type: Direct-Connect\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
769 | "UPnPNat: false\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
770 | "ICF: false\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
771 | "Hashed-Nonce: {%s}\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
772 | "\r\n", |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
773 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
774 | dc->nonce_hash |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
775 | ); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
776 | } |
| 30067 | 777 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
778 | msg = msn_slpmsg_sip_new( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
779 | slpcall, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
780 | 0, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
781 | header, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
782 | slpcall->branch, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
783 | "application/x-msnmsgr-transreqbody", |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
784 | content |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
785 | ); |
|
30086
32109706f5ec
Set some information for debugging.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30083
diff
changeset
|
786 | msg->info = "DC INVITE"; |
|
32109706f5ec
Set some information for debugging.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30083
diff
changeset
|
787 | msg->text_body = TRUE; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
788 | g_free(header); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
789 | g_free(content); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
790 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
791 | msn_slplink_queue_slpmsg(slpcall->slplink, msg); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
792 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
793 | else if (!strcmp(type, "application/x-msnmsgr-transreqbody")) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
794 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
795 | /* Do we get this? */ |
| 15884 | 796 | purple_debug_info("msn", "OK with transreqbody\n"); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
797 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
798 | else if (!strcmp(type, "application/x-msnmsgr-transrespbody")) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
799 | { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
800 | msn_slp_process_transresp(slpcall, content); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
801 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
802 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
803 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
804 | MsnSlpCall * |
|
11236
3dda2280d355
[gaim-migrate @ 13382]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11235
diff
changeset
|
805 | msn_slp_sip_recv(MsnSlpLink *slplink, const char *body) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
806 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
807 | MsnSlpCall *slpcall; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
808 | |
|
10907
9d159f3911f2
[gaim-migrate @ 12638]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10887
diff
changeset
|
809 | if (body == NULL) |
|
9d159f3911f2
[gaim-migrate @ 12638]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10887
diff
changeset
|
810 | { |
| 15884 | 811 | purple_debug_warning("msn", "received bogus message\n"); |
|
10907
9d159f3911f2
[gaim-migrate @ 12638]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10887
diff
changeset
|
812 | return NULL; |
|
9d159f3911f2
[gaim-migrate @ 12638]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10887
diff
changeset
|
813 | } |
|
9d159f3911f2
[gaim-migrate @ 12638]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10887
diff
changeset
|
814 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
815 | if (!strncmp(body, "INVITE", strlen("INVITE"))) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
816 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
817 | char *branch; |
|
29376
9a3f73531905
Fix CVE-2010-0277, a possible remote crash when parsing an incoming
Mark Doliner <markdoliner@pidgin.im>
parents:
29193
diff
changeset
|
818 | char *call_id; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
819 | char *content; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
820 | char *content_type; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
821 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
822 | /* From: <msnmsgr:buddy@hotmail.com> */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
823 | #if 0 |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
824 | slpcall->remote_user = get_token(body, "From: <msnmsgr:", ">\r\n"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
825 | #endif |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
826 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
827 | branch = get_token(body, ";branch={", "}"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
828 | |
|
29376
9a3f73531905
Fix CVE-2010-0277, a possible remote crash when parsing an incoming
Mark Doliner <markdoliner@pidgin.im>
parents:
29193
diff
changeset
|
829 | call_id = get_token(body, "Call-ID: {", "}"); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
830 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
831 | #if 0 |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
832 | long content_len = -1; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
833 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
834 | temp = get_token(body, "Content-Length: ", "\r\n"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
835 | if (temp != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
836 | content_len = atoi(temp); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
837 | g_free(temp); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
838 | #endif |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
839 | content_type = get_token(body, "Content-Type: ", "\r\n"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
840 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
841 | content = get_token(body, "\r\n\r\n", NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
842 | |
|
30088
0a3e7ea024c5
Fix some leaks, and simplify these branches.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30087
diff
changeset
|
843 | slpcall = NULL; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
844 | if (branch && call_id) |
|
28457
2431bae68adf
Ignore SLP invites if they do not contain all the required fields. The
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28306
diff
changeset
|
845 | { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
846 | slpcall = msn_slplink_find_slp_call(slplink, call_id); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
847 | if (slpcall) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
848 | { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
849 | g_free(slpcall->branch); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
850 | slpcall->branch = g_strdup(branch); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
851 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
852 | else if (content_type && content) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
853 | { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
854 | slpcall = msn_slpcall_new(slplink); |
|
30088
0a3e7ea024c5
Fix some leaks, and simplify these branches.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30087
diff
changeset
|
855 | slpcall->id = g_strdup(call_id); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
856 | got_invite(slpcall, branch, content_type, content); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
857 | } |
|
28457
2431bae68adf
Ignore SLP invites if they do not contain all the required fields. The
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28306
diff
changeset
|
858 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
859 | |
|
30088
0a3e7ea024c5
Fix some leaks, and simplify these branches.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30087
diff
changeset
|
860 | g_free(call_id); |
|
10519
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10403
diff
changeset
|
861 | g_free(branch); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
862 | g_free(content_type); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
863 | g_free(content); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
864 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
865 | else if (!strncmp(body, "MSNSLP/1.0 ", strlen("MSNSLP/1.0 "))) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
866 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
867 | char *content; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
868 | char *content_type; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
869 | /* Make sure this is "OK" */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
870 | const char *status = body + strlen("MSNSLP/1.0 "); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
871 | char *call_id; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
872 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
873 | call_id = get_token(body, "Call-ID: {", "}"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
874 | slpcall = msn_slplink_find_slp_call(slplink, call_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
875 | g_free(call_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
876 | |
|
9231
aa417f2a801e
[gaim-migrate @ 10027]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9226
diff
changeset
|
877 | g_return_val_if_fail(slpcall != NULL, NULL); |
|
aa417f2a801e
[gaim-migrate @ 10027]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9226
diff
changeset
|
878 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
879 | if (strncmp(status, "200 OK", 6)) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
880 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
881 | /* It's not valid. Kill this off. */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
882 | char temp[32]; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
883 | const char *c; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
884 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
885 | /* Eww */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
886 | if ((c = strchr(status, '\r')) || (c = strchr(status, '\n')) || |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
887 | (c = strchr(status, '\0'))) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
888 | { |
| 9739 | 889 | size_t offset = c - status; |
| 890 | if (offset >= sizeof(temp)) | |
| 891 | offset = sizeof(temp) - 1; | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
892 | |
| 9739 | 893 | strncpy(temp, status, offset); |
| 894 | temp[offset] = '\0'; | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
895 | } |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
896 | |
| 15884 | 897 | purple_debug_error("msn", "Received non-OK result: %s\n", temp); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
898 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
899 | slpcall->wasted = TRUE; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
900 | |
|
24618
190103ba3381
For some reason the slpmsg and slplink functions don't have underscores
Mark Doliner <markdoliner@pidgin.im>
parents:
24612
diff
changeset
|
901 | /* msn_slpcall_destroy(slpcall); */ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
902 | return slpcall; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
903 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
904 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
905 | content_type = get_token(body, "Content-Type: ", "\r\n"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
906 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
907 | content = get_token(body, "\r\n\r\n", NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
908 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
909 | got_ok(slpcall, content_type, content); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
910 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
911 | g_free(content_type); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
912 | g_free(content); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
913 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
914 | else if (!strncmp(body, "BYE", strlen("BYE"))) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
915 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
916 | char *call_id; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
917 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
918 | call_id = get_token(body, "Call-ID: {", "}"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
919 | slpcall = msn_slplink_find_slp_call(slplink, call_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
920 | g_free(call_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
921 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
922 | if (slpcall != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
923 | slpcall->wasted = TRUE; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
924 | |
|
24618
190103ba3381
For some reason the slpmsg and slplink functions don't have underscores
Mark Doliner <markdoliner@pidgin.im>
parents:
24612
diff
changeset
|
925 | /* msn_slpcall_destroy(slpcall); */ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
926 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
927 | else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
928 | slpcall = NULL; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
929 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
930 | return slpcall; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
931 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
932 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
933 | /************************************************************************** |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
934 | * Msg Callbacks |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
935 | **************************************************************************/ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
936 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
937 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
938 | msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
939 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
940 | MsnSession *session; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
941 | MsnSlpLink *slplink; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
942 | const char *data; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
943 | gsize len; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
944 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
945 | session = cmdproc->servconn->session; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
946 | slplink = msn_session_get_slplink(session, msg->remote_user); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
947 | |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10527
diff
changeset
|
948 | if (slplink->swboard == NULL) |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10527
diff
changeset
|
949 | { |
|
24660
483e2ad56d8e
If we're setting swboard here then we need to add the slplink to the
Mark Doliner <markdoliner@pidgin.im>
parents:
24630
diff
changeset
|
950 | /* |
|
483e2ad56d8e
If we're setting swboard here then we need to add the slplink to the
Mark Doliner <markdoliner@pidgin.im>
parents:
24630
diff
changeset
|
951 | * We will need swboard in order to change its flags. If its |
|
483e2ad56d8e
If we're setting swboard here then we need to add the slplink to the
Mark Doliner <markdoliner@pidgin.im>
parents:
24630
diff
changeset
|
952 | * NULL, something has probably gone wrong earlier on. I |
|
483e2ad56d8e
If we're setting swboard here then we need to add the slplink to the
Mark Doliner <markdoliner@pidgin.im>
parents:
24630
diff
changeset
|
953 | * didn't want to do this, but MSN 7 is somehow causing us |
|
483e2ad56d8e
If we're setting swboard here then we need to add the slplink to the
Mark Doliner <markdoliner@pidgin.im>
parents:
24630
diff
changeset
|
954 | * to crash here, I couldn't reproduce it to debug more, |
|
483e2ad56d8e
If we're setting swboard here then we need to add the slplink to the
Mark Doliner <markdoliner@pidgin.im>
parents:
24630
diff
changeset
|
955 | * and people are reporting bugs. Hopefully this doesn't |
|
483e2ad56d8e
If we're setting swboard here then we need to add the slplink to the
Mark Doliner <markdoliner@pidgin.im>
parents:
24630
diff
changeset
|
956 | * cause more crashes. Stu. |
|
483e2ad56d8e
If we're setting swboard here then we need to add the slplink to the
Mark Doliner <markdoliner@pidgin.im>
parents:
24630
diff
changeset
|
957 | */ |
|
24626
17f8b6004658
cmdproc->data should never be null. Log a warning message if it
Mark Doliner <markdoliner@pidgin.im>
parents:
24620
diff
changeset
|
958 | if (cmdproc->data == NULL) |
|
17f8b6004658
cmdproc->data should never be null. Log a warning message if it
Mark Doliner <markdoliner@pidgin.im>
parents:
24620
diff
changeset
|
959 | g_warning("msn_p2p_msg cmdproc->data was NULL\n"); |
|
17f8b6004658
cmdproc->data should never be null. Log a warning message if it
Mark Doliner <markdoliner@pidgin.im>
parents:
24620
diff
changeset
|
960 | else { |
|
17f8b6004658
cmdproc->data should never be null. Log a warning message if it
Mark Doliner <markdoliner@pidgin.im>
parents:
24620
diff
changeset
|
961 | slplink->swboard = (MsnSwitchBoard *)cmdproc->data; |
|
14029
0e8ca0cb7054
[gaim-migrate @ 16523]
Mark Doliner <markdoliner@pidgin.im>
parents:
13713
diff
changeset
|
962 | slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink); |
|
24626
17f8b6004658
cmdproc->data should never be null. Log a warning message if it
Mark Doliner <markdoliner@pidgin.im>
parents:
24620
diff
changeset
|
963 | } |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10527
diff
changeset
|
964 | } |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10527
diff
changeset
|
965 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
966 | data = msn_message_get_bin_data(msg, &len); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
967 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29774
diff
changeset
|
968 | msn_slplink_process_msg(slplink, &msg->msnslp_header, data, len); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
969 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
970 | |
|
11137
cf40226ddff7
[gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents:
11127
diff
changeset
|
971 | static void |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
972 | got_emoticon(MsnSlpCall *slpcall, |
|
11137
cf40226ddff7
[gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents:
11127
diff
changeset
|
973 | const guchar *data, gsize size) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
974 | { |
| 15884 | 975 | PurpleConversation *conv; |
|
23823
1e46336536b3
When receiving an MSN custom smiley, look at the switchboard for the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23817
diff
changeset
|
976 | MsnSwitchBoard *swboard; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
977 | |
|
23823
1e46336536b3
When receiving an MSN custom smiley, look at the switchboard for the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23817
diff
changeset
|
978 | swboard = slpcall->slplink->swboard; |
|
1e46336536b3
When receiving an MSN custom smiley, look at the switchboard for the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23817
diff
changeset
|
979 | conv = swboard->conv; |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10602
diff
changeset
|
980 | |
|
23823
1e46336536b3
When receiving an MSN custom smiley, look at the switchboard for the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23817
diff
changeset
|
981 | if (conv) { |
|
14147
b6323eeaf37b
[gaim-migrate @ 16708]
Daniel Atallah <datallah@pidgin.im>
parents:
14029
diff
changeset
|
982 | /* FIXME: it would be better if we wrote the data as we received it |
|
20502
ac12225eaf18
Port a custom emoticon crash fix that seemed to get lost somewhere along
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20501
diff
changeset
|
983 | instead of all at once, calling write multiple times and |
|
ac12225eaf18
Port a custom emoticon crash fix that seemed to get lost somewhere along
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20501
diff
changeset
|
984 | close once at the very end |
|
ac12225eaf18
Port a custom emoticon crash fix that seemed to get lost somewhere along
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20501
diff
changeset
|
985 | */ |
| 15884 | 986 | purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size); |
|
20502
ac12225eaf18
Port a custom emoticon crash fix that seemed to get lost somewhere along
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20501
diff
changeset
|
987 | purple_conv_custom_smiley_close(conv, slpcall->data_info ); |
|
14147
b6323eeaf37b
[gaim-migrate @ 16708]
Daniel Atallah <datallah@pidgin.im>
parents:
14029
diff
changeset
|
988 | } |
|
27691
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
989 | if (purple_debug_is_verbose()) |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
990 | purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
991 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
992 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
993 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
994 | msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
995 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
996 | MsnSession *session; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
997 | MsnSlpLink *slplink; |
|
23823
1e46336536b3
When receiving an MSN custom smiley, look at the switchboard for the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23817
diff
changeset
|
998 | MsnSwitchBoard *swboard; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
999 | MsnObject *obj; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1000 | char **tokens; |
|
11235
7e1cd737137b
[gaim-migrate @ 13380]
Federico G. Schwindt <fgsch@lodoss.net>
parents:
11138
diff
changeset
|
1001 | char *smile, *body_str; |
|
16090
57832613774a
Patch in Trac ticket #113 from Simom.
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
1002 | const char *body, *who, *sha1; |
|
11518
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1003 | guint tok; |
|
11235
7e1cd737137b
[gaim-migrate @ 13380]
Federico G. Schwindt <fgsch@lodoss.net>
parents:
11138
diff
changeset
|
1004 | size_t body_len; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1005 | |
| 15884 | 1006 | PurpleConversation *conv; |
| 10526 | 1007 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1008 | session = cmdproc->servconn->session; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1009 | |
| 15884 | 1010 | if (!purple_account_get_bool(session->account, "custom_smileys", TRUE)) |
|
12886
050f70062d54
[gaim-migrate @ 15238]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12618
diff
changeset
|
1011 | return; |
|
050f70062d54
[gaim-migrate @ 15238]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12618
diff
changeset
|
1012 | |
|
23999
6c623f317e5f
Don't assign this stuff in a loop.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23938
diff
changeset
|
1013 | swboard = cmdproc->data; |
|
6c623f317e5f
Don't assign this stuff in a loop.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23938
diff
changeset
|
1014 | conv = swboard->conv; |
|
6c623f317e5f
Don't assign this stuff in a loop.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23938
diff
changeset
|
1015 | |
|
11235
7e1cd737137b
[gaim-migrate @ 13380]
Federico G. Schwindt <fgsch@lodoss.net>
parents:
11138
diff
changeset
|
1016 | body = msn_message_get_bin_data(msg, &body_len); |
|
7e1cd737137b
[gaim-migrate @ 13380]
Federico G. Schwindt <fgsch@lodoss.net>
parents:
11138
diff
changeset
|
1017 | body_str = g_strndup(body, body_len); |
|
7e1cd737137b
[gaim-migrate @ 13380]
Federico G. Schwindt <fgsch@lodoss.net>
parents:
11138
diff
changeset
|
1018 | |
|
11518
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1019 | /* MSN Messenger 7 may send more than one MSNObject in a single message... |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1020 | * Maybe 10 tokens is a reasonable max value. */ |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1021 | tokens = g_strsplit(body_str, "\t", 10); |
|
11235
7e1cd737137b
[gaim-migrate @ 13380]
Federico G. Schwindt <fgsch@lodoss.net>
parents:
11138
diff
changeset
|
1022 | |
|
7e1cd737137b
[gaim-migrate @ 13380]
Federico G. Schwindt <fgsch@lodoss.net>
parents:
11138
diff
changeset
|
1023 | g_free(body_str); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1024 | |
|
11518
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1025 | for (tok = 0; tok < 9; tok += 2) { |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1026 | if (tokens[tok] == NULL || tokens[tok + 1] == NULL) { |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1027 | break; |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1028 | } |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1029 | |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1030 | smile = tokens[tok]; |
| 15884 | 1031 | obj = msn_object_new_from_string(purple_url_decode(tokens[tok + 1])); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1032 | |
|
15049
d8749c39e1e4
[gaim-migrate @ 17766]
Daniel Atallah <datallah@pidgin.im>
parents:
14548
diff
changeset
|
1033 | if (obj == NULL) |
|
d8749c39e1e4
[gaim-migrate @ 17766]
Daniel Atallah <datallah@pidgin.im>
parents:
14548
diff
changeset
|
1034 | break; |
|
d8749c39e1e4
[gaim-migrate @ 17766]
Daniel Atallah <datallah@pidgin.im>
parents:
14548
diff
changeset
|
1035 | |
|
11518
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1036 | who = msn_object_get_creator(obj); |
|
16090
57832613774a
Patch in Trac ticket #113 from Simom.
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
1037 | sha1 = msn_object_get_sha1(obj); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1038 | |
|
11518
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1039 | slplink = msn_session_get_slplink(session, who); |
|
24630
e23afee76eab
Attempt to avoid a crash in MSN. See the comment in the code.
Mark Doliner <markdoliner@pidgin.im>
parents:
24626
diff
changeset
|
1040 | if (slplink->swboard != swboard) { |
|
e23afee76eab
Attempt to avoid a crash in MSN. See the comment in the code.
Mark Doliner <markdoliner@pidgin.im>
parents:
24626
diff
changeset
|
1041 | if (slplink->swboard != NULL) |
|
e23afee76eab
Attempt to avoid a crash in MSN. See the comment in the code.
Mark Doliner <markdoliner@pidgin.im>
parents:
24626
diff
changeset
|
1042 | /* |
|
e23afee76eab
Attempt to avoid a crash in MSN. See the comment in the code.
Mark Doliner <markdoliner@pidgin.im>
parents:
24626
diff
changeset
|
1043 | * Apparently we're using a different switchboard now or |
|
e23afee76eab
Attempt to avoid a crash in MSN. See the comment in the code.
Mark Doliner <markdoliner@pidgin.im>
parents:
24626
diff
changeset
|
1044 | * something? I don't know if this is normal, but it |
|
e23afee76eab
Attempt to avoid a crash in MSN. See the comment in the code.
Mark Doliner <markdoliner@pidgin.im>
parents:
24626
diff
changeset
|
1045 | * definitely happens. So make sure the old switchboard |
|
e23afee76eab
Attempt to avoid a crash in MSN. See the comment in the code.
Mark Doliner <markdoliner@pidgin.im>
parents:
24626
diff
changeset
|
1046 | * doesn't still have a reference to us. |
|
e23afee76eab
Attempt to avoid a crash in MSN. See the comment in the code.
Mark Doliner <markdoliner@pidgin.im>
parents:
24626
diff
changeset
|
1047 | */ |
|
e23afee76eab
Attempt to avoid a crash in MSN. See the comment in the code.
Mark Doliner <markdoliner@pidgin.im>
parents:
24626
diff
changeset
|
1048 | slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink); |
|
e23afee76eab
Attempt to avoid a crash in MSN. See the comment in the code.
Mark Doliner <markdoliner@pidgin.im>
parents:
24626
diff
changeset
|
1049 | slplink->swboard = swboard; |
|
24660
483e2ad56d8e
If we're setting swboard here then we need to add the slplink to the
Mark Doliner <markdoliner@pidgin.im>
parents:
24630
diff
changeset
|
1050 | slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink); |
|
24630
e23afee76eab
Attempt to avoid a crash in MSN. See the comment in the code.
Mark Doliner <markdoliner@pidgin.im>
parents:
24626
diff
changeset
|
1051 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1052 | |
|
11518
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1053 | /* If the conversation doesn't exist then this is a custom smiley |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1054 | * used in the first message in a MSN conversation: we need to create |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1055 | * the conversation now, otherwise the custom smiley won't be shown. |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1056 | * This happens because every GtkIMHtml has its own smiley tree: if |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1057 | * the conversation doesn't exist then we cannot associate the new |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1058 | * smiley with its GtkIMHtml widget. */ |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1059 | if (!conv) { |
| 15884 | 1060 | conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, session->account, who); |
|
11518
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1061 | } |
| 10526 | 1062 | |
|
16090
57832613774a
Patch in Trac ticket #113 from Simom.
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
1063 | if (purple_conv_custom_smiley_add(conv, smile, "sha1", sha1, TRUE)) { |
|
11518
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1064 | msn_slplink_request_object(slplink, smile, got_emoticon, NULL, obj); |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1065 | } |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1066 | |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1067 | msn_object_destroy(obj); |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1068 | obj = NULL; |
|
c1c6ea0117d8
[gaim-migrate @ 13763]
Francesco Fracassi <ffracassi@users.sourceforge.net>
parents:
11338
diff
changeset
|
1069 | who = NULL; |
|
16090
57832613774a
Patch in Trac ticket #113 from Simom.
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
1070 | sha1 = NULL; |
| 10526 | 1071 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1072 | g_strfreev(tokens); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1073 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1074 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1075 | static gboolean |
| 15884 | 1076 | buddy_icon_cached(PurpleConnection *gc, MsnObject *obj) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1077 | { |
| 15884 | 1078 | PurpleAccount *account; |
| 1079 | PurpleBuddy *buddy; | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1080 | const char *old; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1081 | const char *new; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1082 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1083 | g_return_val_if_fail(obj != NULL, FALSE); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1084 | |
| 15884 | 1085 | account = purple_connection_get_account(gc); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1086 | |
| 15884 | 1087 | buddy = purple_find_buddy(account, msn_object_get_creator(obj)); |
|
12126
3b70215e9630
[gaim-migrate @ 14426]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
11897
diff
changeset
|
1088 | if (buddy == NULL) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1089 | return FALSE; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1090 | |
|
16534
2ab9e23f99d9
Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents:
16090
diff
changeset
|
1091 | old = purple_buddy_icons_get_checksum_for_user(buddy); |
|
16090
57832613774a
Patch in Trac ticket #113 from Simom.
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
1092 | new = msn_object_get_sha1(obj); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1093 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1094 | if (new == NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1095 | return FALSE; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1096 | |
|
11020
c1251ff4e369
[gaim-migrate @ 12891]
Richard Laager <rlaager@pidgin.im>
parents:
10907
diff
changeset
|
1097 | /* If the old and new checksums are the same, and the file actually exists, |
|
c1251ff4e369
[gaim-migrate @ 12891]
Richard Laager <rlaager@pidgin.im>
parents:
10907
diff
changeset
|
1098 | * then return TRUE */ |
|
16536
e6ff9aa38885
There's no need to actually lookup the icon now, as the core ensures the checksum gets deleted if the file disappears.
Richard Laager <rlaager@pidgin.im>
parents:
16534
diff
changeset
|
1099 | if (old != NULL && !strcmp(old, new)) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1100 | return TRUE; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1101 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1102 | return FALSE; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1103 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1104 | |
|
12323
f52908fb23b0
[gaim-migrate @ 14627]
Richard Laager <rlaager@pidgin.im>
parents:
12126
diff
changeset
|
1105 | static void |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1106 | msn_release_buddy_icon_request(MsnUserList *userlist) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1107 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1108 | MsnUser *user; |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1109 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1110 | g_return_if_fail(userlist != NULL); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1111 | |
|
27691
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1112 | if (purple_debug_is_verbose()) |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1113 | purple_debug_info("msn", "Releasing buddy icon request\n"); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1114 | |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1115 | if (userlist->buddy_icon_window > 0) |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1116 | { |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1117 | GQueue *queue; |
| 15884 | 1118 | PurpleAccount *account; |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1119 | const char *username; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1120 | |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1121 | queue = userlist->buddy_icon_requests; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1122 | |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1123 | if (g_queue_is_empty(userlist->buddy_icon_requests)) |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1124 | return; |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1125 | |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1126 | user = g_queue_pop_head(queue); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1127 | |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1128 | account = userlist->session->account; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1129 | username = user->passport; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1130 | |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1131 | userlist->buddy_icon_window--; |
|
23809
334ee2bd89d7
A patch from felipec to make (msn_)request_user_display static.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23441
diff
changeset
|
1132 | request_user_display(user); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1133 | |
|
27691
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1134 | if (purple_debug_is_verbose()) |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1135 | purple_debug_info("msn", |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1136 | "msn_release_buddy_icon_request(): buddy_icon_window-- yields =%d\n", |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1137 | userlist->buddy_icon_window); |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1138 | } |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1139 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1140 | |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1141 | /* |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1142 | * Called on a timeout from end_user_display(). Frees a buddy icon window slow and dequeues the next |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1143 | * buddy icon request if there is one. |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1144 | */ |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1145 | static gboolean |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1146 | msn_release_buddy_icon_request_timeout(gpointer data) |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1147 | { |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1148 | MsnUserList *userlist = (MsnUserList *)data; |
|
23441
fd45c23a3eb2
Delete trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
23008
diff
changeset
|
1149 | |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1150 | /* Free one window slot */ |
|
23441
fd45c23a3eb2
Delete trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
23008
diff
changeset
|
1151 | userlist->buddy_icon_window++; |
|
fd45c23a3eb2
Delete trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
23008
diff
changeset
|
1152 | |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1153 | /* Clear the tag for our former request timer */ |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1154 | userlist->buddy_icon_request_timer = 0; |
|
23441
fd45c23a3eb2
Delete trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
23008
diff
changeset
|
1155 | |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1156 | msn_release_buddy_icon_request(userlist); |
|
23441
fd45c23a3eb2
Delete trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
23008
diff
changeset
|
1157 | |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1158 | return FALSE; |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1159 | } |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1160 | |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1161 | void |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1162 | msn_queue_buddy_icon_request(MsnUser *user) |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1163 | { |
| 15884 | 1164 | PurpleAccount *account; |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1165 | MsnObject *obj; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1166 | GQueue *queue; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1167 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1168 | g_return_if_fail(user != NULL); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1169 | |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1170 | account = user->userlist->session->account; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1171 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1172 | obj = msn_user_get_object(user); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1173 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1174 | if (obj == NULL) |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1175 | { |
|
16765
058e9e5d7cee
disapproval of revision 'bf9779a51471f98c95339f8736da02b6af1a0a89'
Richard Laager <rlaager@pidgin.im>
parents:
16764
diff
changeset
|
1176 | purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1177 | return; |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1178 | } |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1179 | |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1180 | if (!buddy_icon_cached(account->gc, obj)) |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1181 | { |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1182 | MsnUserList *userlist; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1183 | |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1184 | userlist = user->userlist; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1185 | queue = userlist->buddy_icon_requests; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1186 | |
|
27691
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1187 | if (purple_debug_is_verbose()) |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1188 | purple_debug_info("msn", "Queueing buddy icon request for %s (buddy_icon_window = %i)\n", |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1189 | user->passport, userlist->buddy_icon_window); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1190 | |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1191 | g_queue_push_tail(queue, user); |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1192 | |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1193 | if (userlist->buddy_icon_window > 0) |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1194 | msn_release_buddy_icon_request(userlist); |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1195 | } |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1196 | } |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1197 | |
|
11897
10853b830964
[gaim-migrate @ 14188]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11595
diff
changeset
|
1198 | static void |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1199 | got_user_display(MsnSlpCall *slpcall, |
|
11137
cf40226ddff7
[gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents:
11127
diff
changeset
|
1200 | const guchar *data, gsize size) |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1201 | { |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1202 | MsnUserList *userlist; |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1203 | const char *info; |
| 15884 | 1204 | PurpleAccount *account; |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1205 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1206 | g_return_if_fail(slpcall != NULL); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1207 | |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1208 | info = slpcall->data_info; |
|
27691
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1209 | if (purple_debug_is_verbose()) |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1210 | purple_debug_info("msn", "Got User Display: %s\n", slpcall->slplink->remote_user); |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1211 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1212 | userlist = slpcall->slplink->session->userlist; |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1213 | account = slpcall->slplink->session->account; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1214 | |
| 15884 | 1215 | purple_buddy_icons_set_for_user(account, slpcall->slplink->remote_user, |
|
16539
75a20ae3a527
Change the imgstore and by extension, then the buddy icon code to take over
Richard Laager <rlaager@pidgin.im>
parents:
16538
diff
changeset
|
1216 | g_memdup(data, size), size, info); |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1217 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1218 | #if 0 |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1219 | /* Free one window slot */ |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1220 | userlist->buddy_icon_window++; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1221 | |
| 15884 | 1222 | purple_debug_info("msn", "got_user_display(): buddy_icon_window++ yields =%d\n", |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1223 | userlist->buddy_icon_window); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1224 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1225 | msn_release_buddy_icon_request(userlist); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1226 | #endif |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1227 | } |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1228 | |
|
11897
10853b830964
[gaim-migrate @ 14188]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11595
diff
changeset
|
1229 | static void |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1230 | end_user_display(MsnSlpCall *slpcall, MsnSession *session) |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1231 | { |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1232 | MsnUserList *userlist; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1233 | |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1234 | g_return_if_fail(session != NULL); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1235 | |
|
27691
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1236 | if (purple_debug_is_verbose()) |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1237 | purple_debug_info("msn", "End User Display\n"); |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10602
diff
changeset
|
1238 | |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1239 | userlist = session->userlist; |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1240 | |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10226
diff
changeset
|
1241 | /* If the session is being destroyed we better stop doing anything. */ |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1242 | if (session->destroying) |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10226
diff
changeset
|
1243 | return; |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1244 | |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1245 | /* Delay before freeing a buddy icon window slot and requesting the next icon, if appropriate. |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1246 | * If we don't delay, we'll rapidly hit the MSN equivalent of AIM's rate limiting; the server will |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1247 | * send us an error 800 like so: |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1248 | * |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1249 | * C: NS 000: XFR 21 SB |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1250 | * S: NS 000: 800 21 |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1251 | */ |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1252 | if (userlist->buddy_icon_request_timer) { |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1253 | /* Free the window slot used by this previous request */ |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1254 | userlist->buddy_icon_window++; |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1255 | |
|
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1256 | /* Clear our pending timeout */ |
| 15884 | 1257 | purple_timeout_remove(userlist->buddy_icon_request_timer); |
|
13028
fcd75318a565
[gaim-migrate @ 15381]
Evan Schoenberg <evands@pidgin.im>
parents:
12886
diff
changeset
|
1258 | } |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10226
diff
changeset
|
1259 | |
|
24619
5ece4c87ea96
Use purple_timeout_add_seconds() instead of purple_timeout_add() in a
Mark Doliner <markdoliner@pidgin.im>
parents:
24618
diff
changeset
|
1260 | /* Wait BUDDY_ICON_DELAY s before freeing our window slot and requesting the next icon. */ |
|
5ece4c87ea96
Use purple_timeout_add_seconds() instead of purple_timeout_add() in a
Mark Doliner <markdoliner@pidgin.im>
parents:
24618
diff
changeset
|
1261 | userlist->buddy_icon_request_timer = purple_timeout_add_seconds(BUDDY_ICON_DELAY, |
|
13126
afce0fe97885
[gaim-migrate @ 15487]
Evan Schoenberg <evands@pidgin.im>
parents:
13028
diff
changeset
|
1262 | msn_release_buddy_icon_request_timeout, userlist); |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1263 | } |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1264 | |
|
23809
334ee2bd89d7
A patch from felipec to make (msn_)request_user_display static.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23441
diff
changeset
|
1265 | static void |
|
334ee2bd89d7
A patch from felipec to make (msn_)request_user_display static.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23441
diff
changeset
|
1266 | request_user_display(MsnUser *user) |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1267 | { |
| 15884 | 1268 | PurpleAccount *account; |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1269 | MsnSession *session; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1270 | MsnSlpLink *slplink; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1271 | MsnObject *obj; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1272 | const char *info; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1273 | |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1274 | session = user->userlist->session; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1275 | account = session->account; |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1276 | |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1277 | slplink = msn_session_get_slplink(session, user->passport); |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1278 | |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1279 | obj = msn_user_get_object(user); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1280 | |
|
16090
57832613774a
Patch in Trac ticket #113 from Simom.
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
1281 | info = msn_object_get_sha1(obj); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1282 | |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1283 | if (g_ascii_strcasecmp(user->passport, |
| 15884 | 1284 | purple_account_get_username(account))) |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1285 | { |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1286 | msn_slplink_request_object(slplink, info, got_user_display, |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1287 | end_user_display, obj); |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1288 | } |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1289 | else |
|
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1290 | { |
|
10072
7bcd144ef597
[gaim-migrate @ 11051]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10047
diff
changeset
|
1291 | MsnObject *my_obj = NULL; |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16536
diff
changeset
|
1292 | gconstpointer data = NULL; |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16536
diff
changeset
|
1293 | size_t len = 0; |
|
10072
7bcd144ef597
[gaim-migrate @ 11051]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10047
diff
changeset
|
1294 | |
|
27691
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1295 | if (purple_debug_is_verbose()) |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1296 | purple_debug_info("msn", "Requesting our own user display\n"); |
|
10072
7bcd144ef597
[gaim-migrate @ 11051]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10047
diff
changeset
|
1297 | |
|
7bcd144ef597
[gaim-migrate @ 11051]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10047
diff
changeset
|
1298 | my_obj = msn_user_get_object(session->user); |
|
7bcd144ef597
[gaim-migrate @ 11051]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10047
diff
changeset
|
1299 | |
|
7bcd144ef597
[gaim-migrate @ 11051]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10047
diff
changeset
|
1300 | if (my_obj != NULL) |
|
7bcd144ef597
[gaim-migrate @ 11051]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10047
diff
changeset
|
1301 | { |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16536
diff
changeset
|
1302 | PurpleStoredImage *img = msn_object_get_image(my_obj); |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16536
diff
changeset
|
1303 | data = purple_imgstore_get_data(img); |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16536
diff
changeset
|
1304 | len = purple_imgstore_get_size(img); |
|
10072
7bcd144ef597
[gaim-migrate @ 11051]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10047
diff
changeset
|
1305 | } |
|
7bcd144ef597
[gaim-migrate @ 11051]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10047
diff
changeset
|
1306 | |
|
16544
945caa0d6436
Kill some compiler warnings and TODOs of mine.
Richard Laager <rlaager@pidgin.im>
parents:
16539
diff
changeset
|
1307 | purple_buddy_icons_set_for_user(account, user->passport, g_memdup(data, len), len, info); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
1308 | |
|
23812
5399dc0d191c
disapproval of revision '364ef11540c03fc34138ee3db995e341997833ad'
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23811
diff
changeset
|
1309 | /* Free one window slot */ |
|
5399dc0d191c
disapproval of revision '364ef11540c03fc34138ee3db995e341997833ad'
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23811
diff
changeset
|
1310 | session->userlist->buddy_icon_window++; |
|
5399dc0d191c
disapproval of revision '364ef11540c03fc34138ee3db995e341997833ad'
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23811
diff
changeset
|
1311 | |
|
27691
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1312 | if (purple_debug_is_verbose()) |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1313 | purple_debug_info("msn", "request_user_display(): buddy_icon_window++ yields =%d\n", |
|
d77b2890043e
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26738
diff
changeset
|
1314 | session->userlist->buddy_icon_window); |
|
23812
5399dc0d191c
disapproval of revision '364ef11540c03fc34138ee3db995e341997833ad'
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23811
diff
changeset
|
1315 | |
|
5399dc0d191c
disapproval of revision '364ef11540c03fc34138ee3db995e341997833ad'
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23811
diff
changeset
|
1316 | msn_release_buddy_icon_request(session->userlist); |
|
9860
8f54a6091294
[gaim-migrate @ 10739]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9858
diff
changeset
|
1317 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1318 | } |