Changeset 442eaf2 in nscp

Timestamp:

02/03/08 17:15:14 (5 years ago)

Author:

Michael Medin <michael@…>

Children:

f875332

Parents:

8afca5d

Message:

+ Added API for scripts to register commands

+ Added command descriptions (for some modules)

• Fixed issue in NRPE that displayed a console window when running commands
• New improved "inject" dialog from the system tray Lists avalible commands, and shows command descriptions and a lot of other improvments.

Location:

trunk

Files:

• AutoBuild.h (modified) (1 diff)
• NSClient++.cpp (modified) (3 diffs)
• NSClient++.h (modified) (5 diffs)
• changelog (modified) (1 diff)
• include/NSCHelper.cpp (modified) (3 diffs)
• include/NSCHelper.h (modified) (2 diffs)
• modules/CheckDisk/CheckDisk.cpp (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (1 diff)
• modules/CheckHelpers/CheckHelpers.cpp (modified) (1 diff)
• modules/CheckSystem/CheckSystem.cpp (modified) (1 diff)
• modules/CheckWMI/CheckWMI.cpp (modified) (1 diff)
• modules/NRPEListener/NRPEListener.cpp (modified) (1 diff)
• modules/SysTray/SysTray-2005.vcproj (modified) (1 diff)
• modules/SysTray/SysTray.cpp (modified) (1 diff)
• modules/SysTray/SysTray.rc (modified) (4 diffs)
• modules/SysTray/TrayIcon.cpp (modified) (5 diffs)
• modules/SysTray/resource.h (modified) (2 diffs)

trunk/AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,0,33
-#define PRODUCTVER     0,3,0,33
-#define STRFILEVER     _T("0.3.0.33")
-#define STRPRODUCTVER  _T("0.3.0.33")
+#define FILEVER        0,3,0,35
+#define PRODUCTVER     0,3,0,35
+#define STRFILEVER     _T("0.3.0.35")
+#define STRPRODUCTVER  _T("0.3.0.35")
 #define STRPRODUCTDATE  _T("2008-02-03")
 #endif // AUTOBUILD_H

trunk/NSClient++.cpp

@@ -412 +412 @@
 }
 
+
+std::wstring NSClientT::describeCommand(std::wstring command) {
+  ReadLock readLock(&m_mutexRWcmdDescriptions, true, 5000);
+  if (!readLock.IsLocked()) {
+    LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex when trying to get command list."));
+    return _T("Failed to get mutex when describing command: ") + command;
+  }
+  cmdMap::const_iterator cit = cmdDescriptions_.find(command);
+  if (cit == cmdDescriptions_.end())
+    return _T("Command not found: ") + command + _T(", maybe it has not been register?");
+  return (*cit).second;
+}
+std::list<std::wstring> NSClientT::getAllCommandNames() {
+  std::list<std::wstring> lst;
+  ReadLock readLock(&m_mutexRWcmdDescriptions, true, 5000);
+  if (!readLock.IsLocked()) {
+    LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex when trying to get command list."));
+    return lst;
+  }
+  for (cmdMap::const_iterator cit = cmdDescriptions_.begin(); cit != cmdDescriptions_.end(); ++cit) {
+    lst.push_back((*cit).first);
+  }
+  return lst;
+}
+void NSClientT::registerCommand(std::wstring cmd, std::wstring desc) {
+  WriteLock writeLock(&m_mutexRWcmdDescriptions, true, 10000);
+  if (!writeLock.IsLocked()) {
+    LOG_ERROR_STD(_T("FATAL ERROR: Failed to describe command:") + cmd);
+    return;
+  }
+  cmdDescriptions_[cmd] = desc;
+}
+
 NSCAPI::nagiosReturn NSClientT::inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf) {
   unsigned int aLen = 0;
@@ -773 +806 @@
 NSCAPI::errorReturn NSAPIRehash(int flag) {
   return NSCAPI::hasFailed;
+}
+NSCAPI::errorReturn NSAPIDescribeCommand(const TCHAR* command, TCHAR* buffer, unsigned int bufLen) {
+  return NSCHelper::wrapReturnString(buffer, bufLen, mainClient.describeCommand(command), NSCAPI::isSuccess);
+}
+NSCAPI::errorReturn NSAPIGetAllCommandNames(arrayBuffer::arrayBuffer* aBuffer, unsigned int *bufLen) {
+  unsigned int len = 0;
+  *aBuffer = arrayBuffer::list2arrayBuffer(mainClient.getAllCommandNames(), len);
+  *bufLen = len;
+  return NSCAPI::isSuccess;
+}
+NSCAPI::errorReturn NSAPIReleaseAllCommandNamessBuffer(TCHAR*** aBuffer, unsigned int * bufLen) {
+  arrayBuffer::destroyArrayBuffer(*aBuffer, *bufLen);
+  *bufLen = 0;
+  *aBuffer = NULL;
+  return NSCAPI::isSuccess;
+}
+NSCAPI::errorReturn NSAPIRegisterCommand(const TCHAR* cmd,const TCHAR* desc) {
+  mainClient.registerCommand(cmd, desc);
+  return NSCAPI::isSuccess;
 }
 
@@ -813 +865 @@
   if (_wcsicmp(buffer, _T("NSAPIRehash")) == 0)
     return &NSAPIRehash;
+  if (_wcsicmp(buffer, _T("NSAPIDescribeCommand")) == 0)
+    return &NSAPIDescribeCommand;
+  if (_wcsicmp(buffer, _T("NSAPIGetAllCommandNames")) == 0)
+    return &NSAPIGetAllCommandNames;
+  if (_wcsicmp(buffer, _T("NSAPIReleaseAllCommandNamessBuffer")) == 0)
+    return &NSAPIReleaseAllCommandNamessBuffer;
+  if (_wcsicmp(buffer, _T("NSAPIRegisterCommand")) == 0)
+    return &NSAPIRegisterCommand;
+
   return NULL;
 }

