blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/1171'

Browse Source
This commit is contained in:
Sébastien Helleu 2018-03-31 13:30:21 +02:00
commit 060ba763f2
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/xfer/xfer-config.c
View File

@ -51,6 +51,7 @@ struct t_config_option *xfer_config_network_own_ip;
struct t_config_option *xfer_config_network_port_range;
struct t_config_option *xfer_config_network_speed_limit;
struct t_config_option *xfer_config_network_timeout;
struct t_config_option *xfer_config_network_send_ack;
/* xfer config, file section */
@ -296,6 +297,12 @@ xfer_config_init ()
N_("timeout for xfer request (in seconds)"),
NULL, 5, INT_MAX, "300", NULL, 0,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
xfer_config_network_send_ack = weechat_config_new_option (
xfer_config_file, ptr_section,
"send_ack", "boolean",
N_("does not send acks when receiving files"),
NULL, 0, 0, "on", NULL, 0,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
ptr_section = weechat_config_new_section (xfer_config_file, "file",
0, 0,

1
src/plugins/xfer/xfer-config.h
View File

@ -41,6 +41,7 @@ extern struct t_config_option *xfer_config_network_own_ip;
extern struct t_config_option *xfer_config_network_port_range;
extern struct t_config_option *xfer_config_network_speed_limit;
extern struct t_config_option *xfer_config_network_timeout;
extern struct t_config_option *xfer_config_network_send_ack;
extern struct t_config_option *xfer_config_file_auto_accept_chats;
extern struct t_config_option *xfer_config_file_auto_accept_files;

13
src/plugins/xfer/xfer-dcc.c
View File

@ -28,6 +28,7 @@
#include <sys/socket.h>
#include <poll.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <fcntl.h>
#include <time.h>
#include <netdb.h>
@ -308,7 +309,7 @@ xfer_dcc_resume_hash (struct t_xfer *xfer)
void
xfer_dcc_recv_file_child (struct t_xfer *xfer)
{
int flags, num_read, ack_enabled, ready;
int flags, num_read, ready;
static char buffer[XFER_BLOCKSIZE_MAX];
time_t last_sent, new_time;
unsigned long long pos_last_ack;
@ -345,6 +346,11 @@ xfer_dcc_recv_file_child (struct t_xfer *xfer)
return;
}
/* set TCP_NODELAY to be more aggressive with acks */
/* ignore error as transfer should still work if this fails */
flags = 1;
setsockopt(xfer->sock, IPPROTO_TCP, TCP_NODELAY, &flags, sizeof(flags));
/* connection is OK, change DCC status (inform parent process) */
xfer_network_write_pipe (xfer, XFER_STATUS_ACTIVE,
XFER_NO_ERROR);
@ -356,7 +362,6 @@ xfer_dcc_recv_file_child (struct t_xfer *xfer)
fcntl (xfer->sock, F_SETFL, flags | O_NONBLOCK);
last_sent = time (NULL);
ack_enabled = 1;
pos_last_ack = 0;
while (1)
@ -492,7 +497,7 @@ xfer_dcc_recv_file_child (struct t_xfer *xfer)
}
/* send ACK to sender (if needed) */
if (ack_enabled && (xfer->pos > pos_last_ack))
if (xfer->send_ack && (xfer->pos > pos_last_ack))
{
switch (xfer_dcc_recv_file_send_ack (xfer))
{
@ -503,7 +508,7 @@ xfer_dcc_recv_file_child (struct t_xfer *xfer)
return;
case 1:
/* send error, not fatal (buffer full?): disable ACKs */
ack_enabled = 0;
xfer->send_ack = 0;
break;
case 2:
/* send OK: save position in file as last ACK sent */

1
src/plugins/xfer/xfer.c
View File

@ -501,6 +501,7 @@ xfer_alloc ()
new_xfer->filename_suffix = -1;
new_xfer->pos = 0;
new_xfer->ack = 0;
new_xfer->send_ack = weechat_config_boolean (xfer_config_network_send_ack);
new_xfer->start_resume = 0;
new_xfer->last_check_time = time_now;
new_xfer->last_check_pos = time_now;

1
src/plugins/xfer/xfer.h
View File

@ -156,6 +156,7 @@ struct t_xfer
char *remote_nick_color; /* color name for remote nick */
/* (returned by IRC plugin) */
int fast_send; /* fast send file: does not wait ACK */
int send_ack; /* send ack on file receive */
int blocksize; /* block size for sending file */
time_t start_time; /* time when xfer started */
time_t start_transfer; /* time when xfer transfer started */