Mercurial > pidgin.yaz
annotate libpurple/protocols/msn/directconn.c @ 30436:0ea33256f462
Tabs-to-spaces.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Thu, 18 Mar 2010 03:40:07 +0000 |
parents | bcb5e6c2e5a3 |
children | 519b65d500ff |
rev | line source |
---|---|
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1 /** |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
2 * @file directconn.c MSN direct connection functions |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
3 * |
15823 | 4 * purple |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
5 * |
15823 | 6 * Purple is the legal property of its developers, whose names are too numerous |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
7 * to list here. Please refer to the COPYRIGHT file distributed with this |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
8 * source distribution. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
9 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
10 * This program is free software; you can redistribute it and/or modify |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
11 * it under the terms of the GNU General Public License as published by |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
12 * the Free Software Foundation; either version 2 of the License, or |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
13 * (at your option) any later version. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
14 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
15 * This program is distributed in the hope that it will be useful, |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
18 * GNU General Public License for more details. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
19 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
20 * You should have received a copy of the GNU General Public License |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
21 * along with this program; if not, write to the Free Software |
19680
44b4e8bd759b
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
18431
diff
changeset
|
22 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
23 */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
24 #include "msn.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
25 #include "directconn.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
26 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
27 #include "slp.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
28 #include "slpmsg.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
29 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
30 #define DC_SESSION_ID_OFFS 0 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
31 #define DC_SEQ_ID_OFFS 4 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
32 #define DC_DATA_OFFSET_OFFS 8 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
33 #define DC_TOTAL_DATA_SIZE_OFFS 16 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
34 #define DC_MESSAGE_LENGTH_OFFS 24 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
35 #define DC_FLAGS_OFFS 28 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
36 #define DC_ACK_ID_OFFS 32 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
37 #define DC_ACK_UID_OFFS 36 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
38 #define DC_ACK_DATA_SIZE_OFFS 40 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
39 #define DC_MESSAGE_BODY_OFFS 48 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
40 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
41 #define DC_PACKET_HEADER_SIZE 48 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
42 #define DC_MAX_BODY_SIZE 1352 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
43 #define DC_MAX_PACKET_SIZE (DC_PACKET_HEADER_SIZE + DC_MAX_BODY_SIZE) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
44 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
45 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
46 msn_dc_generate_nonce(MsnDirectConn *dc) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
47 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
48 PurpleCipher *cipher = NULL; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
49 PurpleCipherContext *context = NULL; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
50 static guchar digest[20]; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
51 int i; |
30434 | 52 |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
53 guint32 g1; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
54 guint16 g2; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
55 guint16 g3; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
56 guint64 g4; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
57 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
58 cipher = purple_ciphers_find_cipher("sha1"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
59 g_return_if_fail(cipher != NULL); |
30434 | 60 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
61 for (i = 0; i < 16; i++) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
62 dc->nonce[i] = rand() & 0xff; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
63 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
64 context = purple_cipher_context_new(cipher, NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
65 purple_cipher_context_append(context, dc->nonce, 16); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
66 purple_cipher_context_digest(context, 20, digest, NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
67 purple_cipher_context_destroy(context); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
68 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
69 g1 = *((guint32*)(digest + 0)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
70 g1 = GUINT32_FROM_LE(g1); |
30434 | 71 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
72 g2 = *((guint16*)(digest + 4)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
73 g2 = GUINT16_FROM_LE(g2); |
30434 | 74 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
75 g3 = *((guint16*)(digest + 6)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
76 g3 = GUINT32_FROM_LE(g3); |
30434 | 77 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
78 g4 = *((guint64*)(digest + 8)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
79 g4 = GUINT64_FROM_BE(g4); |
30434 | 80 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
81 g_sprintf( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
82 dc->nonce_hash, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
83 "%08X-%04X-%04X-%04X-%08X%04X", |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
84 g1, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
85 g2, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
86 g3, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
87 (guint16)(g4 >> 48), |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
88 (guint32)((g4 >> 16) & 0xffffffff), |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
89 (guint16)(g4 & 0xffff) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
90 ); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
91 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
92 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
93 static MsnDirectConnPacket* |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
94 msn_dc_new_packet() |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
95 { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
96 MsnDirectConnPacket *p; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
97 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
98 p = g_new0(MsnDirectConnPacket, 1); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
99 p->data = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
100 p->sent_cb = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
101 p->msg = NULL; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
102 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
103 return p; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
104 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
105 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
106 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
107 msn_dc_destroy_packet(MsnDirectConnPacket *p) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
108 { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
109 if (p->data) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
110 g_free(p->data); |
30434 | 111 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
112 if (p->msg) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
113 msn_message_unref(p->msg); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
114 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
115 g_free(p); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
116 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
117 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
118 MsnDirectConn* |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
119 msn_dc_new(MsnSlpCall *slpcall) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
120 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
121 MsnDirectConn *dc; |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
122 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
123 purple_debug_info("msn", "msn_dc_new\n"); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
124 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
125 g_return_val_if_fail(slpcall != NULL, NULL); |
30434 | 126 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
127 dc = g_new0(MsnDirectConn, 1); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
128 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
129 dc->slplink = slpcall->slplink; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
130 dc->slpcall = slpcall; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
131 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
132 if (dc->slplink->dc != NULL) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
133 purple_debug_warning("msn", "msn_dc_new: slplink already has an allocated DC!\n"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
134 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
135 dc->slplink->dc = dc; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
136 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
137 dc->msg_body = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
138 dc->prev_ack = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
139 dc->listen_data = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
140 dc->connect_data = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
141 dc->listenfd = -1; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
142 dc->listenfd_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
143 dc->connect_timeout_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
144 dc->fd = -1; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
145 dc->recv_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
146 dc->send_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
147 dc->state = DC_STATE_CLOSED; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
148 dc->in_buffer = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
149 dc->out_queue = g_queue_new(); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
150 dc->msg_pos = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
151 dc->send_connection_info_msg_cb = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
152 dc->ext_ip = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
153 dc->timeout_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
154 dc->progress = FALSE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
155 //dc->num_calls = 1; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
156 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
157 msn_dc_generate_nonce(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
158 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
159 return dc; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
160 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
161 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
162 void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
163 msn_dc_destroy(MsnDirectConn *dc) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
164 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
165 MsnSlpLink *slplink; |
30434 | 166 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
167 purple_debug_info("msn", "msn_dc_destroy\n"); |
30434 | 168 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
169 g_return_if_fail(dc != NULL); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
170 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
171 slplink = dc->slplink; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
172 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
173 if (dc->slpcall != NULL) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
174 dc->slpcall->wait_for_socket = FALSE; |
30434 | 175 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
176 slplink->dc = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
177 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
178 if (slplink->swboard == NULL) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
179 msn_slplink_destroy(slplink); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
180 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
181 if (dc->msg_body != NULL) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
182 g_free(dc->msg_body); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
183 dc->msg_body = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
184 } |
30434 | 185 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
186 if (dc->prev_ack) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
187 msn_slpmsg_destroy(dc->prev_ack); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
188 dc->prev_ack = NULL; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
189 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
190 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
191 if (dc->listen_data != NULL) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
192 purple_network_listen_cancel(dc->listen_data); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
193 dc->listen_data = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
194 } |
30434 | 195 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
196 if (dc->connect_data != NULL) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
197 purple_proxy_connect_cancel(dc->connect_data); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
198 dc->connect_data = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
199 } |
30434 | 200 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
201 if (dc->listenfd != -1) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
202 purple_network_remove_port_mapping(dc->listenfd); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
203 close(dc->listenfd); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
204 dc->listenfd = -1; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
205 } |
30434 | 206 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
207 if (dc->listenfd_handle != 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
208 purple_timeout_remove(dc->listenfd_handle); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
209 dc->listenfd_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
210 } |
30434 | 211 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
212 if (dc->connect_timeout_handle != 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
213 purple_timeout_remove(dc->connect_timeout_handle); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
214 dc->connect_timeout_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
215 } |
30434 | 216 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
217 if (dc->fd != -1) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
218 close(dc->fd); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
219 dc->fd = -1; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
220 } |
30434 | 221 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
222 if (dc->send_handle != 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
223 purple_input_remove(dc->send_handle); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
224 dc->send_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
225 } |
30434 | 226 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
227 if (dc->recv_handle != 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
228 purple_input_remove(dc->recv_handle); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
229 dc->recv_handle = 0; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
230 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
231 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
232 if (dc->in_buffer != NULL) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
233 g_free(dc->in_buffer); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
234 dc->in_buffer = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
235 } |
30434 | 236 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
237 if (dc->out_queue != NULL) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
238 while (!g_queue_is_empty(dc->out_queue)) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
239 msn_dc_destroy_packet( g_queue_pop_head(dc->out_queue) ); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
240 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
241 g_queue_free(dc->out_queue); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
242 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
243 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
244 if (dc->ext_ip != NULL) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
245 g_free(dc->ext_ip); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
246 dc->ext_ip = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
247 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
248 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
249 if (dc->timeout_handle != 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
250 purple_timeout_remove(dc->timeout_handle); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
251 dc->timeout_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
252 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
253 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
254 g_free(dc); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
255 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
256 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
257 /* |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
258 void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
259 msn_dc_ref(MsnDirectConn *dc) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
260 { |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
261 g_return_if_fail(dc != NULL); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
262 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
263 dc->num_calls++; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
264 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
265 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
266 void |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
267 msn_dc_unref(MsnDirectConn *dc) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
268 { |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
269 g_return_if_fail(dc != NULL); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
270 |
30434 | 271 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
272 if (dc->num_calls > 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
273 dc->num_calls--; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
274 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
275 } |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
276 */ |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
277 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
278 void |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
279 msn_dc_send_invite(MsnDirectConn *dc) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
280 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
281 MsnSlpCall *slpcall; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
282 MsnSlpMessage *msg; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
283 gchar *header; |
30434 | 284 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
285 purple_debug_info("msn", "msn_dc_send_invite\n"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
286 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
287 g_return_if_fail(dc != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
288 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
289 slpcall = dc->slpcall; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
290 g_return_if_fail(slpcall != NULL); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
291 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
292 header = g_strdup_printf( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
293 "INVITE MSNMSGR:%s MSNSLP/1.0", |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
294 slpcall->slplink->remote_user |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
295 ); |
30434 | 296 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
297 msg = msn_slpmsg_sip_new( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
298 slpcall, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
299 0, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
300 header, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
301 slpcall->branch, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
302 "application/x-msnmsgr-transrespbody", |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
303 dc->msg_body |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
304 ); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
305 g_free(header); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
306 g_free(dc->msg_body); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
307 dc->msg_body = NULL; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
308 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
309 msn_slplink_queue_slpmsg(slpcall->slplink, msg); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
310 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
311 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
312 void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
313 msn_dc_send_ok(MsnDirectConn *dc) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
314 { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
315 purple_debug_info("msn", "msn_dc_send_ok\n"); |
30434 | 316 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
317 g_return_if_fail(dc != NULL); |
30434 | 318 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
319 msn_slp_send_ok(dc->slpcall, dc->slpcall->branch, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
320 "application/x-msnmsgr-transrespbody", dc->msg_body); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
321 g_free(dc->msg_body); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
322 dc->msg_body = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
323 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
324 msn_slplink_send_slpmsg(dc->slpcall->slplink, dc->prev_ack); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
325 msn_slpmsg_destroy(dc->prev_ack); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
326 dc->prev_ack = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
327 msn_slplink_send_queued_slpmsgs(dc->slpcall->slplink); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
328 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
329 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
330 static void |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
331 msn_dc_fallback_to_p2p(MsnDirectConn *dc) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
332 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
333 MsnSlpCall *slpcall; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
334 PurpleXfer *xfer; |
30434 | 335 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
336 purple_debug_info("msn", "msn_dc_try_fallback_to_p2p\n"); |
30434 | 337 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
338 g_return_if_fail(dc != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
339 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
340 slpcall = dc->slpcall; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
341 g_return_if_fail(slpcall != NULL); |
30434 | 342 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
343 xfer = slpcall->xfer; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
344 g_return_if_fail(xfer != NULL); |
30434 | 345 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
346 msn_dc_destroy(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
347 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
348 msn_slpcall_session_init(slpcall); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
349 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
350 /* |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
351 switch (purple_xfer_get_status(xfer)) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
352 case PURPLE_XFER_STATUS_NOT_STARTED: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
353 case PURPLE_XFER_STATUS_ACCEPTED: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
354 msn_slpcall_session_init(slpcall); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
355 break; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
356 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
357 case PURPLE_XFER_STATUS_STARTED: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
358 slpcall->session_init_cb = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
359 slpcall->end_cb = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
360 slpcall->progress_cb = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
361 slpcall->cb = NULL; |
30434 | 362 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
363 if (fail_local) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
364 purple_xfer_cancel_local(xfer); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
365 else |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
366 purple_xfer_cancel_remote(xfer); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
367 break; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
368 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
369 default: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
370 slpcall->session_init_cb = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
371 slpcall->end_cb = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
372 slpcall->progress_cb = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
373 slpcall->cb = NULL; |
30434 | 374 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
375 if (fail_local) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
376 purple_xfer_cancel_local(xfer); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
377 else |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
378 purple_xfer_cancel_remote(xfer); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
379 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
380 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
381 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
382 */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
383 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
384 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
385 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
386 msn_dc_parse_binary_header(MsnDirectConn *dc) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
387 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
388 MsnSlpHeader *h; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
389 gchar *buffer; |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
390 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
391 g_return_if_fail(dc != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
392 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
393 h = &dc->header; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
394 /* Skip packet size */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
395 buffer = dc->in_buffer + 4; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
396 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
397 memcpy(&h->session_id, buffer + DC_SESSION_ID_OFFS, sizeof(h->session_id)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
398 h->session_id = GUINT32_FROM_LE(h->session_id); |
30434 | 399 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
400 memcpy(&h->id, buffer + DC_SEQ_ID_OFFS, sizeof(h->id)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
401 h->id = GUINT32_FROM_LE(h->id); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
402 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
403 memcpy(&h->offset, buffer + DC_DATA_OFFSET_OFFS, sizeof(h->offset)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
404 h->offset = GUINT64_FROM_LE(h->offset); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
405 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
406 memcpy(&h->total_size, buffer + DC_TOTAL_DATA_SIZE_OFFS, sizeof(h->total_size)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
407 h->total_size = GUINT64_FROM_LE(h->total_size); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
408 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
409 memcpy(&h->length, buffer + DC_MESSAGE_LENGTH_OFFS, sizeof(h->length)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
410 h->length = GUINT32_FROM_LE(h->length); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
411 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
412 memcpy(&h->flags, buffer + DC_FLAGS_OFFS, sizeof(h->flags)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
413 h->flags = GUINT32_FROM_LE(h->flags); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
414 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
415 memcpy(&h->ack_id, buffer + DC_ACK_ID_OFFS, sizeof(h->ack_id)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
416 h->ack_id = GUINT32_FROM_LE(h->ack_id); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
417 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
418 memcpy(&h->ack_sub_id, buffer + DC_ACK_UID_OFFS, sizeof(h->ack_sub_id)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
419 h->ack_sub_id = GUINT32_FROM_LE(h->ack_sub_id); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
420 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
421 memcpy(&h->ack_size, buffer + DC_ACK_DATA_SIZE_OFFS, sizeof(h->ack_size)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
422 h->ack_size = GUINT64_FROM_LE(h->ack_size); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
423 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
424 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
425 static gchar* |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
426 msn_dc_serialize_binary_header(MsnDirectConn *dc) { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
427 static MsnSlpHeader h; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
428 static gchar bin_header[DC_PACKET_HEADER_SIZE]; |
30434 | 429 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
430 g_return_val_if_fail(dc != NULL, NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
431 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
432 memcpy(&h, &dc->header, sizeof(h)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
433 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
434 h.session_id = GUINT32_TO_LE(h.session_id); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
435 memcpy(bin_header + DC_SESSION_ID_OFFS, &h.session_id, sizeof(h.session_id)); |
30434 | 436 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
437 h.id = GUINT32_TO_LE(h.id); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
438 memcpy(bin_header + DC_SEQ_ID_OFFS, &h.id, sizeof(h.id)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
439 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
440 h.offset = GUINT64_TO_LE(h.offset); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
441 memcpy(bin_header + DC_DATA_OFFSET_OFFS, &h.offset, sizeof(h.offset)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
442 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
443 h.total_size = GUINT64_TO_LE(h.total_size); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
444 memcpy(bin_header + DC_TOTAL_DATA_SIZE_OFFS, &h.total_size, sizeof(h.total_size)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
445 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
446 h.length = GUINT32_TO_LE(h.length); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
447 memcpy(bin_header + DC_MESSAGE_LENGTH_OFFS, &h.length, sizeof(h.length)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
448 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
449 h.flags = GUINT32_TO_LE(h.flags); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
450 memcpy(bin_header + DC_FLAGS_OFFS, &h.flags, sizeof(h.flags)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
451 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
452 h.ack_id = GUINT32_TO_LE(h.ack_id); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
453 memcpy(bin_header + DC_ACK_ID_OFFS, &h.ack_id, sizeof(h.ack_id)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
454 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
455 h.ack_sub_id = GUINT32_TO_LE(h.ack_sub_id); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
456 memcpy(bin_header + DC_ACK_UID_OFFS, &h.ack_sub_id, sizeof(h.ack_sub_id)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
457 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
458 h.ack_size = GUINT64_TO_LE(h.ack_size); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
459 memcpy(bin_header + DC_ACK_DATA_SIZE_OFFS, &h.ack_size, sizeof(h.ack_size)); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
460 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
461 return bin_header; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
462 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
463 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
464 /* |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
465 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
466 msn_dc_send_bye(MsnDirectConn *dc) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
467 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
468 MsnSlpLink *slplink; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
469 PurpleAccount *account; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
470 char *body; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
471 int body_len; |
30434 | 472 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
473 purple_debug_info("msn", "msn_dc_send_bye\n"); |
30434 | 474 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
475 g_return_if_fail(dc != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
476 g_return_if_fail(dc->slpcall != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
477 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
478 slplink = dc->slpcall->slplink; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
479 account = slplink->session->account; |
30434 | 480 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
481 dc->header.session_id = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
482 dc->header.id = dc->slpcall->slplink->slp_seq_id++; |
30434 | 483 dc->header.offset = 0; |
484 | |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
485 body = g_strdup_printf( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
486 "BYE MSNMSGR:%s MSNSLP/1.0\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
487 "To: <msnmsgr:%s>\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
488 "From: <msnmsgr:%s>\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
489 "Via: MSNSLP/1.0/TLP ;branch={%s}\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
490 "CSeq: 0\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
491 "Call-ID: {%s}\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
492 "Max-Forwards: 0\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
493 "Content-Type: application/x-msnmsgr-sessionclosebody\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
494 "Content-Length: 3\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
495 "\r\n\r\n", |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
496 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
497 slplink->remote_user, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
498 slplink->remote_user, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
499 purple_account_get_username(account), |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
500 dc->slpcall->branch, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
501 dc->slpcall->id |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
502 ); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
503 body_len = strlen(body) + 1; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
504 memcpy(dc->buffer, body, body_len); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
505 g_free(body); |
19797
60bc06498746
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@hxbc.us>
parents:
15823
diff
changeset
|
506 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
507 dc->header.total_size = body_len; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
508 dc->header.length = body_len; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
509 dc->header.flags = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
510 dc->header.ack_sub_id = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
511 dc->header.ack_size = 0; |
19797
60bc06498746
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@hxbc.us>
parents:
15823
diff
changeset
|
512 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
513 msn_dc_send_packet(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
514 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
515 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
516 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
517 msn_dc_send_ack(MsnDirectConn *dc) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
518 { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
519 g_return_if_fail(dc != NULL); |
30434 | 520 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
521 dc->header.session_id = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
522 dc->header.ack_sub_id = dc->header.ack_id; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
523 dc->header.ack_id = dc->header.id; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
524 dc->header.id = dc->slpcall->slplink->slp_seq_id++; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
525 dc->header.offset = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
526 dc->header.length = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
527 dc->header.flags = 0x02; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
528 dc->header.ack_size = dc->header.total_size; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
529 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
530 msn_dc_send_packet(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
531 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
532 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
533 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
534 msn_dc_send_data_ack(MsnDirectConn *dc) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
535 { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
536 g_return_if_fail(dc != NULL); |
30434 | 537 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
538 dc->header.session_id = dc->slpcall->session_id; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
539 dc->header.ack_sub_id = dc->header.ack_id; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
540 dc->header.ack_id = dc->header.id; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
541 dc->header.id = dc->slpcall->slplink->slp_seq_id++; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
542 dc->header.offset = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
543 dc->header.length = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
544 dc->header.flags = 0x02; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
545 dc->header.ack_size = dc->header.total_size; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
546 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
547 msn_dc_send_packet(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
548 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
549 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
550 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
551 msn_dc_xfer_send_cancel(PurpleXfer *xfer) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
552 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
553 MsnSlpCall *slpcall; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
554 MsnDirectConn *dc; |
30434 | 555 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
556 purple_debug_info("msn", "msn_dc_xfer_send_cancel\n"); |
30434 | 557 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
558 g_return_if_fail(xfer != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
559 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
560 slpcall = xfer->data; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
561 g_return_if_fail(slpcall != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
562 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
563 dc = slpcall->dc; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
564 g_return_if_fail(dc != NULL); |
30434 | 565 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
566 switch (dc->state) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
567 case DC_STATE_TRANSFER: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
568 msn_dc_send_bye(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
569 dc->state = DC_STATE_CANCELLED; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
570 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
571 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
572 default: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
573 msn_dc_destroy(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
574 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
575 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
576 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
577 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
578 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
579 msn_dc_xfer_recv_cancel(PurpleXfer *xfer) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
580 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
581 MsnSlpCall *slpcall; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
582 MsnDirectConn *dc; |
30434 | 583 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
584 purple_debug_info("msn", "msn_dc_xfer_recv_cancel\n"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
585 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
586 g_return_if_fail(xfer != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
587 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
588 slpcall = xfer->data; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
589 g_return_if_fail(slpcall != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
590 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
591 dc = slpcall->dc; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
592 g_return_if_fail(dc != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
593 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
594 switch (dc->state) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
595 case DC_STATE_TRANSFER: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
596 msn_dc_send_bye(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
597 dc->state = DC_STATE_CANCELLED; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
598 break; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
599 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
600 default: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
601 msn_dc_destroy(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
602 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
603 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
604 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
605 */ |
19797
60bc06498746
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@hxbc.us>
parents:
15823
diff
changeset
|
606 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
607 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
608 msn_dc_send_cb(gpointer data, gint fd, PurpleInputCondition cond) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
609 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
610 MsnDirectConn *dc = data; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
611 MsnDirectConnPacket *p; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
612 int bytes_to_send; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
613 int bytes_sent; |
19797
60bc06498746
Committing khc's msnp14 changes from Trac Ticket #148. --rlaager
Ka-Hing Cheung <khc@hxbc.us>
parents:
15823
diff
changeset
|
614 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
615 g_return_if_fail(dc != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
616 g_return_if_fail(fd != -1); |
30434 | 617 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
618 if(g_queue_is_empty(dc->out_queue)) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
619 if (dc->send_handle != 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
620 purple_input_remove(dc->send_handle); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
621 dc->send_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
622 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
623 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
624 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
625 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
626 p = g_queue_peek_head(dc->out_queue); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
627 bytes_to_send = p->length - dc->msg_pos; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
628 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
629 bytes_sent = send(fd, p->data, bytes_to_send, 0); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
630 if (bytes_sent < 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
631 if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
632 return; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
633 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
634 purple_debug_warning("msn", "msn_dc_send_cb: send error\n"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
635 msn_dc_destroy(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
636 return; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
637 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
638 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
639 dc->progress = TRUE; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
640 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
641 dc->msg_pos += bytes_sent; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
642 if (dc->msg_pos == p->length) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
643 if (p->sent_cb != NULL) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
644 p->sent_cb(p); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
645 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
646 g_queue_pop_head(dc->out_queue); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
647 msn_dc_destroy_packet(p); |
30434 | 648 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
649 dc->msg_pos = 0; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
650 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
651 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
652 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
653 static void |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
654 msn_dc_enqueue_packet(MsnDirectConn *dc, MsnDirectConnPacket *p) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
655 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
656 gboolean was_empty; |
30434 | 657 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
658 was_empty = g_queue_is_empty(dc->out_queue); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
659 g_queue_push_tail(dc->out_queue, p); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
660 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
661 if (was_empty && dc->send_handle == 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
662 dc->send_handle = purple_input_add(dc->fd, PURPLE_INPUT_WRITE, msn_dc_send_cb, dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
663 msn_dc_send_cb(dc, dc->fd, PURPLE_INPUT_WRITE); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
664 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
665 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
666 |
20578
7c30d5aa5e01
Fix incorrect purple_proxy_connect() callback and comment out an unused function.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20514
diff
changeset
|
667 static void |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
668 msn_dc_send_foo(MsnDirectConn *dc) |
20578
7c30d5aa5e01
Fix incorrect purple_proxy_connect() callback and comment out an unused function.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20514
diff
changeset
|
669 { |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
670 MsnDirectConnPacket *p; |
30434 | 671 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
672 purple_debug_info("msn", "msn_dc_send_foo\n"); |
30434 | 673 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
674 g_return_if_fail(dc != NULL); |
20578
7c30d5aa5e01
Fix incorrect purple_proxy_connect() callback and comment out an unused function.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20514
diff
changeset
|
675 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
676 p = msn_dc_new_packet(); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
677 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
678 p->length = 8; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
679 p->data = (guchar*)g_strdup("\4\0\0\0foo"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
680 p->sent_cb = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
681 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
682 msn_dc_enqueue_packet(dc, p); |
20578
7c30d5aa5e01
Fix incorrect purple_proxy_connect() callback and comment out an unused function.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20514
diff
changeset
|
683 } |
7c30d5aa5e01
Fix incorrect purple_proxy_connect() callback and comment out an unused function.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
20514
diff
changeset
|
684 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
685 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
686 msn_dc_send_handshake(MsnDirectConn *dc) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
687 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
688 MsnDirectConnPacket *p; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
689 gchar *h; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
690 guint32 l; |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
691 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
692 g_return_if_fail(dc != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
693 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
694 p = msn_dc_new_packet(); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
695 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
696 p->length = 4 + DC_PACKET_HEADER_SIZE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
697 p->data = g_malloc(p->length); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
698 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
699 l = DC_PACKET_HEADER_SIZE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
700 l = GUINT32_TO_LE(l); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
701 memcpy(p->data, &l, 4); |
30434 | 702 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
703 dc->header.session_id = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
704 dc->header.id = dc->slpcall->slplink->slp_seq_id++; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
705 dc->header.offset = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
706 dc->header.total_size = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
707 dc->header.length = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
708 dc->header.flags = 0x100; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
709 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
710 h = msn_dc_serialize_binary_header(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
711 memcpy(p->data + 4, h, DC_PACKET_HEADER_SIZE); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
712 memcpy(p->data + 4 + DC_ACK_ID_OFFS, dc->nonce, 16); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
713 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
714 msn_dc_enqueue_packet(dc, p); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
715 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
716 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
717 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
718 msn_dc_send_handshake_reply(MsnDirectConn *dc) |
30434 | 719 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
720 MsnDirectConnPacket *p; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
721 gchar *h; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
722 guint32 l; |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
723 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
724 g_return_if_fail(dc != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
725 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
726 p = msn_dc_new_packet(); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
727 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
728 p->length = 4 + DC_PACKET_HEADER_SIZE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
729 p->data = g_malloc(p->length); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
730 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
731 l = DC_PACKET_HEADER_SIZE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
732 l = GUINT32_TO_LE(l); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
733 memcpy(p->data, &l, 4); |
30434 | 734 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
735 dc->header.id = dc->slpcall->slplink->slp_seq_id++; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
736 dc->header.length = 0; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
737 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
738 h = msn_dc_serialize_binary_header(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
739 memcpy(p->data + 4, h, DC_PACKET_HEADER_SIZE); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
740 memcpy(p->data + 4 + DC_ACK_ID_OFFS, dc->nonce, 16); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
741 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
742 msn_dc_enqueue_packet(dc, p); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
743 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
744 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
745 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
746 msn_dc_send_packet_cb(MsnDirectConnPacket *p) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
747 { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
748 if (p->msg != NULL && p->msg->ack_cb != NULL) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
749 p->msg->ack_cb(p->msg, p->msg->ack_data); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
750 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
751 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
752 void |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
753 msn_dc_enqueue_msg(MsnDirectConn *dc, MsnMessage *msg) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
754 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
755 MsnDirectConnPacket *p = msn_dc_new_packet(); |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
756 guint32 length = msg->body_len + DC_PACKET_HEADER_SIZE; |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
757 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
758 p->length = 4 + length; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
759 p->data = g_malloc(p->length); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
760 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
761 length = GUINT32_TO_LE(length); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
762 memcpy(p->data, &length, 4); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
763 memcpy(p->data + 4, &msg->msnslp_header, DC_PACKET_HEADER_SIZE); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
764 memcpy(p->data + 4 + DC_PACKET_HEADER_SIZE, msg->body, msg->body_len); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
765 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
766 p->sent_cb = msn_dc_send_packet_cb; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
767 p->msg = msg; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
768 msn_message_ref(msg); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
769 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
770 msn_dc_enqueue_packet(dc, p); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
771 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
772 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
773 static int |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
774 msn_dc_process_packet(MsnDirectConn *dc, guint32 packet_length) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
775 { |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
776 g_return_val_if_fail(dc != NULL, DC_PROCESS_ERROR); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
777 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
778 switch (dc->state) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
779 case DC_STATE_CLOSED: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
780 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
781 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
782 case DC_STATE_FOO: { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
783 /* FOO message is always 4 bytes long */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
784 if (packet_length != 4 || memcmp(dc->in_buffer, "\4\0\0\0foo", 8) != 0) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
785 return DC_PROCESS_FALLBACK; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
786 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
787 dc->state = DC_STATE_HANDSHAKE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
788 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
789 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
790 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
791 case DC_STATE_HANDSHAKE: { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
792 if (packet_length != DC_PACKET_HEADER_SIZE) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
793 return DC_PROCESS_FALLBACK; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
794 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
795 /* TODO: Check! */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
796 msn_dc_send_handshake_reply(dc); |
30435
bcb5e6c2e5a3
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30434
diff
changeset
|
797 dc->state = DC_STATE_ESTABLISHED; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
798 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
799 msn_slpcall_session_init(dc->slpcall); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
800 dc->slpcall = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
801 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
802 } |
30434 | 803 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
804 case DC_STATE_HANDSHAKE_REPLY: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
805 /* TODO: Check! */ |
30435
bcb5e6c2e5a3
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30434
diff
changeset
|
806 dc->state = DC_STATE_ESTABLISHED; |
30434 | 807 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
808 msn_slpcall_session_init(dc->slpcall); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
809 dc->slpcall = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
810 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
811 |
30435
bcb5e6c2e5a3
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30434
diff
changeset
|
812 case DC_STATE_ESTABLISHED: |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
813 msn_slplink_process_msg( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
814 dc->slplink, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
815 &dc->header, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
816 dc->in_buffer + 4 + DC_PACKET_HEADER_SIZE, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
817 dc->header.length |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
818 ); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
819 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
820 /* |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
821 if (dc->num_calls == 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
822 msn_dc_destroy(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
823 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
824 return DC_PROCESS_CLOSE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
825 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
826 */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
827 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
828 #if 0 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
829 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
830 guint64 file_size; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
831 int bytes_written; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
832 PurpleXfer *xfer; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
833 MsnSlpHeader *h = &dc->header; |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
834 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
835 if (packet_length < DC_PACKET_HEADER_SIZE) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
836 return DC_TRANSFER_FALLBACK; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
837 |
30434 | 838 /* |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
839 * TODO: MSN Messenger 7.0 sends BYE with flags 0x0000000 so we'll get rid of |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
840 * 0x1000000 bit but file data is always sent with flags 0x1000030 in both |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
841 * MSN Messenger and Live.*/ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
842 switch (h->flags) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
843 case 0x0000000: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
844 case 0x1000000: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
845 msn_dc_send_ack(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
846 if (strncmp(dc->buffer, "BYE", 3) == 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
847 /* Remote side cancelled the transfer. */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
848 purple_xfer_cancel_remote(dc->slpcall->xfer); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
849 return DC_TRANSFER_CANCELLED; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
850 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
851 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
852 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
853 case 0x1000030: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
854 /* File data */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
855 xfer = dc->slpcall->xfer; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
856 file_size = purple_xfer_get_size(xfer); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
857 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
858 /* Packet sanity checks */ |
30434 | 859 if ( h->session_id != dc->slpcall->session_id || |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
860 h->offset >= file_size || |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
861 h->total_size != file_size || |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
862 h->length != packet_length - DC_PACKET_HEADER_SIZE || |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
863 h->offset + h->length > file_size) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
864 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
865 purple_debug_warning("msn", "msn_dc_recv_process_packet_cb: packet range check error!\n"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
866 purple_xfer_cancel_local(dc->slpcall->xfer); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
867 return DC_TRANSFER_CANCELLED; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
868 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
869 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
870 bytes_written = fwrite(dc->buffer, 1, h->length, xfer->dest_fp); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
871 if (bytes_written != h->length) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
872 purple_debug_warning("msn", "msn_dc_recv_process_packet_cb: cannot write whole packet to file!\n"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
873 purple_xfer_cancel_local(dc->slpcall->xfer); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
874 return DC_TRANSFER_CANCELLED; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
875 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
876 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
877 xfer->bytes_sent = (h->offset + h->length); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
878 xfer->bytes_remaining = h->total_size - xfer->bytes_sent; |
30434 | 879 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
880 purple_xfer_update_progress(xfer); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
881 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
882 if (xfer->bytes_remaining == 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
883 /* ACK only the last data packet */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
884 msn_dc_send_data_ack(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
885 purple_xfer_set_completed(xfer, TRUE); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
886 dc->state = DC_STATE_BYE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
887 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
888 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
889 default: |
30434 | 890 /* |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
891 * TODO: Packet with unknown flags. Should we ACK these? |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
892 */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
893 msn_dc_send_ack(dc); |
30434 | 894 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
895 purple_debug_warning( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
896 "msn", |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
897 "msn_dc_recv_process_packet_cb: received packet with unknown flags: 0x%08x\n", |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
898 dc->header.flags |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
899 ); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
900 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
901 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
902 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
903 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
904 case DC_STATE_BYE: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
905 /* TODO: Check! */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
906 switch (dc->header.flags) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
907 case 0x0000000: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
908 case 0x1000000: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
909 msn_dc_send_ack(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
910 if (strncmp(dc->buffer, "BYE", 3) == 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
911 dc->state = DC_STATE_COMPLETED; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
912 return DC_TRANSFER_COMPLETED; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
913 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
914 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
915 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
916 default: |
30434 | 917 /* |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
918 * TODO: Packet with unknown flags. Should we ACK these? |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
919 */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
920 msn_dc_send_ack(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
921 purple_debug_warning( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
922 "msn", |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
923 "msn_dc_recv_process_packet_cb: received packet with unknown flags: 0x%08x\n", |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
924 dc->header.flags |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
925 ); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
926 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
927 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
928 #endif |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
929 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
930 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
931 return DC_PROCESS_OK; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
932 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
933 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
934 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
935 msn_dc_recv_cb(gpointer data, gint fd, PurpleInputCondition cond) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
936 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
937 MsnDirectConn *dc; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
938 int free_buf_space; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
939 int bytes_received; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
940 guint32 packet_length; |
30434 | 941 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
942 g_return_if_fail(data != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
943 g_return_if_fail(fd != -1); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
944 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
945 dc = data; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
946 free_buf_space = dc->in_size - dc->in_pos; |
30434 | 947 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
948 bytes_received = recv(fd, dc->in_buffer + dc->in_pos, free_buf_space, 0); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
949 if (bytes_received < 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
950 if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
951 return; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
952 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
953 purple_debug_warning("msn", "msn_dc_recv_cb: recv error\n"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
954 |
30435
bcb5e6c2e5a3
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30434
diff
changeset
|
955 if(dc->state != DC_STATE_ESTABLISHED) |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
956 msn_dc_fallback_to_p2p(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
957 else |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
958 msn_dc_destroy(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
959 return; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
960 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
961 } else if (bytes_received == 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
962 /* EOF. Remote side closed connection. */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
963 purple_debug_info("msn", "msn_dc_recv_cb: recv EOF\n"); |
30434 | 964 |
30435
bcb5e6c2e5a3
Re-indent directconn.h, and fix a typo.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30434
diff
changeset
|
965 if(dc->state != DC_STATE_ESTABLISHED) |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
966 msn_dc_fallback_to_p2p(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
967 else |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
968 msn_dc_destroy(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
969 return; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
970 } |
30434 | 971 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
972 dc->progress = TRUE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
973 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
974 dc->in_pos += bytes_received; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
975 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
976 /* Wait for packet length */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
977 while (dc->in_pos >= 4) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
978 packet_length = *((guint32*)dc->in_buffer); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
979 packet_length = GUINT32_FROM_LE(packet_length); |
30434 | 980 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
981 if (packet_length > DC_MAX_PACKET_SIZE) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
982 /* Oversized packet */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
983 purple_debug_warning("msn", "msn_dc_recv_cb: oversized packet received\n"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
984 return; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
985 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
986 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
987 /* Wait for the whole packet to arrive */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
988 if (dc->in_pos < 4 + packet_length) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
989 return; |
30434 | 990 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
991 if (dc->state != DC_STATE_FOO) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
992 msn_dc_parse_binary_header(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
993 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
994 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
995 switch (msn_dc_process_packet(dc, packet_length)) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
996 case DC_PROCESS_CLOSE: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
997 return; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
998 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
999 case DC_PROCESS_FALLBACK: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1000 purple_debug_warning("msn", "msn_dc_recv_cb: packet processing error, fall back to p2p\n"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1001 msn_dc_fallback_to_p2p(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1002 return; |
30434 | 1003 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1004 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1005 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1006 if (dc->in_pos > packet_length + 4) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1007 memcpy(dc->in_buffer, dc->in_buffer + 4 + packet_length, dc->in_pos - packet_length - 4); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1008 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1009 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1010 dc->in_pos -= packet_length + 4; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1011 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1012 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1013 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1014 #if 0 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1015 static gboolean |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1016 msn_dc_send_next_packet(MsnDirectConn *dc) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1017 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
1018 MsnSlpMessage *msg; |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1019 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1020 if(g_queue_is_empty(dc->out_queue)) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1021 return TRUE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1022 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1023 msg = g_queue_peek_head(dc->out_queue); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1024 msn_slplink_send_msgpart(dc->slplink, msg); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1025 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1026 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1027 |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
1028 PurpleXfer *xfer; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
1029 int bytes_read; |
30434 | 1030 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1031 g_return_val_if_fail(dc != NULL, FALSE); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1032 g_return_val_if_fail(dc->slpcall != NULL, FALSE); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1033 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1034 xfer = dc->slpcall->xfer; |
30434 | 1035 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1036 bytes_read = fread(dc->buffer, 1, DC_MAX_BODY_SIZE, xfer->dest_fp); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1037 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1038 if (bytes_read > 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1039 dc->header.session_id = dc->slpcall->session_id; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1040 /* Only increment seq. ID before sending BYE */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1041 dc->header.id = dc->slpcall->slplink->slp_seq_id; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1042 dc->header.offset = xfer->bytes_sent; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1043 dc->header.total_size = xfer->size; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1044 dc->header.length = bytes_read; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1045 dc->header.flags = 0x1000030; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1046 dc->header.ack_id = rand() % G_MAXUINT32; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1047 dc->header.ack_sub_id = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1048 dc->header.ack_size = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1049 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1050 msn_dc_send_packet(dc); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1051 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1052 xfer->bytes_sent += bytes_read; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1053 xfer->bytes_remaining -= bytes_read; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1054 purple_xfer_update_progress(xfer); |
30434 | 1055 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1056 if (xfer->bytes_remaining == 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1057 purple_xfer_set_completed(xfer, TRUE); |
30434 | 1058 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1059 /* Increment seq. ID for the next BYE message */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1060 dc->slpcall->slplink->slp_seq_id++; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1061 dc->state = DC_STATE_DATA_ACK; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1062 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1063 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1064 } else { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1065 /* File read error */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1066 purple_xfer_cancel_local(xfer); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1067 return FALSE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1068 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1069 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1070 return TRUE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1071 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1072 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1073 static int |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1074 msn_dc_send_process_packet_cb(MsnDirectConn *dc, guint32 packet_length) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1075 { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1076 g_return_val_if_fail(dc != NULL, DC_TRANSFER_CANCELLED); |
30434 | 1077 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1078 switch (dc->state) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1079 case DC_STATE_FOO: { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1080 if (packet_length != 4) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1081 return DC_TRANSFER_FALLBACK; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1082 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1083 if (memcmp(dc->in_buffer, "\4\0\0\0foo", 8) != 0) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1084 return DC_TRANSFER_FALLBACK; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1085 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1086 dc->state = DC_STATE_HANDSHAKE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1087 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1088 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1089 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1090 case DC_STATE_HANDSHAKE: { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1091 if (packet_length != DC_PACKET_HEADER_SIZE) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1092 return DC_TRANSFER_FALLBACK; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1093 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1094 /* TODO: Check! */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1095 msn_dc_send_handshake_reply(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1096 dc->state = DC_STATE_TRANSFER; |
30434 | 1097 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1098 purple_xfer_set_request_denied_fnc(dc->slpcall->xfer, msn_dc_xfer_send_cancel); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1099 purple_xfer_set_cancel_send_fnc(dc->slpcall->xfer, msn_dc_xfer_send_cancel); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1100 purple_xfer_set_end_fnc(dc->slpcall->xfer, msn_dc_xfer_end); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1101 purple_xfer_start(dc->slpcall->xfer, -1, NULL, 0); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1102 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1103 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1104 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1105 case DC_STATE_HANDSHAKE_REPLY: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1106 /* TODO: Check! */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1107 dc->state = DC_STATE_TRANSFER; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1108 break; |
30434 | 1109 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1110 case DC_STATE_TRANSFER: { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1111 switch (dc->header.flags) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1112 case 0x0000000: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1113 case 0x1000000: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1114 msn_dc_send_ack(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1115 if (strncmp(dc->buffer, "BYE", 3) == 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1116 /* Remote side cancelled the transfer. */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1117 purple_xfer_cancel_remote(dc->slpcall->xfer); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1118 return DC_TRANSFER_CANCELLED; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1119 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1120 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1121 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1122 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1123 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1124 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1125 case DC_STATE_DATA_ACK: { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1126 /* TODO: Check! */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1127 msn_dc_send_bye(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1128 dc->state = DC_STATE_BYE_ACK; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1129 break; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1130 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1131 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1132 case DC_STATE_BYE_ACK: |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1133 /* TODO: Check! */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1134 dc->state = DC_STATE_COMPLETED; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1135 return DC_TRANSFER_COMPLETED; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1136 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1137 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1138 return DC_TRANSFER_OK; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1139 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1140 #endif |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1141 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1142 static gboolean |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1143 msn_dc_timeout(gpointer data) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1144 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
1145 MsnDirectConn *dc = data; |
30434 | 1146 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1147 g_return_val_if_fail(dc != NULL, FALSE); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1148 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1149 if (dc->progress) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1150 dc->progress = FALSE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1151 else |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1152 msn_dc_destroy(dc); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1153 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1154 return TRUE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1155 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1156 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1157 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1158 msn_dc_init(MsnDirectConn *dc) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1159 { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1160 g_return_if_fail(dc != NULL); |
30434 | 1161 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1162 dc->in_size = DC_MAX_PACKET_SIZE + 4; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1163 dc->in_pos = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1164 dc->in_buffer = g_malloc(dc->in_size); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1165 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1166 dc->recv_handle = purple_input_add(dc->fd, PURPLE_INPUT_READ, msn_dc_recv_cb, dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1167 dc->send_handle = purple_input_add(dc->fd, PURPLE_INPUT_WRITE, msn_dc_send_cb, dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1168 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1169 dc->timeout_handle = purple_timeout_add_seconds(DC_TIMEOUT, msn_dc_timeout, dc); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1170 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1171 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1172 void |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1173 msn_dc_connected_to_peer_cb(gpointer data, gint fd, const gchar *error_msg) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1174 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
1175 MsnDirectConn *dc; |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1176 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1177 purple_debug_info("msn", "msn_dc_connected_to_peer_cb\n"); |
30434 | 1178 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1179 g_return_if_fail(data != NULL); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1180 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1181 dc = data; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1182 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1183 dc->connect_data = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1184 purple_timeout_remove(dc->connect_timeout_handle); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1185 dc->connect_timeout_handle = 0; |
30434 | 1186 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1187 dc->fd = fd; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1188 if (dc->fd != -1) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1189 msn_dc_init(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1190 msn_dc_send_foo(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1191 msn_dc_send_handshake(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1192 dc->state = DC_STATE_HANDSHAKE_REPLY; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1193 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1194 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1195 |
30434 | 1196 /* |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1197 * This callback will be called when we're the server |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1198 * and nobody has connected us in DC_CONNECT_TIMEOUT seconds |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1199 */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1200 static gboolean |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1201 msn_dc_incoming_connection_timeout_cb(gpointer data) { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
1202 MsnDirectConn *dc = data; |
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
1203 MsnSlpCall *slpcall = dc->slpcall; |
30434 | 1204 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1205 purple_debug_info("msn", "msn_dc_incoming_connection_timeout_cb\n"); |
30434 | 1206 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1207 dc = data; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1208 g_return_val_if_fail(dc != NULL, FALSE); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1209 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1210 slpcall = dc->slpcall; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1211 g_return_val_if_fail(slpcall != NULL, FALSE); |
30434 | 1212 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1213 if (dc->listen_data != NULL) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1214 purple_network_listen_cancel(dc->listen_data); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1215 dc->listen_data = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1216 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1217 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1218 if (dc->listenfd_handle != 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1219 purple_timeout_remove(dc->listenfd_handle); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1220 dc->listenfd_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1221 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1222 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1223 if (dc->listenfd != -1) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1224 purple_network_remove_port_mapping(dc->listenfd); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1225 close(dc->listenfd); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1226 dc->listenfd = -1; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1227 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1228 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1229 msn_dc_destroy(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1230 /* Start p2p file transfer */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1231 msn_slpcall_session_init(slpcall); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1232 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1233 return FALSE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1234 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1235 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1236 /* |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1237 * This callback will be called when we're unable to connect to |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1238 * the remote host in DC_CONNECT_TIMEOUT seconds. |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1239 */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1240 gboolean |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1241 msn_dc_outgoing_connection_timeout_cb(gpointer data) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1242 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
1243 MsnDirectConn *dc = data; |
30434 | 1244 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1245 purple_debug_info("msn", "msn_dc_outgoing_connection_timeout_cb\n"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1246 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1247 g_return_val_if_fail(dc != NULL, FALSE); |
30434 | 1248 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1249 if (dc->connect_timeout_handle != 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1250 purple_timeout_remove(dc->connect_timeout_handle); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1251 dc->connect_timeout_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1252 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1253 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1254 if (dc->connect_data != NULL) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1255 purple_proxy_connect_cancel(dc->connect_data); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1256 dc->connect_data = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1257 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1258 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1259 if (dc->ext_ip && dc->ext_port) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1260 /* Try external IP/port if available. */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1261 dc->connect_data = purple_proxy_connect( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1262 NULL, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1263 dc->slpcall->slplink->session->account, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1264 dc->ext_ip, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1265 dc->ext_port, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1266 msn_dc_connected_to_peer_cb, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1267 dc |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1268 ); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1269 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1270 g_free(dc->ext_ip); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1271 dc->ext_ip = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1272 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1273 if (dc->connect_data) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1274 dc->connect_timeout_handle = purple_timeout_add_seconds( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1275 DC_CONNECT_TIMEOUT, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1276 msn_dc_outgoing_connection_timeout_cb, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1277 dc |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1278 ); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1279 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1280 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1281 } else { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1282 /* |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1283 * Both internal and external connection attempts are failed. |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1284 * Fall back to p2p transfer. |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1285 */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1286 MsnSlpCall *slpcall = dc->slpcall; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1287 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1288 msn_dc_destroy(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1289 /* Start p2p file transfer */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1290 msn_slpcall_session_init(slpcall); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1291 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1292 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1293 return FALSE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1294 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1295 |
30434 | 1296 /* |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1297 * This callback will be called when we're the server |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1298 * and somebody has connected to us in DC_CONNECT_TIMEOUT seconds. |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1299 */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1300 static void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1301 msn_dc_incoming_connection_cb(gpointer data, gint listenfd, PurpleInputCondition cond) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1302 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
1303 MsnDirectConn *dc = data; |
30434 | 1304 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1305 purple_debug_info("msn", "msn_dc_incoming_connection_cb\n"); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1306 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1307 g_return_if_fail(dc != NULL); |
30434 | 1308 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1309 if (dc->connect_timeout_handle != 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1310 purple_timeout_remove(dc->connect_timeout_handle); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1311 dc->connect_timeout_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1312 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1313 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1314 if (dc->listenfd_handle != 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1315 purple_input_remove(dc->listenfd_handle); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1316 dc->listenfd_handle = 0; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1317 } |
30434 | 1318 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1319 dc->fd = accept(listenfd, NULL, 0); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1320 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1321 purple_network_remove_port_mapping(dc->listenfd); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1322 close(dc->listenfd); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1323 dc->listenfd = -1; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1324 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1325 if (dc->fd != -1) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1326 msn_dc_init(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1327 dc->state = DC_STATE_FOO; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1328 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1329 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1330 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1331 void |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1332 msn_dc_listen_socket_created_cb(int listenfd, gpointer data) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1333 { |
30436
0ea33256f462
Tabs-to-spaces.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
30435
diff
changeset
|
1334 MsnDirectConn *dc = data; |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1335 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1336 purple_debug_info("msn", "msn_dc_listen_socket_created_cb\n"); |
30434 | 1337 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1338 g_return_if_fail(dc != NULL); |
30434 | 1339 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1340 dc->listen_data = NULL; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1341 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1342 if (listenfd != -1) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1343 const char *ext_ip; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1344 const char *int_ip; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1345 int port; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1346 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1347 ext_ip = purple_network_get_my_ip(listenfd); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1348 int_ip = purple_network_get_local_system_ip(listenfd); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1349 port = purple_network_get_port_from_fd(listenfd); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1350 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1351 dc->listenfd = listenfd; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1352 dc->listenfd_handle = purple_input_add( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1353 listenfd, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1354 PURPLE_INPUT_READ, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1355 msn_dc_incoming_connection_cb, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1356 dc |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1357 ); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1358 dc->connect_timeout_handle = purple_timeout_add_seconds( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1359 DC_CONNECT_TIMEOUT * 2, /* Internal + external connection attempts */ |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1360 msn_dc_incoming_connection_timeout_cb, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1361 dc |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1362 ); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1363 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1364 if (strcmp(int_ip, ext_ip) != 0) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1365 dc->msg_body = g_strdup_printf( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1366 "Bridge: TCPv1\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1367 "Listening: true\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1368 "Hashed-Nonce: {%s}\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1369 "IPv4External-Addrs: %s\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1370 "IPv4External-Port: %d\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1371 "IPv4Internal-Addrs: %s\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1372 "IPv4Internal-Port: %d\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1373 "\r\n", |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1374 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1375 dc->nonce_hash, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1376 ext_ip, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1377 port, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1378 int_ip, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1379 port |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1380 ); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1381 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1382 } else { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1383 dc->msg_body = g_strdup_printf( |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1384 "Bridge: TCPv1\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1385 "Listening: true\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1386 "Hashed-Nonce: {%s}\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1387 "IPv4External-Addrs: %s\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1388 "IPv4External-Port: %d\r\n" |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1389 "\r\n", |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1390 |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1391 dc->nonce_hash, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1392 ext_ip, |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1393 port |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1394 ); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1395 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1396 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1397 if (dc->slpcall->wait_for_socket) { |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1398 if (dc->send_connection_info_msg_cb != NULL) |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1399 dc->send_connection_info_msg_cb(dc); |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1400 |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1401 dc->slpcall->wait_for_socket = FALSE; |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1402 } |
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1403 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1404 } |
30433
119bd7b072eb
Initial support for direct connections. Preliminary patch from ticket #247
kukkerman@gmail.com
parents:
28238
diff
changeset
|
1405 |