version_string is a new service parameter

version_string is a new service parameter.

Documentation updated and current release is now 0.6.0

VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

server/MaxScale_template.cnf

@@ -37,6 +37,8 @@ passwd=maxpwd
 # 	user=<User to fetch password inforamtion with>
 # 	passwd=<Password of the user, plain text currently>
 #	enable_root_user=<0 or 1, default is 0>
+#	version_string=<specific string for server handshake,
+#		default is the MariaDB embedded library version>
 #
 # Valid router modules currently are:
 # 	readwritesplit, readconnroute and debugcli

server/core/config.c

@@ -29,6 +29,7 @@
  * 06/02/14	Massimiliano Pinto	Added support for enable/disable root user in services
  * 14/02/14	Massimiliano Pinto	Added enable_root_user in the service_params list
  * 11/03/14	Massimiliano Pinto	Added Unix socket support
+ * 11/05/14     Massimiliano Pinto	Added  version_string support to service
  *
  * @endverbatim
  */
@@ -43,6 +44,7 @@
 #include <monitor.h>
 #include <skygw_utils.h>
 #include <log_manager.h>
+#include <mysql.h>
 
 extern int lm_enabled_logfiles_bitmask;
 
@@ -56,6 +58,7 @@ static	void	check_config_objects(CONFIG_CONTEXT *context);
 
 static	char		*config_file = NULL;
 static	GATEWAY_CONF	gateway;
