Changeset 3baaa4d in nscp for modules

Timestamp:

02/17/05 22:41:31 (8 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

db70efa

Parents:

50744c5

Message:

Verified NSCLient compatiblity for many commands and some minor tweaks (now most NSClient commands are OK)

Location:

modules

Files:

• NSClientCompat/NSClientCompat.cpp (modified) (2 diffs)
• NSClientCompat/NSCommands.cpp (modified) (1 diff)
• SysTray/TrayIcon.cpp (modified) (1 diff)

modules/NSClientCompat/NSClientCompat.cpp

@@ -86 +86 @@
  * This also handles a lot of the simpler responses (though some are deferred to other helper functions)
  *
- #define REQ_CLIENTVERSION  1 // x
- #define REQ_CPULOAD    2 // x
- #define REQ_UPTIME     3 // x
- #define REQ_USEDDISKSPACE  4 // x
- #define REQ_SERVICESTATE 5 // x
- #define REQ_PROCSTATE    6 // x
- #define REQ_MEMUSE     7 // x
- //#define REQ_COUNTER    8 // ! - not implemented
- //#define REQ_FILEAGE    9 // ! - not implemented
- //#define REQ_INSTANCES  10  // ! - not implemented
+ #define REQ_CLIENTVERSION  1 // Works fine!
+ #define REQ_CPULOAD    2 // Quirks
+ - Needs settings for default buffer size (backlog) and possibly other things.
+ - Buffer needs to be synced with the client (don't know the size of that)
+ - I think the idea was that the buffer would recursive to make a smaller memory footprint.
+  (ie. the first level buffer have samples from every second, next level samples from every minute, next level hours etc...)
+  (and I don't know the status of this, doesn't seem to be that way)
+ #define REQ_UPTIME     3 // Works fine!
+ #define REQ_USEDDISKSPACE  4 // Works fine!
+ #define REQ_SERVICESTATE 5 // Works fine!
+ #define REQ_PROCSTATE    6 // Works fine!
+ #define REQ_MEMUSE     7 // Works fine!
+ //#define REQ_COUNTER    8 // ! - not implemented Have to look at this, if anyone has a sample let me know...
+ //#define REQ_FILEAGE    9 // ! - not implemented Dont know how to use
+ //#define REQ_INSTANCES  10  // ! - not implemented Dont know how to use
  *
  * @param command 
@@ -109 +114 @@
   switch (id) {
     case REQ_CLIENTVERSION:
-      return NSCModuleHelper::getApplicationName() + " " + NSCModuleHelper::getApplicationVersionString();
-    
+      {
+        std::string version = NSCModuleHelper::getSettingsString("nsclient compat", "version", "modern");
+        if (version == "modern")
+          return NSCModuleHelper::getApplicationName() + " " + NSCModuleHelper::getApplicationVersionString();
+        return version;
+      }
     case REQ_UPTIME:
       return strEx::itos(pdhCollector->getUptime());
 
     case REQ_CPULOAD:
-      stl_args = NSCHelper::makelist(argLen, args);
-      if (stl_args.empty())
-        return "ERROR: Missing argument exception.";
-      return strEx::itos(pdhCollector->getCPUAvrage(strEx::stoi(stl_args.front())*(60/CHECK_INTERVAL)));
-
+      {
+        stl_args = NSCHelper::makelist(argLen, args);
+        if (stl_args.empty())
+          return "ERROR: Missing argument exception.";
+        std::string ret;
+        while (!stl_args.empty()) {
+          std::string s = stl_args.front(); stl_args.pop_front();
+          int v = pdhCollector->getCPUAvrage(strEx::stoi(s)*(60/CHECK_INTERVAL));
+          if (v == -1)
+            return ret;
+          if (!ret.empty())
+            ret += "&";
+          ret += strEx::itos(v);
+        }
+        return ret;
+      }
     case REQ_SERVICESTATE:
       return NSCommands::serviceState(NSCHelper::makelist(argLen, args));

modules/NSClientCompat/NSCommands.cpp

@@ -82 +82 @@
         state = error;
       if (!ret.empty()) ret += " - ";
-      ret += exe + " : Stopped";
+      ret += exe + " : not running";
     } else if (showAll) {
       if (!ret.empty()) ret += " - ";

modules/SysTray/TrayIcon.cpp

@@ -43 +43 @@
   case WM_INITDIALOG:
     addIcon(hwndDlg);
-//    return TRUE;
     break;