From 426a8fc62aad047a1aebc609828e9ffb4b7e0a68 Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Fri, 17 May 2024 17:18:42 +0000 Subject: [PATCH] GUACAMOLE-1841: Fixes for telnet on windows. --- src/protocols/telnet/telnet.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/protocols/telnet/telnet.c b/src/protocols/telnet/telnet.c index abe2194f9..11f4e186e 100644 --- a/src/protocols/telnet/telnet.c +++ b/src/protocols/telnet/telnet.c @@ -86,7 +86,11 @@ static int __guac_telnet_write_all(int fd, const char* buffer, int size) { while (remaining > 0) { /* Attempt to write data */ +#ifdef WINDOWS_BUILD + int ret_val = send(fd, buffer, remaining, 0); +#else int ret_val = write(fd, buffer, remaining); +#endif if (ret_val <= 0) return -1; @@ -637,8 +641,11 @@ void* guac_telnet_client_thread(void* data) { /* Resume waiting of no data available */ if (wait_result == 0) continue; - +#ifdef WINDOWS_BUILD + int bytes_read = recv(telnet_client->socket_fd, buffer, sizeof(buffer), 0); +#else int bytes_read = read(telnet_client->socket_fd, buffer, sizeof(buffer)); +#endif if (bytes_read <= 0) break;