Tue, 22 Jun 2010 23:09:36 +0000
Fix debug_*_to_file to process SlpMessages instead of MsnMessages.
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
1 | /** |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
2 | * @file slplink.c MSNSLP Link support |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
3 | * |
| 15884 | 4 | * purple |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
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. |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
9 | * |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
10 | * This program is free software; you can redistribute it and/or modify |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
11 | * it under the terms of the GNU General Public License as published by |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
12 | * the Free Software Foundation; either version 2 of the License, or |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
13 | * (at your option) any later version. |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
14 | * |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
15 | * This program is distributed in the hope that it will be useful, |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
18 | * GNU General Public License for more details. |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
19 | * |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
20 | * You should have received a copy of the GNU General Public License |
|
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
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:
19832
diff
changeset
|
22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
23 | */ |
|
30945
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30931
diff
changeset
|
24 | |
|
30961
885064b16c54
Include internal.h on each c file to avoid windows breakage as recommended by Daniel.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30945
diff
changeset
|
25 | #include "internal.h" |
|
30945
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30931
diff
changeset
|
26 | #include "debug.h" |
|
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30931
diff
changeset
|
27 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
28 | #include "msn.h" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
29 | #include "slplink.h" |
|
31004
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
30 | #include "slpmsg_part.h" |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
31 | |
|
30995
f9181483576b
Move MsnMessage stuff out of slplink to SBConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30994
diff
changeset
|
32 | #include "sbconn.h" |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
33 | #include "switchboard.h" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
34 | #include "slp.h" |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
35 | #include "p2p.h" |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
36 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
37 | #ifdef MSN_DEBUG_SLP_FILES |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
38 | static int m_sc = 0; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
39 | static int m_rc = 0; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
40 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
41 | static void |
|
31028
c5b900f03fd4
Fix debug_*_to_file to process SlpMessages instead of MsnMessages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31010
diff
changeset
|
42 | debug_part_to_file(MsnSlpMessage *msg, gboolean send) |
|
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 | char *tmp; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
45 | char *dir; |
|
31028
c5b900f03fd4
Fix debug_*_to_file to process SlpMessages instead of MsnMessages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31010
diff
changeset
|
46 | char *data; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
47 | int c; |
|
31028
c5b900f03fd4
Fix debug_*_to_file to process SlpMessages instead of MsnMessages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31010
diff
changeset
|
48 | gsize data_size; |
|
9193
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 | dir = send ? "send" : "recv"; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
51 | c = send ? m_sc++ : m_rc++; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
52 | tmp = g_strdup_printf("%s/msntest/%s/%03d", g_get_home_dir(), dir, c); |
|
31028
c5b900f03fd4
Fix debug_*_to_file to process SlpMessages instead of MsnMessages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31010
diff
changeset
|
53 | data = msn_slpmsg_serialize(msg, &data_size); |
|
c5b900f03fd4
Fix debug_*_to_file to process SlpMessages instead of MsnMessages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31010
diff
changeset
|
54 | if (!purple_util_write_data_to_file_absolute(tmp, data, data_size)) |
|
13315
97ad5f28f254
[gaim-migrate @ 15680]
Glauber de Oliveira Costa <gcosta@redhat.com>
parents:
11607
diff
changeset
|
55 | { |
|
26726
b81bcec8f359
Updates for GTK+ 3.0. Remove some deprecated functions (someone should
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25436
diff
changeset
|
56 | purple_debug_error("msn", "could not save debug file\n"); |
|
13315
97ad5f28f254
[gaim-migrate @ 15680]
Glauber de Oliveira Costa <gcosta@redhat.com>
parents:
11607
diff
changeset
|
57 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
58 | g_free(tmp); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
59 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
60 | #endif |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
61 | |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
62 | /************************************************************************** |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
63 | * Main |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
64 | **************************************************************************/ |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
65 | |
|
23447
3217bd0cb9bb
msn_slplink_new() is only used within slplink.c, so make it static and
Mark Doliner <markdoliner@pidgin.im>
parents:
22981
diff
changeset
|
66 | static MsnSlpLink * |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
67 | msn_slplink_new(MsnSession *session, const char *username) |
|
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 | MsnSlpLink *slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
70 | |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
71 | g_return_val_if_fail(session != NULL, NULL); |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
72 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
73 | slplink = g_new0(MsnSlpLink, 1); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
74 | |
|
27770
9d4cc577fe26
Apparently, I missed a few changes for purple_debug_is_verbose().
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27361
diff
changeset
|
75 | if (purple_debug_is_verbose()) |
|
9d4cc577fe26
Apparently, I missed a few changes for purple_debug_is_verbose().
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27361
diff
changeset
|
76 | purple_debug_info("msn", "slplink_new: slplink(%p)\n", slplink); |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10621
diff
changeset
|
77 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
78 | slplink->session = session; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
79 | slplink->slp_seq_id = rand() % 0xFFFFFF00 + 4; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
80 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
81 | slplink->remote_user = g_strdup(username); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
82 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
83 | slplink->slp_msg_queue = g_queue_new(); |
|
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 | session->slplinks = |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
86 | g_list_append(session->slplinks, slplink); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
87 | |
|
30046
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
88 | return msn_slplink_ref(slplink); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
89 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
90 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
91 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
92 | msn_slplink_destroy(MsnSlpLink *slplink) |
|
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 | MsnSession *session; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
95 | |
|
27770
9d4cc577fe26
Apparently, I missed a few changes for purple_debug_is_verbose().
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27361
diff
changeset
|
96 | if (purple_debug_is_verbose()) |
|
9d4cc577fe26
Apparently, I missed a few changes for purple_debug_is_verbose().
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27361
diff
changeset
|
97 | purple_debug_info("msn", "slplink_destroy: slplink(%p)\n", slplink); |
|
10773
ef88ffed66eb
[gaim-migrate @ 12382]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10621
diff
changeset
|
98 | |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
99 | g_return_if_fail(slplink != NULL); |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
100 | |
|
30362
4acd426805d4
NULL-ify one more link on destroy that might lead to a crash.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30337
diff
changeset
|
101 | if (slplink->swboard != NULL) { |
|
14029
0e8ca0cb7054
[gaim-migrate @ 16523]
Mark Doliner <markdoliner@pidgin.im>
parents:
13315
diff
changeset
|
102 | slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink); |
|
30362
4acd426805d4
NULL-ify one more link on destroy that might lead to a crash.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30337
diff
changeset
|
103 | slplink->swboard = NULL; |
|
4acd426805d4
NULL-ify one more link on destroy that might lead to a crash.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30337
diff
changeset
|
104 | } |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
105 | |
|
30046
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
106 | if (slplink->refs > 1) { |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
107 | slplink->refs--; |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
108 | return; |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
109 | } |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
110 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
111 | session = slplink->session; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
112 | |
|
30336
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30325
diff
changeset
|
113 | if (slplink->dc != NULL) { |
|
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30325
diff
changeset
|
114 | slplink->dc->slplink = NULL; |
|
30099
39b378ac4fc8
It's probably a good idea to free the direct connection when the slplink
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30089
diff
changeset
|
115 | msn_dc_destroy(slplink->dc); |
|
30336
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30325
diff
changeset
|
116 | slplink->dc = NULL; |
|
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30325
diff
changeset
|
117 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
118 | |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
119 | while (slplink->slp_calls != NULL) |
|
24618
190103ba3381
For some reason the slpmsg and slplink functions don't have underscores
Mark Doliner <markdoliner@pidgin.im>
parents:
24616
diff
changeset
|
120 | msn_slpcall_destroy(slplink->slp_calls->data); |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
121 | |
| 21018 | 122 | g_queue_free(slplink->slp_msg_queue); |
| 123 | ||
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
124 | session->slplinks = |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
125 | g_list_remove(session->slplinks, slplink); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
126 | |
|
24005
c3ac92d3222f
Re-arrange msn_slplink_destroy and msn_slp_call_destroy. Might help
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23938
diff
changeset
|
127 | g_free(slplink->remote_user); |
|
c3ac92d3222f
Re-arrange msn_slplink_destroy and msn_slp_call_destroy. Might help
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23938
diff
changeset
|
128 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
129 | g_free(slplink); |
|
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 | MsnSlpLink * |
|
30046
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
133 | msn_slplink_ref(MsnSlpLink *slplink) |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
134 | { |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
135 | g_return_val_if_fail(slplink != NULL, NULL); |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
136 | |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
137 | slplink->refs++; |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
138 | if (purple_debug_is_verbose()) |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
139 | purple_debug_info("msn", "slplink ref (%p)[%d]\n", slplink, slplink->refs); |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
140 | |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
141 | return slplink; |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
142 | } |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
143 | |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
144 | void |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
145 | msn_slplink_unref(MsnSlpLink *slplink) |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
146 | { |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
147 | g_return_if_fail(slplink != NULL); |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
148 | |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
149 | slplink->refs--; |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
150 | if (purple_debug_is_verbose()) |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
151 | purple_debug_info("msn", "slplink unref (%p)[%d]\n", slplink, slplink->refs); |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
152 | |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
153 | if (slplink->refs == 0) |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
154 | msn_slplink_destroy(slplink); |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
155 | } |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
156 | |
|
b1109ea8d963
Fix a possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29780
diff
changeset
|
157 | MsnSlpLink * |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
158 | msn_session_find_slplink(MsnSession *session, const char *who) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
159 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
160 | GList *l; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
161 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
162 | for (l = session->slplinks; l != NULL; l = l->next) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
163 | { |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10107
diff
changeset
|
164 | MsnSlpLink *slplink; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10107
diff
changeset
|
165 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
166 | slplink = l->data; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
167 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
168 | if (!strcmp(slplink->remote_user, who)) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
169 | return slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
170 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
171 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
172 | return NULL; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
173 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
174 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
175 | MsnSlpLink * |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
176 | msn_session_get_slplink(MsnSession *session, const char *username) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
177 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
178 | MsnSlpLink *slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
179 | |
|
15049
d8749c39e1e4
[gaim-migrate @ 17766]
Daniel Atallah <datallah@pidgin.im>
parents:
14254
diff
changeset
|
180 | g_return_val_if_fail(session != NULL, NULL); |
|
d8749c39e1e4
[gaim-migrate @ 17766]
Daniel Atallah <datallah@pidgin.im>
parents:
14254
diff
changeset
|
181 | g_return_val_if_fail(username != NULL, NULL); |
|
d8749c39e1e4
[gaim-migrate @ 17766]
Daniel Atallah <datallah@pidgin.im>
parents:
14254
diff
changeset
|
182 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
183 | slplink = msn_session_find_slplink(session, username); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
184 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
185 | if (slplink == NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
186 | slplink = msn_slplink_new(session, username); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
187 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
188 | return slplink; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
189 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
190 | |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
191 | void |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
192 | msn_slplink_add_slpcall(MsnSlpLink *slplink, MsnSlpCall *slpcall) |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
193 | { |
|
10621
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
194 | if (slplink->swboard != NULL) |
|
2b214ffb112b
[gaim-migrate @ 12090]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10602
diff
changeset
|
195 | slplink->swboard->flag |= MSN_SB_FLAG_FT; |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
196 | |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
197 | slplink->slp_calls = g_list_append(slplink->slp_calls, slpcall); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
198 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
199 | /* |
|
30068
ade8dd1a1339
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
200 | if (slplink->dc != NULL && slplink->dc->state == DC_STATE_ESTABLISHED) |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
201 | msn_dc_ref(slplink->dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
202 | */ |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
203 | } |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
204 | |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
205 | void |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
206 | msn_slplink_remove_slpcall(MsnSlpLink *slplink, MsnSlpCall *slpcall) |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
207 | { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
208 | /* |
|
30068
ade8dd1a1339
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
209 | if (slplink->dc != NULL && slplink->dc->state == DC_STATE_ESTABLISHED) |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
210 | msn_dc_unref(slplink->dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
211 | */ |
| 30067 | 212 | |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
213 | slplink->slp_calls = g_list_remove(slplink->slp_calls, slpcall); |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
214 | |
|
24615
9a156dbd94c4
msn_slplink_remove_slpcall() shouldn't be responsible for setting
Mark Doliner <markdoliner@pidgin.im>
parents:
24613
diff
changeset
|
215 | /* The slplink has no slpcalls in it, release it from MSN_SB_FLAG_FT. |
|
9a156dbd94c4
msn_slplink_remove_slpcall() shouldn't be responsible for setting
Mark Doliner <markdoliner@pidgin.im>
parents:
24613
diff
changeset
|
216 | * If nothing else is using it then this might cause swboard to be |
|
9a156dbd94c4
msn_slplink_remove_slpcall() shouldn't be responsible for setting
Mark Doliner <markdoliner@pidgin.im>
parents:
24613
diff
changeset
|
217 | * destroyed. */ |
|
30336
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30325
diff
changeset
|
218 | if (slplink->slp_calls == NULL && slplink->swboard != NULL) { |
|
30382
6eb81c3503c5
And another one just like 988846d28a03cf8bbce4170226129c2305919ebf. But
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30377
diff
changeset
|
219 | slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink); |
|
24615
9a156dbd94c4
msn_slplink_remove_slpcall() shouldn't be responsible for setting
Mark Doliner <markdoliner@pidgin.im>
parents:
24613
diff
changeset
|
220 | msn_switchboard_release(slplink->swboard, MSN_SB_FLAG_FT); |
|
30336
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30325
diff
changeset
|
221 | slplink->swboard = NULL; |
|
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30325
diff
changeset
|
222 | } |
|
30110
ad136348db2d
Close the DC when the slplink is empty.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30099
diff
changeset
|
223 | |
|
ad136348db2d
Close the DC when the slplink is empty.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30099
diff
changeset
|
224 | /* The slplink has no slpcalls in it, release it from the DC. */ |
|
30336
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30325
diff
changeset
|
225 | if (slplink->slp_calls == NULL && slplink->dc != NULL) { |
|
30377
988846d28a03
And another one of those reverse links. We don't want dc to automatically
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30362
diff
changeset
|
226 | slplink->dc->slplink = NULL; |
|
30110
ad136348db2d
Close the DC when the slplink is empty.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30099
diff
changeset
|
227 | msn_dc_destroy(slplink->dc); |
|
30336
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30325
diff
changeset
|
228 | slplink->dc = NULL; |
|
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30325
diff
changeset
|
229 | } |
|
10602
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
230 | } |
|
111ed237f509
[gaim-migrate @ 12032]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10589
diff
changeset
|
231 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
232 | MsnSlpCall * |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
233 | msn_slplink_find_slp_call(MsnSlpLink *slplink, const char *id) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
234 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
235 | GList *l; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
236 | MsnSlpCall *slpcall; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
237 | |
|
10107
a722b8760bed
[gaim-migrate @ 11139]
Evan Schoenberg <evands@pidgin.im>
parents:
10092
diff
changeset
|
238 | if (!id) |
|
a722b8760bed
[gaim-migrate @ 11139]
Evan Schoenberg <evands@pidgin.im>
parents:
10092
diff
changeset
|
239 | return NULL; |
|
a722b8760bed
[gaim-migrate @ 11139]
Evan Schoenberg <evands@pidgin.im>
parents:
10092
diff
changeset
|
240 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
241 | for (l = slplink->slp_calls; l != NULL; l = l->next) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
242 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
243 | slpcall = l->data; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
244 | |
|
10107
a722b8760bed
[gaim-migrate @ 11139]
Evan Schoenberg <evands@pidgin.im>
parents:
10092
diff
changeset
|
245 | if (slpcall->id && !strcmp(slpcall->id, id)) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
246 | return slpcall; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
247 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
248 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
249 | return NULL; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
250 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
251 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
252 | MsnSlpCall * |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
253 | msn_slplink_find_slp_call_with_session_id(MsnSlpLink *slplink, long id) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
254 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
255 | GList *l; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
256 | MsnSlpCall *slpcall; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
257 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
258 | for (l = slplink->slp_calls; l != NULL; l = l->next) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
259 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
260 | slpcall = l->data; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
261 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
262 | if (slpcall->session_id == id) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
263 | return slpcall; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
264 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
265 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
266 | return NULL; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
267 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
268 | |
|
30325
b8ed0b3a8545
This is supposed to go along with the queue sending stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30316
diff
changeset
|
269 | void |
|
31004
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
270 | msn_slplink_send_part(MsnSlpLink *slplink, MsnSlpMessagePart *part) |
|
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
271 | { |
|
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
272 | if (slplink->dc != NULL && slplink->dc->state == DC_STATE_ESTABLISHED) |
|
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
273 | { |
|
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
274 | msn_dc_enqueue_part(slplink->dc, part); |
|
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
275 | } |
|
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
276 | else |
|
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
277 | { |
|
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
278 | msn_sbconn_send_part(slplink, part); |
|
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
279 | } |
|
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
280 | } |
|
31007
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31004
diff
changeset
|
281 | #if 0 |
|
31004
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
282 | void |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
283 | msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
284 | { |
|
30068
ade8dd1a1339
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
285 | if (slplink->dc != NULL && slplink->dc->state == DC_STATE_ESTABLISHED) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
286 | { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
287 | msn_dc_enqueue_msg(slplink->dc, msg); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
288 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
289 | else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
290 | { |
|
30997
ecccf0adf665
Manage sending messages trough switchboard in sbconn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30996
diff
changeset
|
291 | msn_sbconn_send_msg(slplink, msg); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
292 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
293 | } |
|
31007
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31004
diff
changeset
|
294 | #endif |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
295 | |
|
28694
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28238
diff
changeset
|
296 | void |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
297 | msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
298 | { |
|
31004
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
299 | MsnSlpMessagePart *part; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
300 | long long real_size; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
301 | size_t len = 0; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
302 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
303 | /* Maybe we will want to create a new msg for this slpmsg instead of |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
304 | * reusing the same one all the time. */ |
|
31004
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
305 | part = msn_slpmsgpart_new(slpmsg->header, slpmsg->footer); |
|
31007
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31004
diff
changeset
|
306 | part->ack_data = slpmsg; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
307 | |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
308 | real_size = (slpmsg->flags == P2P_ACK) ? 0 : slpmsg->size; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
309 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
310 | if (slpmsg->offset < real_size) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
311 | { |
|
28694
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28238
diff
changeset
|
312 | if (slpmsg->slpcall && slpmsg->slpcall->xfer && purple_xfer_get_type(slpmsg->slpcall->xfer) == PURPLE_XFER_SEND && |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28238
diff
changeset
|
313 | purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED) |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28238
diff
changeset
|
314 | { |
|
30996
2afd1b24e823
Document SlpMessage size limits.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30995
diff
changeset
|
315 | len = MIN(MSN_SBCONN_MAX_SIZE, slpmsg->slpcall->u.outgoing.len); |
|
31004
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
316 | msn_slpmsgpart_set_bin_data(part, slpmsg->slpcall->u.outgoing.data, len); |
|
28694
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28238
diff
changeset
|
317 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
318 | else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
319 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
320 | len = slpmsg->size - slpmsg->offset; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
321 | |
|
30996
2afd1b24e823
Document SlpMessage size limits.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30995
diff
changeset
|
322 | if (len > MSN_SBCONN_MAX_SIZE) |
|
2afd1b24e823
Document SlpMessage size limits.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30995
diff
changeset
|
323 | len = MSN_SBCONN_MAX_SIZE; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
324 | |
|
31004
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
325 | msn_slpmsgpart_set_bin_data(part, slpmsg->slpcall->u.outgoing.data, len); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
326 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
327 | |
|
30986
5e30592f85e5
Drop slp header and footer from MsnMessage in favor of MsnSlpMessage->header and footer.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30981
diff
changeset
|
328 | slpmsg->header->offset = slpmsg->offset; |
|
5e30592f85e5
Drop slp header and footer from MsnMessage in favor of MsnSlpMessage->header and footer.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30981
diff
changeset
|
329 | slpmsg->header->length = len; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
330 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
331 | |
|
31004
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
332 | #if 0 |
|
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
333 | /* TODO: port this function to SlpMessageParts */ |
|
27770
9d4cc577fe26
Apparently, I missed a few changes for purple_debug_is_verbose().
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27361
diff
changeset
|
334 | if (purple_debug_is_verbose()) |
|
9d4cc577fe26
Apparently, I missed a few changes for purple_debug_is_verbose().
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27361
diff
changeset
|
335 | msn_message_show_readable(msg, slpmsg->info, slpmsg->text_body); |
|
31028
c5b900f03fd4
Fix debug_*_to_file to process SlpMessages instead of MsnMessages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31010
diff
changeset
|
336 | #endif |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
337 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
338 | #ifdef MSN_DEBUG_SLP_FILES |
|
31028
c5b900f03fd4
Fix debug_*_to_file to process SlpMessages instead of MsnMessages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31010
diff
changeset
|
339 | debug_part_to_file(slpmsg, TRUE); |
|
31010
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
340 | #endif |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
341 | |
|
31004
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
342 | slpmsg->parts = g_list_append(slpmsg->parts, part); |
|
8ee3ecc37685
SlpLink must not use MsnMessages but SlpMessageParts, so migrate code to use SlpMessagePart API.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30997
diff
changeset
|
343 | msn_slplink_send_part(slplink, part); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
344 | |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
345 | if ((slpmsg->flags == P2P_MSN_OBJ_DATA || |
|
30980
b4cc4a4bc4ee
Fix logic error as pointed out by Elliot.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
346 | slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) || |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
347 | slpmsg->flags == P2P_FILE_DATA) && |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
348 | (slpmsg->slpcall != NULL)) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
349 | { |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
350 | slpmsg->slpcall->progress = TRUE; |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10107
diff
changeset
|
351 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10107
diff
changeset
|
352 | if (slpmsg->slpcall->progress_cb != NULL) |
|
9226
8eb466827540
[gaim-migrate @ 10022]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9219
diff
changeset
|
353 | { |
|
9231
aa417f2a801e
[gaim-migrate @ 10027]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9226
diff
changeset
|
354 | slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size, |
|
aa417f2a801e
[gaim-migrate @ 10027]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9226
diff
changeset
|
355 | len, slpmsg->offset); |
|
9226
8eb466827540
[gaim-migrate @ 10022]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9219
diff
changeset
|
356 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
357 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
358 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
359 | /* slpmsg->offset += len; */ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
360 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
361 | |
|
24622
5e09935657d4
Make another function static
Mark Doliner <markdoliner@pidgin.im>
parents:
24621
diff
changeset
|
362 | static void |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
363 | msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
364 | { |
|
31010
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
365 | slpmsg = slpmsg; |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
366 | slpmsg->header = g_new0(MsnP2PHeader, 1); |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
367 | slpmsg->footer = g_new0(MsnP2PFooter, 1); |
|
30986
5e30592f85e5
Drop slp header and footer from MsnMessage in favor of MsnSlpMessage->header and footer.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30981
diff
changeset
|
368 | |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
369 | if (slpmsg->flags == P2P_NO_FLAG) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
370 | { |
|
31010
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
371 | slpmsg->header->session_id = slpmsg->session_id; |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
372 | slpmsg->header->ack_id = rand() % 0xFFFFFF00; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
373 | } |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
374 | else if (slpmsg->flags == P2P_ACK) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
375 | { |
|
31010
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
376 | slpmsg->header->session_id = slpmsg->session_id; |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
377 | slpmsg->header->ack_id = slpmsg->ack_id; |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
378 | slpmsg->header->ack_size = slpmsg->ack_size; |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
379 | slpmsg->header->ack_sub_id = slpmsg->ack_sub_id; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
380 | } |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
381 | else if (slpmsg->flags == P2P_MSN_OBJ_DATA || |
|
30980
b4cc4a4bc4ee
Fix logic error as pointed out by Elliot.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
382 | slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) || |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
383 | slpmsg->flags == P2P_FILE_DATA) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
384 | { |
|
23938
4570d6e22b9e
Get rid of MsnSlpSession entirely. It only seems to link to MsnSlpCall
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23822
diff
changeset
|
385 | MsnSlpCall *slpcall; |
|
4570d6e22b9e
Get rid of MsnSlpSession entirely. It only seems to link to MsnSlpCall
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23822
diff
changeset
|
386 | slpcall = slpmsg->slpcall; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
387 | |
|
23938
4570d6e22b9e
Get rid of MsnSlpSession entirely. It only seems to link to MsnSlpCall
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23822
diff
changeset
|
388 | g_return_if_fail(slpcall != NULL); |
|
31010
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
389 | slpmsg->header->session_id = slpcall->session_id; |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
390 | slpmsg->footer->value = slpcall->app_id; |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
391 | slpmsg->header->ack_id = rand() % 0xFFFFFF00; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
392 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
393 | else if (slpmsg->flags == 0x100) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
394 | { |
|
31010
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
395 | slpmsg->header->ack_id = slpmsg->ack_id; |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
396 | slpmsg->header->ack_sub_id = slpmsg->ack_sub_id; |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
397 | slpmsg->header->ack_size = slpmsg->ack_size; |
|
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 | |
|
31010
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
400 | slpmsg->header->id = slpmsg->id; |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
401 | slpmsg->header->flags = (guint32)slpmsg->flags; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
402 | |
|
31010
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
403 | slpmsg->header->total_size = slpmsg->size; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
404 | |
|
31010
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
405 | msn_slplink_send_msgpart(slplink, slpmsg); |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
406 | |
|
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
407 | #if 0 |
|
30236
06b807e12be2
Normalize the remote passport before sending a P2P message. If it's not
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30198
diff
changeset
|
408 | passport = purple_normalize(slplink->session->account, slplink->remote_user); |
|
30930
bea746046da3
propagate from branch 'im.pidgin.pidgin' (head f858236de0f4fa15af469c339aaac39d7287b442)
Elliott Sales de Andrade <qulogic@pidgin.im>
diff
changeset
|
409 | msn_message_set_header(msg, "P2P-Dest", passport); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
410 | |
|
30995
f9181483576b
Move MsnMessage stuff out of slplink to SBConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30994
diff
changeset
|
411 | msg->ack_cb = msn_sbconn_msg_ack; |
|
f9181483576b
Move MsnMessage stuff out of slplink to SBConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30994
diff
changeset
|
412 | msg->nak_cb = msn_sbconn_msg_nak; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
413 | msg->ack_data = slpmsg; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
414 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
415 | msn_slplink_send_msgpart(slplink, slpmsg); |
|
10284
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
416 | |
|
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
417 | msn_message_destroy(msg); |
|
31010
83a229f1e114
Remove the MsnMessage from SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31007
diff
changeset
|
418 | #endif |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
419 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
420 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
421 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
422 | msn_slplink_queue_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
423 | { |
|
25434
095988451602
This should prevent the crash in #8109 by stopping an invalid message from
Daniel Atallah <datallah@pidgin.im>
parents:
24622
diff
changeset
|
424 | g_return_if_fail(slpmsg != NULL); |
|
095988451602
This should prevent the crash in #8109 by stopping an invalid message from
Daniel Atallah <datallah@pidgin.im>
parents:
24622
diff
changeset
|
425 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
426 | slpmsg->id = slplink->slp_seq_id++; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
427 | |
|
24621
abf83be6a71f
This doesn't matter, but I think the metaphor tends to be that you push
Mark Doliner <markdoliner@pidgin.im>
parents:
24620
diff
changeset
|
428 | g_queue_push_tail(slplink->slp_msg_queue, slpmsg); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
429 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
430 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
431 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
432 | msn_slplink_send_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
433 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
434 | slpmsg->id = slplink->slp_seq_id++; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
435 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
436 | msn_slplink_release_slpmsg(slplink, slpmsg); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
437 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
438 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
439 | void |
|
24620
96c993e8f462
Reame msn_slplink_unleash to msn_slplink_send_queued_slpmsgs, which I
Mark Doliner <markdoliner@pidgin.im>
parents:
24618
diff
changeset
|
440 | msn_slplink_send_queued_slpmsgs(MsnSlpLink *slplink) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
441 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
442 | MsnSlpMessage *slpmsg; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
443 | |
|
24620
96c993e8f462
Reame msn_slplink_unleash to msn_slplink_send_queued_slpmsgs, which I
Mark Doliner <markdoliner@pidgin.im>
parents:
24618
diff
changeset
|
444 | /* Send the queued msgs in the order they were created */ |
|
24621
abf83be6a71f
This doesn't matter, but I think the metaphor tends to be that you push
Mark Doliner <markdoliner@pidgin.im>
parents:
24620
diff
changeset
|
445 | while ((slpmsg = g_queue_pop_head(slplink->slp_msg_queue)) != NULL) |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
446 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
447 | msn_slplink_release_slpmsg(slplink, slpmsg); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
448 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
449 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
450 | |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
451 | static MsnSlpMessage * |
|
30971
39a254a27343
Drop Binary from the struct name.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30969
diff
changeset
|
452 | msn_slplink_create_ack(MsnSlpLink *slplink, MsnP2PHeader *header) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
453 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
454 | MsnSlpMessage *slpmsg; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
455 | |
|
30994
7dea76174d5c
Use better function names.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30993
diff
changeset
|
456 | slpmsg = msn_slpmsg_ack_new(header); |
|
30992
4f9b40ce1521
The creation of SlpMessage must be done in its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
457 | msn_slpmsg_set_slplink(slpmsg, slplink); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
458 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
459 | return slpmsg; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
460 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
461 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
462 | static void |
|
30971
39a254a27343
Drop Binary from the struct name.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30969
diff
changeset
|
463 | msn_slplink_send_ack(MsnSlpLink *slplink, MsnP2PHeader *header) |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
464 | { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
465 | MsnSlpMessage *slpmsg = msn_slplink_create_ack(slplink, header); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
466 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
467 | msn_slplink_send_slpmsg(slplink, slpmsg); |
|
28204
28e981286c52
Patch written by Mark Doliner and Paul Aurich to fix a remote crash on MSN
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28164
diff
changeset
|
468 | msn_slpmsg_destroy(slpmsg); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
469 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
470 | |
|
9571
8a462c9e01aa
[gaim-migrate @ 10414]
Mark Doliner <markdoliner@pidgin.im>
parents:
9330
diff
changeset
|
471 | static void |
|
23938
4570d6e22b9e
Get rid of MsnSlpSession entirely. It only seems to link to MsnSlpCall
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23822
diff
changeset
|
472 | send_file_cb(MsnSlpCall *slpcall) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
473 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
474 | MsnSlpMessage *slpmsg; |
|
17089
b27c8579750b
Patch from sourceforge tracker 1652005 from wabz to fix displaying file
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
475 | PurpleXfer *xfer; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
476 | |
|
29131
ed2f55cc6ad9
Calling purple_xfer_start may actually cancel the transfer (if the file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29130
diff
changeset
|
477 | xfer = (PurpleXfer *)slpcall->xfer; |
|
30316
2dcbbfc2b6b0
It seems like aMSN can get a bit stuck when using multiple file transfers,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30253
diff
changeset
|
478 | if (purple_xfer_get_status(xfer) >= PURPLE_XFER_STATUS_STARTED) |
|
2dcbbfc2b6b0
It seems like aMSN can get a bit stuck when using multiple file transfers,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30253
diff
changeset
|
479 | return; |
|
2dcbbfc2b6b0
It seems like aMSN can get a bit stuck when using multiple file transfers,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30253
diff
changeset
|
480 | |
|
29131
ed2f55cc6ad9
Calling purple_xfer_start may actually cancel the transfer (if the file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29130
diff
changeset
|
481 | purple_xfer_ref(xfer); |
|
ed2f55cc6ad9
Calling purple_xfer_start may actually cancel the transfer (if the file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29130
diff
changeset
|
482 | purple_xfer_start(xfer, -1, NULL, 0); |
|
ed2f55cc6ad9
Calling purple_xfer_start may actually cancel the transfer (if the file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29130
diff
changeset
|
483 | if (purple_xfer_get_status(xfer) != PURPLE_XFER_STATUS_STARTED) { |
|
ed2f55cc6ad9
Calling purple_xfer_start may actually cancel the transfer (if the file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29130
diff
changeset
|
484 | purple_xfer_unref(xfer); |
|
ed2f55cc6ad9
Calling purple_xfer_start may actually cancel the transfer (if the file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29130
diff
changeset
|
485 | return; |
|
ed2f55cc6ad9
Calling purple_xfer_start may actually cancel the transfer (if the file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29130
diff
changeset
|
486 | } |
|
ed2f55cc6ad9
Calling purple_xfer_start may actually cancel the transfer (if the file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29130
diff
changeset
|
487 | purple_xfer_unref(xfer); |
|
ed2f55cc6ad9
Calling purple_xfer_start may actually cancel the transfer (if the file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29130
diff
changeset
|
488 | |
|
30994
7dea76174d5c
Use better function names.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30993
diff
changeset
|
489 | slpmsg = msn_slpmsg_file_new(slpcall, purple_xfer_get_size(xfer)); |
|
30993
ba1b9cad314d
Move more SlpMessage creation to its module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30992
diff
changeset
|
490 | msn_slpmsg_set_slplink(slpmsg, slpcall->slplink); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
491 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
492 | msn_slplink_send_slpmsg(slpcall->slplink, slpmsg); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
493 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
494 | |
|
24616
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
495 | static MsnSlpMessage * |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
496 | msn_slplink_message_find(MsnSlpLink *slplink, long session_id, long id) |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
497 | { |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
498 | GList *e; |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
499 | |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
500 | for (e = slplink->slp_msgs; e != NULL; e = e->next) |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
501 | { |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
502 | MsnSlpMessage *slpmsg = e->data; |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
503 | |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
504 | if ((slpmsg->session_id == session_id) && (slpmsg->id == id)) |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
505 | return slpmsg; |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
506 | } |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
507 | |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
508 | return NULL; |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
509 | } |
|
5c788a8a8160
Make a few more functions static and remove a few declarations for
Mark Doliner <markdoliner@pidgin.im>
parents:
24615
diff
changeset
|
510 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
511 | void |
|
30971
39a254a27343
Drop Binary from the struct name.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30969
diff
changeset
|
512 | msn_slplink_process_msg(MsnSlpLink *slplink, MsnP2PHeader *header, const char *data, gsize len) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
513 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
514 | MsnSlpMessage *slpmsg; |
|
25738
1dbaaa263c96
*** Plucked rev 9dd1c4c3 (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25436
diff
changeset
|
515 | guint64 offset; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
516 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
517 | if (header->total_size < header->length) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
518 | { |
|
29460
fab6bce78263
Attempt to simplify and clean
Mark Doliner <markdoliner@pidgin.im>
parents:
29457
diff
changeset
|
519 | /* We seem to have received a bad header */ |
|
fab6bce78263
Attempt to simplify and clean
Mark Doliner <markdoliner@pidgin.im>
parents:
29457
diff
changeset
|
520 | purple_debug_warning("msn", "Total size listed in SLP binary header " |
|
fab6bce78263
Attempt to simplify and clean
Mark Doliner <markdoliner@pidgin.im>
parents:
29457
diff
changeset
|
521 | "was less than length of this particular message. This " |
|
fab6bce78263
Attempt to simplify and clean
Mark Doliner <markdoliner@pidgin.im>
parents:
29457
diff
changeset
|
522 | "should not happen. Dropping message.\n"); |
|
fab6bce78263
Attempt to simplify and clean
Mark Doliner <markdoliner@pidgin.im>
parents:
29457
diff
changeset
|
523 | return; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
524 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
525 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
526 | offset = header->offset; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
527 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
528 | if (offset == 0) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
529 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
530 | slpmsg = msn_slpmsg_new(slplink); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
531 | slpmsg->id = header->id; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
532 | slpmsg->session_id = header->session_id; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
533 | slpmsg->size = header->total_size; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
534 | slpmsg->flags = header->flags; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
535 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
536 | if (slpmsg->session_id) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
537 | { |
|
29461
3fde79389ce3
We just allocated slpmsg, so of course slpmsg->slpcall will be NULL here
Mark Doliner <markdoliner@pidgin.im>
parents:
29460
diff
changeset
|
538 | slpmsg->slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->session_id); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
539 | if (slpmsg->slpcall != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
540 | { |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
541 | if (slpmsg->flags == P2P_MSN_OBJ_DATA || |
|
30980
b4cc4a4bc4ee
Fix logic error as pointed out by Elliot.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
542 | slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) || |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
543 | slpmsg->flags == P2P_FILE_DATA) |
|
9226
8eb466827540
[gaim-migrate @ 10022]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9219
diff
changeset
|
544 | { |
|
29460
fab6bce78263
Attempt to simplify and clean
Mark Doliner <markdoliner@pidgin.im>
parents:
29457
diff
changeset
|
545 | PurpleXfer *xfer = slpmsg->slpcall->xfer; |
|
9226
8eb466827540
[gaim-migrate @ 10022]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9219
diff
changeset
|
546 | if (xfer != NULL) |
|
8eb466827540
[gaim-migrate @ 10022]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9219
diff
changeset
|
547 | { |
|
28694
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28238
diff
changeset
|
548 | slpmsg->ft = TRUE; |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28238
diff
changeset
|
549 | slpmsg->slpcall->xfer_msg = slpmsg; |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28238
diff
changeset
|
550 | |
|
23991
7f0f58aafd57
take an extra reference to PurpleXfer so we can check whether the whole
Ka-Hing Cheung <khc@pidgin.im>
parents:
23938
diff
changeset
|
551 | purple_xfer_ref(xfer); |
|
28152
e9800c07eb5b
ft: Fix a bunch of uses of 0 as an 'invalid' fd.
Paul Aurich <darkrain42@pidgin.im>
parents:
28017
diff
changeset
|
552 | purple_xfer_start(xfer, -1, NULL, 0); |
|
23991
7f0f58aafd57
take an extra reference to PurpleXfer so we can check whether the whole
Ka-Hing Cheung <khc@pidgin.im>
parents:
23938
diff
changeset
|
553 | |
|
7f0f58aafd57
take an extra reference to PurpleXfer so we can check whether the whole
Ka-Hing Cheung <khc@pidgin.im>
parents:
23938
diff
changeset
|
554 | if (xfer->data == NULL) { |
|
7f0f58aafd57
take an extra reference to PurpleXfer so we can check whether the whole
Ka-Hing Cheung <khc@pidgin.im>
parents:
23938
diff
changeset
|
555 | purple_xfer_unref(xfer); |
|
28017
7fdad79d010a
I don't understand how this branch could be reached, but don't leak the slp
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27770
diff
changeset
|
556 | msn_slpmsg_destroy(slpmsg); |
|
7fdad79d010a
I don't understand how this branch could be reached, but don't leak the slp
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27770
diff
changeset
|
557 | g_return_if_reached(); |
|
23991
7f0f58aafd57
take an extra reference to PurpleXfer so we can check whether the whole
Ka-Hing Cheung <khc@pidgin.im>
parents:
23938
diff
changeset
|
558 | } else { |
|
7f0f58aafd57
take an extra reference to PurpleXfer so we can check whether the whole
Ka-Hing Cheung <khc@pidgin.im>
parents:
23938
diff
changeset
|
559 | purple_xfer_unref(xfer); |
|
7f0f58aafd57
take an extra reference to PurpleXfer so we can check whether the whole
Ka-Hing Cheung <khc@pidgin.im>
parents:
23938
diff
changeset
|
560 | } |
|
9226
8eb466827540
[gaim-migrate @ 10022]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9219
diff
changeset
|
561 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
562 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
563 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
564 | } |
|
29010
2ddb58c7f71e
Get rid of slpmsg->fp since the core is handling all the partial reads and
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28694
diff
changeset
|
565 | if (!slpmsg->ft && slpmsg->size) |
|
10092
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10088
diff
changeset
|
566 | { |
|
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10088
diff
changeset
|
567 | slpmsg->buffer = g_try_malloc(slpmsg->size); |
|
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10088
diff
changeset
|
568 | if (slpmsg->buffer == NULL) |
|
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10088
diff
changeset
|
569 | { |
| 15884 | 570 | purple_debug_error("msn", "Failed to allocate buffer for slpmsg\n"); |
|
25738
1dbaaa263c96
*** Plucked rev 9dd1c4c3 (khc@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25436
diff
changeset
|
571 | msn_slpmsg_destroy(slpmsg); |
|
10092
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10088
diff
changeset
|
572 | return; |
|
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10088
diff
changeset
|
573 | } |
|
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10088
diff
changeset
|
574 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
575 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
576 | else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
577 | { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
578 | slpmsg = msn_slplink_message_find(slplink, header->session_id, header->id); |
|
28164
6a9089f8abf1
Move this check inside the else condition. The other half of the if
Mark Doliner <markdoliner@pidgin.im>
parents:
28152
diff
changeset
|
579 | if (slpmsg == NULL) |
|
6a9089f8abf1
Move this check inside the else condition. The other half of the if
Mark Doliner <markdoliner@pidgin.im>
parents:
28152
diff
changeset
|
580 | { |
|
6a9089f8abf1
Move this check inside the else condition. The other half of the if
Mark Doliner <markdoliner@pidgin.im>
parents:
28152
diff
changeset
|
581 | /* Probably the transfer was canceled */ |
|
6a9089f8abf1
Move this check inside the else condition. The other half of the if
Mark Doliner <markdoliner@pidgin.im>
parents:
28152
diff
changeset
|
582 | purple_debug_error("msn", "Couldn't find slpmsg\n"); |
|
6a9089f8abf1
Move this check inside the else condition. The other half of the if
Mark Doliner <markdoliner@pidgin.im>
parents:
28152
diff
changeset
|
583 | return; |
|
6a9089f8abf1
Move this check inside the else condition. The other half of the if
Mark Doliner <markdoliner@pidgin.im>
parents:
28152
diff
changeset
|
584 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
585 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
586 | |
|
29010
2ddb58c7f71e
Get rid of slpmsg->fp since the core is handling all the partial reads and
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28694
diff
changeset
|
587 | if (slpmsg->ft) |
|
28694
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28238
diff
changeset
|
588 | { |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28238
diff
changeset
|
589 | slpmsg->slpcall->u.incoming_data = |
|
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28238
diff
changeset
|
590 | g_byte_array_append(slpmsg->slpcall->u.incoming_data, (const guchar *)data, len); |
|
29460
fab6bce78263
Attempt to simplify and clean
Mark Doliner <markdoliner@pidgin.im>
parents:
29457
diff
changeset
|
591 | purple_xfer_prpl_ready(slpmsg->slpcall->xfer); |
|
28694
76761af122e8
A quick and dirty hack to make MSN use the in-core code to perform FT.
Paul Aurich <darkrain42@pidgin.im>
parents:
28238
diff
changeset
|
592 | } |
|
28204
28e981286c52
Patch written by Mark Doliner and Paul Aurich to fix a remote crash on MSN
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28164
diff
changeset
|
593 | else if (slpmsg->size && slpmsg->buffer) |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
594 | { |
|
29376
9a3f73531905
Fix CVE-2010-0277, a possible remote crash when parsing an incoming
Mark Doliner <markdoliner@pidgin.im>
parents:
29176
diff
changeset
|
595 | if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size || slpmsg->offset != offset) |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
596 | { |
|
22969
51f5e7777915
This cleans up a bunch of warnings that stem from the fact that size_t and
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22709
diff
changeset
|
597 | purple_debug_error("msn", |
|
27149
f8462e36cb98
Fix two warnings when building on OS X
Paul Aurich <darkrain42@pidgin.im>
parents:
27085
diff
changeset
|
598 | "Oversized slpmsg - msgsize=%lld offset=%" G_GUINT64_FORMAT " len=%" G_GSIZE_FORMAT "\n", |
|
22969
51f5e7777915
This cleans up a bunch of warnings that stem from the fact that size_t and
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22709
diff
changeset
|
599 | slpmsg->size, offset, len); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
600 | g_return_if_reached(); |
|
29376
9a3f73531905
Fix CVE-2010-0277, a possible remote crash when parsing an incoming
Mark Doliner <markdoliner@pidgin.im>
parents:
29176
diff
changeset
|
601 | } else { |
|
9a3f73531905
Fix CVE-2010-0277, a possible remote crash when parsing an incoming
Mark Doliner <markdoliner@pidgin.im>
parents:
29176
diff
changeset
|
602 | memcpy(slpmsg->buffer + offset, data, len); |
|
9a3f73531905
Fix CVE-2010-0277, a possible remote crash when parsing an incoming
Mark Doliner <markdoliner@pidgin.im>
parents:
29176
diff
changeset
|
603 | slpmsg->offset += len; |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
604 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
605 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
606 | |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
607 | if ((slpmsg->flags == P2P_MSN_OBJ_DATA || |
|
30980
b4cc4a4bc4ee
Fix logic error as pointed out by Elliot.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
608 | slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) || |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
609 | slpmsg->flags == P2P_FILE_DATA) && |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10296
diff
changeset
|
610 | (slpmsg->slpcall != NULL)) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
611 | { |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
612 | slpmsg->slpcall->progress = TRUE; |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10107
diff
changeset
|
613 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10107
diff
changeset
|
614 | if (slpmsg->slpcall->progress_cb != NULL) |
|
9231
aa417f2a801e
[gaim-migrate @ 10027]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9226
diff
changeset
|
615 | { |
|
aa417f2a801e
[gaim-migrate @ 10027]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9226
diff
changeset
|
616 | slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size, |
|
aa417f2a801e
[gaim-migrate @ 10027]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9226
diff
changeset
|
617 | len, offset); |
|
aa417f2a801e
[gaim-migrate @ 10027]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9226
diff
changeset
|
618 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
619 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
620 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
621 | #if 0 |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
622 | if (slpmsg->buffer == NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
623 | return; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
624 | #endif |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
625 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
626 | if (header->offset + header->length >= header->total_size) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
627 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
628 | /* All the pieces of the slpmsg have been received */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
629 | MsnSlpCall *slpcall; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
630 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
631 | slpcall = msn_slp_process_msg(slplink, slpmsg); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
632 | |
|
29133
295451fe7ee7
Don't sent an ACK to a SLP message if the SlpCall has been marked as wasted
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29131
diff
changeset
|
633 | if (slpcall == NULL) { |
|
295451fe7ee7
Don't sent an ACK to a SLP message if the SlpCall has been marked as wasted
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29131
diff
changeset
|
634 | msn_slpmsg_destroy(slpmsg); |
|
295451fe7ee7
Don't sent an ACK to a SLP message if the SlpCall has been marked as wasted
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29131
diff
changeset
|
635 | return; |
|
295451fe7ee7
Don't sent an ACK to a SLP message if the SlpCall has been marked as wasted
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29131
diff
changeset
|
636 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
637 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
29780
diff
changeset
|
638 | purple_debug_info("msn", "msn_slplink_process_msg: slpmsg complete\n"); |
|
29133
295451fe7ee7
Don't sent an ACK to a SLP message if the SlpCall has been marked as wasted
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29131
diff
changeset
|
639 | |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
640 | if (/* !slpcall->wasted && */ slpmsg->flags == 0x100) |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
641 | { |
|
20514
676caf300d2c
Finish commenting out references to directconn that would never be called
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20509
diff
changeset
|
642 | #if 0 |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
643 | MsnDirectConn *directconn; |
|
29133
295451fe7ee7
Don't sent an ACK to a SLP message if the SlpCall has been marked as wasted
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29131
diff
changeset
|
644 | |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
645 | directconn = slplink->directconn; |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
646 | if (!directconn->acked) |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
647 | msn_directconn_send_handshake(directconn); |
|
20514
676caf300d2c
Finish commenting out references to directconn that would never be called
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
20509
diff
changeset
|
648 | #endif |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
649 | } |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
650 | else if (slpmsg->flags == P2P_NO_FLAG || slpmsg->flags == P2P_WML2009_COMP || |
|
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
651 | slpmsg->flags == P2P_MSN_OBJ_DATA || |
|
30980
b4cc4a4bc4ee
Fix logic error as pointed out by Elliot.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
652 | slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) || |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30963
diff
changeset
|
653 | slpmsg->flags == P2P_FILE_DATA) |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
654 | { |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
655 | /* Release all the messages and send the ACK */ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
656 | |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
657 | if (slpcall->wait_for_socket) { |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
658 | /* |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
659 | * Save ack for later because we have to send |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
660 | * a 200 OK message to the previous direct connect |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
661 | * invitation before ACK but the listening socket isn't |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
662 | * created yet. |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
663 | */ |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
664 | purple_debug_info("msn", "msn_slplink_process_msg: save ACK\n"); |
| 30067 | 665 | |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
666 | slpcall->slplink->dc->prev_ack = msn_slplink_create_ack(slplink, header); |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
667 | } else if (!slpcall->wasted) { |
|
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
668 | purple_debug_info("msn", "msn_slplink_process_msg: send ACK\n"); |
| 30067 | 669 | |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
670 | msn_slplink_send_ack(slplink, header); |
|
29133
295451fe7ee7
Don't sent an ACK to a SLP message if the SlpCall has been marked as wasted
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29131
diff
changeset
|
671 | msn_slplink_send_queued_slpmsgs(slplink); |
|
295451fe7ee7
Don't sent an ACK to a SLP message if the SlpCall has been marked as wasted
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29131
diff
changeset
|
672 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
673 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
674 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
675 | msn_slpmsg_destroy(slpmsg); |
|
29135
84c866941530
Oops, don't break things for successfully receiving of a file.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29134
diff
changeset
|
676 | |
|
30081
a0f194e8dbb9
Remove old code that was commented out, but is really just not necessary.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
677 | if (!slpcall->wait_for_socket && slpcall->wasted) |
|
29135
84c866941530
Oops, don't break things for successfully receiving of a file.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29134
diff
changeset
|
678 | msn_slpcall_destroy(slpcall); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
679 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
680 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
681 | |
|
11367
98a6c86c1331
[gaim-migrate @ 13591]
Richard Laager <rlaager@pidgin.im>
parents:
11321
diff
changeset
|
682 | static gchar * |
|
29167
8f50a1b6fdfc
msn: Use the PurpleXfer size if available.
Paul Aurich <darkrain42@pidgin.im>
parents:
29135
diff
changeset
|
683 | gen_context(PurpleXfer *xfer, const char *file_name, const char *file_path) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
684 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
685 | gsize size = 0; |
|
29776
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
686 | MsnFileContext *header; |
| 10047 | 687 | gchar *u8 = NULL; |
|
11367
98a6c86c1331
[gaim-migrate @ 13591]
Richard Laager <rlaager@pidgin.im>
parents:
11321
diff
changeset
|
688 | gchar *ret; |
| 10047 | 689 | gunichar2 *uni = NULL; |
| 690 | glong currentChar = 0; | |
|
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
|
691 | glong len = 0; |
|
29776
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
692 | const char *preview; |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
693 | gsize preview_len; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
694 | |
|
29176
20c17274cc44
I already removed the other g_stat, so I don't think this one is needed
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29167
diff
changeset
|
695 | size = purple_xfer_get_size(xfer); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
696 | |
|
30114
8472e53fbbfc
Set desired image formats for thumbnails as a parameter to
Marcus Lundblad <malu@pidgin.im>
parents:
29846
diff
changeset
|
697 | purple_xfer_prepare_thumbnail(xfer, "png"); |
|
29776
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
698 | |
|
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
|
699 | if (!file_name) { |
|
27085
b2ae59736f80
Fix a signed-ness warning.
Paul Aurich <darkrain42@pidgin.im>
parents:
27001
diff
changeset
|
700 | gchar *basename = g_path_get_basename(file_path); |
|
b2ae59736f80
Fix a signed-ness warning.
Paul Aurich <darkrain42@pidgin.im>
parents:
27001
diff
changeset
|
701 | u8 = purple_utf8_try_convert(basename); |
|
b2ae59736f80
Fix a signed-ness warning.
Paul Aurich <darkrain42@pidgin.im>
parents:
27001
diff
changeset
|
702 | g_free(basename); |
| 10047 | 703 | file_name = u8; |
| 704 | } | |
| 705 | ||
|
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
|
706 | uni = g_utf8_to_utf16(file_name, -1, NULL, &len, NULL); |
| 10047 | 707 | |
|
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
|
708 | if (u8) { |
| 10047 | 709 | g_free(u8); |
| 710 | file_name = NULL; | |
| 711 | u8 = NULL; | |
| 712 | } | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
713 | |
|
30126
f09ecb81212c
Rename purple_xfer_get_thumbnail_data/size to be more D-Bus friendly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30123
diff
changeset
|
714 | preview = purple_xfer_get_thumbnail(xfer, &preview_len); |
|
29776
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
715 | header = g_malloc(sizeof(MsnFileContext) + preview_len); |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
716 | |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
717 | header->length = GUINT32_TO_LE(sizeof(MsnFileContext) - 1); |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
718 | header->version = GUINT32_TO_LE(2); /* V.3 contains additional unnecessary data */ |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
719 | header->file_size = GUINT64_TO_LE(size); |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
720 | if (preview) |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
721 | header->type = GUINT32_TO_LE(0); |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
722 | else |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
723 | header->type = GUINT32_TO_LE(1); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
724 | |
|
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
|
725 | len = MIN(len, MAX_FILE_NAME_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
|
726 | for (currentChar = 0; currentChar < len; currentChar++) { |
|
29776
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
727 | header->file_name[currentChar] = GUINT16_TO_LE(uni[currentChar]); |
|
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
|
728 | } |
|
29776
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
729 | memset(&header->file_name[currentChar], 0x00, (MAX_FILE_NAME_LEN - currentChar) * 2); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
730 | |
|
29776
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
731 | memset(&header->unknown1, 0, sizeof(header->unknown1)); |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
732 | header->unknown2 = GUINT32_TO_LE(0xffffffff); |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
733 | if (preview) { |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
734 | memcpy(&header->preview, preview, preview_len); |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
735 | } |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
736 | header->preview[preview_len] = '\0'; |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10107
diff
changeset
|
737 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
738 | g_free(uni); |
|
29776
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
739 | ret = purple_base64_encode((const guchar *)header, sizeof(MsnFileContext) + preview_len); |
|
be53c06b4e34
Add support for recieving and sending MSN file transfer previews.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29774
diff
changeset
|
740 | g_free(header); |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11164
diff
changeset
|
741 | return ret; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
742 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
743 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
744 | void |
| 15884 | 745 | msn_slplink_request_ft(MsnSlpLink *slplink, PurpleXfer *xfer) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
746 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
747 | MsnSlpCall *slpcall; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
748 | char *context; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
749 | const char *fn; |
| 10047 | 750 | const char *fp; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
751 | |
| 15884 | 752 | fn = purple_xfer_get_filename(xfer); |
| 753 | fp = purple_xfer_get_local_filename(xfer); | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
754 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
755 | g_return_if_fail(slplink != NULL); |
| 10047 | 756 | g_return_if_fail(fp != NULL); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
757 | |
|
24618
190103ba3381
For some reason the slpmsg and slplink functions don't have underscores
Mark Doliner <markdoliner@pidgin.im>
parents:
24616
diff
changeset
|
758 | slpcall = msn_slpcall_new(slplink); |
|
190103ba3381
For some reason the slpmsg and slplink functions don't have underscores
Mark Doliner <markdoliner@pidgin.im>
parents:
24616
diff
changeset
|
759 | msn_slpcall_init(slpcall, MSN_SLPCALL_DC); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
760 | |
|
9571
8a462c9e01aa
[gaim-migrate @ 10414]
Mark Doliner <markdoliner@pidgin.im>
parents:
9330
diff
changeset
|
761 | slpcall->session_init_cb = send_file_cb; |
|
9715
e1ec476ea395
[gaim-migrate @ 10576]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9571
diff
changeset
|
762 | slpcall->end_cb = msn_xfer_end_cb; |
|
9259
03ac0392aa0b
[gaim-migrate @ 10058]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9246
diff
changeset
|
763 | slpcall->cb = msn_xfer_completed_cb; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
764 | 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
|
765 | purple_xfer_ref(slpcall->xfer); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
766 | |
|
10296
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
767 | slpcall->pending = TRUE; |
|
9badf1cedc6e
[gaim-migrate @ 11476]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
768 | |
| 15884 | 769 | purple_xfer_set_cancel_send_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:
28238
diff
changeset
|
770 | 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:
28238
diff
changeset
|
771 | purple_xfer_set_write_fnc(xfer, msn_xfer_write); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
772 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
773 | xfer->data = slpcall; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
774 | |
|
29167
8f50a1b6fdfc
msn: Use the PurpleXfer size if available.
Paul Aurich <darkrain42@pidgin.im>
parents:
29135
diff
changeset
|
775 | context = gen_context(xfer, fn, fp); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
776 | |
|
24618
190103ba3381
For some reason the slpmsg and slplink functions don't have underscores
Mark Doliner <markdoliner@pidgin.im>
parents:
24616
diff
changeset
|
777 | msn_slpcall_invite(slpcall, MSN_FT_GUID, 2, context); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
778 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
779 | g_free(context); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
780 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
781 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
782 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
783 | msn_slplink_request_object(MsnSlpLink *slplink, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
784 | const char *info, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
785 | MsnSlpCb cb, |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10107
diff
changeset
|
786 | MsnSlpEndCb end_cb, |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
787 | const MsnObject *obj) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
788 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
789 | MsnSlpCall *slpcall; |
|
11164
4396374c0cd9
[gaim-migrate @ 13265]
Mark Doliner <markdoliner@pidgin.im>
parents:
10773
diff
changeset
|
790 | char *msnobj_data; |
|
4396374c0cd9
[gaim-migrate @ 13265]
Mark Doliner <markdoliner@pidgin.im>
parents:
10773
diff
changeset
|
791 | char *msnobj_base64; |
|
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 | g_return_if_fail(slplink != NULL); |
|
9861
2aae2032f2bf
[gaim-migrate @ 10740]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9788
diff
changeset
|
794 | g_return_if_fail(obj != NULL); |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
795 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
796 | msnobj_data = msn_object_to_string(obj); |
| 15884 | 797 | msnobj_base64 = purple_base64_encode((const guchar *)msnobj_data, strlen(msnobj_data)); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
798 | g_free(msnobj_data); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
799 | |
|
24618
190103ba3381
For some reason the slpmsg and slplink functions don't have underscores
Mark Doliner <markdoliner@pidgin.im>
parents:
24616
diff
changeset
|
800 | slpcall = msn_slpcall_new(slplink); |
|
190103ba3381
For some reason the slpmsg and slplink functions don't have underscores
Mark Doliner <markdoliner@pidgin.im>
parents:
24616
diff
changeset
|
801 | msn_slpcall_init(slpcall, MSN_SLPCALL_ANY); |
|
9193
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 | slpcall->data_info = g_strdup(info); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
804 | slpcall->cb = cb; |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10107
diff
changeset
|
805 | slpcall->end_cb = end_cb; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
806 | |
|
24618
190103ba3381
For some reason the slpmsg and slplink functions don't have underscores
Mark Doliner <markdoliner@pidgin.im>
parents:
24616
diff
changeset
|
807 | msn_slpcall_invite(slpcall, MSN_OBJ_GUID, 1, msnobj_base64); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
808 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
809 | g_free(msnobj_base64); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
810 | } |