Mercurial > pidgin.yaz
annotate src/protocols/irc/dcc_send.c @ 12498:a2de852981c1
[gaim-migrate @ 14810]
SF Patch #1380806 from charkins
"leave docklet loaded when notification area is not present"
"From the summary, this sounds weird, but I think its
better behavior. This really only effects some odd
corner cases. The existing behavior is that the docklet
plugin unloads itself after 10 seconds if the tray icon
isn't created. The behavior with this patch is that
there is a 3 second timeout (this is necessary to avoid
race condition when restoring the gtkblist's visibility
state on startup). After this timeout, the docklet
plugin stays loaded waiting for a notification to
appear, but is essentially non-functional.
In the typical scenario, this patch doesn't effect the
behavior. Here are some examples of where it does matter:
1) If gaim is closed with the buddy list hidden to the
docklet, then gaim is started again without a
notification area, the buddy list doesn't show up for
10 seconds (the time it takes for the docklet to
timeout). This patch would reduce this to 3 seconds.
2) If the user removes the notification area from their
panel, maybe to remove it from one panel and add it to
a different panel, but doesn't add a new one back
within 10 seconds, the current behavior would cause the
docklet plugin to be unloaded. With this patch, the
tray icon would automatically be added to the new
notification area when it becomes available.
3) The gnome-panel dies and is not restarted within 10
seconds. Similar to #2. (There was a bug filed for
this, but can't find it right now).
My main concern was that it could be confusing to the
user if they enable the docklet plugin, then 10 seconds
later it gets disabled without any notification. This
patch doesn't add any notification, but leaves the
plugin running so it will automatically use a
notification area when one becomes available.
I also removed an unused parameter from
docklet_remove() and changed the plugin description
slightly to reflect the change in queuing/notification.
Not sure how clear this is, so bug me on #gaim if you
have any questions. --charkins"
I made a few changes to this patch, but nothing terribly significant...
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 16 Dec 2005 09:16:14 +0000 |
parents | fc464a0abccc |
children | d5b8f4dc1622 |
rev | line source |
---|---|
8351 | 1 /** |
2 * @file dcc_send.c Functions used in sending files with DCC SEND | |
3 * | |
4 * gaim | |
5 * | |
6 * Copyright (C) 2004, Timothy T Ringenbach <omarvo@hotmail.com> | |
7 * Copyright (C) 2003, Robbert Haarman <gaim@inglorion.net> | |
8 * | |
9 * This program is free software; you can redistribute it and/or modify | |
10 * it under the terms of the GNU General Public License as published by | |
11 * the Free Software Foundation; either version 2 of the License, or | |
12 * (at your option) any later version. | |
13 * | |
14 * This program is distributed in the hope that it will be useful, | |
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 * GNU General Public License for more details. | |
18 * | |
19 * You should have received a copy of the GNU General Public License | |
20 * along with this program; if not, write to the Free Software | |
21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
22 */ | |
23 | |
24 #include "internal.h" | |
25 #include "irc.h" | |
26 #include "debug.h" | |
27 #include "ft.h" | |
28 #include "notify.h" | |
29 #include "network.h" | |
30 | |
31 /*************************************************************************** | |
32 * Functions related to receiving files via DCC SEND | |
33 ***************************************************************************/ | |
34 | |
35 struct irc_xfer_rx_data { | |
36 gchar *ip; | |
37 }; | |
38 | |
39 static void irc_dccsend_recv_destroy(GaimXfer *xfer) | |
40 { | |
41 struct irc_xfer_rx_data *xd = xfer->data; | |
42 | |
43 if (xd->ip != NULL) | |
44 g_free(xd->ip); | |
45 | |
46 g_free(xd); | |
47 } | |
48 | |
49 /* | |
50 * This function is called whenever data is received. | |
51 * It sends the acknowledgement (in the form of a total byte count as an | |
52 * unsigned 4 byte integer in network byte order) | |
53 */ | |
11159 | 54 static void irc_dccsend_recv_ack(GaimXfer *xfer, const guchar *data, size_t size) { |
8351 | 55 unsigned long l; |
56 | |
57 l = htonl(xfer->bytes_sent); | |
58 write(xfer->fd, &l, sizeof(l)); | |
59 } | |
60 | |
61 static void irc_dccsend_recv_init(GaimXfer *xfer) { | |
62 struct irc_xfer_rx_data *xd = xfer->data; | |
63 | |
64 gaim_xfer_start(xfer, -1, xd->ip, xfer->remote_port); | |
65 g_free(xd->ip); | |
66 xd->ip = NULL; | |
67 } | |
68 | |
69 /* This function makes the necessary arrangements for receiving files */ | |
70 void irc_dccsend_recv(struct irc_conn *irc, const char *from, const char *msg) { | |
71 GaimXfer *xfer; | |
72 struct irc_xfer_rx_data *xd; | |
73 gchar **token; | |
74 struct in_addr addr; | |
75 GString *filename; | |
76 int i = 0; | |
77 guint32 nip; | |
78 | |
79 token = g_strsplit(msg, " ", 0); | |
80 if (!token[0] || !token[1] || !token[2]) { | |
81 g_strfreev(token); | |
82 return; | |
83 } | |
84 | |
85 filename = g_string_new(""); | |
86 if (token[0][0] == '"') { | |
87 if (!strchr(&(token[0][1]), '"')) { | |
88 g_string_append(filename, &(token[0][1])); | |
89 for (i = 1; token[i]; i++) | |
90 if (!strchr(token[i], '"')) { | |
91 g_string_append_printf(filename, " %s", token[i]); | |
92 } else { | |
93 g_string_append_len(filename, token[i], strlen(token[i]) - 1); | |
94 break; | |
95 } | |
96 } else { | |
97 g_string_append_len(filename, &(token[0][1]), strlen(&(token[0][1])) - 1); | |
98 } | |
99 } else { | |
100 g_string_append(filename, token[0]); | |
101 } | |
102 | |
103 if (!token[i] || !token[i+1] || !token[i+2]) { | |
104 g_strfreev(token); | |
105 g_string_free(filename, TRUE); | |
106 return; | |
107 } | |
108 i++; | |
109 | |
110 xfer = gaim_xfer_new(irc->account, GAIM_XFER_RECEIVE, from); | |
111 xd = g_new0(struct irc_xfer_rx_data, 1); | |
112 xfer->data = xd; | |
113 | |
114 gaim_xfer_set_filename(xfer, filename->str); | |
115 xfer->remote_port = atoi(token[i+1]); | |
116 | |
117 nip = strtoul(token[i], NULL, 10); | |
118 if (nip) { | |
119 addr.s_addr = htonl(nip); | |
120 xd->ip = g_strdup(inet_ntoa(addr)); | |
121 } else { | |
122 xd->ip = g_strdup(token[i]); | |
123 } | |
124 gaim_debug(GAIM_DEBUG_INFO, "irc", "Receiving file from %s\n", | |
125 xd->ip); | |
126 gaim_xfer_set_size(xfer, token[i+2] ? atoi(token[i+2]) : 0); | |
127 | |
128 gaim_xfer_set_init_fnc(xfer, irc_dccsend_recv_init); | |
129 gaim_xfer_set_ack_fnc(xfer, irc_dccsend_recv_ack); | |
130 | |
131 gaim_xfer_set_end_fnc(xfer, irc_dccsend_recv_destroy); | |
132 gaim_xfer_set_request_denied_fnc(xfer, irc_dccsend_recv_destroy); | |
133 gaim_xfer_set_cancel_send_fnc(xfer, irc_dccsend_recv_destroy); | |
134 | |
135 gaim_xfer_request(xfer); | |
136 g_strfreev(token); | |
137 g_string_free(filename, TRUE); | |
138 } | |
139 | |
140 /******************************************************************* | |
141 * Functions related to sending files via DCC SEND | |
142 *******************************************************************/ | |
143 | |
144 struct irc_xfer_send_data { | |
145 gint inpa; | |
146 int fd; | |
147 guchar *rxqueue; | |
148 guint rxlen; | |
149 }; | |
150 | |
151 static void irc_dccsend_send_destroy(GaimXfer *xfer) | |
152 { | |
153 struct irc_xfer_send_data *xd = xfer->data; | |
154 | |
155 if (xd == NULL) | |
156 return; | |
157 | |
158 if (xd->inpa > 0) | |
159 gaim_input_remove(xd->inpa); | |
160 if (xd->fd != -1) | |
161 close(xd->fd); | |
162 | |
163 if (xd->rxqueue) | |
164 g_free(xd->rxqueue); | |
165 | |
166 g_free(xd); | |
167 } | |
168 | |
169 /* just in case you were wondering, this is why DCC is gay */ | |
170 static void irc_dccsend_send_read(gpointer data, int source, GaimInputCondition cond) | |
171 { | |
172 GaimXfer *xfer = data; | |
173 struct irc_xfer_send_data *xd = xfer->data; | |
174 char *buffer[16]; | |
175 int len; | |
176 | |
177 if ((len = read(source, buffer, sizeof(buffer))) <= 0) { | |
178 gaim_input_remove(xd->inpa); | |
179 xd->inpa = 0; | |
180 return; | |
181 } | |
182 | |
183 xd->rxqueue = g_realloc(xd->rxqueue, len + xd->rxlen); | |
184 memcpy(xd->rxqueue + xd->rxlen, buffer, len); | |
185 xd->rxlen += len; | |
186 | |
187 while (1) { | |
11318 | 188 size_t acked; |
8351 | 189 |
190 if (xd->rxlen < 4) | |
191 break; | |
192 | |
193 acked = ntohl(*((gint32 *)xd->rxqueue)); | |
194 | |
195 xd->rxlen -= 4; | |
196 if (xd->rxlen) { | |
10388 | 197 unsigned char *tmp = g_memdup(xd->rxqueue + 4, xd->rxlen); |
8351 | 198 g_free(xd->rxqueue); |
199 xd->rxqueue = tmp; | |
200 } else { | |
201 g_free(xd->rxqueue); | |
202 xd->rxqueue = NULL; | |
203 } | |
204 | |
205 if (acked >= gaim_xfer_get_size(xfer)) { | |
206 gaim_input_remove(xd->inpa); | |
207 xd->inpa = 0; | |
208 gaim_xfer_set_completed(xfer, TRUE); | |
209 gaim_xfer_end(xfer); | |
210 return; | |
211 } | |
212 | |
213 | |
214 } | |
215 } | |
216 | |
12323
fc464a0abccc
[gaim-migrate @ 14627]
Richard Laager <rlaager@wiktel.com>
parents:
12151
diff
changeset
|
217 static gssize irc_dccsend_send_write(const guchar *buffer, size_t size, GaimXfer *xfer) |
8351 | 218 { |
12151
de798f2f4bf1
[gaim-migrate @ 14452]
Richard Laager <rlaager@wiktel.com>
parents:
12143
diff
changeset
|
219 gssize s; |
8351 | 220 |
221 s = MIN(gaim_xfer_get_bytes_remaining(xfer), size); | |
222 if (!s) | |
223 return 0; | |
224 | |
225 return write(xfer->fd, buffer, s); | |
226 } | |
227 | |
228 static void irc_dccsend_send_connected(gpointer data, int source, GaimInputCondition cond) { | |
229 GaimXfer *xfer = (GaimXfer *) data; | |
230 struct irc_xfer_send_data *xd = xfer->data; | |
231 int conn; | |
232 | |
233 conn = accept(xd->fd, NULL, 0); | |
234 if (conn == -1) { | |
235 /* Accepting the connection failed. This could just be related | |
236 * to the nonblocking nature of the listening socket, so we'll | |
237 * just try again next time */ | |
238 /* Let's print an error message anyway */ | |
239 gaim_debug_warning("irc", "accept: %s\n", strerror(errno)); | |
240 return; | |
241 } | |
242 | |
243 gaim_input_remove(xfer->watcher); | |
244 xfer->watcher = 0; | |
245 close(xd->fd); | |
246 xd->fd = -1; | |
247 | |
248 xd->inpa = gaim_input_add(conn, GAIM_INPUT_READ, irc_dccsend_send_read, xfer); | |
249 /* Start the transfer */ | |
250 gaim_xfer_start(xfer, conn, NULL, 0); | |
251 } | |
252 | |
253 /* | |
254 * This function is called after the user has selected a file to send. | |
255 */ | |
256 static void irc_dccsend_send_init(GaimXfer *xfer) { | |
257 struct irc_xfer_send_data *xd = xfer->data; | |
258 GaimConnection *gc = gaim_account_get_connection(gaim_xfer_get_account(xfer)); | |
259 struct irc_conn *irc = gc->proto_data; | |
260 int sock; | |
261 const char *arg[2]; | |
262 char *tmp; | |
263 struct in_addr addr; | |
264 unsigned short int port; | |
265 | |
266 xfer->filename = g_path_get_basename(xfer->local_filename); | |
267 | |
268 /* Create a listening socket */ | |
269 sock = gaim_network_listen_range(0, 0); | |
270 | |
271 if (sock < 0) { | |
10654 | 272 gaim_notify_error(gc, NULL, _("File Transfer Failed"), |
8351 | 273 _("Gaim could not open a listening port.")); |
274 gaim_xfer_cancel_local(xfer); | |
275 return; | |
276 } | |
277 | |
278 xd->fd = sock; | |
279 | |
280 port = gaim_network_get_port_from_fd(sock); | |
281 gaim_debug_misc("irc", "port is %hu\n", port); | |
282 /* Monitor the listening socket */ | |
283 xfer->watcher = gaim_input_add(sock, GAIM_INPUT_READ, | |
284 irc_dccsend_send_connected, xfer); | |
285 | |
286 /* Send the intended recipient the DCC request */ | |
287 arg[0] = xfer->who; | |
8838 | 288 inet_aton(gaim_network_get_my_ip(irc->fd), &addr); |
11656
f9c5480ad0ce
[gaim-migrate @ 13940]
Richard Laager <rlaager@wiktel.com>
parents:
11318
diff
changeset
|
289 arg[1] = tmp = g_strdup_printf("\001DCC SEND \"%s\" %u %hu %" G_GSIZE_FORMAT "\001", |
8351 | 290 xfer->filename, ntohl(addr.s_addr), |
291 port, xfer->size); | |
292 | |
10555 | 293 irc_cmd_privmsg(gc->proto_data, "msg", NULL, arg); |
8351 | 294 g_free(tmp); |
295 } | |
296 | |
12143
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
297 GaimXfer *irc_dccsend_new_xfer(GaimConnection *gc, const char *who) { |
8351 | 298 GaimXfer *xfer; |
299 struct irc_xfer_send_data *xd; | |
300 | |
301 /* Build the file transfer handle */ | |
9466 | 302 xfer = gaim_xfer_new(gaim_connection_get_account(gc), GAIM_XFER_SEND, who); |
8351 | 303 |
304 xd = g_new0(struct irc_xfer_send_data, 1); | |
305 xd->fd = -1; | |
306 xfer->data = xd; | |
307 | |
12143
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
308 /* Setup our I/O op functions */ |
8351 | 309 gaim_xfer_set_init_fnc(xfer, irc_dccsend_send_init); |
310 gaim_xfer_set_write_fnc(xfer, irc_dccsend_send_write); | |
311 gaim_xfer_set_end_fnc(xfer, irc_dccsend_send_destroy); | |
312 gaim_xfer_set_request_denied_fnc(xfer, irc_dccsend_send_destroy); | |
313 gaim_xfer_set_cancel_send_fnc(xfer, irc_dccsend_send_destroy); | |
12143
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
314 |
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
315 return xfer; |
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
316 } |
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
317 |
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
318 /** |
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
319 * Gaim calls this function when the user selects Send File from the |
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
320 * buddy menu |
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
321 * It sets up the GaimXfer struct and tells Gaim to go ahead |
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
322 */ |
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
323 void irc_dccsend_send_file(GaimConnection *gc, const char *who, const char *file) { |
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
324 GaimXfer *xfer = irc_dccsend_new_xfer(gc, who); |
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
325 |
cbebda5f019c
[gaim-migrate @ 14444]
Richard Laager <rlaager@wiktel.com>
parents:
11656
diff
changeset
|
326 /* Perform the request */ |
9466 | 327 if (file) |
328 gaim_xfer_request_accepted(xfer, file); | |
329 else | |
330 gaim_xfer_request(xfer); | |
8351 | 331 } |