mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added options to set tcp send and recv buffer sizes

This commit is contained in:
Jay Sorg 2013-10-02 12:52:35 -07:00
parent 97473e4f66
commit 7176f14647
5 changed files with 159 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
common/os_calls.c
View File

@ -492,6 +492,96 @@ g_tcp_socket(void)
return rv;
}
/*****************************************************************************/
/* returns error */
int APP_CC
g_sck_set_send_buffer_bytes(int sck, int bytes)
{
int option_value;
#if defined(_WIN32)
int option_len;
#else
unsigned int option_len;
#endif
option_value = bytes;
option_len = sizeof(option_value);
if (setsockopt(sck, SOL_SOCKET, SO_SNDBUF, (char *)&option_value,
option_len) != 0)
{
return 1;
}
return 0;
}
/*****************************************************************************/
/* returns error */
int APP_CC
g_sck_get_send_buffer_bytes(int sck, int *bytes)
{
int option_value;
#if defined(_WIN32)
int option_len;
#else
unsigned int option_len;
#endif
option_value = 0;
option_len = sizeof(option_value);
if (getsockopt(sck, SOL_SOCKET, SO_SNDBUF, (char *)&option_value,
&option_len) != 0)
{
return 1;
}
*bytes = option_value;
return 0;
}
/*****************************************************************************/
/* returns error */
int APP_CC
g_sck_set_recv_buffer_bytes(int sck, int bytes)
{
int option_value;
#if defined(_WIN32)
int option_len;
#else
unsigned int option_len;
#endif
option_value = bytes;
option_len = sizeof(option_value);
if (setsockopt(sck, SOL_SOCKET, SO_RCVBUF, (char *)&option_value,
option_len) != 0)
{
return 1;
}
return 0;
}
/*****************************************************************************/
/* returns error */
int APP_CC
g_sck_get_recv_buffer_bytes(int sck, int *bytes)
{
int option_value;
#if defined(_WIN32)
int option_len;
#else
unsigned int option_len;
#endif
option_value = 0;
option_len = sizeof(option_value);
if (getsockopt(sck, SOL_SOCKET, SO_RCVBUF, (char *)&option_value,
&option_len) != 0)
{
return 1;
}
*bytes = option_value;
return 0;
}
/*****************************************************************************/
int APP_CC
g_tcp_local_socket(void)

4
common/os_calls.h
View File

@ -45,6 +45,10 @@ int APP_CC g_getchar(void);
int APP_CC g_tcp_set_no_delay(int sck);
int APP_CC g_tcp_set_keepalive(int sck);
int APP_CC g_tcp_socket(void);
int APP_CC g_sck_set_send_buffer_bytes(int sck, int bytes);
int APP_CC g_sck_get_send_buffer_bytes(int sck, int *bytes);
int APP_CC g_sck_set_recv_buffer_bytes(int sck, int bytes);
int APP_CC g_sck_get_recv_buffer_bytes(int sck, int *bytes);
int APP_CC g_tcp_local_socket(void);
int APP_CC g_sck_get_peer_cred(int sck, int *pid, int *uid, int *gid);
void APP_CC g_tcp_close(int sck);

2
xrdp/xrdp.ini
View File

@ -13,6 +13,8 @@ tcp_nodelay=yes
# regulate if the listening socket use socket option keepalive
# if the network connection disappear without close messages the connection will be closed
tcp_keepalive=yes
#tcp_send_buffer_bytes=32768
#tcp_recv_buffer_bytes=32768
#black=000000
#grey=d6d3ce
#dark_grey=808080

61
xrdp/xrdp_listen.c
View File

@ -217,6 +217,18 @@ xrdp_listen_get_port_address(char *port, int port_bytes,
val = (char *)list_get_item(values, index);
*tcp_keepalive = g_text2bool(val);
}
if (g_strcasecmp(val, "tcp_send_buffer_bytes") == 0)
{
val = (char *)list_get_item(values, index);
startup_param->send_buffer_bytes = g_atoi(val);
}
if (g_strcasecmp(val, "tcp_recv_buffer_bytes") == 0)
{
val = (char *)list_get_item(values, index);
startup_param->recv_buffer_bytes = g_atoi(val);
}
}
}
}
@ -322,6 +334,7 @@ xrdp_listen_main_loop(struct xrdp_listen *self)
tbus done_obj;
int tcp_nodelay;
int tcp_keepalive;
int bytes;
self->status = 1;
@ -356,6 +369,54 @@ xrdp_listen_main_loop(struct xrdp_listen *self)
}
}
if (self->startup_params->send_buffer_bytes > 0)
{
bytes = self->startup_params->send_buffer_bytes;
log_message(LOG_LEVEL_INFO, "setting send buffer to %d bytes",
bytes);
if (g_sck_set_send_buffer_bytes(self->listen_trans->sck,
bytes) != 0)
{
log_message(LOG_LEVEL_ERROR, "error setting send buffer");
}
else
{
if (g_sck_get_send_buffer_bytes(self->listen_trans->sck,
&bytes) != 0)
{
log_message(LOG_LEVEL_ERROR, "error getting send buffer");
}
else
{
log_message(LOG_LEVEL_INFO, "send buffer set to %d bytes", bytes);
}
}
}
if (self->startup_params->recv_buffer_bytes > 0)
{
bytes = self->startup_params->recv_buffer_bytes;
log_message(LOG_LEVEL_INFO, "setting recv buffer to %d bytes",
bytes);
if (g_sck_set_recv_buffer_bytes(self->listen_trans->sck,
bytes) != 0)
{
log_message(LOG_LEVEL_ERROR, "error setting recv buffer");
}
else
{
if (g_sck_get_recv_buffer_bytes(self->listen_trans->sck,
&bytes) != 0)
{
log_message(LOG_LEVEL_ERROR, "error getting recv buffer");
}
else
{
log_message(LOG_LEVEL_INFO, "recv buffer set to %d bytes", bytes);
}
}
}
self->listen_trans->trans_conn_in = xrdp_listen_conn_in;
self->listen_trans->callback_data = self;
term_obj = g_get_term_event(); /*Global termination event */

2
xrdp/xrdp_types.h
View File

@ -489,4 +489,6 @@ struct xrdp_startup_params
int help;
int version;
int fork;
int send_buffer_bytes;
int recv_buffer_bytes;
};