Servertalk implementation wip, added optional support for pub-key authenticated encryption (via libsodium), not backwards compatible.

ucs/CMakeLists.txt

@@ -23,21 +23,6 @@ INSTALL(TARGETS ucs RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 ADD_DEFINITIONS(-DUCS)
 
-TARGET_LINK_LIBRARIES(ucs common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY} libuv fmt)
-
-IF(WIN32)
-	TARGET_LINK_LIBRARIES(ucs "ws2_32" "psapi" "iphlpapi" "userenv")
-ENDIF(WIN32)
-
-IF(UNIX)
-	TARGET_LINK_LIBRARIES(ucs "${CMAKE_DL_LIBS}")
-	TARGET_LINK_LIBRARIES(ucs "z")
-	TARGET_LINK_LIBRARIES(ucs "m")
-	IF(NOT DARWIN)
-		TARGET_LINK_LIBRARIES(ucs "rt")
-	ENDIF(NOT DARWIN)
-	TARGET_LINK_LIBRARIES(ucs "pthread")
-	ADD_DEFINITIONS(-fPIC)
-ENDIF(UNIX)
+TARGET_LINK_LIBRARIES(ucs ${SERVER_LIBS})
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

ucs/ucs.cpp

@@ -34,6 +34,8 @@
 #include <signal.h>
 
 #include "../common/net/tcp_server.h"
+#include "../common/net/servertalk_server.h"
+#include "../common/net/servertalk_client_connection.h"
 
 ChatChannelList *ChannelList;
 Clientlist *g_Clientlist;
@@ -144,6 +146,21 @@ int main() {
 
 	worldserver->Connect();
 
+	EQ::Net::ServertalkServer server;
+	EQ::Net::ServertalkServerOptions opts;
+	opts.port = 5999;
+	server.Listen(opts);
+
+	server.OnConnectionIdentified("QueryServ", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> conn) {
+		Log.Out(Logs::General, Logs::Debug, "New QueryServ Connection....");
+	});
+
+	server.OnConnectionRemoved("QueryServ", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> conn) {
+		Log.Out(Logs::General, Logs::Debug, "Lost QueryServ connection.");
+	});
+
+	EQ::Net::ServertalkClient client("127.0.0.1", 5999, false, "QueryServ", "User:Root;Password:1234567890");
+
 	while(RunLoops) {
 
 		Timer::SetCurrentTime();