Merge branch 'stg-2.409' into stg-2.409-radius

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

diff --git a/projects/sgauthstress/main.cpp b/projects/sgauthstress/main.cpp
index 3d0adb49b96aac8464786aa4735a53251a73db8c..b0819c3c016bad9a2e163c6c96cc70f250fef511 100644 (file)
--- a/projects/sgauthstress/main.cpp
+++ b/projects/sgauthstress/main.cpp
@@ -28,6 +28,8 @@
 
 #include <csignal>
 #include <iostream>
 
 #include <csignal>
 #include <iostream>

+#include <vector>
+#include <list>

 
 #include "stg/common.h"
 #include "stg/store.h"
 
 #include "stg/common.h"
 #include "stg/store.h"


@@ -35,6 +37,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 +97,11 @@ if (settings.ReadSettings())
 
 SetSignalHandlers();
 
 
 SetSignalHandlers();
 

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

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


@@ -110,35 +118,51 @@ 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::list<uint32_t> ips;

     {
     {

-    USER_CONF userConf;
-    if (dataStore->RestoreUserConf(&userConf, *it))
+    std::vector<std::string>::const_iterator it;
+    for (it = userList.begin(); it != userList.end(); ++it)

         {
         {

-        std::cerr << "Failed to read user conf: '" << dataStore->GetStrError() << "'" << std::endl;
-        return -1;
+        USER_CONF userConf;
+        if (dataStore->RestoreUserConf(&userConf, *it))
+            {
+            std::cerr << "Failed to read user conf: '" << dataStore->GetStrError() << "'" << std::endl;
+            return -1;
+            }
+        proto.AddUser(
+                USER(
+                    *it,
+                    userConf.password,
+                    userConf.ips[0].ip
+                )
+        );
+        ips.push_back(userConf.ips[0].ip);

         }
         }

-    users.push_back(
-            USER(
-                settings.GetServerName(),
-                settings.GetServerPort(),
-                settings.GetLocalPort(),
-                *it,
-                userConf.password
-            )
-    );

     }
 
     }
 

-std::cout << "Successfully loaded " << users.size() << " users" << std::endl;
+if (!proto.Start())
+    {
+    std::cerr << "Failed to start listening thread: '" << proto.GetStrError() << "'" << std::endl;
+    return -1;
+    }
+
+std::list<uint32_t>::const_iterator it;
+for (it = ips.begin(); it != ips.end(); ++it)
+    {
+    proto.Connect(*it);
+    }
+
+std::cout << "Successfully loaded " << proto.UserCount() << " users" << std::endl;

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

-    usleep(200000);
+    struct timespec ts = {0, 200000000};
+    nanosleep(&ts, NULL);

     }
 
     }
 

+proto.Stop();
+

 storeLoader.Unload();
 
 return 0;
 storeLoader.Unload();
 
 return 0;