Thu, 17 Jun 2010 19:54:52 +0000
Reomove MsnMessage reference from DirectConn.
|
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 directconn.c MSN direct connection functions |
|
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:
18610
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:
30336
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:
30336
diff
changeset
|
26 | #include "cipher.h" |
|
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30336
diff
changeset
|
27 | #include "debug.h" |
|
b875cf477e19
Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30336
diff
changeset
|
28 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
29 | #include "msn.h" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
30 | #include "directconn.h" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
31 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
32 | #include "slp.h" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
33 | #include "slpmsg.h" |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30961
diff
changeset
|
34 | #include "p2p.h" |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
35 | |
|
30106
142f2a062877
I've seen packet sizes larger than our current maximum. Hopefully 8KiB is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30105
diff
changeset
|
36 | #define DC_MAX_BODY_SIZE 8*1024 |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30961
diff
changeset
|
37 | #define DC_MAX_PACKET_SIZE (P2P_PACKET_HEADER_SIZE + DC_MAX_BODY_SIZE) |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
38 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
39 | static void |
|
30094
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
40 | msn_dc_calculate_nonce_hash(MsnDirectConnNonceType type, |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
41 | const guchar nonce[16], gchar nonce_hash[37]) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
42 | { |
|
30072
0564e70bd919
Clean up msn_dc_generate_nonce. It just looked weird.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30071
diff
changeset
|
43 | guchar digest[20]; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
44 | |
|
30094
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
45 | if (type == DC_NONCE_SHA1) { |
|
30092
ad8776ef2844
Support old-style Nonce, which should let us use direct connections to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30090
diff
changeset
|
46 | PurpleCipher *cipher = purple_ciphers_find_cipher("sha1"); |
|
ad8776ef2844
Support old-style Nonce, which should let us use direct connections to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30090
diff
changeset
|
47 | PurpleCipherContext *context = purple_cipher_context_new(cipher, NULL); |
|
30094
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
48 | purple_cipher_context_append(context, nonce, sizeof(nonce)); |
|
30092
ad8776ef2844
Support old-style Nonce, which should let us use direct connections to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30090
diff
changeset
|
49 | purple_cipher_context_digest(context, sizeof(digest), digest, NULL); |
|
ad8776ef2844
Support old-style Nonce, which should let us use direct connections to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30090
diff
changeset
|
50 | purple_cipher_context_destroy(context); |
|
30094
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
51 | } else if (type == DC_NONCE_PLAIN) { |
|
30092
ad8776ef2844
Support old-style Nonce, which should let us use direct connections to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30090
diff
changeset
|
52 | memcpy(digest, nonce, 16); |
|
ad8776ef2844
Support old-style Nonce, which should let us use direct connections to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30090
diff
changeset
|
53 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
54 | |
|
30094
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
55 | g_sprintf(nonce_hash, |
|
30376
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
56 | "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X", |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
57 | |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
58 | digest[3], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
59 | digest[2], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
60 | digest[1], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
61 | digest[0], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
62 | |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
63 | digest[5], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
64 | digest[4], |
|
30373
015cf7cacf23
For some reason, this line creates the following warning:
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30349
diff
changeset
|
65 | |
|
30376
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
66 | digest[7], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
67 | digest[6], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
68 | |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
69 | digest[8], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
70 | digest[9], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
71 | |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
72 | digest[10], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
73 | digest[11], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
74 | digest[12], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
75 | digest[13], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
76 | digest[14], |
|
50d2c4e03154
It's probably best just to be explicit about the ordering here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30373
diff
changeset
|
77 | digest[15] |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
78 | ); |
|
30094
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
79 | } |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
80 | |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
81 | static void |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
82 | msn_dc_generate_nonce(MsnDirectConn *dc) |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
83 | { |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
84 | guint32 *nonce; |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
85 | int i; |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
86 | |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
87 | nonce = (guint32 *)&dc->nonce; |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
88 | for (i = 0; i < 4; i++) |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
89 | nonce[i] = rand(); |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
90 | |
|
dba1e7ecf923
Remove some duplicate code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30092
diff
changeset
|
91 | msn_dc_calculate_nonce_hash(dc->nonce_type, dc->nonce, dc->nonce_hash); |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
92 | |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
93 | if (purple_debug_is_verbose()) |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
94 | purple_debug_info("msn", "DC %p generated nonce %s\n", dc, dc->nonce_hash); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
95 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
96 | |
|
30075
381b22b5bd49
This DC stuff is a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30074
diff
changeset
|
97 | static MsnDirectConnPacket * |
|
30097
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
98 | msn_dc_new_packet(guint32 length) |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
99 | { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
100 | MsnDirectConnPacket *p; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
101 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
102 | p = g_new0(MsnDirectConnPacket, 1); |
|
30098
b18dd95fe141
The length of a DC packet does not include itself.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30097
diff
changeset
|
103 | p->length = length; |
|
30097
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
104 | p->data = g_malloc(length); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
105 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
106 | return p; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
107 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
108 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
109 | static void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
110 | msn_dc_destroy_packet(MsnDirectConnPacket *p) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
111 | { |
|
30076
2b751385616f
Minor cleanups.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30075
diff
changeset
|
112 | g_free(p->data); |
| 30067 | 113 | |
|
31007
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
114 | #if 0 |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
115 | if (p->msg) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
116 | msn_message_unref(p->msg); |
|
31007
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
117 | #endif |
|
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
118 | if (p->part) |
|
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
119 | msn_slpmsgpart_destroy(p->part); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
120 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
121 | g_free(p); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
122 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
123 | |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
124 | MsnDirectConn * |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
125 | msn_dc_new(MsnSlpCall *slpcall) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
126 | { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
127 | MsnDirectConn *dc; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
128 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
129 | g_return_val_if_fail(slpcall != NULL, NULL); |
| 30067 | 130 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
131 | dc = g_new0(MsnDirectConn, 1); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
132 | |
| 30077 | 133 | if (purple_debug_is_verbose()) |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
134 | purple_debug_info("msn", "msn_dc_new %p\n", dc); |
|
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
135 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
136 | dc->slplink = slpcall->slplink; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
137 | dc->slpcall = slpcall; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
138 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
139 | if (dc->slplink->dc != NULL) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
140 | purple_debug_warning("msn", "msn_dc_new: slplink already has an allocated DC!\n"); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
141 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
142 | dc->slplink->dc = dc; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
143 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
144 | dc->msg_body = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
145 | dc->prev_ack = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
146 | dc->listen_data = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
147 | dc->connect_data = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
148 | dc->listenfd = -1; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
149 | dc->listenfd_handle = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
150 | dc->connect_timeout_handle = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
151 | dc->fd = -1; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
152 | dc->recv_handle = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
153 | dc->send_handle = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
154 | dc->state = DC_STATE_CLOSED; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
155 | dc->in_buffer = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
156 | dc->out_queue = g_queue_new(); |
|
30097
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
157 | dc->msg_pos = -1; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
158 | dc->send_connection_info_msg_cb = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
159 | dc->ext_ip = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
160 | dc->timeout_handle = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
161 | dc->progress = FALSE; |
|
30328
fe6e047b9f85
C comments only.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30327
diff
changeset
|
162 | /*dc->num_calls = 1;*/ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
163 | |
|
30092
ad8776ef2844
Support old-style Nonce, which should let us use direct connections to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30090
diff
changeset
|
164 | /* TODO: Probably should set this based on buddy caps */ |
|
ad8776ef2844
Support old-style Nonce, which should let us use direct connections to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30090
diff
changeset
|
165 | dc->nonce_type = DC_NONCE_PLAIN; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
166 | msn_dc_generate_nonce(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
167 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
168 | return dc; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
169 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
170 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
171 | void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
172 | msn_dc_destroy(MsnDirectConn *dc) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
173 | { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
174 | MsnSlpLink *slplink; |
| 30067 | 175 | |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
176 | if (purple_debug_is_verbose()) |
|
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
177 | purple_debug_info("msn", "msn_dc_destroy %p\n", dc); |
| 30067 | 178 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
179 | g_return_if_fail(dc != NULL); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
180 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
181 | if (dc->slpcall != NULL) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
182 | dc->slpcall->wait_for_socket = FALSE; |
| 30067 | 183 | |
|
30336
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30328
diff
changeset
|
184 | slplink = dc->slplink; |
|
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30328
diff
changeset
|
185 | if (slplink) { |
|
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30328
diff
changeset
|
186 | 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:
30328
diff
changeset
|
187 | if (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:
30328
diff
changeset
|
188 | msn_slplink_destroy(slplink); |
|
cec8b3660981
NULL-ify some reverse links so that there's no double-free on exit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30328
diff
changeset
|
189 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
190 | |
|
30084
57ef011cbce0
NULL-ing this stuff after free is nice in theory, but totally pointless
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30077
diff
changeset
|
191 | g_free(dc->msg_body); |
| 30067 | 192 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
193 | if (dc->prev_ack) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
194 | msn_slpmsg_destroy(dc->prev_ack); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
195 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
196 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
197 | if (dc->listen_data != NULL) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
198 | purple_network_listen_cancel(dc->listen_data); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
199 | } |
| 30067 | 200 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
201 | if (dc->connect_data != NULL) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
202 | purple_proxy_connect_cancel(dc->connect_data); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
203 | } |
| 30067 | 204 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
205 | if (dc->listenfd != -1) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
206 | purple_network_remove_port_mapping(dc->listenfd); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
207 | close(dc->listenfd); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
208 | } |
| 30067 | 209 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
210 | if (dc->listenfd_handle != 0) { |
|
30256
669f8bc11d33
This is not a timeout, but an input handler.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30255
diff
changeset
|
211 | purple_input_remove(dc->listenfd_handle); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
212 | } |
| 30067 | 213 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
214 | if (dc->connect_timeout_handle != 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
215 | purple_timeout_remove(dc->connect_timeout_handle); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
216 | } |
| 30067 | 217 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
218 | if (dc->fd != -1) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
219 | close(dc->fd); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
220 | } |
| 30067 | 221 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
222 | if (dc->send_handle != 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
223 | purple_input_remove(dc->send_handle); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
224 | } |
| 30067 | 225 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
226 | if (dc->recv_handle != 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
227 | purple_input_remove(dc->recv_handle); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
228 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
229 | |
|
30084
57ef011cbce0
NULL-ing this stuff after free is nice in theory, but totally pointless
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30077
diff
changeset
|
230 | g_free(dc->in_buffer); |
| 30067 | 231 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
232 | if (dc->out_queue != NULL) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
233 | while (!g_queue_is_empty(dc->out_queue)) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
234 | msn_dc_destroy_packet( g_queue_pop_head(dc->out_queue) ); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
235 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
236 | g_queue_free(dc->out_queue); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
237 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
238 | |
|
30084
57ef011cbce0
NULL-ing this stuff after free is nice in theory, but totally pointless
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30077
diff
changeset
|
239 | g_free(dc->ext_ip); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
240 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
241 | if (dc->timeout_handle != 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
242 | purple_timeout_remove(dc->timeout_handle); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
243 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
244 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
245 | g_free(dc); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
246 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
247 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
248 | /* |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
249 | void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
250 | msn_dc_ref(MsnDirectConn *dc) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
251 | { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
252 | g_return_if_fail(dc != NULL); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
253 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
254 | dc->num_calls++; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
255 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
256 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
257 | void |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
258 | msn_dc_unref(MsnDirectConn *dc) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
259 | { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
260 | g_return_if_fail(dc != NULL); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
261 | |
| 30067 | 262 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
263 | if (dc->num_calls > 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
264 | dc->num_calls--; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
265 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
266 | } |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
267 | */ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
268 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
269 | void |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
270 | msn_dc_send_invite(MsnDirectConn *dc) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
271 | { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
272 | MsnSlpCall *slpcall; |
|
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
273 | MsnSlpMessage *msg; |
|
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
274 | gchar *header; |
| 30067 | 275 | |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
276 | if (purple_debug_is_verbose()) |
|
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
277 | purple_debug_info("msn", "msn_dc_send_invite %p\n", dc); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
278 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
279 | g_return_if_fail(dc != NULL); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
280 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
281 | slpcall = dc->slpcall; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
282 | g_return_if_fail(slpcall != NULL); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
283 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
284 | header = g_strdup_printf( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
285 | "INVITE MSNMSGR:%s MSNSLP/1.0", |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
286 | slpcall->slplink->remote_user |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
287 | ); |
| 30067 | 288 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
289 | msg = msn_slpmsg_sip_new( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
290 | slpcall, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
291 | 0, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
292 | header, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
293 | slpcall->branch, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
294 | "application/x-msnmsgr-transrespbody", |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
295 | dc->msg_body |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
296 | ); |
|
30086
32109706f5ec
Set some information for debugging.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30085
diff
changeset
|
297 | msg->info = "DC INVITE"; |
|
32109706f5ec
Set some information for debugging.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30085
diff
changeset
|
298 | msg->text_body = TRUE; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
299 | g_free(header); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
300 | g_free(dc->msg_body); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
301 | dc->msg_body = NULL; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
302 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
303 | msn_slplink_queue_slpmsg(slpcall->slplink, msg); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
304 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
305 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
306 | void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
307 | msn_dc_send_ok(MsnDirectConn *dc) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
308 | { |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
309 | if (purple_debug_is_verbose()) |
|
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
310 | purple_debug_info("msn", "msn_dc_send_ok %p\n", dc); |
| 30067 | 311 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
312 | g_return_if_fail(dc != NULL); |
| 30067 | 313 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
314 | msn_slp_send_ok(dc->slpcall, dc->slpcall->branch, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
315 | "application/x-msnmsgr-transrespbody", dc->msg_body); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
316 | g_free(dc->msg_body); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
317 | dc->msg_body = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
318 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
319 | msn_slplink_send_slpmsg(dc->slpcall->slplink, dc->prev_ack); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
320 | msn_slpmsg_destroy(dc->prev_ack); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
321 | dc->prev_ack = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
322 | msn_slplink_send_queued_slpmsgs(dc->slpcall->slplink); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
323 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
324 | |
|
30100
3382aeef1a88
Make msn_dc_fallback_to_p2p non-static, and remove some old code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30098
diff
changeset
|
325 | void |
|
30349
26be44d0f764
I think it's more accurate to say that a DC is a P2P transfer, so if that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30336
diff
changeset
|
326 | msn_dc_fallback_to_sb(MsnDirectConn *dc) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
327 | { |
|
30315
04efebd0545a
Ref the slplink before destroying the DC, or we might lose our slpcall.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30314
diff
changeset
|
328 | MsnSlpLink *slplink; |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
329 | MsnSlpCall *slpcall; |
|
30318
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
330 | GQueue *queue = NULL; |
| 30067 | 331 | |
|
30349
26be44d0f764
I think it's more accurate to say that a DC is a P2P transfer, so if that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30336
diff
changeset
|
332 | purple_debug_info("msn", "msn_dc_fallback_to_sb %p\n", dc); |
| 30067 | 333 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
334 | g_return_if_fail(dc != NULL); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
335 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
336 | slpcall = dc->slpcall; |
|
30315
04efebd0545a
Ref the slplink before destroying the DC, or we might lose our slpcall.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30314
diff
changeset
|
337 | slplink = msn_slplink_ref(dc->slplink); |
|
30318
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
338 | if (slpcall && !g_queue_is_empty(dc->out_queue)) { |
|
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
339 | queue = dc->out_queue; |
|
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
340 | dc->out_queue = NULL; |
|
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
341 | } |
| 30067 | 342 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
343 | msn_dc_destroy(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
344 | |
|
30318
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
345 | if (slpcall) { |
|
30314
72174fad31d8
Use msn_dc_fallback_to_p2p where possible.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30256
diff
changeset
|
346 | msn_slpcall_session_init(slpcall); |
|
30318
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
347 | if (queue) { |
|
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
348 | while (!g_queue_is_empty(queue)) { |
|
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
349 | MsnDirectConnPacket *p = g_queue_pop_head(queue); |
|
31007
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
350 | msn_slplink_send_msgpart(slplink, (MsnSlpMessage*)p->part->ack_data); |
|
30318
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
351 | msn_dc_destroy_packet(p); |
|
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
352 | } |
|
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
353 | g_queue_free(queue); |
|
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
354 | } |
|
16ea090fa7ea
If there's stuff stuck in the DC queue, then try to send it over the SB if
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30315
diff
changeset
|
355 | } |
|
30315
04efebd0545a
Ref the slplink before destroying the DC, or we might lose our slpcall.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30314
diff
changeset
|
356 | msn_slplink_unref(slplink); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
357 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
358 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
359 | static void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
360 | msn_dc_send_cb(gpointer data, gint fd, PurpleInputCondition cond) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
361 | { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
362 | MsnDirectConn *dc = data; |
|
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
363 | MsnDirectConnPacket *p; |
|
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
364 | int bytes_to_send; |
|
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
365 | int bytes_sent; |
|
20473
91e1b3a49d10
msn.tgz from SF Patch #1621854 from Ka-Hing Cheung
Ka-Hing Cheung <khc@pidgin.im>
parents:
20472
diff
changeset
|
366 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
367 | g_return_if_fail(dc != NULL); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
368 | g_return_if_fail(fd != -1); |
| 30067 | 369 | |
|
30084
57ef011cbce0
NULL-ing this stuff after free is nice in theory, but totally pointless
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30077
diff
changeset
|
370 | if (g_queue_is_empty(dc->out_queue)) { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
371 | if (dc->send_handle != 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
372 | purple_input_remove(dc->send_handle); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
373 | dc->send_handle = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
374 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
375 | return; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
376 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
377 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
378 | p = g_queue_peek_head(dc->out_queue); |
|
30097
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
379 | |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
380 | if (dc->msg_pos < 0) { |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
381 | /* First we send the length of the packet */ |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
382 | guint32 len = GUINT32_TO_LE(p->length); |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
383 | bytes_sent = send(fd, &len, 4, 0); |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
384 | if (bytes_sent < 0) { |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
385 | if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
386 | return; |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
387 | |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
388 | purple_debug_warning("msn", "msn_dc_send_cb: send error\n"); |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
389 | msn_dc_destroy(dc); |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
390 | return; |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
391 | } |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
392 | dc->msg_pos = 0; |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
393 | } |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
394 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
395 | bytes_to_send = p->length - dc->msg_pos; |
|
30103
123a1c4a914b
I'm pretty sure we need to actually use dc->msg_pos for something, instead
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30102
diff
changeset
|
396 | bytes_sent = send(fd, p->data + dc->msg_pos, bytes_to_send, 0); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
397 | if (bytes_sent < 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
398 | if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
399 | return; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
400 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
401 | purple_debug_warning("msn", "msn_dc_send_cb: send error\n"); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
402 | msn_dc_destroy(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
403 | return; |
|
10899
87d9aec5b72d
[gaim-migrate @ 12619]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10589
diff
changeset
|
404 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
405 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
406 | dc->progress = TRUE; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
407 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
408 | dc->msg_pos += bytes_sent; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
409 | if (dc->msg_pos == p->length) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
410 | if (p->sent_cb != NULL) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
411 | p->sent_cb(p); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
412 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
413 | g_queue_pop_head(dc->out_queue); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
414 | msn_dc_destroy_packet(p); |
| 30067 | 415 | |
|
30097
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
416 | dc->msg_pos = -1; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
417 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
418 | } |
|
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 | static void |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
421 | msn_dc_enqueue_packet(MsnDirectConn *dc, MsnDirectConnPacket *p) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
422 | { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
423 | gboolean was_empty; |
| 30067 | 424 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
425 | was_empty = g_queue_is_empty(dc->out_queue); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
426 | g_queue_push_tail(dc->out_queue, p); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
427 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
428 | if (was_empty && dc->send_handle == 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
429 | dc->send_handle = purple_input_add(dc->fd, PURPLE_INPUT_WRITE, msn_dc_send_cb, dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
430 | msn_dc_send_cb(dc, dc->fd, PURPLE_INPUT_WRITE); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
431 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
432 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
433 | |
|
20646
69768ff2194a
Fix incorrect purple_proxy_connect() callback and comment out an unused function.
Daniel Atallah <datallah@pidgin.im>
parents:
20597
diff
changeset
|
434 | static void |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
435 | msn_dc_send_foo(MsnDirectConn *dc) |
|
20646
69768ff2194a
Fix incorrect purple_proxy_connect() callback and comment out an unused function.
Daniel Atallah <datallah@pidgin.im>
parents:
20597
diff
changeset
|
436 | { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
437 | MsnDirectConnPacket *p; |
| 30067 | 438 | |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
439 | if (purple_debug_is_verbose()) |
|
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
440 | purple_debug_info("msn", "msn_dc_send_foo %p\n", dc); |
| 30067 | 441 | |
|
30097
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
442 | p = msn_dc_new_packet(4); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
443 | |
|
30097
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
444 | memcpy(p->data, "foo\0", 4); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
445 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
446 | msn_dc_enqueue_packet(dc, p); |
|
20646
69768ff2194a
Fix incorrect purple_proxy_connect() callback and comment out an unused function.
Daniel Atallah <datallah@pidgin.im>
parents:
20597
diff
changeset
|
447 | } |
|
69768ff2194a
Fix incorrect purple_proxy_connect() callback and comment out an unused function.
Daniel Atallah <datallah@pidgin.im>
parents:
20597
diff
changeset
|
448 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
449 | static void |
|
30101
a0bfbebab591
Try and reduce some code duplication.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30100
diff
changeset
|
450 | msn_dc_send_handshake_with_nonce(MsnDirectConn *dc, MsnDirectConnPacket *p) |
|
a0bfbebab591
Try and reduce some code duplication.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30100
diff
changeset
|
451 | { |
|
a0bfbebab591
Try and reduce some code duplication.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30100
diff
changeset
|
452 | const gchar *h; |
|
a0bfbebab591
Try and reduce some code duplication.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30100
diff
changeset
|
453 | |
|
30979
43e0afd84f6c
Use p2p functions in directconn too.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
454 | h = (gchar*) msn_p2p_header_to_wire(&dc->header); |
|
43e0afd84f6c
Use p2p functions in directconn too.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
455 | |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30961
diff
changeset
|
456 | memcpy(p->data, h, P2P_PACKET_HEADER_SIZE); |
|
30101
a0bfbebab591
Try and reduce some code duplication.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30100
diff
changeset
|
457 | |
|
30971
39a254a27343
Drop Binary from the struct name.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30969
diff
changeset
|
458 | memcpy(p->data + offsetof(MsnP2PHeader, ack_id), dc->nonce, 16); |
|
30101
a0bfbebab591
Try and reduce some code duplication.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30100
diff
changeset
|
459 | |
|
a0bfbebab591
Try and reduce some code duplication.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30100
diff
changeset
|
460 | msn_dc_enqueue_packet(dc, p); |
|
a0bfbebab591
Try and reduce some code duplication.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30100
diff
changeset
|
461 | } |
|
a0bfbebab591
Try and reduce some code duplication.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30100
diff
changeset
|
462 | |
|
a0bfbebab591
Try and reduce some code duplication.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30100
diff
changeset
|
463 | static void |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
464 | msn_dc_send_handshake(MsnDirectConn *dc) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
465 | { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
466 | MsnDirectConnPacket *p; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
467 | |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30961
diff
changeset
|
468 | p = msn_dc_new_packet(P2P_PACKET_HEADER_SIZE); |
| 30067 | 469 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
470 | dc->header.session_id = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
471 | dc->header.id = dc->slpcall->slplink->slp_seq_id++; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
472 | dc->header.offset = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
473 | dc->header.total_size = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
474 | dc->header.length = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
475 | dc->header.flags = 0x100; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
476 | |
|
30101
a0bfbebab591
Try and reduce some code duplication.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30100
diff
changeset
|
477 | msn_dc_send_handshake_with_nonce(dc, p); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
478 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
479 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
480 | static void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
481 | msn_dc_send_handshake_reply(MsnDirectConn *dc) |
| 30067 | 482 | { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
483 | MsnDirectConnPacket *p; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
484 | |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30961
diff
changeset
|
485 | p = msn_dc_new_packet(P2P_PACKET_HEADER_SIZE); |
| 30067 | 486 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
487 | dc->header.id = dc->slpcall->slplink->slp_seq_id++; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
488 | dc->header.length = 0; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
489 | |
|
30101
a0bfbebab591
Try and reduce some code duplication.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30100
diff
changeset
|
490 | msn_dc_send_handshake_with_nonce(dc, p); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
491 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
492 | |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
493 | static gboolean |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
494 | msn_dc_verify_handshake(MsnDirectConn *dc, guint32 packet_length) |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
495 | { |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
496 | guchar nonce[16]; |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
497 | gchar nonce_hash[37]; |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
498 | |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30961
diff
changeset
|
499 | if (packet_length != P2P_PACKET_HEADER_SIZE) |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
500 | return FALSE; |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
501 | |
|
30971
39a254a27343
Drop Binary from the struct name.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30969
diff
changeset
|
502 | memcpy(nonce, dc->in_buffer + 4 + offsetof(MsnP2PHeader, ack_id), 16); |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
503 | |
|
30102
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
504 | if (dc->nonce_type == DC_NONCE_PLAIN) { |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
505 | if (memcmp(dc->nonce, nonce, 16) == 0) { |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
506 | purple_debug_info("msn", |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
507 | "Nonce from buddy request and nonce from DC attempt match, " |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
508 | "allowing direct connection\n"); |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
509 | return TRUE; |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
510 | } else { |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
511 | purple_debug_warning("msn", |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
512 | "Nonce from buddy request and nonce from DC attempt " |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
513 | "don't match, ignoring direct connection\n"); |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
514 | return FALSE; |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
515 | } |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
516 | |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
517 | } else if (dc->nonce_type == DC_NONCE_SHA1) { |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
518 | msn_dc_calculate_nonce_hash(dc->nonce_type, nonce, nonce_hash); |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
519 | |
|
30102
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
520 | if (g_str_equal(dc->remote_nonce, nonce_hash)) { |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
521 | purple_debug_info("msn", |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
522 | "Received nonce %s from buddy request " |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
523 | "and calculated nonce %s from DC attempt. " |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
524 | "Nonces match, allowing direct connection\n", |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
525 | dc->remote_nonce, nonce_hash); |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
526 | return TRUE; |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
527 | } else { |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
528 | purple_debug_warning("msn", |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
529 | "Received nonce %s from buddy request " |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
530 | "and calculated nonce %s from DC attempt. " |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
531 | "Nonces don't match, ignoring direct connection\n", |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
532 | dc->remote_nonce, nonce_hash); |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
533 | return FALSE; |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
534 | } |
|
7375eaf7c469
I think this finally works with both aMSN and the official client, for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30101
diff
changeset
|
535 | } else |
|
30096
6b0dfc4e1e83
Obviously, if this comparison fails, I should be returning FALSE.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30095
diff
changeset
|
536 | return FALSE; |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
537 | } |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
538 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
539 | static void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
540 | msn_dc_send_packet_cb(MsnDirectConnPacket *p) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
541 | { |
|
31007
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
542 | if (p->part != NULL && p->part->ack_cb != NULL) |
|
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
543 | p->part->ack_cb(p->part, p->part->ack_data); |
|
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
544 | } |
|
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
545 | |
|
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
546 | #if 0 |
|
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
547 | static void |
|
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
548 | msn_dc_send_packet_cb(MsnDirectConnPacket *p) |
|
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
549 | { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
550 | if (p->msg != NULL && p->msg->ack_cb != NULL) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
551 | p->msg->ack_cb(p->msg, p->msg->ack_data); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
552 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
553 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
554 | void |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
555 | msn_dc_enqueue_msg(MsnDirectConn *dc, MsnMessage *msg) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
556 | { |
|
30097
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
557 | MsnDirectConnPacket *p; |
|
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
558 | guint32 length; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
559 | |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30961
diff
changeset
|
560 | length = msg->body_len + P2P_PACKET_HEADER_SIZE; |
|
30097
581f70ecbc24
It seems like every DC packet requires a length, so why make every little
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30096
diff
changeset
|
561 | p = msn_dc_new_packet(length); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
562 | |
|
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
|
563 | memcpy(p->data, msg->slpmsg->header, P2P_PACKET_HEADER_SIZE); |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30961
diff
changeset
|
564 | memcpy(p->data + P2P_PACKET_HEADER_SIZE, msg->body, msg->body_len); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
565 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
566 | p->sent_cb = msn_dc_send_packet_cb; |
|
30076
2b751385616f
Minor cleanups.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30075
diff
changeset
|
567 | p->msg = msn_message_ref(msg); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
568 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
569 | msn_dc_enqueue_packet(dc, p); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
570 | } |
|
31007
336b38bb5876
Reomove MsnMessage reference from DirectConn.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31006
diff
changeset
|
571 | #endif |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
572 | |
|
30999
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
573 | void |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
574 | msn_dc_enqueue_part(MsnDirectConn *dc, MsnSlpMessagePart *part) |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
575 | { |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
576 | MsnDirectConnPacket *p; |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
577 | guint32 length; |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
578 | |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
579 | length = part->size + P2P_PACKET_HEADER_SIZE; |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
580 | p = msn_dc_new_packet(length); |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
581 | |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
582 | memcpy(p->data, part->header, P2P_PACKET_HEADER_SIZE); |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
583 | memcpy(p->data + P2P_PACKET_HEADER_SIZE, part->buffer, part->size); |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
584 | |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
585 | p->sent_cb = msn_dc_send_packet_cb; |
|
31006
4c2fa01fcff7
This bit must be migrated too.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30999
diff
changeset
|
586 | p->part = part; |
|
30999
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
587 | |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
588 | msn_dc_enqueue_packet(dc, p); |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
589 | } |
|
274aa4f2422d
Add a function that enqueue a Part instead of a Message since directconn does not sends messages.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30986
diff
changeset
|
590 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
591 | static int |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
592 | msn_dc_process_packet(MsnDirectConn *dc, guint32 packet_length) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
593 | { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
594 | g_return_val_if_fail(dc != NULL, DC_PROCESS_ERROR); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
595 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
596 | switch (dc->state) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
597 | case DC_STATE_CLOSED: |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
598 | break; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
599 | |
|
30076
2b751385616f
Minor cleanups.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30075
diff
changeset
|
600 | case DC_STATE_FOO: |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
601 | /* FOO message is always 4 bytes long */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
602 | if (packet_length != 4 || memcmp(dc->in_buffer, "\4\0\0\0foo", 8) != 0) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
603 | return DC_PROCESS_FALLBACK; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
604 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
605 | dc->state = DC_STATE_HANDSHAKE; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
606 | break; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
607 | |
|
30076
2b751385616f
Minor cleanups.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30075
diff
changeset
|
608 | case DC_STATE_HANDSHAKE: |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
609 | if (!msn_dc_verify_handshake(dc, packet_length)) |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
610 | return DC_PROCESS_FALLBACK; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
611 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
612 | msn_dc_send_handshake_reply(dc); |
|
30068
ade8dd1a1339
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
613 | dc->state = DC_STATE_ESTABLISHED; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
614 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
615 | msn_slpcall_session_init(dc->slpcall); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
616 | dc->slpcall = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
617 | break; |
| 30067 | 618 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
619 | case DC_STATE_HANDSHAKE_REPLY: |
|
30090
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
620 | if (!msn_dc_verify_handshake(dc, packet_length)) |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
621 | return DC_PROCESS_FALLBACK; |
|
a97b8c06eeae
Save remote nonce, and verify we get the same data when initiating the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30086
diff
changeset
|
622 | |
|
30068
ade8dd1a1339
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
623 | dc->state = DC_STATE_ESTABLISHED; |
| 30067 | 624 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
625 | msn_slpcall_session_init(dc->slpcall); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
626 | dc->slpcall = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
627 | break; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
628 | |
|
30068
ade8dd1a1339
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
629 | case DC_STATE_ESTABLISHED: |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
630 | msn_slplink_process_msg( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
631 | dc->slplink, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
632 | &dc->header, |
|
30966
c9d0661c74ed
Start moving p2p specific code to its own module.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30961
diff
changeset
|
633 | dc->in_buffer + 4 + P2P_PACKET_HEADER_SIZE, |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
634 | dc->header.length |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
635 | ); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
636 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
637 | /* |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
638 | if (dc->num_calls == 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
639 | msn_dc_destroy(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
640 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
641 | return DC_PROCESS_CLOSE; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
642 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
643 | */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
644 | break; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
645 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
646 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
647 | return DC_PROCESS_OK; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
648 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
649 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
650 | static void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
651 | msn_dc_recv_cb(gpointer data, gint fd, PurpleInputCondition cond) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
652 | { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
653 | MsnDirectConn *dc; |
|
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
654 | int free_buf_space; |
|
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
655 | int bytes_received; |
|
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
656 | guint32 packet_length; |
| 30067 | 657 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
658 | g_return_if_fail(data != NULL); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
659 | g_return_if_fail(fd != -1); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
660 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
661 | dc = data; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
662 | free_buf_space = dc->in_size - dc->in_pos; |
| 30067 | 663 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
664 | bytes_received = recv(fd, dc->in_buffer + dc->in_pos, free_buf_space, 0); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
665 | if (bytes_received < 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
666 | if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
667 | return; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
668 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
669 | purple_debug_warning("msn", "msn_dc_recv_cb: recv error\n"); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
670 | |
|
30068
ade8dd1a1339
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
671 | if(dc->state != DC_STATE_ESTABLISHED) |
|
30349
26be44d0f764
I think it's more accurate to say that a DC is a P2P transfer, so if that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30336
diff
changeset
|
672 | msn_dc_fallback_to_sb(dc); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
673 | else |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
674 | msn_dc_destroy(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
675 | return; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
676 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
677 | } else if (bytes_received == 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
678 | /* EOF. Remote side closed connection. */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
679 | purple_debug_info("msn", "msn_dc_recv_cb: recv EOF\n"); |
| 30067 | 680 | |
|
30068
ade8dd1a1339
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30067
diff
changeset
|
681 | if(dc->state != DC_STATE_ESTABLISHED) |
|
30349
26be44d0f764
I think it's more accurate to say that a DC is a P2P transfer, so if that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30336
diff
changeset
|
682 | msn_dc_fallback_to_sb(dc); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
683 | else |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
684 | msn_dc_destroy(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
685 | return; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
686 | } |
| 30067 | 687 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
688 | dc->progress = TRUE; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
689 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
690 | dc->in_pos += bytes_received; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
691 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
692 | /* Wait for packet length */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
693 | while (dc->in_pos >= 4) { |
|
30106
142f2a062877
I've seen packet sizes larger than our current maximum. Hopefully 8KiB is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30105
diff
changeset
|
694 | packet_length = GUINT32_FROM_LE(*((guint32*)dc->in_buffer)); |
| 30067 | 695 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
696 | if (packet_length > DC_MAX_PACKET_SIZE) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
697 | /* Oversized packet */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
698 | purple_debug_warning("msn", "msn_dc_recv_cb: oversized packet received\n"); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
699 | return; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
700 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
701 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
702 | /* Wait for the whole packet to arrive */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
703 | if (dc->in_pos < 4 + packet_length) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
704 | return; |
| 30067 | 705 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
706 | if (dc->state != DC_STATE_FOO) { |
|
30979
43e0afd84f6c
Use p2p functions in directconn too.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
707 | MsnP2PHeader *context; |
|
43e0afd84f6c
Use p2p functions in directconn too.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
708 | MsnP2PHeader *h; |
|
43e0afd84f6c
Use p2p functions in directconn too.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
709 | |
|
43e0afd84f6c
Use p2p functions in directconn too.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
710 | /* Skip packet size */ |
|
43e0afd84f6c
Use p2p functions in directconn too.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
711 | context = (MsnP2PHeader *)(dc->in_buffer + 4); |
|
43e0afd84f6c
Use p2p functions in directconn too.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
712 | |
|
43e0afd84f6c
Use p2p functions in directconn too.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
713 | h = msn_p2p_header_from_wire(context); |
|
43e0afd84f6c
Use p2p functions in directconn too.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
714 | memcpy(&dc->header, h, P2P_PACKET_HEADER_SIZE); |
|
43e0afd84f6c
Use p2p functions in directconn too.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
30971
diff
changeset
|
715 | g_free(h); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
716 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
717 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
718 | switch (msn_dc_process_packet(dc, packet_length)) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
719 | case DC_PROCESS_CLOSE: |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
720 | return; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
721 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
722 | case DC_PROCESS_FALLBACK: |
|
30349
26be44d0f764
I think it's more accurate to say that a DC is a P2P transfer, so if that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30336
diff
changeset
|
723 | purple_debug_warning("msn", "msn_dc_recv_cb: packet processing error, fall back to SB\n"); |
|
26be44d0f764
I think it's more accurate to say that a DC is a P2P transfer, so if that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30336
diff
changeset
|
724 | msn_dc_fallback_to_sb(dc); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
725 | return; |
| 30067 | 726 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
727 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
728 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
729 | if (dc->in_pos > packet_length + 4) { |
|
30107
8f91902bcc39
Valgrind pointed out that dest and src may overlap, so we need to use
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30106
diff
changeset
|
730 | g_memmove(dc->in_buffer, dc->in_buffer + 4 + packet_length, dc->in_pos - packet_length - 4); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
731 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
732 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
733 | dc->in_pos -= packet_length + 4; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
734 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
735 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
736 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
737 | static gboolean |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
738 | msn_dc_timeout(gpointer data) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
739 | { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
740 | MsnDirectConn *dc = data; |
| 30067 | 741 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
742 | g_return_val_if_fail(dc != NULL, FALSE); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
743 | |
|
30254
7c1f0dc0d410
If removing a timeout and return FALSE in its handler isn't good, then
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30186
diff
changeset
|
744 | if (dc->progress) { |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
745 | dc->progress = FALSE; |
|
30254
7c1f0dc0d410
If removing a timeout and return FALSE in its handler isn't good, then
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30186
diff
changeset
|
746 | return TRUE; |
|
7c1f0dc0d410
If removing a timeout and return FALSE in its handler isn't good, then
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30186
diff
changeset
|
747 | } else { |
|
7c1f0dc0d410
If removing a timeout and return FALSE in its handler isn't good, then
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30186
diff
changeset
|
748 | dc->timeout_handle = 0; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
749 | msn_dc_destroy(dc); |
|
30254
7c1f0dc0d410
If removing a timeout and return FALSE in its handler isn't good, then
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30186
diff
changeset
|
750 | return FALSE; |
|
7c1f0dc0d410
If removing a timeout and return FALSE in its handler isn't good, then
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30186
diff
changeset
|
751 | } |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
752 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
753 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
754 | static void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
755 | msn_dc_init(MsnDirectConn *dc) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
756 | { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
757 | g_return_if_fail(dc != NULL); |
| 30067 | 758 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
759 | dc->in_size = DC_MAX_PACKET_SIZE + 4; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
760 | dc->in_pos = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
761 | dc->in_buffer = g_malloc(dc->in_size); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
762 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
763 | dc->recv_handle = purple_input_add(dc->fd, PURPLE_INPUT_READ, msn_dc_recv_cb, dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
764 | dc->send_handle = purple_input_add(dc->fd, PURPLE_INPUT_WRITE, msn_dc_send_cb, dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
765 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
766 | dc->timeout_handle = purple_timeout_add_seconds(DC_TIMEOUT, msn_dc_timeout, dc); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
767 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
768 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
769 | void |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
770 | msn_dc_connected_to_peer_cb(gpointer data, gint fd, const gchar *error_msg) |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
771 | { |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
772 | MsnDirectConn *dc = data; |
| 30067 | 773 | |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
774 | if (purple_debug_is_verbose()) |
|
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
775 | purple_debug_info("msn", "msn_dc_connected_to_peer_cb %p\n", dc); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
776 | |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
777 | g_return_if_fail(dc != NULL); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
778 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
779 | dc->connect_data = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
780 | purple_timeout_remove(dc->connect_timeout_handle); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
781 | dc->connect_timeout_handle = 0; |
| 30067 | 782 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
783 | dc->fd = fd; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
784 | if (dc->fd != -1) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
785 | msn_dc_init(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
786 | msn_dc_send_foo(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
787 | msn_dc_send_handshake(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
788 | dc->state = DC_STATE_HANDSHAKE_REPLY; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
789 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
790 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
791 | |
| 30067 | 792 | /* |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
793 | * This callback will be called when we're the server |
|
30327
d3d120d3f9e8
Make it more explicit that incoming and outgoing timeouts are different.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30318
diff
changeset
|
794 | * and nobody has connected us in DC_INCOMING_TIMEOUT seconds |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
795 | */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
796 | static gboolean |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
797 | msn_dc_incoming_connection_timeout_cb(gpointer data) { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
798 | MsnDirectConn *dc = data; |
|
30109
356116df6885
This should probably work a bit better. At least, we want to get rid of any
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30107
diff
changeset
|
799 | MsnSlpCall *slpcall; |
| 30067 | 800 | |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
801 | if (purple_debug_is_verbose()) |
|
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
802 | purple_debug_info("msn", "msn_dc_incoming_connection_timeout_cb %p\n", dc); |
| 30067 | 803 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
804 | g_return_val_if_fail(dc != NULL, FALSE); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
805 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
806 | slpcall = dc->slpcall; |
| 30067 | 807 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
808 | if (dc->listen_data != NULL) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
809 | purple_network_listen_cancel(dc->listen_data); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
810 | dc->listen_data = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
811 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
812 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
813 | if (dc->listenfd_handle != 0) { |
|
30256
669f8bc11d33
This is not a timeout, but an input handler.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30255
diff
changeset
|
814 | purple_input_remove(dc->listenfd_handle); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
815 | dc->listenfd_handle = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
816 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
817 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
818 | if (dc->listenfd != -1) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
819 | purple_network_remove_port_mapping(dc->listenfd); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
820 | close(dc->listenfd); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
821 | dc->listenfd = -1; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
822 | } |
|
14174
1615a99529dc
[gaim-migrate @ 16746]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
823 | |
|
30109
356116df6885
This should probably work a bit better. At least, we want to get rid of any
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30107
diff
changeset
|
824 | dc->connect_timeout_handle = 0; |
|
30349
26be44d0f764
I think it's more accurate to say that a DC is a P2P transfer, so if that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30336
diff
changeset
|
825 | msn_dc_fallback_to_sb(dc); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
826 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
827 | return FALSE; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
828 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
829 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
830 | /* |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
831 | * This callback will be called when we're unable to connect to |
|
30327
d3d120d3f9e8
Make it more explicit that incoming and outgoing timeouts are different.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30318
diff
changeset
|
832 | * the remote host in DC_OUTGOING_TIMEOUT seconds. |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
833 | */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
834 | gboolean |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
835 | msn_dc_outgoing_connection_timeout_cb(gpointer data) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
836 | { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
837 | MsnDirectConn *dc = data; |
| 30067 | 838 | |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
839 | purple_debug_info("msn", "msn_dc_outgoing_connection_timeout_cb %p\n", dc); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
840 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
841 | g_return_val_if_fail(dc != NULL, FALSE); |
| 30067 | 842 | |
|
30186
3122a381a2c6
We can't both remove a timeout and return FALSE in its callback.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30109
diff
changeset
|
843 | dc->connect_timeout_handle = 0; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
844 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
845 | if (dc->connect_data != NULL) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
846 | purple_proxy_connect_cancel(dc->connect_data); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
847 | dc->connect_data = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
848 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
849 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
850 | if (dc->ext_ip && dc->ext_port) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
851 | /* Try external IP/port if available. */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
852 | dc->connect_data = purple_proxy_connect( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
853 | NULL, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
854 | dc->slpcall->slplink->session->account, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
855 | dc->ext_ip, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
856 | dc->ext_port, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
857 | msn_dc_connected_to_peer_cb, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
858 | dc |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
859 | ); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
860 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
861 | g_free(dc->ext_ip); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
862 | dc->ext_ip = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
863 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
864 | if (dc->connect_data) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
865 | dc->connect_timeout_handle = purple_timeout_add_seconds( |
|
30327
d3d120d3f9e8
Make it more explicit that incoming and outgoing timeouts are different.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30318
diff
changeset
|
866 | DC_OUTGOING_TIMEOUT, |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
867 | msn_dc_outgoing_connection_timeout_cb, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
868 | dc |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
869 | ); |
|
30255
47794eb7b979
Fallback to P2P if connecting to external IP didn't work immediately.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30254
diff
changeset
|
870 | } else { |
|
47794eb7b979
Fallback to P2P if connecting to external IP didn't work immediately.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30254
diff
changeset
|
871 | /* |
|
47794eb7b979
Fallback to P2P if connecting to external IP didn't work immediately.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30254
diff
changeset
|
872 | * Connection failed |
|
30349
26be44d0f764
I think it's more accurate to say that a DC is a P2P transfer, so if that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30336
diff
changeset
|
873 | * Fall back to SB transfer |
|
30255
47794eb7b979
Fallback to P2P if connecting to external IP didn't work immediately.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30254
diff
changeset
|
874 | */ |
|
47794eb7b979
Fallback to P2P if connecting to external IP didn't work immediately.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30254
diff
changeset
|
875 | msn_dc_outgoing_connection_timeout_cb(dc); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
876 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
877 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
878 | } else { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
879 | /* |
|
30186
3122a381a2c6
We can't both remove a timeout and return FALSE in its callback.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30109
diff
changeset
|
880 | * Both internal and external connection attempts failed. |
|
30349
26be44d0f764
I think it's more accurate to say that a DC is a P2P transfer, so if that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30336
diff
changeset
|
881 | * Fall back to SB transfer. |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
882 | */ |
|
30349
26be44d0f764
I think it's more accurate to say that a DC is a P2P transfer, so if that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30336
diff
changeset
|
883 | msn_dc_fallback_to_sb(dc); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
884 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
885 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
886 | return FALSE; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
887 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
888 | |
| 30067 | 889 | /* |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
890 | * This callback will be called when we're the server |
|
30327
d3d120d3f9e8
Make it more explicit that incoming and outgoing timeouts are different.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30318
diff
changeset
|
891 | * and somebody has connected to us in DC_INCOMING_TIMEOUT seconds. |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
892 | */ |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
893 | static void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
894 | msn_dc_incoming_connection_cb(gpointer data, gint listenfd, PurpleInputCondition cond) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
895 | { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
896 | MsnDirectConn *dc = data; |
| 30067 | 897 | |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
898 | if (purple_debug_is_verbose()) |
|
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
899 | purple_debug_info("msn", "msn_dc_incoming_connection_cb %p\n", dc); |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
900 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
901 | g_return_if_fail(dc != NULL); |
| 30067 | 902 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
903 | if (dc->connect_timeout_handle != 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
904 | purple_timeout_remove(dc->connect_timeout_handle); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
905 | dc->connect_timeout_handle = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
906 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
907 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
908 | if (dc->listenfd_handle != 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
909 | purple_input_remove(dc->listenfd_handle); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
910 | dc->listenfd_handle = 0; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
911 | } |
| 30067 | 912 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
913 | dc->fd = accept(listenfd, NULL, 0); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
914 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
915 | purple_network_remove_port_mapping(dc->listenfd); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
916 | close(dc->listenfd); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
917 | dc->listenfd = -1; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
918 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
919 | if (dc->fd != -1) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
920 | msn_dc_init(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
921 | dc->state = DC_STATE_FOO; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
922 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
923 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
924 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
925 | void |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
926 | msn_dc_listen_socket_created_cb(int listenfd, gpointer data) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
927 | { |
|
30069
e10a97223cf8
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30068
diff
changeset
|
928 | MsnDirectConn *dc = data; |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
929 | |
|
30074
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
930 | if (purple_debug_is_verbose()) |
|
f8a8097f6191
This DC stuff seems a bit verbose.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30073
diff
changeset
|
931 | purple_debug_info("msn", "msn_dc_listen_socket_created_cb %p\n", dc); |
| 30067 | 932 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
933 | g_return_if_fail(dc != NULL); |
| 30067 | 934 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
935 | dc->listen_data = NULL; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
936 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
937 | if (listenfd != -1) { |
|
30084
57ef011cbce0
NULL-ing this stuff after free is nice in theory, but totally pointless
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30077
diff
changeset
|
938 | const char *ext_ip; |
|
57ef011cbce0
NULL-ing this stuff after free is nice in theory, but totally pointless
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30077
diff
changeset
|
939 | const char *int_ip; |
|
57ef011cbce0
NULL-ing this stuff after free is nice in theory, but totally pointless
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30077
diff
changeset
|
940 | int port; |
|
14174
1615a99529dc
[gaim-migrate @ 16746]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
941 | |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
942 | ext_ip = purple_network_get_my_ip(listenfd); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
943 | int_ip = purple_network_get_local_system_ip(listenfd); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
944 | port = purple_network_get_port_from_fd(listenfd); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
945 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
946 | dc->listenfd = listenfd; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
947 | dc->listenfd_handle = purple_input_add( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
948 | listenfd, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
949 | PURPLE_INPUT_READ, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
950 | msn_dc_incoming_connection_cb, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
951 | dc |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
952 | ); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
953 | dc->connect_timeout_handle = purple_timeout_add_seconds( |
|
30327
d3d120d3f9e8
Make it more explicit that incoming and outgoing timeouts are different.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30318
diff
changeset
|
954 | DC_INCOMING_TIMEOUT, |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
955 | msn_dc_incoming_connection_timeout_cb, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
956 | dc |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
957 | ); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
958 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
959 | if (strcmp(int_ip, ext_ip) != 0) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
960 | dc->msg_body = g_strdup_printf( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
961 | "Bridge: TCPv1\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
962 | "Listening: true\r\n" |
|
30092
ad8776ef2844
Support old-style Nonce, which should let us use direct connections to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30090
diff
changeset
|
963 | "%sNonce: {%s}\r\n" |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
964 | "IPv4External-Addrs: %s\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
965 | "IPv4External-Port: %d\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
966 | "IPv4Internal-Addrs: %s\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
967 | "IPv4Internal-Port: %d\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
968 | "\r\n", |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
969 | |
|
30092
ad8776ef2844
Support old-style Nonce, which should let us use direct connections to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30090
diff
changeset
|
970 | dc->nonce_type != DC_NONCE_PLAIN ? "Hashed-" : "", |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
971 | dc->nonce_hash, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
972 | ext_ip, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
973 | port, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
974 | int_ip, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
975 | port |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
976 | ); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
977 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
978 | } else { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
979 | dc->msg_body = g_strdup_printf( |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
980 | "Bridge: TCPv1\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
981 | "Listening: true\r\n" |
|
30092
ad8776ef2844
Support old-style Nonce, which should let us use direct connections to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30090
diff
changeset
|
982 | "%sNonce: {%s}\r\n" |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
983 | "IPv4External-Addrs: %s\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
984 | "IPv4External-Port: %d\r\n" |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
985 | "\r\n", |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
986 | |
|
30092
ad8776ef2844
Support old-style Nonce, which should let us use direct connections to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30090
diff
changeset
|
987 | dc->nonce_type != DC_NONCE_PLAIN ? "Hashed-" : "", |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
988 | dc->nonce_hash, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
989 | ext_ip, |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
990 | port |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
991 | ); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
992 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
993 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
994 | if (dc->slpcall->wait_for_socket) { |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
995 | if (dc->send_connection_info_msg_cb != NULL) |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
996 | dc->send_connection_info_msg_cb(dc); |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
997 | |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
998 | dc->slpcall->wait_for_socket = FALSE; |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
999 | } |
|
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
1000 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
diff
changeset
|
1001 | } |
|
30066
25742b976ce2
Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents:
28170
diff
changeset
|
1002 |