trunk/NSClient++.h

@@ -28 +28 @@
 #include <NSCAPI.h>
 #include <MutexRW.h>
+#include <map>
 
 
@@ -59 +60 @@
   typedef NSCPlugin* plugin_type;
   typedef std::vector<plugin_type> pluginList;
+  typedef std::map<std::wstring,std::wstring> cmdMap;
   pluginList plugins_;
   pluginList commandHandlers_;
@@ -66 +68 @@
   MutexHandler messageMutex;
   MutexRW  m_mutexRW;
+  MutexRW  m_mutexRWcmdDescriptions;
+  cmdMap cmdDescriptions_;
   bool debug_;
 
@@ -95 +99 @@
   void loadPlugins(void);
   void unloadPlugins(void);
+  std::wstring describeCommand(std::wstring command);
+  std::list<std::wstring> getAllCommandNames();
+  void registerCommand(std::wstring cmd, std::wstring desc);
 
   bool logDebug();
@@ -134 +141 @@
 NSCAPI::errorReturn NSAPIReadSettings(int type);
 NSCAPI::errorReturn NSAPIRehash(int flag);
+NSCAPI::errorReturn NSAPIDescribeCommand(const TCHAR*,TCHAR*,unsigned int);
+NSCAPI::errorReturn NSAPIGetAllCommandNames(TCHAR***, unsigned int *);
+NSCAPI::errorReturn NSAPIReleaseAllCommandNamessBuffer(TCHAR***, unsigned int *);
+NSCAPI::errorReturn NSAPIRegisterCommand(const TCHAR*,const TCHAR*);
 
 //////////////////////////////////////////////////////////////////////////

trunk/changelog

@@ -8 +8 @@
 2008-02-03 MickeM
  + Added encryption subsystem to NSCA module (still no mcrypt support, but atleast you have "xor" and passwords)
+ + Added API for scripts to register commands
+ + Added command descriptions (for some modules)
+ * Fixed issue in NRPE that displayed a console window when running commands
+ * New improved "inject" dialog from the system tray
+   Lists avalible commands, and shows command descriptions and a lot of other improvments.
 
 2008-02-02 MickeM

trunk/include/NSCHelper.cpp

@@ -137 +137 @@
   lpNSAPIReadSettings fNSAPIReadSettings = NULL;
   lpNSAPIRehash fNSAPIRehash = NULL;
+  lpNSAPIDescribeCommand fNSAPIDescribeCommand= NULL;
+  lpNSAPIGetAllCommandNames fNSAPIGetAllCommandNames= NULL;
+  lpNSAPIReleaseAllCommandNamessBuffer fNSAPIReleaseAllCommandNamessBuffer= NULL;
+  lpNSAPIRegisterCommand fNSAPIRegisterCommand= NULL;
 
 }
@@ -468 +472 @@
 }
 
