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

common: changes to trans for timeout

Browse Source
This commit is contained in:
Jay Sorg 2015-08-18 21:10:23 -07:00
parent bfe69badc3
commit 6384bae1e7
1 changed files with 72 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
common/trans.c
View File

@ -649,29 +649,88 @@ trans_connect(struct trans *self, const char *server, const char *port,
int timeout) int timeout)
{ {
int error; int error;
int now;
int start_time;
start_time = g_time3();
if (self->sck != 0) if (self->sck != 0)
{ {
g_tcp_close(self->sck); g_tcp_close(self->sck);
self->sck = 0;
} }
if (self->mode == TRANS_MODE_TCP) /* tcp */ if (self->mode == TRANS_MODE_TCP) /* tcp */
{ {
self->sck = g_tcp_socket(); self->sck = g_tcp_socket();
if (self->sck < 0) if (self->sck < 0)
{
self->status = TRANS_STATUS_DOWN;
return 1; return 1;
}
g_tcp_set_non_blocking(self->sck); g_tcp_set_non_blocking(self->sck);
while (1)
{
error = g_tcp_connect(self->sck, server, port); error = g_tcp_connect(self->sck, server, port);
if (error == 0)
{
break;
}
else
{
if (timeout < 1)
{
self->status = TRANS_STATUS_DOWN;
return 1;
}
now = g_time3();
if (now - start_time < timeout)
{
g_sleep(timeout / 5);
}
else
{
self->status = TRANS_STATUS_DOWN;
return 1;
}
}
}
} }
else if (self->mode == TRANS_MODE_UNIX) /* unix socket */ else if (self->mode == TRANS_MODE_UNIX) /* unix socket */
{ {
self->sck = g_tcp_local_socket(); self->sck = g_tcp_local_socket();
if (self->sck < 0) if (self->sck < 0)
{
self->status = TRANS_STATUS_DOWN;
return 1; return 1;
}
g_tcp_set_non_blocking(self->sck); g_tcp_set_non_blocking(self->sck);
while (1)
{
error = g_tcp_local_connect(self->sck, port); error = g_tcp_local_connect(self->sck, port);
if (error == 0)
{
break;
}
else
{
if (timeout < 1)
{
self->status = TRANS_STATUS_DOWN;
return 1;
}
now = g_time3();
if (now - start_time < timeout)
{
g_sleep(timeout / 5);
}
else
{
self->status = TRANS_STATUS_DOWN;
return 1;
}
}
}
} }
else else
{ {
@ -683,6 +742,15 @@ trans_connect(struct trans *self, const char *server, const char *port,
{ {
if (g_tcp_last_error_would_block(self->sck)) if (g_tcp_last_error_would_block(self->sck))
{ {
now = g_time3();
if (now - start_time < timeout)
{
timeout = timeout - (now - start_time);
}
else
{
timeout = 0;
}
if (g_tcp_can_send(self->sck, timeout)) if (g_tcp_can_send(self->sck, timeout))
{ {
self->status = TRANS_STATUS_UP; /* ok */ self->status = TRANS_STATUS_UP; /* ok */