pxcloud/guacamole-server
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from main branch back to next.

Browse Source
This commit is contained in:
Michael Jumper 2024-08-30 10:51:35 -07:00
commit 1dfb3feeb6
3 changed files with 59 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/guacctl
View File

@ -117,7 +117,7 @@ error() {
##
usage() {
cat >&2 <<END
guacctl 1.5.5, Apache Guacamole terminal session control utility.
guacctl 1.6.0, Apache Guacamole terminal session control utility.
Usage: guacctl [OPTION] [FILE or NAME]...
-d, --download download each of the files listed.

2
configure.ac
View File

@ -18,7 +18,7 @@
#
AC_PREREQ([2.61])
AC_INIT([guacamole-server], [1.5.5])
AC_INIT([guacamole-server], [1.6.0])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AM_SILENT_RULES([yes])

75
src/libguac/tcp.c
View File

@ -54,8 +54,7 @@ int guac_tcp_connect(const char* hostname, const char* port, const int timeout)
}
/* Attempt connection to each address until success */
current_address = addresses;
while (current_address != NULL) {
for (current_address = addresses; current_address != NULL; current_address = current_address->ai_next) {
/* Resolve hostname */
if ((retval = getnameinfo(current_address->ai_addr,
@ -69,40 +68,80 @@ int guac_tcp_connect(const char* hostname, const char* port, const int timeout)
continue;
}
/* Get socket */
/* Get socket or return the error. */
fd = socket(current_address->ai_family, SOCK_STREAM, 0);
if (fd < 0) {
freeaddrinfo(addresses);
return fd;
}
/* Variable to store current socket options. */
int opt;
/* Get current socket options */
if ((opt = fcntl(fd, F_GETFL, NULL)) < 0) {
guac_error = GUAC_STATUS_INVALID_ARGUMENT;
guac_error_message = "Failed to retrieve socket options.";
close(fd);
continue;
}
/* Set socket to non-blocking */
fcntl(fd, F_SETFL, O_NONBLOCK);
/* Set up timeout. */
fd_set fdset;
FD_ZERO(&fdset);
FD_SET(fd, &fdset);
if (fcntl(fd, F_SETFL, opt | O_NONBLOCK) < 0) {
guac_error = GUAC_STATUS_INVALID_ARGUMENT;
guac_error_message = "Failed to set non-blocking socket.";
close(fd);
continue;
}
/* Structure that stores our timeout setting. */
struct timeval tv;
tv.tv_sec = timeout;
tv.tv_usec = 0;
/* Connect and wait for timeout */
if (connect(fd, current_address->ai_addr, current_address->ai_addrlen) < 0) {
guac_error = GUAC_STATUS_REFUSED;
guac_error_message = "Unable to connect via socket.";
close(fd);
if ((retval = connect(fd, current_address->ai_addr, current_address->ai_addrlen)) < 0) {
if (errno == EINPROGRESS) {
/* Set up timeout. */
fd_set fdset;
FD_ZERO(&fdset);
FD_SET(fd, &fdset);
retval = select(fd + 1, NULL, &fdset, NULL, &tv);
}
else {
guac_error = GUAC_STATUS_REFUSED;
guac_error_message = "Unable to connect via socket.";
close(fd);
continue;
}
}
/* Successful connection */
if (retval > 0) {
/* Restore previous socket options. */
if (fcntl(fd, F_SETFL, opt) < 0) {
guac_error = GUAC_STATUS_INVALID_ARGUMENT;
guac_error_message = "Failed to reset socket options.";
close(fd);
continue;
}
break;
}
/* Check for the connection and break if successful */
if (select(fd + 1, NULL, &fdset, NULL, &tv) > 0)
break;
if (retval == 0) {
guac_error = GUAC_STATUS_REFUSED;
guac_error_message = "Timeout connecting via socket.";
}
else {
guac_error = GUAC_STATUS_INVALID_ARGUMENT;
guac_error_message = "Error attempting to connect via socket.";
}
/* Connection not successful - free resources and go to the next address. */
/* Some error has occurred - free resources before next iteration. */
close(fd);
current_address = current_address->ai_next;
}