+std::list<std::wstring> NSCModuleHelper::getAllCommandNames() {
+  if (!fNSAPIGetAllCommandNames || !fNSAPIReleaseAllCommandNamessBuffer )
+    throw NSCMHExcpetion(_T("NSCore has not been initiated..."));
+  arrayBuffer::arrayBuffer aBuffer = NULL;
+  unsigned int argLen = 0;
+  if (fNSAPIGetAllCommandNames(&aBuffer, &argLen) != NSCAPI::isSuccess) {
+    throw NSCMHExcpetion(_T("Commands could not be retrieved."));
+  }
+  std::list<std::wstring> ret = arrayBuffer::arrayBuffer2list(argLen, aBuffer);
+  if (fNSAPIReleaseAllCommandNamessBuffer(&aBuffer, &argLen) != NSCAPI::isSuccess) {
+    throw NSCMHExcpetion(_T("Commands could not be destroyed."));
+  }
+  assert(aBuffer == NULL);
+  return ret;
+}
+std::wstring NSCModuleHelper::describeCommand(std::wstring command) {
+  if (!fNSAPIDescribeCommand)
+    throw NSCMHExcpetion(_T("NSCore has not been initiated..."));
+  TCHAR *buffer = new TCHAR[BUFF_LEN+1];
+  if (fNSAPIDescribeCommand(command.c_str(), buffer, BUFF_LEN) != NSCAPI::isSuccess) {
+    delete [] buffer;
+    throw NSCMHExcpetion(_T("Base path could not be retrieved"));
+  }
+  std::wstring ret = buffer;
+  delete [] buffer;
+  return ret;
+}
+void NSCModuleHelper::registerCommand(std::wstring command, std::wstring description) {
+  if (!fNSAPIRegisterCommand)
+    throw NSCMHExcpetion(_T("NSCore has not been initiated..."));
+  fNSAPIRegisterCommand(command.c_str(), description.c_str());
+}
+
 
 bool NSCModuleHelper::checkLogMessages(int type) {
@@ -545 +582 @@
   NSCModuleHelper::fNSAPIReadSettings = (NSCModuleHelper::lpNSAPIReadSettings)f(_T("NSAPIReadSettings"));
   NSCModuleHelper::fNSAPIRehash = (NSCModuleHelper::lpNSAPIRehash)f(_T("NSAPIRehash"));
+
+  NSCModuleHelper::fNSAPIDescribeCommand = (NSCModuleHelper::lpNSAPIDescribeCommand)f(_T("NSAPIDescribeCommand"));
+  NSCModuleHelper::fNSAPIGetAllCommandNames = (NSCModuleHelper::lpNSAPIGetAllCommandNames)f(_T("NSAPIGetAllCommandNames"));
+  NSCModuleHelper::fNSAPIReleaseAllCommandNamessBuffer = (NSCModuleHelper::lpNSAPIReleaseAllCommandNamessBuffer)f(_T("NSAPIReleaseAllCommandNamessBuffer"));
+  NSCModuleHelper::fNSAPIRegisterCommand = (NSCModuleHelper::lpNSAPIRegisterCommand)f(_T("NSAPIRegisterCommand"));
+
   return NSCAPI::isSuccess;
 }

trunk/include/NSCHelper.h

@@ -119 +119 @@
   typedef NSCAPI::errorReturn (*lpNSAPIReadSettings)(int);
   typedef NSCAPI::errorReturn (*lpNSAPIRehash)(int);
+  typedef NSCAPI::errorReturn (*lpNSAPIDescribeCommand)(const TCHAR*,TCHAR*,unsigned int);
+  typedef NSCAPI::errorReturn (*lpNSAPIGetAllCommandNames)(arrayBuffer::arrayBuffer*, unsigned int *);
+  typedef NSCAPI::errorReturn (*lpNSAPIReleaseAllCommandNamessBuffer)(arrayBuffer::arrayBuffer*, unsigned int *);
+  typedef NSCAPI::errorReturn (*lpNSAPIRegisterCommand)(const TCHAR*,const TCHAR*);
 
   // Helper functions for calling into the core
@@ -142 +146 @@
   NSCAPI::errorReturn ReadSettings(int type);
   NSCAPI::errorReturn Rehash(int flag);
+  std::list<std::wstring> getAllCommandNames();
+  std::wstring describeCommand(std::wstring command);
+  void registerCommand(std::wstring command, std::wstring description);
 };
 

trunk/modules/CheckDisk/CheckDisk.cpp

@@ -40 +40 @@
 }
 
