fixup: Use function instead of macro to enable TLS

Signed-off-by: Björn Svensson <[email protected]>
valkey-io · Dec 13, 2024 · 425af3f · 425af3f
1 parent 8f0e516
commit 425af3f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 17 deletions.
diff --git a/examples/cluster-async-tls.c b/examples/cluster-async-tls.c
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
     options.onConnect = connectCallback;
     options.onDisconnect = disconnectCallback;
     options.options = VALKEY_OPT_USE_CLUSTER_SLOTS;
-    VALKEY_CLUSTER_OPTIONS_SET_SSL(&options, tls);
+    valkeyClusterSetOptionEnableTLS(&options, tls);
 
     struct event_base *base = event_base_new();
     VALKEY_CLUSTER_OPTIONS_SET_ADAPTER_LIBEVENT(&options, base);

diff --git a/examples/cluster-tls.c b/examples/cluster-tls.c
@@ -29,7 +29,7 @@ int main(int argc, char **argv) {
     options.initial_nodes = CLUSTER_NODE_TLS;
     options.connect_timeout = &timeout;
     options.options = VALKEY_OPT_USE_CLUSTER_SLOTS;
-    VALKEY_CLUSTER_OPTIONS_SET_SSL(&options, tls);
+    valkeyClusterSetOptionEnableTLS(&options, tls);
 
     valkeyClusterContext *cc = valkeyClusterConnectWithOptions(&options);
     if (!cc) {

diff --git a/include/valkey/cluster.h b/include/valkey/cluster.h
@@ -164,7 +164,7 @@ typedef struct {
     const char *password;                  /* Authentication password. */
     int max_retry_count;                   /* Allowed retry attempts. */
 
-    /* TLS enabled using VALKEY_CLUSTER_OPTIONS_SET_SSL macro. */
+    /* TLS set by valkeyClusterSetOptionEnableTLS. */
     void *tls;
     int (*tls_init_fn)(struct valkeyContext *, struct valkeyTLSContext *);
 

diff --git a/include/valkey/cluster_tls.h b/include/valkey/cluster_tls.h
@@ -40,16 +40,9 @@ extern "C" {
 /**
  * Configuration option to enable TLS negotiation on a context.
  */
-int valkeyClusterSetOptionEnableTLS(valkeyClusterContext *cc,
+int valkeyClusterSetOptionEnableTLS(valkeyClusterOptions *options,
                                     valkeyTLSContext *tls);
 
-/* Helper macro to initialize options. */
-#define VALKEY_CLUSTER_OPTIONS_SET_SSL(opts, tls_)           \
-    do {                                                     \
-        (opts)->tls = tls_;                                  \
-        (opts)->tls_init_fn = &valkeyInitiateTLSWithContext; \
-    } while (0)
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/cluster_tls.c b/src/cluster_tls.c
@@ -28,14 +28,12 @@
  */
 #include "cluster_tls.h"
 
-int valkeyClusterSetOptionEnableTLS(valkeyClusterContext *cc,
+int valkeyClusterSetOptionEnableTLS(valkeyClusterOptions *options,
                                     valkeyTLSContext *tls) {
-    if (cc == NULL || tls == NULL) {
+    if (options == NULL || tls == NULL) {
         return VALKEY_ERR;
     }
-
-    cc->tls = tls;
-    cc->tls_init_fn = &valkeyInitiateTLSWithContext;
-
+    options->tls = tls;
+    options->tls_init_fn = &valkeyInitiateTLSWithContext;
     return VALKEY_OK;
 }