More isolation of TLS support stuff.

Author: yossigo

memtier_benchmark.cpp

@@ -790,6 +790,7 @@ static int config_parse_args(int argc, char *argv[], struct benchmark_config *cf
                     }
                     break;
                 }
+#ifdef USE_TLS
                 case o_tls:
                     cfg->tls = true;
                     break;
@@ -805,6 +806,7 @@ static int config_parse_args(int argc, char *argv[], struct benchmark_config *cf
                 case o_tls_skip_verify:
                     cfg->tls_skip_verify = true;
                     break;
+#endif
             default:
                     return -1;
                     break;

memtier_benchmark.h

@@ -49,14 +49,6 @@ struct benchmark_config {
     const char *protocol;
     const char *out_file;
     const char *client_stats;
-    bool tls;
-    const char *tls_cert;
-    const char *tls_key;
-    const char *tls_cacert;
-    bool tls_skip_verify;
-#ifdef USE_TLS
-    SSL_CTX *openssl_ctx;
-#endif
     unsigned int run_count;
     int debug;
     int show_config;
@@ -101,6 +93,14 @@ struct benchmark_config {
     const char *json_out_file;
     bool cluster_mode;
     struct arbitrary_command_list* arbitrary_commands;
+#ifdef USE_TLS
+    bool tls;
+    const char *tls_cert;
+    const char *tls_key;
+    const char *tls_cacert;
+    bool tls_skip_verify;
+    SSL_CTX *openssl_ctx;
+#endif
 };
 
 

shard_connection.cpp

@@ -187,6 +187,7 @@ void shard_connection::setup_event(int sockfd) {
 #ifdef USE_TLS
     if (m_config->openssl_ctx) {
         SSL *ctx = SSL_new(m_config->openssl_ctx);
+        assert(ctx != NULL);
         m_bev = bufferevent_openssl_socket_new(m_event_base,
                 sockfd, ctx, BUFFEREVENT_SSL_CONNECTING, BEV_OPT_CLOSE_ON_FREE);
     } else {