Update ChangeLog.

[stg.git] / include / stg / user_ips.h

diff --git a/include/stg/user_ips.h b/include/stg/user_ips.h
index fa107fc944b0f82f2e5d06871d8e15ed17eda7ed..bb920957e57e91baf5740322a440eb854975df69 100644 (file)
--- a/include/stg/user_ips.h
+++ b/include/stg/user_ips.h
@@ -27,6 +27,14 @@
 #ifndef USER_IPS_H
 #define USER_IPS_H
 
 #ifndef USER_IPS_H
 #define USER_IPS_H
 

+#include "stg/common.h"
+#include "os_int.h"
+
+#include <cstring>
+#include <vector>
+#include <string>
+#include <iostream>
+

 #ifdef FREE_BSD
 #include <sys/types.h>
 #endif
 #ifdef FREE_BSD
 #include <sys/types.h>
 #endif


@@ -35,15 +43,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 

-#include <cstring>
-#include <vector>
-#include <string>
-#include <iostream>
-#include <sstream>
-
-#include "stg/common.h"
-#include "os_int.h"
-

 //-------------------------------------------------------------------------
 struct IP_MASK
 {
 //-------------------------------------------------------------------------
 struct IP_MASK
 {


@@ -75,29 +74,21 @@ private:
 };
 //-------------------------------------------------------------------------
 
 };
 //-------------------------------------------------------------------------
 

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

 inline
 std::string USER_IPS::GetIpStr() const
 {
 if (ips.empty())
 inline
 std::string USER_IPS::GetIpStr() const
 {
 if (ips.empty())

-    {

     return "";
     return "";

-    }

 
 if (ips[0].ip == 0)
 
 if (ips[0].ip == 0)

-    {

     return "*";
     return "*";

-    }

 
 ContainerType::const_iterator it(ips.begin());
 
 ContainerType::const_iterator it(ips.begin());

-std::ostringstream s;
-s << inet_ntostring(it->ip);
+std::string res = inet_ntostring(it->ip);

 ++it;
 for (; it != ips.end(); ++it)
 ++it;
 for (; it != ips.end(); ++it)

-    {
-    s << "," << inet_ntostring(it->ip);
-    }
-return s.str();
+    res += "," + inet_ntostring(it->ip);
+return res;

 }
 //-----------------------------------------------------------------------------
 inline
 }
 //-----------------------------------------------------------------------------
 inline


@@ -112,9 +103,7 @@ inline
 bool USER_IPS::IsIPInIPS(uint32_t ip) const
 {
 if (ips.empty())
 bool USER_IPS::IsIPInIPS(uint32_t ip) const
 {
 if (ips.empty())

-    {

     return false;
     return false;

-    }

 
 if (ips.front().ip == 0)
     return true;
 
 if (ips.front().ip == 0)
     return true;


@@ -153,25 +142,20 @@ inline
 const USER_IPS StrToIPS(const std::string & ipsStr)
 {
 USER_IPS ips;
 const USER_IPS StrToIPS(const std::string & ipsStr)
 {
 USER_IPS ips;

-char * paddr;
-IP_MASK im;

 std::vector<std::string> ipMask;
 if (ipsStr.empty())
 std::vector<std::string> ipMask;
 if (ipsStr.empty())

-    {

     return ips;
     return ips;

-    }

 
 if (ipsStr[0] == '*' && ipsStr.size() == 1)
     {
 
 if (ipsStr[0] == '*' && ipsStr.size() == 1)
     {

-    im.ip = 0;
-    im.mask = 0;
-    ips.ips.push_back(im);
+    ips.ips.push_back(IP_MASK());

     return ips;
     }
 
 char * tmp = new char[ipsStr.size() + 1];
 strcpy(tmp, ipsStr.c_str());
 char * pstr = tmp;
     return ips;
     }
 
 char * tmp = new char[ipsStr.size() + 1];
 strcpy(tmp, ipsStr.c_str());
 char * pstr = tmp;

+char * paddr = NULL;

 while ((paddr = strtok(pstr, ",")))
     {
     pstr = NULL;
 while ((paddr = strtok(pstr, ",")))
     {
     pstr = NULL;


@@ -188,36 +172,28 @@ for (USER_IPS::IndexType i = 0; i < ipMask.size(); i++)
     strcpy(str, ipMask[i].c_str());
     strIp = strtok(str, "/");
     if (strIp == NULL)
     strcpy(str, ipMask[i].c_str());
     strIp = strtok(str, "/");
     if (strIp == NULL)

-        {

         return ips;
         return ips;

-        }

     strMask = strtok(NULL, "/");
 
     strMask = strtok(NULL, "/");
 

+    IP_MASK im;
+

     im.ip = inet_addr(strIp);
     if (im.ip == INADDR_NONE)
     im.ip = inet_addr(strIp);
     if (im.ip == INADDR_NONE)

-        {

         return ips;
         return ips;

-        }

 
     im.mask = 32;
     if (strMask != NULL)
         {
         int m = 0;
         if (str2x(strMask, m) != 0)
 
     im.mask = 32;
     if (strMask != NULL)
         {
         int m = 0;
         if (str2x(strMask, m) != 0)

-            {

             return ips;
             return ips;

-            }

         im.mask = m;
 
         if (im.mask > 32)
         im.mask = m;
 
         if (im.mask > 32)

-            {

             return ips;
             return ips;

-            }

 
         if ((im.ip & ips.CalcMask(im.mask)) != im.ip)
 
         if ((im.ip & ips.CalcMask(im.mask)) != im.ip)

-            {

             return ips;
             return ips;

-            }

         }
     ips.ips.push_back(im);
     }
         }
     ips.ips.push_back(im);
     }