Merge. Revision history for source files should be all back now.

--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h

1 files changed, 80 insertions, 0 deletions

diff --git a/externals/mysql/vio/viotest-sslconnect.cc b/externals/mysql/vio/viotest-sslconnect.cc
new file mode 100644
index 00000000000..89e1a6e7dfe
--- /dev/null
+++ b/externals/mysql/vio/viotest-sslconnect.cc
@@ -0,0 +1,80 @@
+
+/* 
+**  Virtual I/O library
+**  Written by Andrei Errapart <andreie@no.spam.ee>
+*/
+
+#include	"all.h"
+
+#include	<sys/types.h>
+#include	<sys/socket.h>
+#include	<netinet/in.h>
+#include	<stdio.h>
+#include	<unistd.h>
+
+
+void
+fatal_error(	const char*	r)
+{
+	perror(r);
+	exit(0);
+}
+
+void
+print_usage()
+{
+	printf("viotest-sslconnect: testing SSL virtual IO. Usage:\n");
+	printf("viotest-sslconnect key cert\n");
+}
+
+int
+main(	int	argc,
+	char**	argv)
+{
+	char*	key = 0;
+	char*	cert = 0;
+
+	if (argc<3)
+	{
+		print_usage();
+		return 1;
+	}
+
+	char		ip[4] = {127, 0, 0, 1};
+	unsigned long	addr = (unsigned long)
+			((unsigned long)ip[0]<<24L)|
+			((unsigned long)ip[1]<<16L)|
+			((unsigned long)ip[2]<< 8L)|
+			((unsigned long)ip[3]);
+	int	fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (fd<0)
+		fatal_error("socket");
+	struct sockaddr_in	sa;
+	sa.sin_family = AF_INET;
+	sa.sin_port=htons(4433);
+	sa.sin_addr.s_addr=htonl(addr);
+	int	sa_size = sizeof sa;
+	if (connect(fd, reinterpret_cast<const sockaddr*>(&sa), sa_size)==-1)
+		fatal_error("connect");
+	key = argv[1];
+	cert = argv[2];
+	printf("Key  : %s\n", key);
+	printf("Cert : %s\n", cert);
+
+	VIO_NS::VioSSLConnectorFd*	ssl_connector = new VIO_NS::VioSSLConnectorFd(cert, key,0,0);
+
+	VIO_NS::VioSSL*	vio = ssl_connector->connect(fd);
+
+	char	xbuf[100];
+	int	r = vio->read(xbuf, sizeof(xbuf));
+	if (r<=0) {
+		delete ssl_connector;
+		delete vio;
+		fatal_error("client:SSL_read");
+	}
+	xbuf[r] = 0;
+	printf("client:got %s\n", xbuf);
+	delete vio;
+	delete ssl_connector;
+	return 0;
+}