Cleanup of SSL init function in cluster context

Signed-off-by: Björn Svensson <[email protected]>
bjosv · Sep 23, 2024 · 6bb24e5 · 6bb24e5
1 parent fbbf80e
commit 6bb24e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/include/valkey/cluster.h b/include/valkey/cluster.h
@@ -68,9 +68,9 @@ extern "C" {
 
 struct hilist;
 struct valkeyClusterAsyncContext;
+struct valkeySSLContext;
 
 typedef int(adapterAttachFn)(valkeyAsyncContext *, void *);
-typedef int(sslInitFn)(valkeyContext *, void *);
 typedef void(valkeyClusterCallbackFn)(struct valkeyClusterAsyncContext *,
                                       void *, void *);
 typedef struct valkeyClusterNode {
@@ -116,8 +116,8 @@ typedef struct valkeyClusterContext {
     int retry_count;       /* Current number of failing attempts */
     int need_update_route; /* Indicator for valkeyClusterReset() (Pipel.) */
 
-    void *ssl;              /* Pointer to a valkeySSLContext when using SSL/TLS. */
-    sslInitFn *ssl_init_fn; /* Func ptr for SSL context initiation */
+    void *ssl; /* Pointer to a valkeySSLContext when using SSL/TLS. */
+    int (*ssl_init_fn)(struct valkeyContext *, struct valkeySSLContext *);
 
     void (*on_connect)(const struct valkeyContext *c, int status);
     void (*event_callback)(const struct valkeyClusterContext *cc, int event,

diff --git a/src/cluster_ssl.c b/src/cluster_ssl.c
@@ -28,19 +28,14 @@
  */
 #include "cluster_ssl.h"
 
-static int valkeyClusterInitiateSSLWithContext(valkeyContext *c,
-                                               void *valkey_ssl_ctx) {
-    return valkeyInitiateSSLWithContext(c, valkey_ssl_ctx);
-}
-
 int valkeyClusterSetOptionEnableSSL(valkeyClusterContext *cc,
                                     valkeySSLContext *ssl) {
     if (cc == NULL || ssl == NULL) {
         return VALKEY_ERR;
     }
 
     cc->ssl = ssl;
-    cc->ssl_init_fn = &valkeyClusterInitiateSSLWithContext;
+    cc->ssl_init_fn = &valkeyInitiateSSLWithContext;
 
     return VALKEY_OK;
 }