Add SSL for redis_client_pipeline.

Author: zhengshuxin

lib_acl_cpp/include/acl_cpp/redis/redis_client_pipeline.hpp

@@ -12,6 +12,7 @@ namespace acl {
 
 class token_tree;
 class socket_stream;
+class sslbase_conf;
 class redis_client;
 
 typedef enum {
@@ -192,6 +193,7 @@ class redis_pipeline_channel : public thread {
 	void stop_thread();
 
 public:
+	redis_pipeline_channel& set_ssl_conf(sslbase_conf* ssl_conf);
 	redis_pipeline_channel& set_passwd(const char* passwd);
 	const char* get_addr() const {
 		return addr_.c_str();
@@ -229,13 +231,13 @@ class redis_pipeline_channel : public thread {
 class ACL_CPP_API redis_client_pipeline : public thread {
 public:
 	redis_client_pipeline(const char* addr, box_type_t type = BOX_TYPE_MBOX);
-	virtual ~redis_client_pipeline(void);
+	virtual ~redis_client_pipeline();
 
 	// Start the pipeline thread
-	void start_thread(void);
+	void start_thread();
 
 	// Stop the pipeline thread
-	void stop_thread(void);
+	void stop_thread();
 
 public:
 	// Called by redis_command in pipeline mode
@@ -246,9 +248,12 @@ class ACL_CPP_API redis_client_pipeline : public thread {
 
 	// Called by redis_command::get_pipeline_message, and can be overrided
 	// by child class. The box can be tbox, tbox_array, mbox, or fiber_tbox.
-	virtual box<redis_pipeline_message>* create_box(void);
+	virtual box<redis_pipeline_message>* create_box();
 
 public:
+	// Set the ssl conf for the connection with redis internal.
+	redis_client_pipeline& set_ssl_conf(sslbase_conf* ssl_conf);
+
 	// Set the password for connecting the redis server
 	redis_client_pipeline& set_password(const char* passwd);
 
@@ -265,17 +270,18 @@ class ACL_CPP_API redis_client_pipeline : public thread {
 	redis_client_pipeline& set_preconnect(bool yes);
 
 	// Get the max hash slot of redis
-	int get_max_slot(void) const {
+	int get_max_slot() const {
 		return max_slot_;
 	}
 
 protected:
 	// @override from acl::thread
-	void* run(void);
+	void* run();
 
 private:
 	string addr_;		// The default redis address
 	string passwd_;		// Password for connecting redis
+	sslbase_conf* ssl_conf_;// SSL will be used if not null
 	box_type_t box_type_;	// The type of box
 	int    max_slot_;	// The max hash slot for redis cluster
 	int    conn_timeout_;	// Timeout to connect redis
@@ -295,13 +301,13 @@ class ACL_CPP_API redis_client_pipeline : public thread {
 	void set_slot(int slot, const char* addr);
 
 	// Set all hash slots' addresses of all redises
-	void set_all_slot(void);
+	void set_all_slot();
 
 	// Start all pipeline channels threads
-	void start_channels(void);
+	void start_channels();
 
 	// Stop all pipeline channels threads
-	void stop_channels(void);
+	void stop_channels();
 
 	// Start one pipeline channel thread with the specified redis address
 	redis_pipeline_channel* start_channel(const char* addr);
@@ -326,7 +332,7 @@ class ACL_CPP_API redis_client_pipeline : public thread {
 
 /**
  * Sample:
- * void main_thread(void) {
+ * void main_thread() {
  *	acl::redis_client_pipeline pipeline("127.0.0.1:6379");
  *	pipeline.start_thread();
  *	// Start some threads

lib_acl_cpp/src/mqtt/mqtt_connect.cpp

@@ -82,6 +82,7 @@ void mqtt_connect::set_will_qos(mqtt_qos_t qos) {
 		break;
 	default:
 		logger_error("invalid qos: %d", (int) qos);
+		break;
 	}
 }
 

lib_acl_cpp/src/redis/redis_client_pipeline.cpp

@@ -27,6 +27,12 @@ redis_pipeline_channel::~redis_pipeline_channel()
 	delete box_;
 }
 
+redis_pipeline_channel &redis_pipeline_channel::set_ssl_conf(acl::sslbase_conf *ssl_conf)
+{
+	client_->set_ssl_conf(ssl_conf);
+	return *this;
+}
+
 redis_pipeline_channel& redis_pipeline_channel::set_passwd(const char *passwd)
 {
 	if (passwd && *passwd) {
@@ -362,6 +368,12 @@ redis_client_pipeline& redis_client_pipeline::set_retry(bool on)
 	return *this;
 }
 
+redis_client_pipeline& redis_client_pipeline::set_ssl_conf(acl::sslbase_conf *ssl_conf)
+{
+	ssl_conf_ = ssl_conf;
+	return *this;
+}
+
 redis_client_pipeline& redis_client_pipeline::set_password(const char* passwd)
 {
 	if (passwd && *passwd) {
@@ -642,9 +654,13 @@ redis_pipeline_channel* redis_client_pipeline::start_channel(const char *addr)
 {
 	redis_pipeline_channel* channel = NEW redis_pipeline_channel(
 		*this, addr, conn_timeout_, rw_timeout_, retry_);
+
+	channel->set_ssl_conf(ssl_conf_);
+
 	if (!passwd_.empty()) {
 		channel->set_passwd(passwd_);
 	}
+
 	if (channel->start_thread()) {
 		channels_->insert(addr, channel);
 		return channel;