Added separate touch time for traffcounter packet processor.

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / users_methods.cpp

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
index 48ef3103123515633614d073fa2b0f9b445cefc7..5b39cf1e84aff4f00ec3ac9016b7629fce753638 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
@@ -10,7 +10,6 @@
 #include "users_methods.h"
 #include "rpcconfig.h"
 #include "user_helper.h"
 #include "users_methods.h"
 #include "rpcconfig.h"
 #include "user_helper.h"

-#include "utils.h"

 
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
 


@@ -405,14 +404,13 @@ void METHOD_GET_ONLINE_IPS::execute(xmlrpc_c::paramList const & paramList,
                                     xmlrpc_c::value *   const   retvalPtr)
 {
 std::string cookie = paramList.getString(0);
                                     xmlrpc_c::value *   const   retvalPtr)
 {
 std::string cookie = paramList.getString(0);

-std::vector<xmlrpc_c::value> subnetsStr = paramList.getArray(1);
+typedef std::vector<xmlrpc_c::value> ValueVector;
+ValueVector subnetsStr = paramList.getArray(1);

 paramList.verifyEnd(2);
 
 std::vector<IP_MASK> subnets;
 
 paramList.verifyEnd(2);
 
 std::vector<IP_MASK> subnets;
 

-std::vector<xmlrpc_c::value>::iterator it;
-
-for (it = subnetsStr.begin(); it != subnetsStr.end(); ++it)
+for (ValueVector::const_iterator it(subnetsStr.begin()); it != subnetsStr.end(); ++it)

     {
     IP_MASK ipm;
     if (ParseNet(xmlrpc_c::value_string(*it), ipm))
     {
     IP_MASK ipm;
     if (ParseNet(xmlrpc_c::value_string(*it), ipm))


@@ -435,7 +433,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-std::vector<xmlrpc_c::value> ips;
+ValueVector ips;

 
 USER_PTR u;
 
 
 USER_PTR u;
 


@@ -458,8 +456,7 @@ while (1)
         {
         uint32_t ip = u->GetCurrIP();
 
         {
         uint32_t ip = u->GetCurrIP();
 

-        std::vector<IP_MASK>::iterator it;
-        for (it = subnets.begin(); it != subnets.end(); ++it)
+        for (std::vector<IP_MASK>::const_iterator it(subnets.begin()); it != subnets.end(); ++it)

             {
             if ((it->ip & it->mask) == (ip & it->mask))
                 {
             {
             if ((it->ip & it->mask) == (ip & it->mask))
                 {