-
 bool CheckDisk::loadModule() {
+  try {
+    NSCModuleHelper::registerCommand(_T("CheckFileSize"), _T("Check or directory a file and verify its size."));
+    NSCModuleHelper::registerCommand(_T("CheckDriveSize"), _T("Check the size (free-space) of a drive or volume."));
+    NSCModuleHelper::registerCommand(_T("CheckFile"), _T("Check various aspects of a file and/or folder."));
+  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+    NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
+  } catch (...) {
+    NSC_LOG_ERROR_STD(_T("Failed to register command."));
+  }
   return true;
 }

trunk/modules/CheckEventLog/CheckEventLog.cpp

@@ -45 +45 @@
 
 bool CheckEventLog::loadModule() {
+  try {
+    NSCModuleHelper::registerCommand(_T("CheckEventLog"), _T("Check for errors in the event logger!"));
+  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+    NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
+  } catch (...) {
+    NSC_LOG_ERROR_STD(_T("Failed to register command."));
+  }
   return true;
 }

trunk/modules/CheckHelpers/CheckHelpers.cpp

@@ -40 +40 @@
 
 bool CheckHelpers::loadModule() {
+  try {
+    NSCModuleHelper::registerCommand(_T("CheckAlwaysOK"), _T("Run another check and regardless of its return code return OK."));
+    NSCModuleHelper::registerCommand(_T("CheckAlwaysCRITICAL"), _T("Run another check and regardless of its return code return CRIT."));
+    NSCModuleHelper::registerCommand(_T("CheckAlwaysWARNING"), _T("Run another check and regardless of its return code return WARN."));
+    NSCModuleHelper::registerCommand(_T("CheckMultiple"), _T("Run more then one check and return the worst state."));
+  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+    NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
+  } catch (...) {
+    NSC_LOG_ERROR_STD(_T("Failed to register command."));
+  }
   return true;
 }

trunk/modules/CheckSystem/CheckSystem.cpp

@@ -108 +108 @@
     }
   }
-  
+  try {
+    NSCModuleHelper::registerCommand(_T("checkCPU"), _T("Check the CPU load of the computer."));
+    NSCModuleHelper::registerCommand(_T("checkUpTime"), _T("Check the up-time of the computer."));
+    NSCModuleHelper::registerCommand(_T("checkServiceState"), _T("Check the state of one or more of the computer services."));
+    NSCModuleHelper::registerCommand(_T("checkProcState"), _T("Check the state of one or more of the processes running on the computer."));
+    NSCModuleHelper::registerCommand(_T("checkMem"), _T("Check free/used memory on the system."));
+    NSCModuleHelper::registerCommand(_T("checkCounter"), _T("Check a PDH counter."));
+  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+    NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
+  } catch (...) {
+    NSC_LOG_ERROR_STD(_T("Failed to register command."));
+  }
   return true;
 }

trunk/modules/CheckWMI/CheckWMI.cpp

@@ -43 +43 @@
 
 bool CheckWMI::loadModule() {
+  try {
+    NSCModuleHelper::registerCommand(_T("CheckWMIValue"), _T("Run a WMI query and check the resulting value (the values of each row determin the state)."));
+    NSCModuleHelper::registerCommand(_T("CheckWMI"), _T("Run a WMI query and check the resulting rows (the number of hits determine state)."));
+  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+    NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
+  } catch (...) {
+    NSC_LOG_ERROR_STD(_T("Failed to register command."));
+  }
   return wmiQuery.initialize();
 }

trunk/modules/NRPEListener/NRPEListener.cpp

@@ -265 +265 @@
   ZeroMemory(&si, sizeof(STARTUPINFO));
   si.cb = sizeof(STARTUPINFO);
-  si.dwFlags = STARTF_USESTDHANDLES;
+  si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
   si.hStdInput = hChildInR;
   si.hStdOutput = hChildOutW;
   si.hStdError = hChildOutW;
+  si.wShowWindow = SW_HIDE;
 
 

trunk/modules/SysTray/SysTray-2005.vcproj

@@ -1774 +1774 @@
   </Files>
   <Globals>
+    <Global
+      Name="RESOURCE_FILE"
+      Value="SysTray.rc"
+    />
   </Globals>
 </VisualStudioProject>

trunk/modules/SysTray/SysTray.cpp

@@ -75 +75 @@
     }
   } else {
-    NSC_LOG_ERROR_STD(_T("Undefined command, usgae: install or uninstall"));
+    NSC_LOG_ERROR_STD(_T("Undefined command, usage: install or uninstall"));
     return -1;
   }

trunk/modules/SysTray/SysTray.rc