+char			*version_string = NULL;
 
 /**
  * Config item handler for the ini file reader
@@ -116,6 +119,21 @@ config_load(char *file)
 CONFIG_CONTEXT	config;
 int		rval;
 
+	MYSQL *conn;
+	conn = mysql_init(NULL);
+	if (conn) {
+		if (mysql_real_connect(conn, NULL, NULL, NULL, NULL, 0, NULL, 0)) {
+			char *ptr;
+			version_string = (char *)mysql_get_server_info(conn);
+			ptr = strstr(version_string, "-embedded");
+			if (ptr) {
+				*ptr = '\0';
+			}
+
+		}
+		mysql_close(conn);
+	}
+
 	global_defaults();
 
 	config.object = "";
@@ -146,6 +164,11 @@ int		rval;
 
 	if (!config_file)
 		return 0;
+
+
+	if (gateway.version_string)
+		free(gateway.version_string);
+
 	global_defaults();
 
 	config.object = "";
@@ -205,6 +228,15 @@ int			error_count = 0;
 				char *enable_root_user =
 					config_get_value(obj->parameters, "enable_root_user");
 
+				char *version_string = config_get_value(obj->parameters, "version_string");
+
+				if (version_string) {
+					((SERVICE *)(obj->element))->version_string = strdup(version_string);
+				} else {
+					if (gateway.version_string)
+						((SERVICE *)(obj->element))->version_string = strdup(gateway.version_string);
+				}
+
                                 if (obj->element == NULL) /*< if module load failed */
                                 {
                                         LOGIF(LE, (skygw_log_write_flush(
@@ -710,6 +742,10 @@ static void
 global_defaults()
 {
 	gateway.n_threads = 1;
+	if (version_string != NULL)
+		gateway.version_string = strdup(version_string);
+	else
+		gateway.version_string = NULL;
 }
 
 /**
@@ -753,7 +789,7 @@ SERVER			*server;
 					char *auth;
 					char *enable_root_user;
                                         char* max_slave_conn_str;
-                                        
+					char *version_string;
 
 					enable_root_user = config_get_value(obj->parameters, "enable_root_user");
 
@@ -761,6 +797,15 @@ SERVER			*server;
                                                                 "user");
 					auth = config_get_value(obj->parameters,
                                                                 "passwd");
+
+					version_string = config_get_value(obj->parameters, "version_string");
+
+					if (version_string) {
+						if (service->version_string)
+							free(service->version_string);
+							service->version_string = strdup(version_string);
+					}
+
 					if (user && auth) {
 						service_update(service, router,
                                                                user,
@@ -1030,6 +1075,7 @@ static char *service_params[] =
                 "passwd",
 		"enable_root_user",
                 "max_slave_connections",
+		"version_string",
                 NULL
         };
 

server/core/service.c

@@ -28,6 +28,7 @@
  * 06/02/14	Massimiliano Pinto	Added: serviceEnableRootUser routine
  * 25/02/14	Massimiliano Pinto	Added: service refresh limit feature
  * 28/02/14	Massimiliano Pinto	users_alloc moved from service_alloc to serviceStartPort (generic hashable for services)
+ * 07/05/14	Massimiliano Pinto	Added: version_string initialized to NULL
  *
  * @endverbatim
  */
@@ -96,6 +97,7 @@ SERVICE 	*service;
 	}
 	service->name = strdup(servname);
 	service->routerModule = strdup(router);
+	service->version_string = NULL;
 	memset(&service->stats, 0, sizeof(SERVICE_STATS));
 	service->ports = NULL;
 	service->stats.started = time(0);

server/include/config.h

@@ -27,6 +27,7 @@
  *
  * Date		Who			Description
  * 21/06/13	Mark Riddoch		Initial implementation
+ * 07/05/14	Massimiliano Pinto	Added version_string to global configuration
  *
  * @endverbatim
  */
@@ -76,6 +77,7 @@ typedef struct	config_context {
  */
 typedef struct {
 	int			n_threads;		/**< Number of polling threads */
+	char			*version_string;	/**< The version string of embedded database library */
 } GATEWAY_CONF;
 
 extern int	    config_load(char *);

server/include/service.h

@@ -39,6 +39,7 @@
  * 23/06/13	Mark Riddoch		Added service user and users
  * 06/02/14	Massimiliano Pinto	Added service flag for root user access
  * 25/02/14	Massimiliano Pinto	Added service refresh limit feature
+ * 07/05/14	Massimiliano Pinto	Added version_string field to service struct
  *
  * @endverbatim
  */
@@ -110,6 +111,7 @@ typedef struct service {
 	void		*router_instance;
 						/**< The router instance for this service */
 	struct server	*databases;		/**< The set of servers in the backend */
+	char		*version_string;	/** version string for this service listeners */
 	SERVICE_USER	credentials;		/**< The cedentials of the service user */	
 	SPINLOCK	spin;			/**< The service spinlock */
 	SERVICE_STATS	stats;			/**< The service statistics */

server/modules/protocol/mysql_client.c

@@ -33,6 +33,7 @@
  * 					If current user is authenticated the new users' table will replace the old one
  * 28/02/2014   Massimiliano Pinto	Added: client IPv4 in dcb->ipv4 and inet_ntop for string representation
  * 11/03/2014   Massimiliano Pinto	Added: Unix socket support
+ * 07/05/2014	Massimiliano Pinto	Added: specific version string in server handshake
  *
  */
 
@@ -225,10 +226,21 @@ MySQLSendHandshake(DCB* dcb)
         uint8_t mysql_filler_ten[10];
         uint8_t mysql_last_byte = 0x00;
 	char server_scramble[GW_MYSQL_SCRAMBLE_SIZE + 1]="";
+	char *version_string;
+	int len_version_string=0;
 
 	MySQLProtocol *protocol = DCB_PROTOCOL(dcb, MySQLProtocol);
 	GWBUF		*buf;
 
+	/* get the version string from service property if available*/
+	if (dcb->service->version_string != NULL) {
+		version_string = dcb->service->version_string;
+		len_version_string = strlen(version_string);
+	} else {
+		version_string = GW_MYSQL_VERSION;
+		len_version_string = strlen(GW_MYSQL_VERSION);
+	}
+
 	gw_generate_random_str(server_scramble, GW_MYSQL_SCRAMBLE_SIZE);
 	
 	// copy back to the caller
@@ -245,7 +257,7 @@ MySQLSendHandshake(DCB* dcb)
 
         memcpy(mysql_plugin_data, server_scramble + 8, 12);
 
-        mysql_payload_size  = sizeof(mysql_protocol_version) + (strlen(GW_MYSQL_VERSION) + 1) + sizeof(mysql_thread_id) + 8 + sizeof(mysql_filler) + sizeof(mysql_server_capabilities_one) + sizeof(mysql_server_language) + sizeof(mysql_server_status) + sizeof(mysql_server_capabilities_two) + sizeof(mysql_scramble_len) + sizeof(mysql_filler_ten) + 12 + sizeof(mysql_last_byte) + strlen("mysql_native_password") + sizeof(mysql_last_byte);
+	mysql_payload_size  = sizeof(mysql_protocol_version) + (len_version_string + 1) + sizeof(mysql_thread_id) + 8 + sizeof(mysql_filler) + sizeof(mysql_server_capabilities_one) + sizeof(mysql_server_language) + sizeof(mysql_server_status) + sizeof(mysql_server_capabilities_two) + sizeof(mysql_scramble_len) + sizeof(mysql_filler_ten) + 12 + sizeof(mysql_last_byte) + strlen("mysql_native_password") + sizeof(mysql_last_byte);
 
         // allocate memory for packet header + payload
         if ((buf = gwbuf_alloc(sizeof(mysql_packet_header) + mysql_payload_size)) == NULL)
@@ -271,8 +283,9 @@ MySQLSendHandshake(DCB* dcb)
         mysql_handshake_payload = mysql_handshake_payload + sizeof(mysql_protocol_version);
 
 	// write server version plus 0 filler
-        strcpy((char *)mysql_handshake_payload, GW_MYSQL_VERSION);
+	strcpy((char *)mysql_handshake_payload, version_string);
-        mysql_handshake_payload = mysql_handshake_payload + strlen(GW_MYSQL_VERSION);
+	mysql_handshake_payload = mysql_handshake_payload + len_version_string;
+
         *mysql_handshake_payload = 0x00;
 
 	mysql_handshake_payload++;