This is an automated email from the ASF dual-hosted git repository. jmuehlner pushed a commit to branch staging/1.6.0 in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit 49f9644fe3ede9a4268d61e1cbc75fc681faf686 Merge: 3029b4ca 5ec496fb Author: James Muehlner <[email protected]> AuthorDate: Wed Aug 28 10:34:10 2024 -0700 GUACAMOLE-600: Merge refactor of guac_socket_tcp_connect() to guac_tcp_connect(). src/common-ssh/ssh.c | 4 ++-- src/libguac/Makefile.am | 4 ++-- src/libguac/guacamole/{socket-tcp.h => tcp.h} | 22 +++++++++++++++------- src/libguac/{socket-tcp.c => tcp.c} | 7 ++++--- src/libguac/wol.c | 6 +++--- src/protocols/telnet/telnet.c | 4 ++-- 6 files changed, 28 insertions(+), 19 deletions(-)
