Commit 924904dd for guacamole.apache.org

commit 924904ddf04c5a77291f38b7ab52cbdf56b6e870
Author: Bradley Bennett <bbennett@keepersecurity.com>
Date:   Mon Feb 23 12:17:23 2026 -0500

    GUACAMOLE-2231: Update SSH/Telnet WOL logs to match RDP/VNC.

diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c
index d0e5a187..1ef85bee 100644
--- a/src/protocols/rdp/rdp.c
+++ b/src/protocols/rdp/rdp.c
@@ -764,7 +764,7 @@ void* guac_rdp_client_thread(void* data) {

         /* Just send the packet, or return NULL if failed. */
         else {
-            guac_client_log(client, GUAC_LOG_DEBUG, "Sending RDP Wake-on-LAN packet.");
+            guac_client_log(client, GUAC_LOG_DEBUG, "Sending Wake-on-LAN packet.");

             if (guac_wol_wake(settings->wol_mac_addr,
                     settings->wol_broadcast_addr,
diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c
index 4f99fb97..95c07e68 100644
--- a/src/protocols/ssh/ssh.c
+++ b/src/protocols/ssh/ssh.c
@@ -242,7 +242,8 @@ void* ssh_client_thread(void* data) {
          */
         if (settings->wol_wait_time > 0) {
             guac_client_log(client, GUAC_LOG_DEBUG, "Sending Wake-on-LAN packet, "
-                "and pausing for %d seconds.", settings->wol_wait_time);
+                "and retrying connection check %d times every %d seconds.",
+                GUAC_WOL_DEFAULT_CONNECT_RETRIES, settings->wol_wait_time);

             /* Send the Wake-on-LAN request and wait until the server is responsive. */
             if (guac_wol_wake_and_wait(settings->wol_mac_addr,
@@ -253,17 +254,21 @@ void* ssh_client_thread(void* data) {
                     settings->hostname,
                     settings->port,
                     settings->timeout)) {
-                guac_client_log(client, GUAC_LOG_ERROR, "Failed to send WOL packet or connect to remote server.");
+                guac_client_log(client, GUAC_LOG_ERROR, "Failed to send WOL packet, or connect to remote server.");
                 return NULL;
             }
         }

-        /* Just send the packet and continue the connection, or return if failed. */
-        else if (guac_wol_wake(settings->wol_mac_addr,
-                     settings->wol_broadcast_addr,
-                     settings->wol_udp_port)) {
-            guac_client_log(client, GUAC_LOG_ERROR, "Failed to send WOL packet.");
-            return NULL;
+        /* Just send the packet, or return NULL if failed. */
+        else {
+            guac_client_log(client, GUAC_LOG_DEBUG, "Sending Wake-on-LAN packet.");
+
+            if (guac_wol_wake(settings->wol_mac_addr,
+                    settings->wol_broadcast_addr,
+                    settings->wol_udp_port)) {
+                guac_client_log(client, GUAC_LOG_ERROR, "Failed to send WOL packet.");
+                return NULL;
+            }
         }
     }

@@ -571,4 +576,3 @@ void* ssh_client_thread(void* data) {
     return NULL;

 }
-
diff --git a/src/protocols/telnet/telnet.c b/src/protocols/telnet/telnet.c
index e14c2314..2f3616c7 100644
--- a/src/protocols/telnet/telnet.c
+++ b/src/protocols/telnet/telnet.c
@@ -502,7 +502,8 @@ void* guac_telnet_client_thread(void* data) {
          */
         if (settings->wol_wait_time > 0) {
             guac_client_log(client, GUAC_LOG_DEBUG, "Sending Wake-on-LAN packet, "
-                "and pausing for %d seconds.", settings->wol_wait_time);
+                "and retrying connection check %d times every %d seconds.",
+                GUAC_WOL_DEFAULT_CONNECT_RETRIES, settings->wol_wait_time);

             /* Send the Wake-on-LAN request and wait until the server is responsive. */
             if (guac_wol_wake_and_wait(settings->wol_mac_addr,
@@ -513,17 +514,21 @@ void* guac_telnet_client_thread(void* data) {
                     settings->hostname,
                     settings->port,
                     settings->timeout)) {
-                guac_client_log(client, GUAC_LOG_ERROR, "Failed to send WOL packet or connect to remote server.");
+                guac_client_log(client, GUAC_LOG_ERROR, "Failed to send WOL packet, or connect to remote server.");
                 return NULL;
             }
         }

-        /* Just send the packet and continue the connection, or return if failed. */
-        else if (guac_wol_wake(settings->wol_mac_addr,
+        /* Just send the packet, or return NULL if failed. */
+        else {
+            guac_client_log(client, GUAC_LOG_DEBUG, "Sending Wake-on-LAN packet.");
+
+            if (guac_wol_wake(settings->wol_mac_addr,
                     settings->wol_broadcast_addr,
                     settings->wol_udp_port)) {
-            guac_client_log(client, GUAC_LOG_ERROR, "Failed to send WOL packet.");
-            return NULL;
+                guac_client_log(client, GUAC_LOG_ERROR, "Failed to send WOL packet.");
+                return NULL;
+            }
         }
     }

@@ -623,4 +628,3 @@ void* guac_telnet_client_thread(void* data) {
     return NULL;

 }
-