@@ -42 +42 @@
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 317
-        VERTGUIDE, 207
-        VERTGUIDE, 267
+        RIGHTMARGIN, 351
+        VERTGUIDE, 114
+        VERTGUIDE, 291
         TOPMARGIN, 7
-        BOTTOMMARGIN, 43
+        BOTTOMMARGIN, 144
+        HORZGUIDE, 15
+        HORZGUIDE, 27
+        HORZGUIDE, 47
+        HORZGUIDE, 59
+        HORZGUIDE, 63
+        HORZGUIDE, 77
+        HORZGUIDE, 81
+        HORZGUIDE, 85
     END
 END
@@ -57 +65 @@
 //
 
-IDD_INJECTDIALOG DIALOGEX 0, 0, 324, 50
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | 
-    WS_CAPTION | WS_SYSMENU
+IDD_INJECTDIALOG DIALOGEX 0, 0, 358, 151
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Inject command into NSClient++"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "Inject",IDOK,267,29,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,207,29,50,14
-    EDITTEXT        IDC_COMMAND,7,7,310,12,ES_AUTOHSCROLL
+    COMBOBOX        IDC_CMD_BOX,7,15,107,279,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_ARG_BOX,7,35,344,24,ES_MULTILINE | ES_AUTOHSCROLL
+    EDITTEXT        IDC_MSG,7,93,344,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_PERF,7,113,344,12,ES_AUTOHSCROLL | ES_READONLY
+    DEFPUSHBUTTON   "Inject",IDC_INJECT,291,63,60,14
+    PUSHBUTTON      "Done",IDCANCEL,291,130,60,14
+    LTEXT           "Command:",IDC_STATIC,7,7,35,8
+    LTEXT           "Arguments:",IDC_STATIC,7,27,38,8
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,80,344,1
+    LTEXT           "Result message:",IDC_STATIC,7,85,54,8
+    LTEXT           "Performance data:",IDC_STATIC,7,105,61,8
+    LTEXT           "",IDC_DESCRIPTION,114,15,237,12
 END
 
@@ -132 +148 @@
 #endif //_WIN32
 
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -179 +180 @@
 END
 
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
 #endif    // Swedish resources
 /////////////////////////////////////////////////////////////////////////////

trunk/modules/SysTray/TrayIcon.cpp

@@ -22 +22 @@
 #include ".\trayicon.h"
 #include "resource.h"
+#include <commctrl.h>
 #include <strEx.h>
 #include <ShellAPI.h>
@@ -59 +60 @@
 }
 
