Windows installer adds PING and SSH subagents to agent configuration on server

[public/netxms.git] / src / server / tools / nxconfig / nxconfig.cpp

diff --git a/src/server/tools/nxconfig/nxconfig.cpp b/src/server/tools/nxconfig/nxconfig.cpp
index 455abe8..e463ae7 100644 (file)
--- a/src/server/tools/nxconfig/nxconfig.cpp
+++ b/src/server/tools/nxconfig/nxconfig.cpp
@@ -14,9 +14,13 @@
 #include "SummaryPage.h"
 #include "ProcessingPage.h"
 #include "ConfigFilePage.h"
+#include "WinSrvPage.h"
+#include "SrvDepsPage.h"
 #include "LoggingPage.h"
 #include "FinishPage.h"
 
+#include <winsock2.h>
+#include <afxsock.h>           // MFC socket extensions
 #include <iphlpapi.h>
 #include <iprtrmib.h>
 #include <rtinfo.h>
@@ -48,7 +52,7 @@ CNxconfigApp::CNxconfigApp()
 /////////////////////////////////////////////////////////////////////////////
 // The one and only CNxconfigApp object
 
-CNxconfigApp theApp;
+CNxconfigApp appNxConfig;
 
 /////////////////////////////////////////////////////////////////////////////
 // CNxconfigApp initialization
@@ -81,6 +85,11 @@ BOOL CNxconfigApp::InitInstance()
 
       RegCloseKey(hKey);
    }
+   else
+   {
+      AfxMessageBox(_T("Unable to determine NetXMS installation directory"));
+      m_szInstallDir[0] = 0;
+   }
 
    // Parse command line
    if (!_tcsicmp(m_lpCmdLine, _T("--create-agent-config")))
@@ -93,7 +102,7 @@ BOOL CNxconfigApp::InitInstance()
    // installation directory
    if ((dwData != 0) || (m_szInstallDir[0] == 0))
    {
-      if (dwData != 0)
+      if ((dwData != 0) && (_tcsicmp(m_lpCmdLine, _T("--configure-if-needed"))))
          AfxMessageBox(_T("Server already configured"));
       return FALSE;
    }
@@ -105,33 +114,19 @@ BOOL CNxconfigApp::InitInstance()
        //  of your final executable, you should remove from the following
        //  the specific initialization routines you do not need.
 
-#ifdef _AFXDLL
-       Enable3dControls();                     // Call this when using MFC in a shared DLL
-#else
-       Enable3dControlsStatic();       // Call this when linking to MFC statically
-#endif
-
        // Change the registry key under which our settings are stored.
-       // TODO: You should modify this string to be something appropriate
-       // such as the name of your company or organization.
-       SetRegistryKey(_T("Local AppWizard-Generated Applications"));
-
+       SetRegistryKey(_T("NetXMS"));
 
        // To create the main window, this code creates a new frame window
        // object and then sets it as the application's main window object.
-
        CMainFrame* pFrame = new CMainFrame;
        m_pMainWnd = pFrame;
 
        // create and load the frame with its resources
-
        pFrame->LoadFrame(IDR_MAINFRAME,
                WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE, NULL,
                NULL);
 
-
-
-
        // The one and only window has been initialized, so show and update it.
        //pFrame->ShowWindow(SW_SHOW);
        //pFrame->UpdateWindow();
@@ -154,6 +149,8 @@ void CNxconfigApp::OnFileCfgWizard()
    CPollCfgPage pgPollConfig;
    CSMTPPage pgSMTP;
    CLoggingPage pgLogging;
+   CWinSrvPage pgWinSrv;
+   CSrvDepsPage pgSrvDeps;
    CSummaryPage pgSummary;
    CProcessingPage pgProcessing;
    CFinishPage pgFinish;
@@ -166,6 +163,8 @@ void CNxconfigApp::OnFileCfgWizard()
    dlg.AddPage(&pgPollConfig);
    dlg.AddPage(&pgSMTP);
    dlg.AddPage(&pgLogging);
+   dlg.AddPage(&pgWinSrv);
+   dlg.AddPage(&pgSrvDeps);
    dlg.AddPage(&pgSummary);
    dlg.AddPage(&pgProcessing);
    dlg.AddPage(&pgFinish);
@@ -200,7 +199,8 @@ void CNxconfigApp::CreateAgentConfig()
    IP_ADDR_STRING *pAddr;
    TCHAR szAddrList[4096], szFile[MAX_PATH];
 
-   if (_taccess(_T("nxagentd.conf"), 0) == 0)
+   _sntprintf(szFile, MAX_PATH, _T("%s\\etc\\nxagentd.conf"), m_szInstallDir);
+   if (_taccess(szFile, 0) == 0)
       return;  // File already exist, we shouldn't overwrite it
 
    // Get local interface list
@@ -215,11 +215,17 @@ void CNxconfigApp::CreateAgentConfig()
             // Read all IP addresses for adapter
             for(pAddr = &pInfo->IpAddressList; pAddr != NULL; pAddr = pAddr->Next)
             {
-               if (_tcscmp(pAddr->IpAddress.String, _T("0.0.0.0")))
+               if (strcmp(pAddr->IpAddress.String, "0.0.0.0"))
                {
                   if (szAddrList[0] != 0)
                      _tcscat(szAddrList, _T(", "));
-                  _tcscat(szAddrList, pAddr->IpAddress.String);
+#ifdef UNICODE
+                                               WCHAR ipaddr[32];
+                                               MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, pAddr->IpAddress.String, -1, ipaddr, 32);
+                  wcscat(szAddrList, ipaddr);
+#else
+                  strcat(szAddrList, pAddr->IpAddress.String);
+#endif
                }
             }
          }
@@ -227,19 +233,22 @@ void CNxconfigApp::CreateAgentConfig()
       free(pBuffer);
    }
 
-   _sntprintf(szFile, MAX_PATH, _T("%s\\etc\\nxagentd.conf"), m_szInstallDir);
    fp = _tfopen(szFile, _T("w"));
    if (fp != NULL)
    {
       currTime = time(NULL);
-      _ftprintf(fp, _T("#\n# NetXMS agent configuration file\n# Created by server installer at %s#\n\n"),
-                _tctime(&currTime));
-      _ftprintf(fp, _T("LogFile = {syslog}\nServers = 127.0.0.1\n"));
+      _ftprintf(fp, _T("#\n# NetXMS agent configuration file\n# Created by server installer at %s#\n\n"), _tctime(&currTime));
       if (szAddrList[0] != 0)
-         _ftprintf(fp, _T("InstallationServers = %s\n"), szAddrList);
+      {
+         _ftprintf(fp, _T("LogFile = {syslog}\nMasterServers = 127.0.0.1, %s\n"), szAddrList);
+      }
+      else
+      {
+         _ftprintf(fp, _T("LogFile = {syslog}\nMasterServers = 127.0.0.1\n"));
+      }
       _ftprintf(fp, _T("FileStore = %s\\var\n"), m_szInstallDir);
       _ftprintf(fp, _T("RequireAuthentication = no\n"));
-      _ftprintf(fp, _T("SubAgent = winperf.nsm\nSubAgent = portcheck.nsm\n"));
+      _ftprintf(fp, _T("SubAgent = winperf.nsm\nSubAgent = portcheck.nsm\nSubAgent = ping.nsm\nSubAgent = ssh.nsm\n"));
       fclose(fp);
    }
 }