Thu, 07 Dec 2006 08:23:18 +0000
[gaim-migrate @ 17915]
* Add a little cushion to the rate average calculation to hopefully
account for any inaccuracies due to network lag and stuff
* If one of our connections is disconnected, close the socket and
don't try to write to it again. This will hopefully fix a weird
race condition that Kevin was running into?
| 13235 | 1 | /* |
| 2 | * Gaim's oscar protocol plugin | |
| 3 | * This file is the legal property of its developers. | |
| 4 | * Please see the AUTHORS file distributed alongside this file. | |
| 5 | * | |
| 6 | * This library is free software; you can redistribute it and/or | |
| 7 | * modify it under the terms of the GNU Lesser General Public | |
| 8 | * License as published by the Free Software Foundation; either | |
| 9 | * version 2 of the License, or (at your option) any later version. | |
| 10 | * | |
| 11 | * This library is distributed in the hope that it will be useful, | |
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 14 | * Lesser General Public License for more details. | |
| 15 | * | |
| 16 | * You should have received a copy of the GNU Lesser General Public | |
| 17 | * License along with this library; if not, write to the Free Software | |
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 19 | */ | |
| 20 | ||
| 21 | /* | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
22 | * Functions dealing with peer connections. This includes the code |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
23 | * used to establish a peer connection for both Oscar File transfer |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
24 | * (OFT) and Oscar Direct Connect (ODC). (ODC is also referred to |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
25 | * as DirectIM and IM Image.) |
| 13235 | 26 | */ |
| 27 | ||
| 28 | #ifdef HAVE_CONFIG_H | |
| 29 | #include <config.h> | |
| 30 | #endif | |
| 31 | ||
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
32 | /* From the oscar PRPL */ |
| 13235 | 33 | #include "oscar.h" |
| 34 | #include "peer.h" | |
| 35 | ||
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
36 | /* From Gaim */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
37 | #include "conversation.h" |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
38 | #include "ft.h" |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
39 | #include "network.h" |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
40 | #include "notify.h" |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
41 | #include "request.h" |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
42 | #include "util.h" |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
43 | |
| 13235 | 44 | #ifndef _WIN32 |
| 45 | #include <stdio.h> | |
| 46 | #include <netdb.h> | |
| 47 | #include <sys/socket.h> | |
| 48 | #include <netinet/in.h> | |
| 49 | #include <arpa/inet.h> /* for inet_ntoa */ | |
| 50 | #include <limits.h> /* for UINT_MAX */ | |
| 51 | #endif | |
| 52 | ||
| 53 | #ifdef _WIN32 | |
| 54 | #include "win32dep.h" | |
| 55 | #endif | |
| 56 | ||
| 57 | /* | |
| 58 | * I really want to switch all our networking code to using IPv6 only, | |
| 59 | * but that really isn't a good idea at all. Evan S. of Adium says | |
| 60 | * OS X sets all connections as "AF_INET6/PF_INET6," even if there is | |
| 61 | * nothing inherently IPv6 about them. And I feel like Linux kernel | |
| 62 | * 2.6.5 is doing the same thing. So we REALLY should accept | |
| 63 | * connections if they're showing up as IPv6. Old OSes (Solaris?) | |
| 64 | * that might not have full IPv6 support yet will fail if we try | |
| 65 | * to use PF_INET6 but it isn't defined. --Mark Doliner | |
| 66 | */ | |
| 67 | #ifndef PF_INET6 | |
| 68 | #define PF_INET6 PF_INET | |
| 69 | #endif | |
| 70 | ||
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
71 | PeerConnection * |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
72 | peer_connection_find_by_type(OscarData *od, const char *sn, OscarCapability type) |
| 13235 | 73 | { |
|
14410
a5ae93474db6
[gaim-migrate @ 17050]
Mark Doliner <markdoliner@pidgin.im>
parents:
14329
diff
changeset
|
74 | GSList *cur; |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
75 | PeerConnection *conn; |
| 13235 | 76 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
77 | for (cur = od->peer_connections; cur != NULL; cur = cur->next) |
|
13255
b318f395092d
[gaim-migrate @ 15620]
Mark Doliner <markdoliner@pidgin.im>
parents:
13254
diff
changeset
|
78 | { |
|
b318f395092d
[gaim-migrate @ 15620]
Mark Doliner <markdoliner@pidgin.im>
parents:
13254
diff
changeset
|
79 | conn = cur->data; |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
80 | if ((conn->type == type) && !aim_sncmp(conn->sn, sn)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
81 | return conn; |
| 13235 | 82 | } |
| 83 | ||
| 84 | return NULL; | |
| 85 | } | |
| 86 | ||
| 87 | /** | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
88 | * @param cookie This must be exactly 8 characters. |
| 13235 | 89 | */ |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
90 | PeerConnection * |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
91 | peer_connection_find_by_cookie(OscarData *od, const char *sn, const guchar *cookie) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
92 | { |
|
14410
a5ae93474db6
[gaim-migrate @ 17050]
Mark Doliner <markdoliner@pidgin.im>
parents:
14329
diff
changeset
|
93 | GSList *cur; |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
94 | PeerConnection *conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
95 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
96 | for (cur = od->peer_connections; cur != NULL; cur = cur->next) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
97 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
98 | conn = cur->data; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
99 | if (!memcmp(conn->cookie, cookie, 8) && !aim_sncmp(conn->sn, sn)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
100 | return conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
101 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
102 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
103 | return NULL; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
104 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
105 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
106 | PeerConnection * |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
107 | peer_connection_new(OscarData *od, OscarCapability type, const char *sn) |
| 13235 | 108 | { |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
109 | PeerConnection *conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
110 | GaimAccount *account; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
111 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
112 | account = gaim_connection_get_account(od->gc); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
113 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
114 | conn = g_new0(PeerConnection, 1); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
115 | conn->od = od; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
116 | conn->type = type; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
117 | conn->sn = g_strdup(sn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
118 | conn->buffer_outgoing = gaim_circ_buffer_new(0); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
119 | conn->listenerfd = -1; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
120 | conn->fd = -1; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
121 | conn->lastactivity = time(NULL); |
|
13674
441167e6dd11
[gaim-migrate @ 16074]
Mark Doliner <markdoliner@pidgin.im>
parents:
13666
diff
changeset
|
122 | conn->use_proxy |= gaim_account_get_bool(account, "always_use_rv_proxy", FALSE); |
| 13235 | 123 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
124 | if (type == OSCAR_CAPABILITY_DIRECTIM) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
125 | memcpy(conn->magic, "ODC2", 4); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
126 | else if (type == OSCAR_CAPABILITY_SENDFILE) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
127 | memcpy(conn->magic, "OFT2", 4); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
128 | |
|
14410
a5ae93474db6
[gaim-migrate @ 17050]
Mark Doliner <markdoliner@pidgin.im>
parents:
14329
diff
changeset
|
129 | od->peer_connections = g_slist_prepend(od->peer_connections, conn); |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
130 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
131 | return conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
132 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
133 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
134 | static void |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
135 | peer_connection_close(PeerConnection *conn) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
136 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
137 | if (conn->type == OSCAR_CAPABILITY_DIRECTIM) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
138 | peer_odc_close(conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
139 | else if (conn->type == OSCAR_CAPABILITY_SENDFILE) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
140 | peer_oft_close(conn); |
| 13235 | 141 | |
| 15173 | 142 | if (conn->verified_connect_data != NULL) |
|
14166
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
143 | { |
| 15173 | 144 | gaim_proxy_connect_cancel(conn->verified_connect_data); |
| 145 | conn->verified_connect_data = NULL; | |
| 146 | } | |
| 147 | ||
| 148 | if (conn->client_connect_data != NULL) | |
| 149 | { | |
| 150 | gaim_proxy_connect_cancel(conn->client_connect_data); | |
| 151 | conn->client_connect_data = NULL; | |
|
14166
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
152 | } |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
153 | |
|
14329
05c3cc0c1f79
[gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
154 | if (conn->listen_data != NULL) |
|
05c3cc0c1f79
[gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
155 | { |
|
05c3cc0c1f79
[gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
156 | gaim_network_listen_cancel(conn->listen_data); |
|
05c3cc0c1f79
[gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
157 | conn->listen_data = NULL; |
|
05c3cc0c1f79
[gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
158 | } |
|
05c3cc0c1f79
[gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
159 | |
|
14166
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
160 | if (conn->connect_timeout_timer != 0) |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
161 | { |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
162 | gaim_timeout_remove(conn->connect_timeout_timer); |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
163 | conn->connect_timeout_timer = 0; |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
164 | } |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
165 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
166 | if (conn->watcher_incoming != 0) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
167 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
168 | gaim_input_remove(conn->watcher_incoming); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
169 | conn->watcher_incoming = 0; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
170 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
171 | if (conn->watcher_outgoing != 0) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
172 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
173 | gaim_input_remove(conn->watcher_outgoing); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
174 | conn->watcher_outgoing = 0; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
175 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
176 | if (conn->listenerfd != -1) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
177 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
178 | close(conn->listenerfd); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
179 | conn->listenerfd = -1; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
180 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
181 | if (conn->fd != -1) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
182 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
183 | close(conn->fd); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
184 | conn->fd = -1; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
185 | } |
| 13235 | 186 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
187 | g_free(conn->buffer_incoming.data); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
188 | conn->buffer_incoming.data = NULL; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
189 | conn->buffer_incoming.len = 0; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
190 | conn->buffer_incoming.offset = 0; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
191 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
192 | gaim_circ_buffer_destroy(conn->buffer_outgoing); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
193 | conn->buffer_outgoing = gaim_circ_buffer_new(0); |
| 13235 | 194 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
195 | conn->flags &= ~PEER_CONNECTION_FLAG_IS_INCOMING; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
196 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
197 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
198 | static gboolean |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
199 | peer_connection_destroy_cb(gpointer data) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
200 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
201 | PeerConnection *conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
202 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
203 | conn = data; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
204 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
205 | gaim_request_close_with_handle(conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
206 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
207 | peer_connection_close(conn); |
| 13235 | 208 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
209 | if (conn->xfer != NULL) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
210 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
211 | GaimXferStatusType status; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
212 | conn->xfer->data = NULL; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
213 | status = gaim_xfer_get_status(conn->xfer); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
214 | if ((status != GAIM_XFER_STATUS_DONE) && |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
215 | (status != GAIM_XFER_STATUS_CANCEL_LOCAL) && |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
216 | (status != GAIM_XFER_STATUS_CANCEL_REMOTE)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
217 | { |
|
13609
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13593
diff
changeset
|
218 | if ((conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED) || |
|
a6fbfad454b6
[gaim-migrate @ 15994]
Mark Doliner <markdoliner@pidgin.im>
parents:
13593
diff
changeset
|
219 | (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_REFUSED)) |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
220 | gaim_xfer_cancel_remote(conn->xfer); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
221 | else |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
222 | gaim_xfer_cancel_local(conn->xfer); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
223 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
224 | gaim_xfer_unref(conn->xfer); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
225 | conn->xfer = NULL; |
| 13235 | 226 | } |
| 227 | ||
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
228 | g_free(conn->sn); |
|
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
229 | g_free(conn->error_message); |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
230 | g_free(conn->proxyip); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
231 | g_free(conn->clientip); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
232 | g_free(conn->verifiedip); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
233 | gaim_circ_buffer_destroy(conn->buffer_outgoing); |
| 13235 | 234 | |
|
14410
a5ae93474db6
[gaim-migrate @ 17050]
Mark Doliner <markdoliner@pidgin.im>
parents:
14329
diff
changeset
|
235 | conn->od->peer_connections = g_slist_remove(conn->od->peer_connections, conn); |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
236 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
237 | g_free(conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
238 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
239 | return FALSE; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
240 | } |
| 13235 | 241 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
242 | void |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
243 | peer_connection_destroy(PeerConnection *conn, OscarDisconnectReason reason, const gchar *error_message) |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
244 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
245 | if (conn->destroy_timeout != 0) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
246 | gaim_timeout_remove(conn->destroy_timeout); |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
247 | conn->disconnect_reason = reason; |
|
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
248 | g_free(conn->error_message); |
|
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
249 | conn->error_message = g_strdup(error_message); |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
250 | peer_connection_destroy_cb(conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
251 | } |
| 13235 | 252 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
253 | void |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
254 | peer_connection_schedule_destroy(PeerConnection *conn, OscarDisconnectReason reason, const gchar *error_message) |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
255 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
256 | if (conn->destroy_timeout != 0) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
257 | /* Already taken care of */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
258 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
259 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
260 | gaim_debug_info("oscar", "Scheduling destruction of peer connection\n"); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
261 | conn->disconnect_reason = reason; |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
262 | g_free(conn->error_message); |
|
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
263 | conn->error_message = g_strdup(error_message); |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
264 | conn->destroy_timeout = gaim_timeout_add(0, peer_connection_destroy_cb, conn); |
| 13235 | 265 | } |
| 266 | ||
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
267 | /*******************************************************************/ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
268 | /* Begin code for receiving data on a peer connection */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
269 | /*******************************************************************/ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
270 | |
| 13235 | 271 | /** |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
272 | * This should be used to read ODC and OFT framing info. It should |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
273 | * NOT be used to read the payload sent across the connection (IMs, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
274 | * file data, etc), and it should NOT be used to read proxy negotiation |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
275 | * headers. |
| 13235 | 276 | * |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
277 | * Unlike flap_connection_recv_cb(), this only reads one frame at a |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
278 | * time. This is done so that the watcher can be changed during the |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
279 | * handling of the frame. If the watcher is changed then this |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
280 | * function will not read in any more data. This happens when |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
281 | * reading the payload of a direct IM frame, or when we're |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
282 | * receiving a file from the remote user. Once the data has been |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
283 | * read, the watcher will be switched back to this function to |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
284 | * continue reading the next frame. |
| 13235 | 285 | */ |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
286 | void |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
287 | peer_connection_recv_cb(gpointer data, gint source, GaimInputCondition cond) |
| 13235 | 288 | { |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
289 | PeerConnection *conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
290 | ssize_t read; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
291 | guint8 header[6]; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
292 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
293 | conn = data; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
294 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
295 | /* Start reading a new ODC/OFT frame */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
296 | if (conn->buffer_incoming.data == NULL) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
297 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
298 | /* Peek at the first 6 bytes to get the length */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
299 | read = recv(conn->fd, &header, 6, MSG_PEEK); |
| 13235 | 300 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
301 | /* Check if the remote user closed the connection */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
302 | if (read == 0) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
303 | { |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
304 | peer_connection_destroy(conn, OSCAR_DISCONNECT_REMOTE_CLOSED, NULL); |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
305 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
306 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
307 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
308 | /* If there was an error then close the connection */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
309 | if (read == -1) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
310 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
311 | if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
312 | /* No worries */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
313 | return; |
| 13235 | 314 | |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
315 | peer_connection_destroy(conn, |
|
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
316 | OSCAR_DISCONNECT_LOST_CONNECTION, strerror(errno)); |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
317 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
318 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
319 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
320 | conn->lastactivity = time(NULL); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
321 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
322 | /* If we don't even have the first 6 bytes then do nothing */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
323 | if (read < 6) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
324 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
325 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
326 | /* Read the first 6 bytes (magic string and frame length) */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
327 | read = recv(conn->fd, &header, 6, 0); |
| 13235 | 328 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
329 | /* All ODC/OFT frames must start with a magic string */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
330 | if (memcmp(conn->magic, header, 4)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
331 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
332 | gaim_debug_warning("oscar", "Expecting magic string to " |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
333 | "be %c%c%c%c but received magic string %c%c%c%c. " |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
334 | "Closing connection.\n", |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
335 | conn->magic[0], conn->magic[1], conn->magic[2], |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
336 | conn->magic[3], header[0], header[1], header[2], header[3]); |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
337 | peer_connection_destroy(conn, OSCAR_DISCONNECT_INVALID_DATA, NULL); |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
338 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
339 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
340 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
341 | /* Initialize a new temporary ByteStream for incoming data */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
342 | conn->buffer_incoming.len = aimutil_get16(&header[4]) - 6; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
343 | conn->buffer_incoming.data = g_new(guint8, conn->buffer_incoming.len); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
344 | conn->buffer_incoming.offset = 0; |
| 13235 | 345 | } |
| 346 | ||
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
347 | /* Read data into the temporary buffer until it is complete */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
348 | read = recv(conn->fd, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
349 | &conn->buffer_incoming.data[conn->buffer_incoming.offset], |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
350 | conn->buffer_incoming.len - conn->buffer_incoming.offset, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
351 | 0); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
352 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
353 | /* Check if the remote user closed the connection */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
354 | if (read == 0) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
355 | { |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
356 | peer_connection_destroy(conn, OSCAR_DISCONNECT_REMOTE_CLOSED, NULL); |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
357 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
358 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
359 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
360 | if (read == -1) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
361 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
362 | if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
363 | /* No worries */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
364 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
365 | |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
366 | peer_connection_destroy(conn, |
|
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
367 | OSCAR_DISCONNECT_LOST_CONNECTION, strerror(errno)); |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
368 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
369 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
370 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
371 | conn->lastactivity = time(NULL); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
372 | conn->buffer_incoming.offset += read; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
373 | if (conn->buffer_incoming.offset < conn->buffer_incoming.len) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
374 | /* Waiting for more data to arrive */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
375 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
376 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
377 | /* We have a complete ODC/OFT frame! Handle it and continue reading */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
378 | byte_stream_rewind(&conn->buffer_incoming); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
379 | if (conn->type == OSCAR_CAPABILITY_DIRECTIM) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
380 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
381 | peer_odc_recv_frame(conn, &conn->buffer_incoming); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
382 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
383 | else if (conn->type == OSCAR_CAPABILITY_SENDFILE) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
384 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
385 | peer_oft_recv_frame(conn, &conn->buffer_incoming); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
386 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
387 | g_free(conn->buffer_incoming.data); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
388 | conn->buffer_incoming.data = NULL; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
389 | } |
| 13235 | 390 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
391 | /*******************************************************************/ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
392 | /* End code for receiving data on a peer connection */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
393 | /*******************************************************************/ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
394 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
395 | /*******************************************************************/ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
396 | /* Begin code for sending data on a peer connection */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
397 | /*******************************************************************/ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
398 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
399 | static void |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
400 | send_cb(gpointer data, gint source, GaimInputCondition cond) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
401 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
402 | PeerConnection *conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
403 | gsize writelen; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
404 | ssize_t wrotelen; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
405 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
406 | conn = data; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
407 | writelen = gaim_circ_buffer_get_max_read(conn->buffer_outgoing); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
408 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
409 | if (writelen == 0) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
410 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
411 | gaim_input_remove(conn->watcher_outgoing); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
412 | conn->watcher_outgoing = 0; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
413 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
414 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
415 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
416 | wrotelen = send(conn->fd, conn->buffer_outgoing->outptr, writelen, 0); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
417 | if (wrotelen <= 0) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
418 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
419 | if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
420 | /* No worries */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
421 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
422 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
423 | if (conn->ready) |
|
15191
d52a86abd255
[gaim-migrate @ 17915]
Mark Doliner <markdoliner@pidgin.im>
parents:
15178
diff
changeset
|
424 | { |
|
d52a86abd255
[gaim-migrate @ 17915]
Mark Doliner <markdoliner@pidgin.im>
parents:
15178
diff
changeset
|
425 | gaim_input_remove(conn->watcher_outgoing); |
|
d52a86abd255
[gaim-migrate @ 17915]
Mark Doliner <markdoliner@pidgin.im>
parents:
15178
diff
changeset
|
426 | conn->watcher_outgoing = 0; |
|
d52a86abd255
[gaim-migrate @ 17915]
Mark Doliner <markdoliner@pidgin.im>
parents:
15178
diff
changeset
|
427 | close(conn->fd); |
|
d52a86abd255
[gaim-migrate @ 17915]
Mark Doliner <markdoliner@pidgin.im>
parents:
15178
diff
changeset
|
428 | conn->fd = -1; |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
429 | peer_connection_schedule_destroy(conn, |
|
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
430 | OSCAR_DISCONNECT_LOST_CONNECTION, NULL); |
|
15191
d52a86abd255
[gaim-migrate @ 17915]
Mark Doliner <markdoliner@pidgin.im>
parents:
15178
diff
changeset
|
431 | } |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
432 | else |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
433 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
434 | /* |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
435 | * This could happen when unable to send a negotiation |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
436 | * frame to a peer proxy server. |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
437 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
438 | peer_connection_trynext(conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
439 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
440 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
441 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
442 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
443 | gaim_circ_buffer_mark_read(conn->buffer_outgoing, wrotelen); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
444 | conn->lastactivity = time(NULL); |
| 13235 | 445 | } |
| 446 | ||
| 447 | /** | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
448 | * This should be called by OFT/ODC code to send a standard OFT or ODC |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
449 | * frame across the peer connection along with some payload data. Or |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
450 | * maybe a file. Anything, really. |
| 13235 | 451 | */ |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
452 | void |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
453 | peer_connection_send(PeerConnection *conn, ByteStream *bs) |
| 13235 | 454 | { |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
455 | /* Add everything to our outgoing buffer */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
456 | gaim_circ_buffer_append(conn->buffer_outgoing, bs->data, bs->len); |
| 13235 | 457 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
458 | /* If we haven't already started writing stuff, then start the cycle */ |
|
15191
d52a86abd255
[gaim-migrate @ 17915]
Mark Doliner <markdoliner@pidgin.im>
parents:
15178
diff
changeset
|
459 | if ((conn->watcher_outgoing == 0) && (conn->fd != -1)) |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
460 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
461 | conn->watcher_outgoing = gaim_input_add(conn->fd, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
462 | GAIM_INPUT_WRITE, send_cb, conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
463 | send_cb(conn, conn->fd, 0); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
464 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
465 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
466 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
467 | /*******************************************************************/ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
468 | /* End code for sending data on a peer connection */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
469 | /*******************************************************************/ |
| 13235 | 470 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
471 | /*******************************************************************/ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
472 | /* Begin code for establishing a peer connection */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
473 | /*******************************************************************/ |
| 13235 | 474 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
475 | void |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
476 | peer_connection_finalize_connection(PeerConnection *conn) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
477 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
478 | conn->watcher_incoming = gaim_input_add(conn->fd, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
479 | GAIM_INPUT_READ, peer_connection_recv_cb, conn); |
| 13235 | 480 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
481 | if (conn->type == OSCAR_CAPABILITY_DIRECTIM) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
482 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
483 | /* |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
484 | * If we are connecting to them then send our cookie so they |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
485 | * can verify who we are. Note: This doesn't seem to be |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
486 | * necessary, but it also doesn't seem to hurt. |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
487 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
488 | if (!(conn->flags & PEER_CONNECTION_FLAG_IS_INCOMING)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
489 | peer_odc_send_cookie(conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
490 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
491 | else if (conn->type == OSCAR_CAPABILITY_SENDFILE) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
492 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
493 | if (gaim_xfer_get_type(conn->xfer) == GAIM_XFER_SEND) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
494 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
495 | peer_oft_send_prompt(conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
496 | } |
| 13235 | 497 | } |
| 498 | ||
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
499 | /* |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
500 | * Tell the remote user that we're connected (which may also imply |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
501 | * that we've accepted their request). |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
502 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
503 | if (!(conn->flags & PEER_CONNECTION_FLAG_IS_INCOMING)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
504 | aim_im_sendch2_connected(conn); |
| 13235 | 505 | } |
| 506 | ||
| 507 | /** | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
508 | * We tried to make an outgoing connection to a remote user. It |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
509 | * either connected or failed to connect. |
| 13235 | 510 | */ |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
511 | static void |
| 15173 | 512 | peer_connection_common_established_cb(gpointer data, gint source, const gchar *error_message, gboolean verified) |
| 13235 | 513 | { |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
514 | PeerConnection *conn; |
| 13235 | 515 | |
|
14166
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
516 | conn = data; |
| 13235 | 517 | |
| 15173 | 518 | if (verified) |
| 519 | conn->verified_connect_data = NULL; | |
| 520 | else | |
| 521 | conn->client_connect_data = NULL; | |
|
15175
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
522 | |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
523 | if (source < 0) |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
524 | { |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
525 | if ((conn->verified_connect_data == NULL) && |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
526 | (conn->client_connect_data == NULL)) |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
527 | { |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
528 | /* Our parallel connection attemps have both failed. */ |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
529 | peer_connection_trynext(conn); |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
530 | } |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
531 | return; |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
532 | } |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
533 | |
|
14166
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
534 | gaim_timeout_remove(conn->connect_timeout_timer); |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
535 | conn->connect_timeout_timer = 0; |
| 13235 | 536 | |
|
15178
eabb35896e1a
[gaim-migrate @ 17902]
Mark Doliner <markdoliner@pidgin.im>
parents:
15175
diff
changeset
|
537 | if (conn->client_connect_data != NULL) |
|
eabb35896e1a
[gaim-migrate @ 17902]
Mark Doliner <markdoliner@pidgin.im>
parents:
15175
diff
changeset
|
538 | { |
| 15173 | 539 | gaim_proxy_connect_cancel(conn->client_connect_data); |
| 540 | conn->client_connect_data = NULL; | |
|
15178
eabb35896e1a
[gaim-migrate @ 17902]
Mark Doliner <markdoliner@pidgin.im>
parents:
15175
diff
changeset
|
541 | } |
|
eabb35896e1a
[gaim-migrate @ 17902]
Mark Doliner <markdoliner@pidgin.im>
parents:
15175
diff
changeset
|
542 | |
|
eabb35896e1a
[gaim-migrate @ 17902]
Mark Doliner <markdoliner@pidgin.im>
parents:
15175
diff
changeset
|
543 | if (conn->verified_connect_data != NULL) |
|
eabb35896e1a
[gaim-migrate @ 17902]
Mark Doliner <markdoliner@pidgin.im>
parents:
15175
diff
changeset
|
544 | { |
| 15173 | 545 | gaim_proxy_connect_cancel(conn->verified_connect_data); |
| 546 | conn->verified_connect_data = NULL; | |
| 547 | } | |
|
15175
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
548 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
549 | conn->fd = source; |
| 13235 | 550 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
551 | peer_connection_finalize_connection(conn); |
|
13240
db5187cc40d1
[gaim-migrate @ 15605]
Mark Doliner <markdoliner@pidgin.im>
parents:
13235
diff
changeset
|
552 | } |
| 13235 | 553 | |
| 15173 | 554 | static void |
| 555 | peer_connection_verified_established_cb(gpointer data, gint source, const gchar *error_message) | |
| 556 | { | |
| 557 | peer_connection_common_established_cb(data, source, error_message, TRUE); | |
| 558 | } | |
|
15175
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
559 | |
| 15173 | 560 | static void |
| 561 | peer_connection_client_established_cb(gpointer data, gint source, const gchar *error_message) | |
| 562 | { | |
| 563 | peer_connection_common_established_cb(data, source, error_message, FALSE); | |
| 564 | } | |
| 565 | ||
| 13235 | 566 | /** |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
567 | * This is the watcher callback for any listening socket that is |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
568 | * waiting for a peer to connect. When a peer connects we set the |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
569 | * input watcher to start reading data from the peer. |
| 13235 | 570 | * |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
571 | * To make sure that the connection is with the intended person and |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
572 | * not with a malicious middle man, we don't send anything until we've |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
573 | * received a peer frame from the remote user and have verified that |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
574 | * the cookie in the peer frame matches the cookie that was exchanged |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
575 | * in the channel 2 ICBM. |
| 13235 | 576 | */ |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
577 | void |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
578 | peer_connection_listen_cb(gpointer data, gint source, GaimInputCondition cond) |
|
13240
db5187cc40d1
[gaim-migrate @ 15605]
Mark Doliner <markdoliner@pidgin.im>
parents:
13235
diff
changeset
|
579 | { |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
580 | PeerConnection *conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
581 | OscarData *od; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
582 | GaimConnection *gc; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
583 | struct sockaddr addr; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
584 | socklen_t addrlen = sizeof(addr); |
| 13235 | 585 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
586 | conn = data; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
587 | od = conn->od; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
588 | gc = od->gc; |
| 13235 | 589 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
590 | gaim_debug_info("oscar", "Accepting connection on listener socket.\n"); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
591 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
592 | conn->fd = accept(conn->listenerfd, &addr, &addrlen); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
593 | if (conn->fd == -1) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
594 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
595 | if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
596 | /* No connection yet--no worries */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
597 | /* TODO: Hmm, but they SHOULD be connected if we're here, right? */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
598 | return; |
| 13235 | 599 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
600 | peer_connection_trynext(conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
601 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
602 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
603 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
604 | if ((addr.sa_family != PF_INET) && (addr.sa_family != PF_INET6)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
605 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
606 | /* Invalid connection type?! Continue waiting. */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
607 | close(conn->fd); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
608 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
609 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
610 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
611 | fcntl(conn->fd, F_SETFL, O_NONBLOCK); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
612 | gaim_input_remove(conn->watcher_incoming); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
613 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
614 | peer_connection_finalize_connection(conn); |
| 13235 | 615 | } |
| 616 | ||
| 617 | /** | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
618 | * We've just opened a listener socket, so we send the remote |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
619 | * user an ICBM and ask them to connect to us. |
| 13235 | 620 | */ |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
621 | static void |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
622 | peer_connection_establish_listener_cb(int listenerfd, gpointer data) |
| 13235 | 623 | { |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
624 | PeerConnection *conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
625 | OscarData *od; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
626 | GaimConnection *gc; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
627 | GaimAccount *account; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
628 | GaimConversation *conv; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
629 | char *tmp; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
630 | FlapConnection *bos_conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
631 | const char *listener_ip; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
632 | unsigned short listener_port; |
| 13235 | 633 | |
|
14329
05c3cc0c1f79
[gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
634 | conn = data; |
|
05c3cc0c1f79
[gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
635 | conn->listen_data = NULL; |
| 13235 | 636 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
637 | if (listenerfd == -1) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
638 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
639 | /* Could not open listener socket */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
640 | peer_connection_trynext(conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
641 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
642 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
643 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
644 | od = conn->od; |
|
14329
05c3cc0c1f79
[gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
645 | gc = od->gc; |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
646 | account = gaim_connection_get_account(gc); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
647 | conn->listenerfd = listenerfd; |
| 13235 | 648 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
649 | /* Send the "please connect to me!" ICBM */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
650 | bos_conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICBM); |
|
13665
c8984bccd64c
[gaim-migrate @ 16066]
Mark Doliner <markdoliner@pidgin.im>
parents:
13609
diff
changeset
|
651 | if (bos_conn == NULL) |
|
c8984bccd64c
[gaim-migrate @ 16066]
Mark Doliner <markdoliner@pidgin.im>
parents:
13609
diff
changeset
|
652 | { |
|
c8984bccd64c
[gaim-migrate @ 16066]
Mark Doliner <markdoliner@pidgin.im>
parents:
13609
diff
changeset
|
653 | /* Not good */ |
|
c8984bccd64c
[gaim-migrate @ 16066]
Mark Doliner <markdoliner@pidgin.im>
parents:
13609
diff
changeset
|
654 | peer_connection_trynext(conn); |
|
c8984bccd64c
[gaim-migrate @ 16066]
Mark Doliner <markdoliner@pidgin.im>
parents:
13609
diff
changeset
|
655 | return; |
|
c8984bccd64c
[gaim-migrate @ 16066]
Mark Doliner <markdoliner@pidgin.im>
parents:
13609
diff
changeset
|
656 | } |
|
c8984bccd64c
[gaim-migrate @ 16066]
Mark Doliner <markdoliner@pidgin.im>
parents:
13609
diff
changeset
|
657 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
658 | listener_ip = gaim_network_get_my_ip(bos_conn->fd); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
659 | listener_port = gaim_network_get_port_from_fd(conn->listenerfd); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
660 | if (conn->type == OSCAR_CAPABILITY_DIRECTIM) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
661 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
662 | aim_im_sendch2_odc_requestdirect(od, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
663 | conn->cookie, conn->sn, gaim_network_ip_atoi(listener_ip), |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
664 | listener_port, ++conn->lastrequestnumber); |
| 13235 | 665 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
666 | /* Print a message to a local conversation window */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
667 | conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, conn->sn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
668 | tmp = g_strdup_printf(_("Asking %s to connect to us at %s:%hu for " |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
669 | "Direct IM."), conn->sn, listener_ip, listener_port); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
670 | gaim_conversation_write(conv, NULL, tmp, GAIM_MESSAGE_SYSTEM, time(NULL)); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
671 | g_free(tmp); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
672 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
673 | else if (conn->type == OSCAR_CAPABILITY_SENDFILE) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
674 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
675 | aim_im_sendch2_sendfile_requestdirect(od, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
676 | conn->cookie, conn->sn, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
677 | gaim_network_ip_atoi(listener_ip), |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
678 | listener_port, ++conn->lastrequestnumber, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
679 | (const gchar *)conn->xferdata.name, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
680 | conn->xferdata.size, conn->xferdata.totfiles); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
681 | } |
| 13235 | 682 | } |
| 683 | ||
| 684 | /** | |
|
14166
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
685 | * This is a callback function used when we're connecting to a peer |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
686 | * using either the client IP or the verified IP and the connection |
| 15173 | 687 | * took longer than 5 seconds to complete. We do this because |
|
14166
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
688 | * waiting for the OS to time out the connection attempt is not |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
689 | * practical--the default timeout on many OSes can be 3 minutes or |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
690 | * more, and users are impatient. |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
691 | * |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
692 | * Worst case scenario: the user is connected to the Internet using |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
693 | * a modem with severe lag. The peer connections fail and Gaim falls |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
694 | * back to using a proxied connection. The lower bandwidth |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
695 | * limitations imposed by the proxied connection won't matter because |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
696 | * the user is using a modem. |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
697 | * |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
698 | * I suppose this line of thinking is discriminatory against people |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
699 | * with very high lag but decent throughput who are transferring |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
700 | * large files. But we don't care about those people. |
| 15173 | 701 | * |
| 702 | * I (Sean) changed the timeout from 15 to 5 seconds, as 60 seconds is | |
| 703 | * too long for a user to wait to send a file. I'm also parallelizing | |
| 704 | * requests when possible. The longest we should have to wait now is 10 | |
| 705 | * seconds. We shouldn't make it shorter than this. | |
|
14166
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
706 | */ |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
707 | static gboolean |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
708 | peer_connection_tooktoolong(gpointer data) |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
709 | { |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
710 | PeerConnection *conn; |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
711 | |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
712 | conn = data; |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
713 | |
|
15175
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
714 | gaim_debug_info("oscar", "Peer connection timed out after 5 seconds. " |
|
14166
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
715 | "Trying next method...\n"); |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
716 | |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
717 | peer_connection_trynext(conn); |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
718 | |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
719 | /* Cancel this timer. It'll be added again, if needed. */ |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
720 | return FALSE; |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
721 | } |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
722 | |
|
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
723 | /** |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
724 | * Try to establish the given PeerConnection using a defined |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
725 | * sequence of steps. |
| 13235 | 726 | */ |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
727 | void |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
728 | peer_connection_trynext(PeerConnection *conn) |
| 13235 | 729 | { |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
730 | GaimAccount *account; |
| 13235 | 731 | |
|
14166
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
732 | account = gaim_connection_get_account(conn->od->gc); |
| 13235 | 733 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
734 | /* |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
735 | * Close any remnants of a previous failed connection attempt. |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
736 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
737 | peer_connection_close(conn); |
| 13235 | 738 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
739 | /* |
| 15173 | 740 | * 1. Attempt to connect to the remote user using their verifiedip and clientip. |
| 741 | * We try these at the same time and use whichever succeeds first, so we don't | |
| 742 | * have to wait for a timeout. | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
743 | */ |
| 15173 | 744 | if (!(conn->flags & PEER_CONNECTION_FLAG_TRIED_DIRECT) && |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
745 | (conn->verifiedip != NULL) && (conn->port != 0) && (!conn->use_proxy)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
746 | { |
| 15173 | 747 | conn->flags |= PEER_CONNECTION_FLAG_TRIED_DIRECT; |
| 13235 | 748 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
749 | if (conn->type == OSCAR_CAPABILITY_DIRECTIM) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
750 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
751 | gchar *tmp; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
752 | GaimConversation *conv; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
753 | tmp = g_strdup_printf(_("Attempting to connect to %s:%hu."), |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
754 | conn->verifiedip, conn->port); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
755 | conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, conn->sn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
756 | gaim_conversation_write(conv, NULL, tmp, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
757 | GAIM_MESSAGE_SYSTEM, time(NULL)); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
758 | g_free(tmp); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
759 | } |
| 13235 | 760 | |
| 15173 | 761 | conn->verified_connect_data = gaim_proxy_connect(NULL, account, |
|
14166
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
762 | conn->verifiedip, conn->port, |
| 15173 | 763 | peer_connection_verified_established_cb, conn); |
| 13235 | 764 | |
|
13666
3fd8677daf94
[gaim-migrate @ 16067]
Mark Doliner <markdoliner@pidgin.im>
parents:
13665
diff
changeset
|
765 | if ((conn->verifiedip == NULL) || |
|
3fd8677daf94
[gaim-migrate @ 16067]
Mark Doliner <markdoliner@pidgin.im>
parents:
13665
diff
changeset
|
766 | strcmp(conn->verifiedip, conn->clientip)) |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
767 | { |
| 15173 | 768 | conn->client_connect_data = gaim_proxy_connect(NULL, account, |
|
14166
59f2d7f35ad8
[gaim-migrate @ 16735]
Mark Doliner <markdoliner@pidgin.im>
parents:
14151
diff
changeset
|
769 | conn->clientip, conn->port, |
| 15173 | 770 | peer_connection_client_established_cb, conn); |
|
15175
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
771 | } |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
772 | |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
773 | if ((conn->verified_connect_data != NULL) || |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
774 | (conn->client_connect_data != NULL)) |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
775 | { |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
776 | /* Connecting... */ |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
777 | conn->connect_timeout_timer = gaim_timeout_add(5000, |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
778 | peer_connection_tooktoolong, conn); |
|
b4e8ca031526
[gaim-migrate @ 17899]
Mark Doliner <markdoliner@pidgin.im>
parents:
15173
diff
changeset
|
779 | return; |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
780 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
781 | } |
| 13235 | 782 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
783 | /* |
| 15173 | 784 | * 2. Attempt to have the remote user connect to us (using both |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
785 | * our verifiedip and our clientip). |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
786 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
787 | if (!(conn->flags & PEER_CONNECTION_FLAG_TRIED_INCOMING) && |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
788 | (!conn->use_proxy)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
789 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
790 | conn->flags |= PEER_CONNECTION_FLAG_TRIED_INCOMING; |
| 13235 | 791 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
792 | /* |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
793 | * Remote user is connecting to us, so we'll need to verify |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
794 | * that the user who connected is our friend. |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
795 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
796 | conn->flags |= PEER_CONNECTION_FLAG_IS_INCOMING; |
| 13235 | 797 | |
|
14329
05c3cc0c1f79
[gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
798 | conn->listen_data = gaim_network_listen_range(5190, 5290, SOCK_STREAM, |
|
05c3cc0c1f79
[gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
799 | peer_connection_establish_listener_cb, conn); |
|
05c3cc0c1f79
[gaim-migrate @ 16949]
Mark Doliner <markdoliner@pidgin.im>
parents:
14324
diff
changeset
|
800 | if (conn->listen_data != NULL) |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
801 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
802 | /* Opening listener socket... */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
803 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
804 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
805 | } |
| 13235 | 806 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
807 | /* |
| 15173 | 808 | * 3. Attempt to have both users connect to an intermediate proxy |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
809 | * server. |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
810 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
811 | if (!(conn->flags & PEER_CONNECTION_FLAG_TRIED_PROXY)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
812 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
813 | conn->flags |= PEER_CONNECTION_FLAG_TRIED_PROXY; |
| 13235 | 814 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
815 | /* |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
816 | * If we initiate the proxy connection, then the remote user |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
817 | * could be anyone, so we need to verify that the user who |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
818 | * connected is our friend. |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
819 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
820 | if (!conn->use_proxy) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
821 | conn->flags |= PEER_CONNECTION_FLAG_IS_INCOMING; |
| 13235 | 822 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
823 | if (conn->type == OSCAR_CAPABILITY_DIRECTIM) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
824 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
825 | gchar *tmp; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
826 | GaimConversation *conv; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
827 | tmp = g_strdup_printf(_("Attempting to connect via proxy server.")); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
828 | conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, conn->sn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
829 | gaim_conversation_write(conv, NULL, tmp, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
830 | GAIM_MESSAGE_SYSTEM, time(NULL)); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
831 | g_free(tmp); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
832 | } |
| 13235 | 833 | |
| 15173 | 834 | conn->verified_connect_data = gaim_proxy_connect(NULL, account, |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
835 | (conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
836 | PEER_PROXY_PORT, |
|
14170
f611621bc8a0
[gaim-migrate @ 16742]
Mark Doliner <markdoliner@pidgin.im>
parents:
14166
diff
changeset
|
837 | peer_proxy_connection_established_cb, conn); |
| 15173 | 838 | if (conn->verified_connect_data != NULL) |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
839 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
840 | /* Connecting... */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
841 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
842 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
843 | } |
| 13235 | 844 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
845 | /* Give up! */ |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
846 | peer_connection_destroy(conn, OSCAR_DISCONNECT_COULD_NOT_CONNECT, NULL); |
| 13235 | 847 | } |
| 848 | ||
| 849 | /** | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
850 | * Initiate a peer connection with someone. |
| 13235 | 851 | */ |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
852 | void |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
853 | peer_connection_propose(OscarData *od, OscarCapability type, const char *sn) |
| 13235 | 854 | { |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
855 | PeerConnection *conn; |
| 13235 | 856 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
857 | if (type == OSCAR_CAPABILITY_DIRECTIM) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
858 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
859 | conn = peer_connection_find_by_type(od, sn, type); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
860 | if (conn != NULL) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
861 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
862 | if (conn->ready) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
863 | { |
|
13665
c8984bccd64c
[gaim-migrate @ 16066]
Mark Doliner <markdoliner@pidgin.im>
parents:
13609
diff
changeset
|
864 | GaimAccount *account; |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
865 | GaimConversation *conv; |
| 13235 | 866 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
867 | gaim_debug_info("oscar", "Already have a direct IM " |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
868 | "session with %s.\n", sn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
869 | account = gaim_connection_get_account(od->gc); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
870 | conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
871 | sn, account); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
872 | if (conv != NULL) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
873 | gaim_conversation_present(conv); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
874 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
875 | } |
| 13235 | 876 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
877 | /* Cancel the old connection and try again */ |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
878 | peer_connection_destroy(conn, OSCAR_DISCONNECT_RETRYING, NULL); |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
879 | } |
| 13235 | 880 | } |
| 881 | ||
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
882 | conn = peer_connection_new(od, type, sn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
883 | conn->flags |= PEER_CONNECTION_FLAG_INITIATED_BY_ME; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
884 | conn->flags |= PEER_CONNECTION_FLAG_APPROVED; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
885 | aim_icbm_makecookie(conn->cookie); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
886 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
887 | peer_connection_trynext(conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
888 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
889 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
890 | /** |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
891 | * Someone else wants to establish a peer connection with us, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
892 | * and we said yes. |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
893 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
894 | static void |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
895 | peer_connection_got_proposition_yes_cb(gpointer data, gint id) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
896 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
897 | PeerConnection *conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
898 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
899 | conn = data; |
| 13235 | 900 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
901 | conn->flags |= PEER_CONNECTION_FLAG_APPROVED; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
902 | peer_connection_trynext(conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
903 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
904 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
905 | /** |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
906 | * Someone else wants to establish a peer connection with us, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
907 | * and we said no. |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
908 | * |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
909 | * "Well, one time my friend asked me if I wanted to play the |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
910 | * piccolo. But I said no." |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
911 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
912 | static void |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
913 | peer_connection_got_proposition_no_cb(gpointer data, gint id) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
914 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
915 | PeerConnection *conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
916 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
917 | conn = data; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
918 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
919 | aim_im_denytransfer(conn->od, conn->sn, conn->cookie, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
920 | AIM_TRANSFER_DENY_DECLINE); |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
921 | peer_connection_destroy(conn, OSCAR_DISCONNECT_LOCAL_CLOSED, NULL); |
| 13235 | 922 | } |
| 923 | ||
| 924 | /** | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
925 | * Someone else wants to establish a peer connection with us. |
| 13235 | 926 | */ |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
927 | void |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
928 | peer_connection_got_proposition(OscarData *od, const gchar *sn, const gchar *message, IcbmArgsCh2 *args) |
| 13235 | 929 | { |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
930 | GaimConnection *gc; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
931 | GaimAccount *account; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
932 | PeerConnection *conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
933 | gchar *buf; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
934 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
935 | gc = od->gc; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
936 | account = gaim_connection_get_account(gc); |
|
13240
db5187cc40d1
[gaim-migrate @ 15605]
Mark Doliner <markdoliner@pidgin.im>
parents:
13235
diff
changeset
|
937 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
938 | /* |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
939 | * If we have a connection with this same cookie then they are |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
940 | * probably just telling us they weren't able to connect to us |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
941 | * and we should try connecting to them, instead. Or they want |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
942 | * to go through a proxy. |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
943 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
944 | conn = peer_connection_find_by_cookie(od, sn, args->cookie); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
945 | if ((conn != NULL) && (conn->type == args->type)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
946 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
947 | gaim_debug_info("oscar", "Remote user wants to try a " |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
948 | "different connection method\n"); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
949 | g_free(conn->proxyip); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
950 | g_free(conn->clientip); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
951 | g_free(conn->verifiedip); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
952 | if (args->use_proxy) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
953 | conn->proxyip = g_strdup(args->proxyip); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
954 | else |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
955 | conn->proxyip = NULL; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
956 | conn->verifiedip = g_strdup(args->verifiedip); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
957 | conn->clientip = g_strdup(args->clientip); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
958 | conn->port = args->port; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
959 | conn->use_proxy |= args->use_proxy; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
960 | conn->lastrequestnumber++; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
961 | peer_connection_trynext(conn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
962 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
963 | } |
|
13240
db5187cc40d1
[gaim-migrate @ 15605]
Mark Doliner <markdoliner@pidgin.im>
parents:
13235
diff
changeset
|
964 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
965 | /* If this is a direct IM, then close any existing session */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
966 | if (args->type == OSCAR_CAPABILITY_DIRECTIM) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
967 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
968 | conn = peer_connection_find_by_type(od, sn, args->type); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
969 | if (conn != NULL) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
970 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
971 | /* Close the old direct IM and start a new one */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
972 | gaim_debug_info("oscar", "Received new direct IM request " |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
973 | "from %s. Destroying old connection.\n", sn); |
|
14464
b7bca43f75b3
[gaim-migrate @ 17110]
Mark Doliner <markdoliner@pidgin.im>
parents:
14410
diff
changeset
|
974 | peer_connection_destroy(conn, OSCAR_DISCONNECT_REMOTE_CLOSED, NULL); |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
975 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
976 | } |
|
13240
db5187cc40d1
[gaim-migrate @ 15605]
Mark Doliner <markdoliner@pidgin.im>
parents:
13235
diff
changeset
|
977 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
978 | /* Check for proper arguments */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
979 | if (args->type == OSCAR_CAPABILITY_SENDFILE) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
980 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
981 | if ((args->info.sendfile.filename == NULL) || |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
982 | (args->info.sendfile.totsize == 0) || |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
983 | (args->info.sendfile.totfiles == 0)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
984 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
985 | gaim_debug_warning("oscar", |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
986 | "%s tried to send you a file with incomplete " |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
987 | "information.\n", sn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
988 | return; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
989 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
990 | } |
| 13235 | 991 | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
992 | conn = peer_connection_new(od, args->type, sn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
993 | memcpy(conn->cookie, args->cookie, 8); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
994 | if (args->use_proxy) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
995 | conn->proxyip = g_strdup(args->proxyip); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
996 | conn->clientip = g_strdup(args->clientip); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
997 | conn->verifiedip = g_strdup(args->verifiedip); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
998 | conn->port = args->port; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
999 | conn->use_proxy |= args->use_proxy; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1000 | conn->lastrequestnumber++; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1001 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1002 | if (args->type == OSCAR_CAPABILITY_DIRECTIM) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1003 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1004 | buf = g_strdup_printf(_("%s has just asked to directly connect to %s"), |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1005 | sn, gaim_account_get_username(account)); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1006 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1007 | gaim_request_action(conn, NULL, buf, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1008 | _("This requires a direct connection between " |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1009 | "the two computers and is necessary for IM " |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1010 | "Images. Because your IP address will be " |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1011 | "revealed, this may be considered a privacy " |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1012 | "risk."), |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1013 | GAIM_DEFAULT_ACTION_NONE, conn, 2, |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1014 | _("_Connect"), G_CALLBACK(peer_connection_got_proposition_yes_cb), |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1015 | _("Cancel"), G_CALLBACK(peer_connection_got_proposition_no_cb)); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1016 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1017 | else if (args->type == OSCAR_CAPABILITY_SENDFILE) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1018 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1019 | gchar *filename; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1020 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1021 | conn->xfer = gaim_xfer_new(account, GAIM_XFER_RECEIVE, sn); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1022 | conn->xfer->data = conn; |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1023 | gaim_xfer_ref(conn->xfer); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1024 | gaim_xfer_set_size(conn->xfer, args->info.sendfile.totsize); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1025 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1026 | /* Set the file name */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1027 | if (g_utf8_validate(args->info.sendfile.filename, -1, NULL)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1028 | filename = g_strdup(args->info.sendfile.filename); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1029 | else |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1030 | filename = gaim_utf8_salvage(args->info.sendfile.filename); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1031 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1032 | if (args->info.sendfile.subtype == AIM_OFT_SUBTYPE_SEND_DIR) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1033 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1034 | /* |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1035 | * If they are sending us a directory then the last character |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1036 | * of the file name will be an asterisk. We don't want to |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1037 | * save stuff to a directory named "*" so we remove the |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1038 | * asterisk from the file name. |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1039 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1040 | char *tmp = strrchr(filename, '\\'); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1041 | if ((tmp != NULL) && (tmp[1] == '*')) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1042 | tmp[0] = '\0'; |
|
13240
db5187cc40d1
[gaim-migrate @ 15605]
Mark Doliner <markdoliner@pidgin.im>
parents:
13235
diff
changeset
|
1043 | } |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1044 | gaim_xfer_set_filename(conn->xfer, filename); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1045 | g_free(filename); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1046 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1047 | /* |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1048 | * Set the message (unless this is the dummy message from an |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1049 | * ICQ client or an empty message from an AIM client. |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1050 | * TODO: Maybe we should strip HTML and then see if strlen>0? |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1051 | */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1052 | if ((message != NULL) && |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1053 | (g_ascii_strncasecmp(message, "<ICQ_COOL_FT>", 13) != 0) && |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1054 | (g_ascii_strcasecmp(message, "<HTML>") != 0)) |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1055 | { |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1056 | gaim_xfer_set_message(conn->xfer, message); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1057 | } |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1058 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1059 | /* Setup our I/O op functions */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1060 | gaim_xfer_set_init_fnc(conn->xfer, peer_oft_recvcb_init); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1061 | gaim_xfer_set_end_fnc(conn->xfer, peer_oft_recvcb_end); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1062 | gaim_xfer_set_request_denied_fnc(conn->xfer, peer_oft_cb_generic_cancel); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1063 | gaim_xfer_set_cancel_recv_fnc(conn->xfer, peer_oft_cb_generic_cancel); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1064 | gaim_xfer_set_ack_fnc(conn->xfer, peer_oft_recvcb_ack_recv); |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1065 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1066 | /* Now perform the request */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1067 | gaim_xfer_request(conn->xfer); |
| 13235 | 1068 | } |
| 1069 | } | |
|
13593
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1070 | |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1071 | /*******************************************************************/ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1072 | /* End code for establishing a peer connection */ |
|
3450a7cede99
[gaim-migrate @ 15978]
Mark Doliner <markdoliner@pidgin.im>
parents:
13255
diff
changeset
|
1073 | /*******************************************************************/ |