X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmysql.c;h=3bd8cb98159cf853d2e815a442c0de4575844d93;hb=afb38f31abd27d5b4ce08023f8bbbaeeb353c55f;hp=9167c6b5589f2e28e3c31ccd7ed2d51166f67eaa;hpb=7dcf9ab7675fe91d1bd74998f55031bc3b0480c0;p=collectd.git

diff --git a/src/mysql.c b/src/mysql.c
index 9167c6b5..3bd8cb98 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -46,6 +46,14 @@ struct mysql_database_s /* {{{ */
 	char *user;
 	char *pass;
 	char *database;
+
+	/* mysql_ssl_set params */
+	char *key;
+	char *cert;
+	char *ca;
+	char *capath;
+	char *cipher;
+
 	char *socket;
 	int   port;
 	int   timeout;
@@ -87,6 +95,11 @@ static void mysql_database_free (void *arg) /* {{{ */
 	sfree (db->socket);
 	sfree (db->instance);
 	sfree (db->database);
+	sfree (db->key);
+	sfree (db->cert);
+	sfree (db->ca);
+	sfree (db->capath);
+	sfree (db->cipher);
 	sfree (db);
 } /* }}} void mysql_database_free */
 
@@ -126,6 +139,12 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */
 	db->user     = NULL;
 	db->pass     = NULL;
 	db->database = NULL;
+	db->key      = NULL;
+	db->cert     = NULL;
+	db->ca       = NULL;
+	db->capath   = NULL;
+	db->cipher   = NULL;
+
 	db->socket   = NULL;
 	db->con      = NULL;
 	db->timeout  = 0;
@@ -168,6 +187,16 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */
 			status = cf_util_get_string (child, &db->socket);
 		else if (strcasecmp ("Database", child->key) == 0)
 			status = cf_util_get_string (child, &db->database);
+		else if (strcasecmp ("SSLKey", child->key) == 0)
+			status = cf_util_get_string (child, &db->key);
+		else if (strcasecmp ("SSLCert", child->key) == 0)
+			status = cf_util_get_string (child, &db->cert);
+		else if (strcasecmp ("SSLCA", child->key) == 0)
+			status = cf_util_get_string (child, &db->ca);
+		else if (strcasecmp ("SSLCAPath", child->key) == 0)
+			status = cf_util_get_string (child, &db->capath);
+		else if (strcasecmp ("SSLCipher", child->key) == 0)
+			status = cf_util_get_string (child, &db->cipher);
 		else if (strcasecmp ("ConnectTimeout", child->key) == 0)
 			status = cf_util_get_int (child, &db->timeout);
 		else if (strcasecmp ("MasterStats", child->key) == 0)
@@ -193,15 +222,11 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */
 	/* If all went well, register this database for reading */
 	if (status == 0)
 	{
-		user_data_t ud = { 0 };
 		char cb_name[DATA_MAX_NAME_LEN];
 
 		DEBUG ("mysql plugin: Registering new read callback: %s",
 				(db->database != NULL) ? db->database : "<default>");
 
-		ud.data = (void *) db;
-		ud.free_func = mysql_database_free;
-
 		if (db->instance != NULL)
 			ssnprintf (cb_name, sizeof (cb_name), "mysql-%s",
 					db->instance);
@@ -209,8 +234,10 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */
 			sstrncpy (cb_name, "mysql", sizeof (cb_name));
 
 		plugin_register_complex_read (/* group = */ NULL, cb_name,
-					      mysql_read,
-					      /* interval = */ 0, &ud);
+				mysql_read, /* interval = */ 0, &(user_data_t) {
+					.data = db,
+					.free_func = mysql_database_free,
+				});
 	}
 	else
 	{
@@ -245,6 +272,8 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */
 
 static MYSQL *getconnection (mysql_database_t *db)
 {
+	const char *cipher;
+
 	if (db->is_connected)
 	{
 		int status;
@@ -272,6 +301,8 @@ static MYSQL *getconnection (mysql_database_t *db)
 	/* Configure TCP connect timeout (default: 0) */
 	db->con->options.connect_timeout = db->timeout;
 
+	mysql_ssl_set (db->con, db->key, db->cert, db->ca, db->capath, db->cipher);
+
 	if (mysql_real_connect (db->con, db->host, db->user, db->pass,
 				db->database, db->port, db->socket, 0) == NULL)
 	{
@@ -283,10 +314,14 @@ static MYSQL *getconnection (mysql_database_t *db)
 		return (NULL);
 	}
 
+	cipher = mysql_get_ssl_cipher (db->con);
+
 	INFO ("mysql plugin: Successfully connected to database %s "
-			"at server %s (server version: %s, protocol version: %d)",
+			"at server %s with cipher %s "
+			"(server version: %s, protocol version: %d) ",
 			(db->database != NULL) ? db->database : "<none>",
 			mysql_get_host_info (db->con),
+			(cipher != NULL) ?  cipher : "<none>",
 			mysql_get_server_info (db->con),
 			mysql_get_proto_info (db->con));
 
@@ -963,7 +998,7 @@ static int mysql_read (user_data_t *ud)
 				counter_submit ("mysql_sort", "scan", val, db);
 
 		}
-		else if (strncmp (key, "Slow_queries", strlen ("Slow_queries")) == 0) 
+		else if (strncmp (key, "Slow_queries", strlen ("Slow_queries")) == 0)
 		{
 			counter_submit ("mysql_slow_queries", NULL , val, db);
 		}