Merge lp:~diego-fmpwizard/mysql-proxy/master_info into lp:mysql-proxy

[fmpwizard]

[fmpwizard (diego-fmpwizard)]

Here I added to_masterinfo_string() to Lua so that you can create a master.info file from a lua script. It does the opposite to from_masterinfo_string()

I also added some master_ssl_* fields that were missing from lua.

[Jan Kneschke (jan-kneschke)]

looks good.

review: Approve

=== modified file 'lib/mysql-proto.c'
--- lib/mysql-proto.c	2009-02-07 03:59:23 +0000
+++ lib/mysql-proto.c	2009-04-14 15:11:59 +0000
@@ -181,7 +181,8 @@
 	}
 
 	lua_newtable(L);
-
+        
+        LUA_EXPORT_INT(info, master_lines);
 	LUA_EXPORT_STR(info, master_log_file);
 	LUA_EXPORT_INT(info, master_log_pos);
 	LUA_EXPORT_STR(info, master_host);
@@ -190,7 +191,12 @@
 	LUA_EXPORT_INT(info, master_port);
 	LUA_EXPORT_INT(info, master_connect_retry);
 	LUA_EXPORT_INT(info, master_ssl);
-	if (info->lines >= 15) {
+        LUA_EXPORT_STR(info, master_ssl_ca);
+        LUA_EXPORT_STR(info, master_ssl_capath);
+        LUA_EXPORT_STR(info, master_ssl_cert);
+        LUA_EXPORT_STR(info, master_ssl_cipher);
+        LUA_EXPORT_STR(info, master_ssl_key);
+        if (info->master_lines >= 15) {
 		LUA_EXPORT_INT(info, master_ssl_verify_server_cert);
 	}
 	
@@ -199,6 +205,43 @@
 	return 1;
 }
 
+static int lua_proto_append_masterinfo_string (lua_State *L) {
+        GString *packet;
+        network_mysqld_masterinfo_t *info;
+
+        luaL_checktype(L, 1, LUA_TTABLE);
+
+        info = network_mysqld_masterinfo_new();
+
+        LUA_IMPORT_INT(info, master_lines);
+        LUA_IMPORT_STR(info, master_log_file);
+        LUA_IMPORT_INT(info, master_log_pos);
+        LUA_IMPORT_STR(info, master_host);
+        LUA_IMPORT_STR(info, master_user);
+        LUA_IMPORT_STR(info, master_password);
+        LUA_IMPORT_INT(info, master_port);
+        LUA_IMPORT_INT(info, master_connect_retry);
+        LUA_IMPORT_INT(info, master_ssl);
+        LUA_IMPORT_STR(info, master_ssl_ca);
+        LUA_IMPORT_STR(info, master_ssl_capath);
+        LUA_IMPORT_STR(info, master_ssl_cert);
+        LUA_IMPORT_STR(info, master_ssl_cipher);
+        LUA_IMPORT_STR(info, master_ssl_key);
+        LUA_IMPORT_INT(info, master_ssl_verify_server_cert);
+
+        packet = g_string_new(NULL);
+        network_mysqld_masterinfo_append(packet, info);
+
+        lua_pushlstring(L, S(packet));
+
+        network_mysqld_masterinfo_free(info);
+
+        g_string_free(packet, TRUE);
+
+        return 1;
+}
+
+
 static int lua_proto_append_ok_packet (lua_State *L) {
 	GString *packet;
 	network_mysqld_ok_packet_t *ok_packet;
@@ -446,6 +489,7 @@
 	{"from_response_packet", lua_proto_get_response_packet},
 	{"to_response_packet", lua_proto_append_response_packet},
 	{"from_masterinfo_string", lua_proto_get_masterinfo_string},
+        {"to_masterinfo_string", lua_proto_append_masterinfo_string},
 	{NULL, NULL},
 };
 
 
=== modified file 'src/network-mysqld-masterinfo.c'
--- src/network-mysqld-masterinfo.c	2009-02-23 23:37:58 +0000
+++ src/network-mysqld-masterinfo.c	2009-04-14 15:11:59 +0000
@@ -118,9 +118,10 @@
 	g_return_val_if_fail(info, -1);
 	g_return_val_if_fail(packet, -1);
 
