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

rename g_tcp_can_recv to g_sck_can_recv

Browse Source
This commit is contained in:
Jay Sorg 2015-10-07 22:17:12 -07:00
parent 0bb92e0a61
commit fd793bd213
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ssl_calls.c
View File

@ -841,6 +841,6 @@ ssl_tls_can_recv(struct ssl_tls *tls, int sck, int millis)
return 1;
}
g_reset_wait_obj(tls->rwo);
return g_tcp_can_recv(sck, millis);
return g_sck_can_recv(sck, millis);
}

6
common/trans.c
View File

@ -77,7 +77,7 @@ trans_tcp_send(struct trans *self, const void *data, int len)
int APP_CC
trans_tcp_can_recv(struct trans *self, int sck, int millis)
{
return g_tcp_can_recv(sck, millis);
return g_sck_can_recv(sck, millis);
}
/*****************************************************************************/
@ -285,7 +285,7 @@ trans_check_wait_objs(struct trans *self)
if (self->type1 == TRANS_TYPE_LISTENER) /* listening */
{
if (g_tcp_can_recv(self->sck, 0))
if (g_sck_can_recv(self->sck, 0))
{
in_sck = g_sck_accept(self->sck, self->addr, sizeof(self->addr),
self->port, sizeof(self->port));
@ -437,7 +437,7 @@ trans_force_read_s(struct trans *self, struct stream *in_s, int size)
{
if (g_tcp_last_error_would_block(self->sck))
{
if (!g_tcp_can_recv(self->sck, 100))
if (!g_sck_can_recv(self->sck, 100))
{
/* check for term here */
if (self->is_term != 0)

2
rdp/rdp_tcp.c
View File

@ -74,7 +74,7 @@ rdp_tcp_recv(struct rdp_tcp *self, struct stream *s, int len)
{
if (g_tcp_last_error_would_block(self->sck))
{
g_tcp_can_recv(self->sck, 10);
g_sck_can_recv(self->sck, 10);
}
else
{

2
xrdp/xrdp_mm.c
View File

@ -1450,7 +1450,7 @@ access_control(char *username, char *password, char *srv)
if (reply > 0)
{
/* We wait in 5 sec for a reply from sesman*/
if (g_tcp_can_recv(socket, 5000))
if (g_sck_can_recv(socket, 5000))
{
reply = g_tcp_recv(socket, in_s->end, 500, 0);