Brand new connection handling.

[stg.git] / projects / stargazer / plugins / other / smux / tables.cpp

diff --git a/projects/stargazer/plugins/other/smux/tables.cpp b/projects/stargazer/plugins/other/smux/tables.cpp
index 962c91a8207f3e288ceb2e1eb1adb1ffcc56223f..c3e3ef54c48d870fee774d16ac11e3420b8b67e2 100644 (file)
--- a/projects/stargazer/plugins/other/smux/tables.cpp
+++ b/projects/stargazer/plugins/other/smux/tables.cpp
@@ -28,9 +28,10 @@ assert(handle && "USERS::OpenSearch is always correct");
 USER_PTR user;
 while (!users.SearchNext(handle, &user))
     {
 USER_PTR user;
 while (!users.SearchNext(handle, &user))
     {

+    if (user->GetDeleted())
+        continue;

     std::string tariffName(user->GetProperty().tariffName.ConstData());
     std::string tariffName(user->GetProperty().tariffName.ConstData());

-    std::map<std::string, size_t>::iterator it;
-    it = data.lower_bound(tariffName);
+    std::map<std::string, size_t>::iterator it(data.lower_bound(tariffName));

     if (it == data.end() ||
         it->first != tariffName)
         {
     if (it == data.end() ||
         it->first != tariffName)
         {


@@ -50,8 +51,8 @@ OID prefixOid(prefix);
 std::map<std::string, size_t>::const_iterator it(data.begin());
 while (it != data.end())
     {
 std::map<std::string, size_t>::const_iterator it(data.begin());
 while (it != data.end())
     {

-    sensors[prefixOid.copyWithSuffix(2, idx)] = new ConstSensor<std::string>(it->first);
-    sensors[prefixOid.copyWithSuffix(3, idx)] = new ConstSensor<int>(it->second);
+    sensors[prefixOid.copyWithSuffix(2, static_cast<unsigned int>(idx))] = new ConstSensor<std::string>(it->first);
+    sensors[prefixOid.copyWithSuffix(3, static_cast<unsigned int>(idx))] = new ConstSensor<unsigned long>(it->second);

     ++idx;
     ++it;
     }
     ++idx;
     ++it;
     }