-	err = err || network_mysqld_masterinfo_get_int32(packet, &lines);
-	info->lines = lines;
-	err = err || network_mysqld_masterinfo_get_string(packet, info->master_log_file);
+	/*err = err || network_mysqld_masterinfo_get_int32(packet, &lines);*/
+	/*info->master_lines = lines;*/
+        err = err || network_mysqld_masterinfo_get_int32(packet, &(info->master_lines));
+        err = err || network_mysqld_masterinfo_get_string(packet, info->master_log_file);
 	err = err || network_mysqld_masterinfo_get_int32(packet, &(info->master_log_pos));
 	err = err || network_mysqld_masterinfo_get_string(packet, info->master_host);
 	err = err || network_mysqld_masterinfo_get_string(packet, info->master_user);
@@ -133,7 +134,7 @@
 	err = err || network_mysqld_masterinfo_get_string(packet, info->master_ssl_cert);
 	err = err || network_mysqld_masterinfo_get_string(packet, info->master_ssl_cipher);
 	err = err || network_mysqld_masterinfo_get_string(packet, info->master_ssl_key);
-	if (lines >= 15) {
+	if (info->master_lines >= 15) {
 		err = err || network_mysqld_masterinfo_get_int32(packet, &(info->master_ssl_verify_server_cert));
 	}
 	return err ? -1 : 0;
@@ -159,8 +160,8 @@
 	g_return_val_if_fail(info, -1);
 	g_return_val_if_fail(packet, -1);
 
-	err = err || network_mysqld_masterinfo_append_int32(packet, 15);
-	err = err || network_mysqld_masterinfo_append_string(packet, info->master_log_file);
+	err = err || network_mysqld_masterinfo_append_int32(packet, info->master_lines);
+        err = err || network_mysqld_masterinfo_append_string(packet, info->master_log_file);
 	err = err || network_mysqld_masterinfo_append_int32(packet, info->master_log_pos);
 	err = err || network_mysqld_masterinfo_append_string(packet, info->master_host);
 	err = err || network_mysqld_masterinfo_append_string(packet, info->master_user);
@@ -173,7 +174,9 @@
 	err = err || network_mysqld_masterinfo_append_string(packet, info->master_ssl_cert);
 	err = err || network_mysqld_masterinfo_append_string(packet, info->master_ssl_cipher);
 	err = err || network_mysqld_masterinfo_append_string(packet, info->master_ssl_key);
-	err = err || network_mysqld_masterinfo_append_int32(packet, info->master_ssl_verify_server_cert);
+	if (info->master_lines >= 15) {
+                err = err || network_mysqld_masterinfo_append_int32(packet, info->master_ssl_verify_server_cert);
+        }
 
 	return err ? -1 : 0;
 }
 
