diff --git a/include/valkey/cluster.h b/include/valkey/cluster.h index 6747c493..91d5405a 100644 --- 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 index fcd5e4e3..3c591e35 100644 --- a/src/cluster_ssl.c +++ b/src/cluster_ssl.c @@ -28,11 +28,6 @@ */ #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) { @@ -40,7 +35,7 @@ int valkeyClusterSetOptionEnableSSL(valkeyClusterContext *cc, } cc->ssl = ssl; - cc->ssl_init_fn = &valkeyClusterInitiateSSLWithContext; + cc->ssl_init_fn = &valkeyInitiateSSLWithContext; return VALKEY_OK; }