From dc3c6ce85cf17e1da653a4a17bf3cca69ed02732 Mon Sep 17 00:00:00 2001 From: Mark Nunberg Date: Wed, 10 Apr 2019 08:36:34 -0400 Subject: [PATCH] build ssl example if ssl is enabled --- examples/CMakeLists.txt | 5 +++++ examples/example-ssl.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 27388cb..8ab4b42 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -37,5 +37,10 @@ IF (APPLE) TARGET_LINK_LIBRARIES(example-macosx hiredis ${CF}) ENDIF() +IF (HIREDIS_SSL) + ADD_EXECUTABLE(example-ssl example-ssl.c) + TARGET_LINK_LIBRARIES(example-ssl hiredis) +ENDIF() + ADD_EXECUTABLE(example example.c) TARGET_LINK_LIBRARIES(example hiredis) \ No newline at end of file diff --git a/examples/example-ssl.c b/examples/example-ssl.c index a90b78a..156f524 100644 --- a/examples/example-ssl.c +++ b/examples/example-ssl.c @@ -18,8 +18,12 @@ int main(int argc, char **argv) { const char *key = argv[4]; const char *ca = argc > 4 ? argv[5] : NULL; - struct timeval timeout = { 1, 500000 }; // 1.5 seconds - c = redisConnectWithTimeout(hostname, port, timeout); + struct timeval tv = { 1, 500000 }; // 1.5 seconds + redisOptions options = {0}; + REDIS_OPTIONS_SET_TCP(&options, hostname, port); + options.timeout = &tv; + c = redisConnectWithOptions(&options); + if (c == NULL || c->err) { if (c) { printf("Connection error: %s\n", c->errstr);