[NY Flight] Improved socket reading for sgconf.

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

diff --git a/include/stg/user_ips.h b/include/stg/user_ips.h
index e68190c543e5531227ad13c444be1c4b9c728327..e55f99fa7fc114460681fcebe87c8639ef2ee259 100644 (file)
--- a/include/stg/user_ips.h
+++ b/include/stg/user_ips.h
@@ -70,7 +70,8 @@ public:
     std::string GetIpStr() const;
     bool IsIPInIPS(uint32_t ip) const;
     bool OnlyOneIP() const;
     std::string GetIpStr() const;
     bool IsIPInIPS(uint32_t ip) const;
     bool OnlyOneIP() const;

-    int  Count() const;
+    bool IsAnyIP() const;
+    size_t  Count() const;

     void Add(const IP_MASK &im);
     void Erase();
 
     void Add(const IP_MASK &im);
     void Erase();
 


@@ -129,9 +130,9 @@ return s.str();
 }
 //-----------------------------------------------------------------------------
 inline
 }
 //-----------------------------------------------------------------------------
 inline

-int USER_IPS::Count() const
+size_t USER_IPS::Count() const

 {
 {

-return static_cast<int>(ips.size());
+return ips.size();

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


@@ -172,6 +173,12 @@ return false;
 }
 //-----------------------------------------------------------------------------
 inline
 }
 //-----------------------------------------------------------------------------
 inline

+bool USER_IPS::IsAnyIP() const
+{
+    return !ips.empty() && ips.front().ip == 0;
+}
+//-----------------------------------------------------------------------------
+inline

 void USER_IPS::Add(const IP_MASK &im)
 {
 ips.push_back(im);
 void USER_IPS::Add(const IP_MASK &im)
 {
 ips.push_back(im);