diff --git a/common/ssl_calls.c b/common/ssl_calls.c index 7bc33fcb..43002a40 100644 --- a/common/ssl_calls.c +++ b/common/ssl_calls.c @@ -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); } diff --git a/common/trans.c b/common/trans.c index 973bafaa..1e05864b 100644 --- a/common/trans.c +++ b/common/trans.c @@ -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) diff --git a/rdp/rdp_tcp.c b/rdp/rdp_tcp.c index f0a76d7d..0200e777 100644 --- a/rdp/rdp_tcp.c +++ b/rdp/rdp_tcp.c @@ -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 { diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c index 2af2e86d..56d2623f 100644 --- a/xrdp/xrdp_mm.c +++ b/xrdp/xrdp_mm.c @@ -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);