Locks added, rnd logic for ALIVE changed, CONN_ACK bug fixed

[stg.git] / projects / sgauthstress / main.cpp

diff --git a/projects/sgauthstress/main.cpp b/projects/sgauthstress/main.cpp
index 3d0adb49b96aac8464786aa4735a53251a73db8c..21df6d74f9ea4c7135afc5d6aaaae2301d2f5cc2 100644 (file)
--- a/projects/sgauthstress/main.cpp
+++ b/projects/sgauthstress/main.cpp
@@ -35,6 +35,7 @@
 
 #include "settings.h"
 #include "store_loader.h"
 
 #include "settings.h"
 #include "store_loader.h"

+#include "proto.h"

 #include "user.h"
 
 time_t stgTime;
 #include "user.h"
 
 time_t stgTime;


@@ -94,6 +95,11 @@ if (settings.ReadSettings())
 
 SetSignalHandlers();
 
 
 SetSignalHandlers();
 

+PROTO proto(settings.GetServerName(),
+            settings.GetServerPort(),
+            settings.GetLocalPort(),
+            1);
+

 STORE_LOADER storeLoader(settings.GetModulesPath(), settings.GetStoreModuleSettings());
 if (storeLoader.Load())
     {
 STORE_LOADER storeLoader(settings.GetModulesPath(), settings.GetStoreModuleSettings());
 if (storeLoader.Load())
     {


@@ -110,7 +116,6 @@ if (dataStore->GetUsersList(&userList))
     return -1;
     }
 
     return -1;
     }
 

-std::vector<USER> users;

 std::vector<std::string>::const_iterator it;
 for (it = userList.begin(); it != userList.end(); ++it)
     {
 std::vector<std::string>::const_iterator it;
 for (it = userList.begin(); it != userList.end(); ++it)
     {


@@ -120,18 +125,17 @@ for (it = userList.begin(); it != userList.end(); ++it)
         std::cerr << "Failed to read user conf: '" << dataStore->GetStrError() << "'" << std::endl;
         return -1;
         }
         std::cerr << "Failed to read user conf: '" << dataStore->GetStrError() << "'" << std::endl;
         return -1;
         }

-    users.push_back(
+    proto.AddUser(

             USER(
             USER(

-                settings.GetServerName(),
-                settings.GetServerPort(),
-                settings.GetLocalPort(),

                 *it,
                 *it,

-                userConf.password
-            )
+                userConf.password,
+                userConf.ips[0].ip
+            ),
+            true

     );
     }
 
     );
     }
 

-std::cout << "Successfully loaded " << users.size() << " users" << std::endl;
+std::cout << "Successfully loaded " << proto.UserCount() << " users" << std::endl;

 
 running = true;
 while (running)
 
 running = true;
 while (running)