diff --git a/server/.gitignore b/server/.gitignore new file mode 100644 index 00000000..ffa24600 --- /dev/null +++ b/server/.gitignore @@ -0,0 +1,79 @@ +/Debug/ + +# Created by https://www.gitignore.io/api/eclipse +# Edit at https://www.gitignore.io/?templates=eclipse + +### Clion ### + +/.idea + +### Eclipse ### +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# CDT- autotools +.autotools + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Annotation Processing +.apt_generated/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet + +### Eclipse Patch ### +# Eclipse Core +.project + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# Annotation Processing +.apt_generated + +.sts4-cache/ + +# End of https://www.gitignore.io/api/eclipse \ No newline at end of file diff --git a/server/Debug/libserver.dll b/server/Debug/libserver.dll deleted file mode 100644 index 8cb21e8d..00000000 Binary files a/server/Debug/libserver.dll and /dev/null differ diff --git a/server/Debug/logs/basics.csv b/server/Debug/logs/basics.csv deleted file mode 100644 index db41e7af..00000000 --- a/server/Debug/logs/basics.csv +++ /dev/null @@ -1,28 +0,0 @@ -Date;Time;Severity;TID;This;Function;Message -2019/04/26;11:51:05.533;INFO;4328;0;server::ServerEngine::initServer@51;"Server launched" -2019/04/26;11:51:07.252;INFO;4328;0;server::ServerEngine::startListening@70;"Start listening on IP 127.0.0.1 and port 62111" -2019/04/26;11:51:07.382;INFO;9464;0;server::ServerTCPSocket::acceptConnection@82;"acceptConnection started" -2019/04/26;12:03:12.221;INFO;7532;0;server::ServerEngine::initServer@51;"Server launched" -2019/04/26;12:03:13.873;INFO;7532;0;server::ServerEngine::startListening@70;"Start listening on IP 127.0.0.1 and port 62111" -2019/04/26;12:03:14.008;INFO;2780;0;server::ServerTCPSocket::acceptConnection@82;"acceptConnection started" -2019/04/26;12:04:25.851;INFO;2860;0;server::ServerEngine::initServer@51;"Server launched" -2019/04/26;12:04:27.514;INFO;2860;0;server::ServerEngine::startListening@70;"Start listening on IP 127.0.0.1 and port 62111" -2019/04/26;12:04:27.644;INFO;6316;0;server::ServerTCPSocket::acceptConnection@84;"acceptConnection started" -2019/04/26;12:06:24.411;INFO;10448;0;server::ServerEngine::initServer@51;"Server launched" -2019/04/26;12:06:25.794;INFO;10448;0;server::ServerEngine::startListening@70;"Start listening on IP 127.0.0.1 and port 62111" -2019/04/26;12:06:25.914;INFO;10444;0;server::ServerTCPSocket::acceptConnection@82;"acceptConnection started" -2019/04/26;12:14:25.324;INFO;2728;0;server::ServerEngine::initServer@51;"Server launched" -2019/04/26;12:14:27.174;INFO;2728;0;server::ServerEngine::startListening@70;"Start listening on IP 127.0.0.1 and port 62111" -2019/04/26;12:14:27.310;INFO;4172;0;server::ServerTCPSocket::acceptConnection@82;"acceptConnection started" -2019/04/26;12:16:16.276;INFO;3984;0;server::ServerEngine::initServer@51;"Server launched" -2019/04/26;12:16:17.661;INFO;3984;0;server::ServerEngine::startListening@70;"Start listening on IP 127.0.0.1 and port 62111" -2019/04/26;12:16:17.783;INFO;3392;0;server::ServerTCPSocket::acceptConnection@82;"acceptConnection started" -2019/04/26;12:20:03.643;INFO;4636;0;server::ServerEngine::initServer@51;"Server launched" -2019/04/26;12:20:05.304;INFO;4636;0;server::ServerEngine::startListening@70;"Start listening on IP 127.0.0.1 and port 62111" -2019/04/26;12:20:05.433;INFO;5308;0;server::ServerTCPSocket::acceptConnection@82;"acceptConnection started" -2019/04/26;12:22:16.160;INFO;11108;0;server::ServerEngine::initServer@51;"Server launched" -2019/04/26;12:22:17.823;INFO;11108;0;server::ServerEngine::startListening@70;"Start listening on IP 127.0.0.1 and port 62111" -2019/04/26;12:22:17.953;INFO;10448;0;server::ServerTCPSocket::acceptConnection@82;"acceptConnection started" -2019/04/26;12:24:38.216;INFO;7528;0;server::ServerEngine::initServer@51;"Server launched" -2019/04/26;12:24:39.670;INFO;7528;0;server::ServerEngine::startListening@70;"Start listening on IP 127.0.0.1 and port 62111" -2019/04/26;12:24:39.790;INFO;9532;0;server::ServerTCPSocket::acceptConnection@82;"acceptConnection started" diff --git a/server/Debug/server.exe b/server/Debug/server.exe deleted file mode 100644 index 07b3644d..00000000 Binary files a/server/Debug/server.exe and /dev/null differ diff --git a/server/Debug/src/config/config_wrapper.o b/server/Debug/src/config/config_wrapper.o deleted file mode 100644 index 6acd68f9..00000000 Binary files a/server/Debug/src/config/config_wrapper.o and /dev/null differ diff --git a/server/Debug/src/dll/dll_server_api_wrapper.o b/server/Debug/src/dll/dll_server_api_wrapper.o deleted file mode 100644 index 0d939a11..00000000 Binary files a/server/Debug/src/dll/dll_server_api_wrapper.o and /dev/null differ diff --git a/server/Debug/src/logger/logger.o b/server/Debug/src/logger/logger.o deleted file mode 100644 index 2ee334b9..00000000 Binary files a/server/Debug/src/logger/logger.o and /dev/null differ diff --git a/server/Debug/src/main.o b/server/Debug/src/main.o deleted file mode 100644 index 24504bed..00000000 Binary files a/server/Debug/src/main.o and /dev/null differ diff --git a/server/Debug/src/server/client_data.o b/server/Debug/src/server/client_data.o deleted file mode 100644 index 8b0c402f..00000000 Binary files a/server/Debug/src/server/client_data.o and /dev/null differ diff --git a/server/Debug/src/server/server_api.o b/server/Debug/src/server/server_api.o deleted file mode 100644 index 96338676..00000000 Binary files a/server/Debug/src/server/server_api.o and /dev/null differ diff --git a/server/Debug/src/server/server_engine.o b/server/Debug/src/server/server_engine.o deleted file mode 100644 index 046fe98f..00000000 Binary files a/server/Debug/src/server/server_engine.o and /dev/null differ diff --git a/server/Debug/src/server/server_tcp_socket.o b/server/Debug/src/server/server_tcp_socket.o deleted file mode 100644 index abf52c1a..00000000 Binary files a/server/Debug/src/server/server_tcp_socket.o and /dev/null differ diff --git a/server/include/dll/dll_server_api_wrapper.h b/server/include/dll/dll_server_api_wrapper.h index 84d0a070..9af3b332 100644 --- a/server/include/dll/dll_server_api_wrapper.h +++ b/server/include/dll/dll_server_api_wrapper.h @@ -51,7 +51,7 @@ ADDAPI server::ServerAPI* createServerAPI(); ADDAPI void disposeServerAPI(server::ServerAPI* server); void responsePacketForDll(server::ResponsePacket response_packet, ResponseDLL& response_packet_dll); -ADDAPI void initServer(server::ServerAPI* server, ResponseDLL& response_packet); +ADDAPI void initServer(server::ServerAPI* server, const char* path, ResponseDLL& response_packet); ADDAPI void startServer(server::ServerAPI* server, const char* ip, const char* port, ResponseDLL& response_packet); ADDAPI void stopServer(server::ServerAPI* server, ResponseDLL& response_packet); ADDAPI void restartTarget(server::ServerAPI* server, int id_client, ResponseDLL& response_packet); diff --git a/server/src/dll/dll_server_api_wrapper.cpp b/server/src/dll/dll_server_api_wrapper.cpp index 9f171c5c..119af50f 100644 --- a/server/src/dll/dll_server_api_wrapper.cpp +++ b/server/src/dll/dll_server_api_wrapper.cpp @@ -32,8 +32,8 @@ using namespace server; notifyConnectionAccepted = handler; } - void initServer(server::ServerAPI* server, ResponseDLL& response_packet) { - ResponsePacket response = server->initServer("config/init.json"); + void initServer(server::ServerAPI* server, const char* path, ResponseDLL& response_packet) { + ResponsePacket response = server->initServer(path); responsePacketForDll(response, response_packet); }