=== modified file 'src/network-mysqld-masterinfo.h'
--- src/network-mysqld-masterinfo.h	2009-02-07 03:59:23 +0000
+++ src/network-mysqld-masterinfo.h	2009-04-14 15:11:59 +0000
@@ -24,7 +24,7 @@
 #include "network-mysqld-proto.h"
 
 typedef struct {
-	guint32   lines;
+	guint32   master_lines;
 	GString  *master_log_file;
 	guint32   master_log_pos;
 	GString  *master_host;
 
=== modified file 'tests/unit/lua/mysql-proto.lua'
--- tests/unit/lua/mysql-proto.lua	2009-02-07 03:59:23 +0000
+++ tests/unit/lua/mysql-proto.lua	2009-04-14 15:11:59 +0000
@@ -184,25 +184,60 @@
 assert(tbl.database == "db", ("expected 'db', got %s"):format(tostring(tbl.database)))
 
 -- test 5.1 master.info format
-local masterinfofile = proto.from_masterinfo_string("15\nhostname-bin.000024\n2143897\n127.0.0.1\nroot\n123\n3306\n60\n0\n\n\n\n\n\n0\n")
+local masterinfofile = proto.from_masterinfo_string(
+"15\nhostname-bin.000024\n2143897\n127.0.0.1\nroot\n123\n3306\n60\n0\nca-cert.pem\n"
+.. "/usr/local/mysql/ssl/ca/\nclient-cert.pem\nssl_cipher\nclient-key.pem\n0\n")
+assert( masterinfofile["master_lines"] == 15)
 assert( masterinfofile["master_host"] == "127.0.0.1")
-assert( masterinfofile["master_ssl"] == 0)
 assert( masterinfofile["master_log_pos"] == 2143897)
 assert( masterinfofile["master_user"] == "root")
 assert( masterinfofile["master_connect_retry"] == 60)
 assert( masterinfofile["master_log_file"] == "hostname-bin.000024")
 assert( masterinfofile["master_port"] == 3306)
 assert( masterinfofile["master_password"] == "123")
+assert( masterinfofile["master_ssl"] == 0) 
+assert( masterinfofile["master_ssl_ca"] == "ca-cert.pem")
+assert( masterinfofile["master_ssl_capath"] == "/usr/local/mysql/ssl/ca/")
+assert( masterinfofile["master_ssl_cert"] == "client-cert.pem")
+assert( masterinfofile["master_ssl_cipher"] == "ssl_cipher")
+assert( masterinfofile["master_ssl_key"] == "client-key.pem")
 assert( masterinfofile["master_ssl_verify_server_cert"] == 0)
 
 -- test 4.1 and 5.0 master.info format
-local masterinfofile = proto.from_masterinfo_string("14\nhostname-bin.000024\n2143897\n127.0.0.1\nroot\n123\n3306\n60\n0\n\n\n\n\n\n")
+local masterinfofile = proto.from_masterinfo_string(
+"14\nhostname-bin.000024\n2143897\n127.0.0.1\nroot\n123\n3306\n60\n0\nca-cert.pem\n"
+.. "/usr/local/mysql/ssl/ca/\nclient-cert.pem\nssl_cipher\nclient-key.pem\n")
+
+assert( masterinfofile["master_lines"] == 14)
 assert( masterinfofile["master_host"] == "127.0.0.1")
-assert( masterinfofile["master_ssl"] == 0)
 assert( masterinfofile["master_log_pos"] == 2143897)
 assert( masterinfofile["master_user"] == "root")
 assert( masterinfofile["master_connect_retry"] == 60)
 assert( masterinfofile["master_log_file"] == "hostname-bin.000024")
 assert( masterinfofile["master_port"] == 3306)
-assert( masterinfofile["master_password"] == "123") 
+assert( masterinfofile["master_password"] == "123")
+assert( masterinfofile["master_ssl"] == 0)
+assert( masterinfofile["master_ssl_ca"] == "ca-cert.pem")
+assert( masterinfofile["master_ssl_capath"] == "/usr/local/mysql/ssl/ca/")
+assert( masterinfofile["master_ssl_cert"] == "client-cert.pem")
+assert( masterinfofile["master_ssl_cipher"] == "ssl_cipher")
+assert( masterinfofile["master_ssl_key"] == "client-key.pem")
 assert( masterinfofile["master_ssl_verify_server_cert"] == nil)
+
+-- test proto.to_masterinfo_string()
+
+local masterinfofile = proto.from_masterinfo_string(
+"15\nhostname-bin.000024\n2143897\n127.0.0.1\nroot\n123\n3306\n60\n0\nca-cert.pem\n"
+.. "/usr/local/mysql/ssl/ca/\nclient-cert.pem\nssl_cipher\nclient-key.pem\n0\n")
+
+assert( proto.to_masterinfo_string(masterinfofile) == 
+"15\nhostname-bin.000024\n2143897\n127.0.0.1\nroot\n123\n3306\n60\n0\nca-cert.pem\n"
+.. "/usr/local/mysql/ssl/ca/\nclient-cert.pem\nssl_cipher\nclient-key.pem\n0\n")
+
+local masterinfofile = proto.from_masterinfo_string(  
+"14\nhostname-bin.000024\n2143897\n127.0.0.1\nroot\n123\n3306\n60\n0\nca-cert.pem\n"
+.. "/usr/local/mysql/ssl/ca/\nclient-cert.pem\nssl_cipher\nclient-key.pem\n")
+
+assert( proto.to_masterinfo_string(masterinfofile) ==
+"14\nhostname-bin.000024\n2143897\n127.0.0.1\nroot\n123\n3306\n60\n0\nca-cert.pem\n"
+.. "/usr/local/mysql/ssl/ca/\nclient-cert.pem\nssl_cipher\nclient-key.pem\n")