X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/5f2937099a707ddb360954f5c10fe79cfa906110..b27841d687ec9e84983340b5581376dfb24010ea:/projects/stargazer/plugins/other/smux/sensors.cpp

diff --git a/projects/stargazer/plugins/other/smux/sensors.cpp b/projects/stargazer/plugins/other/smux/sensors.cpp
index 6018566c..d868e37b 100644
--- a/projects/stargazer/plugins/other/smux/sensors.cpp
+++ b/projects/stargazer/plugins/other/smux/sensors.cpp
@@ -1,16 +1,20 @@
-#include "stg/INTEGER.h"
+#include "sensors.h"
 
 #include "stg/user.h"
 
-#include "sensors.h"
+#include <cassert>
 
-bool UsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#include "stg/INTEGER.h"
+#pragma GCC diagnostic pop
+
+void UsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const
 {
 int handle = users.OpenSearch();
-if (!handle)
-    return false;
+assert(handle && "USERS::OpenSearch is always correct");
 
-USER_PTR user;
+STG::User* user;
 size_t count = 0;
 while (!users.SearchNext(handle, &user))
     {
@@ -21,17 +25,15 @@ while (!users.SearchNext(handle, &user))
 users.CloseSearch(handle);
 
 ValueToOS(count, objectSyntax);
-return true;
 }
 
 #ifdef DEBUG
 std::string UsersSensor::ToString() const
 {
 int handle = users.OpenSearch();
-if (!handle)
-    return "";
+assert(handle && "USERS::OpenSearch is always correct");
 
-USER_PTR user;
+STG::User* user;
 size_t count = 0;
 while (!users.SearchNext(handle, &user))
     {
@@ -41,8 +43,19 @@ while (!users.SearchNext(handle, &user))
 
 users.CloseSearch(handle);
 
-std::string res;
-x2str(count, res);
-return res;
+return std::to_string(count);
 }
 #endif
+
+bool ActiveUsersSensor::UserPredicate(STG::User* userPtr) const
+{
+if (!userPtr->GetConnected())
+    return false;
+for (size_t i = 0; i < DIR_NUM; ++i)
+    {
+    if (userPtr->GetSessionUpload()[i] > 0 ||
+        userPtr->GetSessionDownload()[i] > 0)
+        return true;
+    }
+return false;
+}