X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/7adae1923ee7cde74ee96f762c994ecafa0e1ca4..807369965afc3210e6bb01ff5f325cbfa27d2782:/projects/sgauthstress/main.cpp?ds=sidebyside diff --git a/projects/sgauthstress/main.cpp b/projects/sgauthstress/main.cpp index 3d0adb49..f4e94b4f 100644 --- a/projects/sgauthstress/main.cpp +++ b/projects/sgauthstress/main.cpp @@ -35,6 +35,7 @@ #include "settings.h" #include "store_loader.h" +#include "proto.h" #include "user.h" time_t stgTime; @@ -94,6 +95,11 @@ if (settings.ReadSettings()) SetSignalHandlers(); +PROTO proto(settings.GetServerName(), + settings.GetServerPort(), + settings.GetLocalPort(), + 1); + STORE_LOADER storeLoader(settings.GetModulesPath(), settings.GetStoreModuleSettings()); if (storeLoader.Load()) { @@ -110,7 +116,6 @@ if (dataStore->GetUsersList(&userList)) return -1; } -std::vector users; std::vector::const_iterator it; for (it = userList.begin(); it != userList.end(); ++it) { @@ -120,18 +125,16 @@ for (it = userList.begin(); it != userList.end(); ++it) std::cerr << "Failed to read user conf: '" << dataStore->GetStrError() << "'" << std::endl; return -1; } - users.push_back( + proto.AddUser( USER( - settings.GetServerName(), - settings.GetServerPort(), - settings.GetLocalPort(), *it, - userConf.password + userConf.password, + userConf.ips[0].ip ) ); } -std::cout << "Successfully loaded " << users.size() << " users" << std::endl; +std::cout << "Successfully loaded " << proto.UserCount() << " users" << std::endl; running = true; while (running)