diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/main.cpp | 25 | ||||
| -rw-r--r-- | server/udm-server.cbp | 8 |
2 files changed, 31 insertions, 2 deletions
diff --git a/server/src/main.cpp b/server/src/main.cpp index 13b291b..7274da0 100644 --- a/server/src/main.cpp +++ b/server/src/main.cpp @@ -19,11 +19,13 @@ */ #include <boost/program_options.hpp> #include <boost/filesystem.hpp> +#include <boost/asio.hpp> #include <iostream> #include "api_module_metadata_storage.h" #include "modules_handler.h" #include "utilities.h" +#include "server.h" #include "main.h" @@ -37,6 +39,9 @@ namespace bpo = boost::program_options; runtime_config_s runtime_config; + +server *serv = nullptr; + //TODO: "core" config section architecture, define base settings @@ -155,6 +160,26 @@ int main(int argc, char *argv[]) { //TODO: fork here } + boost::asio::io_service io_service_server; + try{ + serv = new server(io_service_server, 6613); + } + catch(std::exception &e) + { + //TODO: + } + catch(...) + { + //TODO: + } + boost::system::error_code ec; + io_service_server.run(ec); + if(ec) + { + //TODO: + } + + //TODO: run here return 0; //stub for now } diff --git a/server/udm-server.cbp b/server/udm-server.cbp index a416bdb..462f8e3 100644 --- a/server/udm-server.cbp +++ b/server/udm-server.cbp @@ -13,6 +13,7 @@ <Option compiler="gcc" /> <Compiler> <Add option="-g" /> + <Add directory="include" /> </Compiler> </Target> <Target title="Release"> @@ -23,6 +24,7 @@ <Compiler> <Add option="-O2" /> <Add directory="server/include" /> + <Add directory="include" /> </Compiler> <Linker> <Add option="-s" /> @@ -42,8 +44,8 @@ <Add library="boost_program_options" /> </Linker> <ExtraCommands> - <Add before="#[ -d ../protocol ] || mkdir ../protocol" /> - <Add before="#protoc --cpp_out=../protocol --proto_path=../protocol ../protocol/udm.proto" /> + <Add before="[ -d ../protocol ] || mkdir ../protocol" /> + <Add before="protoc --cpp_out=../protocol --proto_path=../protocol ../protocol/udm.proto" /> </ExtraCommands> <Unit filename="../protocol/udm.pb.cc" /> <Unit filename="../protocol/udm.pb.h" /> @@ -54,11 +56,13 @@ <Unit filename="include/main.h" /> <Unit filename="include/modules_handler.h" /> <Unit filename="include/protocol.h" /> + <Unit filename="include/server.h" /> <Unit filename="include/utilities.h" /> <Unit filename="src/api_core.cpp" /> <Unit filename="src/main.cpp" /> <Unit filename="src/modules_handler.cpp" /> <Unit filename="src/protocol.cpp" /> + <Unit filename="src/server.cpp" /> <Unit filename="src/utilities.cpp" /> <Extensions> <code_completion /> |