github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coverity CID 468110/468131

Browse Source 
file descriptors cannot be zero when not in use. This commit
enforces that for the test TCP proxy.
This commit is contained in:
matt335672
2025-02-01 17:27:20 +00:00
parent db32f9c6a3
commit 2d2934241c
1 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/devel/tcp_proxy/main.c
+36 -19
View File
@@ -71,25 +71,28 @@ g_tcp_socket_ok(int sck)
static int static int
main_loop(char *local_port, char *remote_ip, char *remote_port, int hexdump) main_loop(char *local_port, char *remote_ip, char *remote_port, int hexdump)
{ {
int lis_sck; int lis_sck = -1;
int acc_sck; int acc_sck = -1;
int con_sck; int con_sck = -1;
int sel; int sel;
int count; int count;
int sent; int sent;
int error; int error;
int i; int i;
int acc_to_con; int acc_to_con = 0;
int con_to_acc; int con_to_acc = 0;
acc_to_con = 0;
con_to_acc = 0;
acc_sck = 0;
/* create the listening socket and setup options */ /* create the listening socket and setup options */
lis_sck = g_tcp_socket(); lis_sck = g_tcp_socket();
g_tcp_set_non_blocking(lis_sck); if (lis_sck < 0)
error = g_tcp_bind(lis_sck, local_port); {
error = 1;
}
else
{
g_tcp_set_non_blocking(lis_sck);
error = g_tcp_bind(lis_sck, local_port);
}
if (error != 0) if (error != 0)
{ {
@@ -135,7 +138,7 @@ main_loop(char *local_port, char *remote_ip, char *remote_port, int hexdump)
/* stop listening */ /* stop listening */
g_tcp_close(lis_sck); g_tcp_close(lis_sck);
lis_sck = 0; lis_sck = -1;
if (error == 0) if (error == 0)
{ {
@@ -144,13 +147,18 @@ main_loop(char *local_port, char *remote_ip, char *remote_port, int hexdump)
} }
/* connect outgoing socket */ /* connect outgoing socket */
con_sck = 0;
if (error == 0) if (error == 0)
{ {
con_sck = g_tcp_socket(); con_sck = g_tcp_socket();
g_tcp_set_non_blocking(con_sck); if (con_sck < 0)
error = g_tcp_connect(con_sck, remote_ip, remote_port); {
error = 1;
}
else
{
g_tcp_set_non_blocking(con_sck);
error = g_tcp_connect(con_sck, remote_ip, remote_port);
}
if ((error == -1) && g_tcp_last_error_would_block(con_sck)) if ((error == -1) && g_tcp_last_error_would_block(con_sck))
{ {
@@ -280,9 +288,18 @@ main_loop(char *local_port, char *remote_ip, char *remote_port, int hexdump)
} }
} }
g_tcp_close(lis_sck); if (lis_sck >= 0)
g_tcp_close(con_sck); {
g_tcp_close(acc_sck); g_tcp_close(lis_sck);
}
if (con_sck >= 0)
{
g_tcp_close(con_sck);
}
if (acc_sck >= 0)
{
g_tcp_close(acc_sck);
}
LOG(LOG_LEVEL_INFO, "acc_to_con %d", acc_to_con); LOG(LOG_LEVEL_INFO, "acc_to_con %d", acc_to_con);
LOG(LOG_LEVEL_INFO, "con_to_acc %d", con_to_acc); LOG(LOG_LEVEL_INFO, "con_to_acc %d", con_to_acc);
return 0; return 0;