Commit e9276653 for guacamole.apache.org
commit e9276653d3c71b8719df5ba3d6774e2ee718f421
Author: Michael Jumper <mjumper@apache.org>
Date: Fri Sep 25 18:08:50 2026 -0700
GUACAMOLE-2118: Move internal struct out of public "socket-ssl.h" header.
diff --git a/src/libguac/guacamole/socket-ssl.h b/src/libguac/guacamole/socket-ssl.h
index b639e0e1..5d84642a 100644
--- a/src/libguac/guacamole/socket-ssl.h
+++ b/src/libguac/guacamole/socket-ssl.h
@@ -30,37 +30,6 @@
#include "socket-types.h"
#include <openssl/ssl.h>
-#include <pthread.h>
-
-/**
- * SSL socket-specific data.
- */
-typedef struct guac_socket_ssl_data {
-
- /**
- * The file descriptor that SSL communication will take place
- * over.
- */
- int fd;
-
- /**
- * The current SSL context.
- */
- SSL_CTX* context;
-
- /**
- * The SSL connection, created automatically via
- * guac_socket_open_secure().
- */
- SSL* ssl;
-
- /**
- * Lock that is acquired when an instruction is being written, and released
- * when the instruction is finished being written.
- */
- pthread_mutex_t socket_lock;
-
-} guac_socket_ssl_data;
/**
* Creates a new guac_socket which will use SSL for all communication. Freeing
diff --git a/src/libguac/socket-ssl.c b/src/libguac/socket-ssl.c
index 5da4a91e..1e295f1e 100644
--- a/src/libguac/socket-ssl.c
+++ b/src/libguac/socket-ssl.c
@@ -28,6 +28,36 @@
#include <openssl/ssl.h>
+/**
+ * SSL socket-specific data.
+ */
+typedef struct guac_socket_ssl_data {
+
+ /**
+ * The file descriptor that SSL communication will take place
+ * over.
+ */
+ int fd;
+
+ /**
+ * The current SSL context.
+ */
+ SSL_CTX* context;
+
+ /**
+ * The SSL connection, created automatically via
+ * guac_socket_open_secure().
+ */
+ SSL* ssl;
+
+ /**
+ * Lock that is acquired when an instruction is being written, and released
+ * when the instruction is finished being written.
+ */
+ pthread_mutex_t socket_lock;
+
+} guac_socket_ssl_data;
+
static ssize_t __guac_socket_ssl_read_handler(guac_socket* socket,
void* buf, size_t count) {