+std::wstring getDlgItemText(HWND hDlg, int nIDDlgItem) {
+#define BUFF_LEN 4096
+  std::wstring ret;
+  TCHAR *buffer = new TCHAR[BUFF_LEN+1];
+  if (!GetDlgItemText(hDlg, nIDDlgItem, buffer, BUFF_LEN))
+    buffer[0]=0;
+  ret = buffer;
+  delete [] buffer;
+  return ret;
+}
+void updateDescFromCmd(HWND hDlg, std::wstring cmd) {
+  std::wstring result = _T("");
+  try {
+    result = NSCModuleHelper::describeCommand(cmd);
+  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+    result = _T("Error: ") + e.msg_;
+  } catch (...) {
+    result = _T("Unknown error!");
+  }
+  SetDlgItemText(hDlg, IDC_DESCRIPTION, result.c_str());
+}
 /*
 INT_PTR CALLBACK DialogProc(          HWND hwndDlg,
@@ -70 +92 @@
   {
   case WM_INITDIALOG:
-    SetDlgItemText(hwndDlg, IDC_COMMAND, TrayIcon::defaultCommand.c_str());
+    {
+      SetDlgItemText(hwndDlg, IDC_CMD_BOX, TrayIcon::defaultCommand.c_str());
+      SetDlgItemText(hwndDlg, IDC_DESCRIPTION, _T("Loading commands, please wait..."));
+
+      SendDlgItemMessage(hwndDlg, IDC_CMD_BOX, CB_RESETCONTENT, 0, 0); 
+      std::wstring result = _T("");
+      try {
+        std::list<std::wstring> lst = NSCModuleHelper::getAllCommandNames();
+        for (std::list<std::wstring>::const_iterator cit = lst.begin(); cit != lst.end(); ++cit) {
+          SendDlgItemMessage(hwndDlg, IDC_CMD_BOX, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>( (*cit).c_str() ));
+        }
+      } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+        result = _T("Error: ") + e.msg_;
+      } catch (...) {
+        result = _T("Unknown error!");
+      }
+      SetDlgItemText(hwndDlg, IDC_DESCRIPTION, result.c_str());
+    }
+    break;
   case WM_COMMAND: 
     switch (LOWORD(wParam))
     {
+    case IDC_CMD_BOX: 
+      switch(HIWORD(wParam)) 
+      {
+      case CBN_SELCHANGE:
+        {
+          std::wstring cmd;
+          unsigned int id = SendDlgItemMessage(hwndDlg, IDC_CMD_BOX, CB_GETCURSEL, 0, 0); 
+          unsigned int len = SendDlgItemMessage(hwndDlg, IDC_CMD_BOX, CB_GETLBTEXTLEN, id, 0);
+          TCHAR *buf = new TCHAR[len+2];
+          LRESULT ret;
+          ret = SendDlgItemMessage(hwndDlg, IDC_CMD_BOX, CB_GETLBTEXT, id, reinterpret_cast<LPARAM>(buf));
+          if (ret > 0 && ret <= len) {
+            cmd = buf;
+            updateDescFromCmd(hwndDlg, cmd);
+          }
+          delete [] buf;
+        }
+        break;
+      case CBN_KILLFOCUS:
+        updateDescFromCmd(hwndDlg, getDlgItemText(hwndDlg, IDC_CMD_BOX));
+        break;
+      }
+      break;
+    case IDC_INJECT:
+      {
+#define BUFF_LEN 4096
+        std::wstring result = _T("");
+        std::wstring cmd = getDlgItemText(hwndDlg, IDC_CMD_BOX);
+        std::wstring args = getDlgItemText(hwndDlg, IDC_ARG_BOX);
+        std::wstring msg;
+        std::wstring perf;
+        try {
+          NSCAPI::nagiosReturn ret = NSCModuleHelper::InjectSplitAndCommand(cmd, args, ' ', msg, perf);
+          if (ret == NSCAPI::returnIgnored) {
+            result = _T("Command not found!");
+          } else {
+            result = NSCHelper::translateReturn(ret);
+          }
+        } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+          result = _T("Error: ") + e.msg_;
+        } catch (...) {
+          result = _T("Unknown error!");
+        }
+        SetDlgItemText(hwndDlg, IDC_DESCRIPTION, result.c_str());
+        SetDlgItemText(hwndDlg, IDC_MSG, msg.c_str());
+        SetDlgItemText(hwndDlg, IDC_PERF, perf.c_str());
+      }
+      break;
     case IDOK: 
       {
@@ -116 +204 @@
           TrayIcon::defaultCommand = NSCModuleHelper::getSettingsString(_T("systray"), _T("defaultCommand"), _T(""));
         if (DialogBox(NSCModuleWrapper::getModule(),MAKEINTRESOURCE(IDD_INJECTDIALOG),NULL,InjectDialogProc) == IDOK) {
-          // @todo NSCModuleHelper::InjectCommand(TrayIcon::defaultCommand);
+          //NSCModuleHelper::InjectSplitAndCommand(TrayIcon::defaultCommand, buffer);
         }
         break;
@@ -122 +210 @@
         {
           long long err = reinterpret_cast<long long>(ShellExecute(hwndDlg, _T("open"), 
-            (NSCModuleHelper::getBasePath() + NSCModuleHelper::getSettingsString(_T("log"), _T("file"), _T(""))).c_str(), 
+            (NSCModuleHelper::getBasePath() + _T("\\") + NSCModuleHelper::getSettingsString(_T("log"), _T("file"), _T(""))).c_str(), 
             NULL, NULL, SW_SHOWNORMAL));
           if (err <=32) {

trunk/modules/SysTray/resource.h

@@ -9 +9 @@
 #define IDD_INJECTDIALOG                105
 #define IDC_COMMAND                     1000
+#define IDC_ARG_BOX                     1000
+#define IDC_CMD_BOX                     1001
+#define IDC_MSG                         1003
+#define IDC_PERF                        1004
+#define IDC_DESCRIPTION                 1005
+#define IDC_INJECT                      1006
 #define ID_POPUP_NSCLIENT               40006
 #define ID_POPUP_INJECTCOMMAND          40007
@@ -21 +27 @@
 #define _APS_NEXT_RESOURCE_VALUE        106
 #define _APS_NEXT_COMMAND_VALUE         40011
-#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_CONTROL_VALUE         1007
 #define _APS_NEXT_SYMED_VALUE           101
 #endif