GlobalPlatform · WarKaa · Jan 29, 2020 · Jan 29, 2020
diff --git a/server/.gitignore 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
diff --git a/server/Debug/libserver.dll b/server/Debug/libserver.dll
diff --git a/server/Debug/logs/basics.csv b/server/Debug/logs/basics.csv
diff --git a/server/Debug/server.exe b/server/Debug/server.exe
diff --git a/server/Debug/src/config/config_wrapper.o b/server/Debug/src/config/config_wrapper.o
diff --git a/server/Debug/src/dll/dll_server_api_wrapper.o b/server/Debug/src/dll/dll_server_api_wrapper.o
diff --git a/server/Debug/src/logger/logger.o b/server/Debug/src/logger/logger.o
diff --git a/server/Debug/src/main.o b/server/Debug/src/main.o
diff --git a/server/Debug/src/server/client_data.o b/server/Debug/src/server/client_data.o
diff --git a/server/Debug/src/server/server_api.o b/server/Debug/src/server/server_api.o
diff --git a/server/Debug/src/server/server_engine.o b/server/Debug/src/server/server_engine.o
diff --git a/server/Debug/src/server/server_tcp_socket.o b/server/Debug/src/server/server_tcp_socket.o
diff --git 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
@@ -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);
 }