libnxcscp merged into libnetxms
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 20 Oct 2006 09:55:00 +0000 (09:55 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 20 Oct 2006 09:55:00 +0000 (09:55 +0000)
46 files changed:
.gitattributes
configure.ac
doc/internal/db_format_change.txt
include/netxms-version.h
include/netxmsdb.h
include/nxclapi.h
include/nxcpapi.h [moved from include/nxcscpapi.h with 82% similarity]
include/nxsl_classes.h
netxms.dsw
sql/schema.in
sql/setup.in
src/Makefile.am
src/agent/core/nxagentd.dsp
src/agent/install/nxagent-x64.iss
src/agent/install/nxagent.iss
src/agent/subagents/portCheck/main.cpp
src/agent/subagents/portCheck/portcheck.dsp
src/console/nxnotify/nxnotify.dsp
src/console/win32/ObjectCommentsEditor.cpp
src/console/win32/ObjectCommentsEditor.h
src/console/win32/nxcon.clw
src/console/win32/nxcon.dsp
src/install/windows/netxms.iss
src/libnetxms/config.cpp
src/libnetxms/libnetxms.dsp
src/libnetxms/libnetxms.h
src/libnxcl/libnxcl.dsp
src/libnxcl/libnxcl.h
src/libnxcl/objects.cpp
src/libnxmap/libnxmap.dsp
src/libnxmap/libnxmap.h
src/libnxsl/libnxsl.dsp
src/libnxsl/libnxsl.h
src/nxevent/nxevent.dsp
src/server/core/nxcore.dsp
src/server/dbdrv/sqlite/sqlite.dsp
src/server/include/nms_core.h
src/server/include/nxsrvapi.h
src/server/libnxsrv/libnxsrv.dsp
src/server/libnxsrv/libnxsrv.h
src/server/tools/nxaction/nxaction.dsp
src/server/tools/nxadm/nxadm.dsp
src/server/tools/nxadm/nxadm.h
src/server/tools/nxdbmgr/upgrade.cpp
src/server/tools/nxget/nxget.dsp
src/server/tools/nxupload/nxupload.dsp

index a91ea04..2cb3851 100644 (file)
@@ -203,7 +203,7 @@ include/nms_cscp.h -text
 include/nms_threads.h -text
 include/nms_util.h -text
 include/nxclapi.h -text
-include/nxcscpapi.h -text
+include/nxcpapi.h -text
 include/nxevent.h -text
 include/nximage.h -text
 include/nxlexer_styles.h -text
index 5f1289b..65ad6c2 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.208 2006-10-13 15:44:19 victor Exp $
+# $Id: configure.ac,v 1.209 2006-10-20 09:54:49 victor Exp $
 #
 # Process this file with autoconf to produce a configure script.
 #
@@ -851,7 +851,6 @@ CPPFLAGS="$CPPFLAGS -DDATADIR=\\\"\${pkgdatadir}\\\" -DLIBDIR=\\\"\${libdir}\\\"
 #
 
 LIBNETXMS_LIBRARY_VERSION=0:2:0
-LIBNXCSCP_LIBRARY_VERSION=0:2:0
 LIBNXMAP_LIBRARY_VERSION=0:2:0
 LIBNXCL_LIBRARY_VERSION=0:2:0
 LIBNXSNMP_LIBRARY_VERSION=0:2:0
@@ -861,7 +860,6 @@ DBDRV_LIBRARY_VERSION=0:2:0
 SMSDRV_LIBRARY_VERSION=0:2:0
 LIBNXSL_LIBRARY_VERSION=0:2:0
 AC_SUBST(LIBNETXMS_LIBRARY_VERSION)
-AC_SUBST(LIBNXCSCP_LIBRARY_VERSION)
 AC_SUBST(LIBNXMAP_LIBRARY_VERSION)
 AC_SUBST(LIBNXCL_LIBRARY_VERSION)
 AC_SUBST(LIBNXSNMP_LIBRARY_VERSION)
@@ -894,7 +892,6 @@ AC_CONFIG_FILES([
        sql/Makefile
        src/Makefile
        src/libnetxms/Makefile
-       src/libnxcscp/Makefile
        src/libnxsnmp/Makefile
        src/libnxcl/Makefile
        src/libnxsl/Makefile
index 5bbb707..d6c5d51 100644 (file)
@@ -1,4 +1,11 @@
 *************
+* 50 ==> 51 *
+*************
+
+- Columns "range_start" and "range_end" added to table "object_tools"
+
+
+*************
 * 49 ==> 50 *
 *************
 
index a06841d..b2899d2 100644 (file)
@@ -31,7 +31,7 @@
 #define NETXMS_VERSION_MAJOR        0
 #define NETXMS_VERSION_MINOR        2
 #define NETXMS_VERSION_BUILD        14
-#define NETXMS_VERSION_STRING       _T("0.2.14-rc8")
+#define NETXMS_VERSION_STRING       _T("0.2.14-rc9")
 
 
 //
index 6350dfb..e0854ed 100644 (file)
@@ -23,6 +23,6 @@
 #ifndef _netxms_db_h
 #define _netxms_db_h
 
-#define DB_FORMAT_VERSION      50
+#define DB_FORMAT_VERSION      51
 
 #endif
index 948d040..0a65e1c 100644 (file)
@@ -28,7 +28,7 @@
 #include <nms_util.h>
 #include <nxevent.h>
 #include <nximage.h>
-#include <nxcscpapi.h>
+#include <nxcpapi.h>
 #include <nxtools.h>
 #include <nxlog.h>
 #include <uuid.h>
@@ -677,19 +677,19 @@ typedef struct
 // Trap parameter mapping entry
 //
 
-struct NXC_OID_MAP
+typedef struct
 {
    DWORD *pdwObjectId;     // Trap OID
    DWORD dwOidLen;         // Trap OID length
    TCHAR szDescription[MAX_DB_STRING];
-};
+} NXC_OID_MAP;
 
 
 //
 // Trap configuration entry
 //
 
-struct NXC_TRAP_CFG_ENTRY
+typedef struct
 {
    DWORD dwId;             // Entry ID
    DWORD *pdwObjectId;     // Trap OID
@@ -698,20 +698,20 @@ struct NXC_TRAP_CFG_ENTRY
    DWORD dwNumMaps;        // Number of parameter mappings
    NXC_OID_MAP *pMaps;
    TCHAR szDescription[MAX_DB_STRING];
-};
+} NXC_TRAP_CFG_ENTRY;
 
 
 //
 // Condition's input DCI definition
 //
 
-struct INPUT_DCI
+typedef struct
 {
    DWORD dwId;
    DWORD dwNodeId;
    int nFunction;    // Average, last, diff
    int nPolls;       // Number of polls used for average
-};
+} INPUT_DCI;
 
 
 /********************************************************************
@@ -1526,6 +1526,10 @@ DWORD LIBNXCL_EXPORTABLE NXCUpdateAgentConfig(NXC_SESSION hSession, DWORD dwNode
                                               TCHAR *pszConfig, BOOL bApply);
 DWORD LIBNXCL_EXPORTABLE NXCExecuteAction(NXC_SESSION hSession, DWORD dwObjectId,
                                           TCHAR *pszAction);
+DWORD LIBNXCL_EXPORTABLE NXCGetObjectComments(NXC_SESSION hSession,
+                                              DWORD dwObjectId, TCHAR **ppszText);
+DWORD LIBNXCL_EXPORTABLE NXCUpdateObjectComments(NXC_SESSION hSession,
+                                                 DWORD dwObjectId, TCHAR *pszText);
 
 DWORD LIBNXCL_EXPORTABLE NXCLoadCCList(NXC_SESSION hSession, NXC_CC_LIST **ppList);
 void LIBNXCL_EXPORTABLE NXCDestroyCCList(NXC_CC_LIST *pList);
similarity index 82%
rename from include/nxcscpapi.h
rename to include/nxcpapi.h
index a03cc2c..633333e 100644 (file)
@@ -1,6 +1,6 @@
 /* 
 ** NetXMS - Network Management System
-** CSCP API Library
+** NXCP API
 ** Copyright (C) 2003, 2004 Victor Kirhenshtein
 **
 ** This program is free software; you can redistribute it and/or modify
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **
-** $module: nxcscpapi.h
+** File: nxcpapi.h
 **
 **/
 
-#ifndef _nxcscpapi_h_
-#define _nxcscpapi_h_
+#ifndef _nxcpapi_h_
+#define _nxcpapi_h_
 
 #include <nms_threads.h>
-
-
-#ifdef _WIN32
-#ifdef LIBNXCSCP_EXPORTS
-#define LIBNXCSCP_EXPORTABLE __declspec(dllexport)
-#else
-#define LIBNXCSCP_EXPORTABLE __declspec(dllimport)
-#endif
-#else    /* _WIN32 */
-#define LIBNXCSCP_EXPORTABLE
-#endif
-
-
-//
-// Encryption methods
-//
-
-#define CSCP_ENCRYPTION_NONE           0
-#define CSCP_ENCRYPTION_BLOWFISH_SHA1  1
+#include <nms_util.h>
 
 
 //
@@ -58,11 +40,13 @@ typedef struct
 } CSCP_BUFFER;
 
 
+#ifdef __cplusplus
+
 //
 // Class for holding CSCP messages
 //
 
-class LIBNXCSCP_EXPORTABLE CSCPMessage
+class LIBNETXMS_EXPORTABLE CSCPMessage
 {
 private:
    WORD m_wCode;
@@ -138,7 +122,7 @@ typedef struct
 // Message waiting queue class
 //
 
-class LIBNXCSCP_EXPORTABLE MsgWaitQueue
+class LIBNETXMS_EXPORTABLE MsgWaitQueue
 {
 private:
    MUTEX m_mutexDataAccess;
@@ -175,6 +159,12 @@ public:
    void SetHoldTime(DWORD dwHoldTime) { m_dwMsgHoldTime = dwHoldTime; }
 };
 
+#else    /* __cplusplus */
+
+typedef void CSCPMessage;
+
+#endif
+
 
 //
 // Functions
@@ -184,35 +174,35 @@ public:
 extern "C" {
 #endif
 
-int LIBNXCSCP_EXPORTABLE RecvNXCPMessage(SOCKET hSocket, CSCP_MESSAGE *pMsg,
+int LIBNETXMS_EXPORTABLE RecvNXCPMessage(SOCKET hSocket, CSCP_MESSAGE *pMsg,
                                          CSCP_BUFFER *pBuffer, DWORD dwMaxMsgSize,
                                          CSCP_ENCRYPTION_CONTEXT **ppCtx,
                                          BYTE *pDecryptionBuffer, DWORD dwTimeout);
-CSCP_MESSAGE LIBNXCSCP_EXPORTABLE *CreateRawNXCPMessage(WORD wCode, DWORD dwId, WORD wFlags,
+CSCP_MESSAGE LIBNETXMS_EXPORTABLE *CreateRawNXCPMessage(WORD wCode, DWORD dwId, WORD wFlags,
                                                         DWORD dwDataSize, void *pData,
                                                         CSCP_MESSAGE *pBuffer);
-TCHAR LIBNXCSCP_EXPORTABLE *NXCPMessageCodeName(WORD wCode, TCHAR *pszBuffer);
-BOOL LIBNXCSCP_EXPORTABLE SendFileOverNXCP(SOCKET hSocket, DWORD dwId, TCHAR *pszFile,
+TCHAR LIBNETXMS_EXPORTABLE *NXCPMessageCodeName(WORD wCode, TCHAR *pszBuffer);
+BOOL LIBNETXMS_EXPORTABLE SendFileOverNXCP(SOCKET hSocket, DWORD dwId, TCHAR *pszFile,
                                            CSCP_ENCRYPTION_CONTEXT *pCtx);
-BOOL LIBNXCSCP_EXPORTABLE NXCPGetPeerProtocolVersion(SOCKET hSocket, int *pnVersion);
+BOOL LIBNETXMS_EXPORTABLE NXCPGetPeerProtocolVersion(SOCKET hSocket, int *pnVersion);
    
-BOOL LIBNXCSCP_EXPORTABLE InitCryptoLib(DWORD dwEnabledCiphers);
-DWORD LIBNXCSCP_EXPORTABLE CSCPGetSupportedCiphers(void);
-CSCP_ENCRYPTED_MESSAGE LIBNXCSCP_EXPORTABLE 
+BOOL LIBNETXMS_EXPORTABLE InitCryptoLib(DWORD dwEnabledCiphers);
+DWORD LIBNETXMS_EXPORTABLE CSCPGetSupportedCiphers(void);
+CSCP_ENCRYPTED_MESSAGE LIBNETXMS_EXPORTABLE 
    *CSCPEncryptMessage(CSCP_ENCRYPTION_CONTEXT *pCtx, CSCP_MESSAGE *pMsg);
-BOOL LIBNXCSCP_EXPORTABLE CSCPDecryptMessage(CSCP_ENCRYPTION_CONTEXT *pCtx,
+BOOL LIBNETXMS_EXPORTABLE CSCPDecryptMessage(CSCP_ENCRYPTION_CONTEXT *pCtx,
                                              CSCP_ENCRYPTED_MESSAGE *pMsg,
                                              BYTE *pDecryptionBuffer);
-DWORD LIBNXCSCP_EXPORTABLE SetupEncryptionContext(CSCPMessage *pMsg, 
+DWORD LIBNETXMS_EXPORTABLE SetupEncryptionContext(CSCPMessage *pMsg, 
                                                   CSCP_ENCRYPTION_CONTEXT **ppCtx,
                                                   CSCPMessage **ppResponse,
                                                   RSA *pPrivateKey, int nNXCPVersion);
-void LIBNXCSCP_EXPORTABLE DestroyEncryptionContext(CSCP_ENCRYPTION_CONTEXT *pCtx);
-void LIBNXCSCP_EXPORTABLE PrepareKeyRequestMsg(CSCPMessage *pMsg, RSA *pServerKey);
-RSA LIBNXCSCP_EXPORTABLE *LoadRSAKeys(TCHAR *pszKeyFile);
+void LIBNETXMS_EXPORTABLE DestroyEncryptionContext(CSCP_ENCRYPTION_CONTEXT *pCtx);
+void LIBNETXMS_EXPORTABLE PrepareKeyRequestMsg(CSCPMessage *pMsg, RSA *pServerKey);
+RSA LIBNETXMS_EXPORTABLE *LoadRSAKeys(TCHAR *pszKeyFile);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif   /* _nxcscpapi_h_ */
+#endif   /* _nxcpapi_h_ */
index 8e3fe08..e51d9f6 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <nms_threads.h>
 #include <nms_util.h>
-#include <nxcscpapi.h>
+#include <nxcpapi.h>
 
 
 //
index f1df676..65109cf 100644 (file)
@@ -42,30 +42,12 @@ Package=<4>
     Project_Dep_Name libnetxms
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libnxmap
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "libnxcscp"=.\src\libnxcscp\libnxcscp.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libnetxms
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "libnxmap"=.\src\libnxmap\libnxmap.dsp - Package Owner=<4>
 
 Package=<5>
@@ -77,9 +59,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libnetxms
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -95,9 +74,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libnetxms
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -128,9 +104,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libnetxms
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -198,9 +171,6 @@ Package=<4>
     Project_Dep_Name libnetxms
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libnxsnmp
     End Project Dependency
     Begin Project Dependency
@@ -222,9 +192,6 @@ Package=<4>
     Project_Dep_Name libnetxms
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libnxsrv
     End Project Dependency
 }}}
@@ -260,9 +227,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libnetxms
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -282,9 +246,6 @@ Package=<4>
     Project_Dep_Name libnxcl
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name nxuilib
     End Project Dependency
 }}}
@@ -303,9 +264,6 @@ Package=<4>
     Project_Dep_Name libnxcl
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libnxsnmp
     End Project Dependency
     Begin Project Dependency
@@ -348,9 +306,6 @@ Package=<4>
     Project_Dep_Name libnetxms
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libnxsnmp
     End Project Dependency
     Begin Project Dependency
@@ -398,9 +353,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libnxcl
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -417,9 +369,6 @@ Package=<4>
     Project_Dep_Name libnetxms
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libnxsrv
     End Project Dependency
 }}}
@@ -492,9 +441,6 @@ Package=<4>
     Project_Dep_Name libnxcl
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name nxuilib
     End Project Dependency
 }}}
@@ -587,9 +533,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libnxcl
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -606,9 +549,6 @@ Package=<4>
     Project_Dep_Name libnetxms
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name libnxsrv
     End Project Dependency
 }}}
@@ -677,9 +617,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libnetxms
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libnxcscp
-    End Project Dependency
 }}}
 
 ###############################################################################
index 2bddaf1..720b30c 100644 (file)
@@ -504,8 +504,10 @@ CREATE TABLE actions
 CREATE TABLE event_groups
 (
        id integer not null,
-       name varchar(63),
-       description varchar(255),
+       name varchar(63) not null,
+       description varchar(255) not null,
+       range_start integer not null,
+       range_end integer not null,
        PRIMARY KEY(id)
 ) TABLE_TYPE;
 
index b981853..fc5b219 100644 (file)
@@ -174,10 +174,10 @@ INSERT INTO user_groups (id,name,system_access,flags,description,guid)
 #define ID_GROUP_1 -2147483647
 #define ID_GROUP_2 -2147483646
 
-INSERT INTO event_groups (id,name,description) 
-   VALUES (ID_GROUP_1,'NodeStatus','All events reporting about node status change');
-INSERT INTO event_groups (id,name,description
-   VALUES (ID_GROUP_2,'NewObjects','All events reporting about new objects creation');
+INSERT INTO event_groups (id,name,description,range_start,range_end
+   VALUES (ID_GROUP_1,'NodeStatus','All events reporting about node status change',0,0);
+INSERT INTO event_groups (id,name,description,range_start,range_end)
+   VALUES (ID_GROUP_2,'NewObjects','All events reporting about new objects creation',0,0);
 
 INSERT INTO event_group_members (group_id,event_code) VALUES (ID_GROUP_1,EVENT_NODE_NORMAL);
 INSERT INTO event_group_members (group_id,event_code) VALUES (ID_GROUP_1,EVENT_NODE_MINOR);
index bb773b3..c41b140 100644 (file)
@@ -8,6 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-SUBDIRS = libnetxms libnxcscp install
+SUBDIRS = libnetxms install
 SUBDIRS += @MODULES@
 EXTRA_DIST = PPC_libs.vcw
index ef19136..f3ca53a 100644 (file)
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 msi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib iphlpapi.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\libnetxms\Release" /libpath:"..\..\libnxcscp\Release"
+# ADD LINK32 msi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib iphlpapi.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\libnetxms\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 msi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib iphlpapi.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug" /libpath:"..\..\libnxcscp\Debug"
+# ADD LINK32 msi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib iphlpapi.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -112,7 +112,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 msi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib iphlpapi.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\libnetxms\Release" /libpath:"..\..\libnxcscp\Release"
-# ADD LINK32 msi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib iphlpapi.lib bufferoverflowU.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\libnetxms\Release64" /libpath:"..\..\libnxcscp\Release64" /machine:AMD64
+# ADD LINK32 bufferoverflowU.lib msi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib iphlpapi.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\libnetxms\Release64" /machine:AMD64
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -144,7 +144,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 msi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib iphlpapi.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug" /libpath:"..\..\libnxcscp\Debug"
-# ADD LINK32 msi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib iphlpapi.lib bufferoverflowU.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug64" /libpath:"..\..\libnxcscp\Debug64" /machine:AMD64
+# ADD LINK32 bufferoverflowU.lib msi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib iphlpapi.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug64" /machine:AMD64
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
index bd8cf2c..0bd8692 100644 (file)
@@ -3,8 +3,8 @@
 
 [Setup]
 AppName=NetXMS Agent
-AppVerName=NetXMS Agent 0.2.13
-AppVersion=0.2.13
+AppVerName=NetXMS Agent 0.2.14-rc9
+AppVersion=0.2.14-rc9
 AppPublisher=NetXMS Team
 AppPublisherURL=http://www.netxms.org
 AppSupportURL=http://www.netxms.org
@@ -12,7 +12,7 @@ AppUpdatesURL=http://www.netxms.org
 DefaultDirName=C:\NetXMS
 DefaultGroupName=NetXMS Agent
 AllowNoIcons=yes
-OutputBaseFilename=nxagent-0.2.13-x64
+OutputBaseFilename=nxagent-0.2.14-rc9-x64
 Compression=lzma
 SolidCompression=yes
 LanguageDetectionMethod=none
@@ -22,7 +22,6 @@ ArchitecturesAllowed=x64
 
 [Files]
 Source: "..\..\libnetxms\Release64\libnetxms.dll"; DestDir: "{app}\bin"; BeforeInstall: StopService; Flags: ignoreversion
-Source: "..\..\libnxcscp\Release64\libnxcscp.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "..\core\Release64\nxagentd.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "..\subagents\winnt\Release64\winnt.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "..\subagents\winperf\Release64\winperf.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion
index a8c0e50..ee2479e 100644 (file)
@@ -3,8 +3,8 @@
 
 [Setup]
 AppName=NetXMS Agent
-AppVerName=NetXMS Agent 0.2.14-rc6
-AppVersion=0.2.14-rc6
+AppVerName=NetXMS Agent 0.2.14-rc9
+AppVersion=0.2.14-rc9
 AppPublisher=NetXMS Team
 AppPublisherURL=http://www.netxms.org
 AppSupportURL=http://www.netxms.org
@@ -12,7 +12,7 @@ AppUpdatesURL=http://www.netxms.org
 DefaultDirName=C:\NetXMS
 DefaultGroupName=NetXMS Agent
 AllowNoIcons=yes
-OutputBaseFilename=nxagent-0.2.14-rc6
+OutputBaseFilename=nxagent-0.2.14-rc9
 Compression=lzma
 SolidCompression=yes
 LanguageDetectionMethod=none
@@ -20,7 +20,6 @@ LicenseFile=..\..\..\copying
 
 [Files]
 Source: "..\..\libnetxms\Release\libnetxms.dll"; DestDir: "{app}\bin"; BeforeInstall: StopService; Flags: ignoreversion
-Source: "..\..\libnxcscp\Release\libnxcscp.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "..\core\Release\nxagentd.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "..\subagents\winnt\Release\winnt.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "..\subagents\win9x\Release\win9x.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion
index 0519258..9a3896b 100644 (file)
@@ -1,9 +1,10 @@
-/* $Id: main.cpp,v 1.13 2006-03-15 12:00:10 alk Exp $ */
+/* $Id: main.cpp,v 1.14 2006-10-20 09:54:51 victor Exp $ */
+
+#define LIBNXCL_NO_DECLARATIONS
 
 #include <nms_common.h>
 #include <nms_agent.h>
 #include <nxclapi.h>
-#include <nxcscpapi.h>
 
 #ifdef _WIN32
 #define PORTCHECK_EXPORTABLE __declspec(dllexport) __cdecl
@@ -171,6 +172,10 @@ DECLARE_SUBAGENT_INIT(PORTCHECK)
 /*
 
 $Log: not supported by cvs2svn $
+Revision 1.13  2006/03/15 12:00:10  alk
+simple telnet service checker added: it connects, response WON'T/DON'T to
+all offers and disconnects (this prevents from "peer died" in logs)
+
 Revision 1.12  2005/10/18 09:01:16  alk
 Added commands (ServiceCheck.*) for
        http
index c49f451..5ab8baf 100644 (file)
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib ws2_32.lib /nologo /dll /machine:I386 /out:"Release/portcheck.nsm" /libpath:"..\..\..\libnetxms\Release" /libpath:"..\..\..\libnxcscp\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib /nologo /dll /machine:I386 /out:"Release/portcheck.nsm" /libpath:"..\..\..\libnetxms\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:"Debug/portcheck.nsm" /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug" /libpath:"..\..\..\libnxcscp\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:"Debug/portcheck.nsm" /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -119,7 +119,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib ws2_32.lib /nologo /dll /machine:I386 /out:"Release/portcheck.nsm" /libpath:"..\..\..\libnetxms\Release" /libpath:"..\..\..\libnxcscp\Release"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib ws2_32.lib bufferoverflowU.lib /nologo /dll /machine:I386 /out:"Release64/portcheck.nsm" /libpath:"..\..\..\libnetxms\Release64" /libpath:"..\..\..\libnxcscp\Release64" /machine:AMD64
+# ADD LINK32 bufferoverflowU.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib /nologo /dll /machine:I386 /out:"Release64/portcheck.nsm" /libpath:"..\..\..\libnetxms\Release64" /machine:AMD64
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -152,7 +152,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:"Debug/portcheck.nsm" /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug" /libpath:"..\..\..\libnxcscp\Debug"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib ws2_32.lib bufferoverflowU.lib /nologo /dll /debug /machine:I386 /out:"Debug64/portcheck.nsm" /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug64" /libpath:"..\..\..\libnxcscp\Debug64" /machine:AMD64
+# ADD LINK32 bufferoverflowU.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:"Debug64/portcheck.nsm" /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug64" /machine:AMD64
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
index 01bf5dd..92837ce 100644 (file)
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 nxuilib.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\nxuilib\Release" /libpath:"..\..\libnetxms\Release" /libpath:"..\..\libnxcscp\Release" /libpath:"..\..\libnxcl\Release"
+# ADD LINK32 libnetxms.lib libnxcl.lib nxuilib.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\nxuilib\Release" /libpath:"..\..\libnetxms\Release" /libpath:"..\..\libnxcl\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -84,7 +84,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 nxuilib.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"..\nxuilib\Debug" /libpath:"..\..\libnetxms\Debug" /libpath:"..\..\libnxcscp\Debug" /libpath:"..\..\libnxcl\Debug"
+# ADD LINK32 libnetxms.lib libnxcl.lib nxuilib.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"..\nxuilib\Debug" /libpath:"..\..\libnetxms\Debug" /libpath:"..\..\libnxcl\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
index 004b19c..fd31412 100644 (file)
@@ -37,6 +37,7 @@ BEGIN_MESSAGE_MAP(CObjectCommentsEditor, CMDIChildWnd)
        ON_WM_DESTROY()
        ON_WM_SIZE()
        ON_WM_SETFOCUS()
+       ON_COMMAND(ID_VIEW_REFRESH, OnViewRefresh)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -103,3 +104,28 @@ void CObjectCommentsEditor::OnSetFocus(CWnd* pOldWnd)
        CMDIChildWnd::OnSetFocus(pOldWnd);
    m_wndEdit.SetFocus();
 }
+
+
+//
+// WM_COMMAND::ID_VIEW_REFRESH message handler
+//
+
+void CObjectCommentsEditor::OnViewRefresh() 
+{
+   DWORD dwResult;
+   TCHAR *pszText;
+
+   dwResult = NXCGetObjectComments(g_hSession, m_dwObjectId, &pszText);
+   if (dwResult == RCC_SUCCESS)
+   {
+      if (pszText != NULL)
+      {
+         m_wndEdit.SetWindowText(pszText);
+         free(pszText);
+      }
+   }
+   else
+   {
+      theApp.ErrorBox(dwResult, _T("Cannot get object's comments: %s"));
+   }
+}
index 31613a9..13488cf 100644 (file)
@@ -42,6 +42,7 @@ protected:
        afx_msg void OnDestroy();
        afx_msg void OnSize(UINT nType, int cx, int cy);
        afx_msg void OnSetFocus(CWnd* pOldWnd);
+       afx_msg void OnViewRefresh();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 };
index ba066ce..ccc7567 100644 (file)
@@ -17,20 +17,20 @@ Class9=CMapView
 
 ResourceCount=179
 Resource1=IDD_CP_GENERAL (English (U.S.))
-Resource2=IDA_ALARM_BROWSER
+Resource2=IDA_EPP
 Resource3=IDD_DCI_DATA_EXPORT (English (U.S.))
-Resource4=IDA_MDI_DEFAULT
-Resource5=IDD_OBJTOOL_COLUMNS
+Resource4=IDR_MAINFRAME
+Resource5=IDD_REMOVE_TEMPLATE
 Class2=CChildView
 Class5=CAboutDlg
 Class6=CControlPanel
 Class8=CMapFrame
 Class10=CLoginDialog
-Resource6=IDD_DCI_TRANSFORM
+Resource6=IDD_CREATE_NODE
 Class11=CProgressDialog
-Resource7=IDA_OBJECT_TOOLS_EDITOR
+Resource7=IDA_DC_EDITOR
 Class12=CObjectBrowser
-Resource8=IDD_CREATE_VPNC
+Resource8=IDD_EDIT_VARIABLE
 Class13=CObjectPropDlg
 Resource9=IDD_THRESHOLD (English (U.S.))
 Resource10=IDD_SELECT_OBJECT (English (U.S.))
@@ -46,45 +46,45 @@ Resource17=IDD_NEW_USER (English (U.S.))
 Class16=CDebugFrame
 Resource18=IDD_NEW_ACTION (English (U.S.))
 Resource19=IDD_OBJECT_PROPERTIES (English (U.S.))
-Resource20=IDD_OBJECT_STATUS
+Resource20=IDD_DCI_SCHEDULE
 Class17=CObjectPreview
 Resource21=IDA_OBJECT_BROWSER (English (U.S.))
 Class18=CToolBox
 Class19=CObjectInfoBox
 Class20=CObjectSearchBox
-Resource22=IDA_EVENT_EDITOR
+Resource22=IDA_NETMAP
 Class21=CEditBox
 Class22=COPGeneral
 Class23=CNodePropsGeneral
 Resource23=IDD_GRAPH_PROPERTIES (English (U.S.))
 Class24=CObjectPropCaps
 Class25=CObjectPropSheet
-Resource24=IDD_SELECT_USER
+Resource24=IDD_OBJECT_SECURITY
 Class26=CRequestProcessingDlg
 Resource25=IDD_SELECT_USER (English (U.S.))
 Resource26=IDD_PROGRESS (English (U.S.))
-Resource27=IDA_NETMAP
+Resource27=IDA_ALARM_BROWSER
 Resource28=IDD_DCI_COLLECTION (English (U.S.))
 Class27=CObjectPropsGeneral
 Resource29=IDR_MAINFRAME (English (U.S.))
 Class28=CObjectPropsSecurity
 Resource30=IDD_SAVE_AGENT_CFG (English (U.S.))
-Resource31=IDD_OBJECT_CAPS
-Resource32=IDA_OBJECT_BROWSER
+Resource31=IDD_OBJECT_NODE_GENERAL
+Resource32=IDA_MDI_DEFAULT
 Class29=CUserSelectDlg
-Resource33=IDD_ABOUTBOX
+Resource33=IDA_AGENT_CONFIG_MANAGER
 Class30=CUserEditor
 Resource34=IDD_DCI_PROPERTIES
 Class31=CNewUserDlg
-Resource35=IDD_OBJTOOL_OPTIONS
-Resource36=IDD_EDIT_IP_SUBNET
+Resource35=IDD_NEW_OBJECT_TOOL
+Resource36=IDD_OBJECT_VPNC_GENERAL
 Class32=CUserPropDlg
 Resource37=IDD_EDIT_VARIABLE (English (U.S.))
-Resource38=IDD_NEW_OBJECT_TOOL
+Resource38=IDD_OBJTOOL_GENERAL
 Class33=CGroupPropDlg
-Resource39=IDD_CHANGE_IP
-Resource40=IDD_MIB_BROWSER
-Resource41=IDA_DATA_VIEW
+Resource39=IDD_OBJTOOL_OPTIONS
+Resource40=IDD_THRESHOLD
+Resource41=IDA_SCRIPT_MANAGER
 Resource42=IDA_ACTION_EDITOR (English (U.S.))
 Class34=CPasswordChangeDlg
 Class35=CNodeSummary
@@ -100,55 +100,55 @@ Class41=CGraphFrame
 Class42=CDCIThresholdsPage
 Resource46=IDA_OBJECT_TOOLS_EDITOR (English (U.S.))
 Resource47=IDM_CONTEXT (English (U.S.))
-Resource48=IDD_CREATE_CONDITION
+Resource48=IDD_CHANGE_PASSWORD
 Class43=CThresholdDlg
 Resource49=IDD_DESKTOP_SAVE_AS (English (U.S.))
-Resource50=IDD_CREATE_TG
+Resource50=IDD_DCI_TRANSFORM
 Class44=CMIBBrowserDlg
 Class45=CEventPolicyEditor
 Class46=CRuleList
 Class47=CRuleHeader
 Resource51=IDD_SELECT_AGENT_PARAM (English (U.S.))
-Resource52=IDD_SAVE_AGENT_CFG
+Resource52=IDD_EDIT_IP_SUBNET
 Class48=CObjectSelDlg
-Resource53=IDD_OBJECT_COND_GENERAL
-Resource54=IDD_OBJECT_NETSRV_GENERAL
+Resource53=IDD_CREATE_CONDITION
+Resource54=IDD_CREATE_NETSRV
 Class49=CRuleCommentDlg
-Resource55=IDD_OBJECT_GENERAL
+Resource55=IDD_REQUEST_PROCESSING
 Class50=CEventSelDlg
-Resource56=IDM_CONTEXT
+Resource56=IDM_VIEW_SPECIFIC
 Resource57=IDA_EPP (English (U.S.))
-Resource58=IDD_DATA_QUERY
+Resource58=IDD_CREATE_TEMPLATE
 Resource59=IDA_PACKAGE_MGR (English (U.S.))
 Resource60=IDD_OBJTOOL_GENERAL (English (U.S.))
 Class51=CObjectPropsPresentation
 Resource61=IDD_CREATE_TEMPLATE (English (U.S.))
-Resource62=IDM_VIEW_SPECIFIC
+Resource62=IDM_CONTEXT
 Class52=CRuleSeverityDlg
-Resource63=IDD_CREATE_NETSRV
+Resource63=IDD_INPUT_BOX
 Class53=CRuleAlarmDlg
 Class54=CAlarmBrowser
 Resource64=IDA_MDI_DEFAULT (English (U.S.))
-Resource65=IDD_CREATE_CONTAINER
+Resource65=IDD_SELECT_ACTION
 Resource66=IDD_EDIT_IP_SUBNET (English (U.S.))
 Resource67=IDD_EDIT_RULE_SEVERITY (English (U.S.))
 Resource68=IDD_ACTION_PROPERTIES (English (U.S.))
 Class55=CConsolePropsGeneral
 Class56=CActionEditor
-Resource69=IDA_EPP
-Resource70=IDD_EDIT_TRAP_ARG
+Resource69=IDA_OBJECT_BROWSER
+Resource70=IDD_EDIT_TRAP
 Class57=CNewActionDlg
-Resource71=IDD_NEW_ACTION
+Resource71=IDD_CP_GENERAL
 Class58=CEditActionDlg
-Resource72=IDD_DESKTOP_SAVE_AS
+Resource72=IDD_OBJECT_RELATIONS
 Class59=CActionSelDlg
-Resource73=IDD_OBJECT_NODE_GENERAL
+Resource73=IDD_EDIT_EVENT
 Resource74=IDD_EDIT_TRAP (English (U.S.))
 Resource75=IDD_USER_PROPERTIES (English (U.S.))
-Resource76=IDD_CP_GENERAL
+Resource76=IDD_EDIT_RULE_ALARM
 Class60=CCreateObjectDlg
 Class61=CCreateContainerDlg
-Resource77=IDD_OBJECT_PRESENTATION
+Resource77=IDD_SELECT_EVENT
 Class62=CCreateNodeDlg
 Resource78=IDD_OBJECT_NODE_GENERAL (English (U.S.))
 Resource79=IDT_MAP (English (U.S.))
@@ -158,31 +158,31 @@ Resource81=IDD_LASTVAL_PROP (English (U.S.))
 Class64=CPollNodeDlg
 Resource82=IDD_POLL_NODE (English (U.S.))
 Class65=CNodePoller
-Resource83=IDA_LAST_VALUES
-Resource84=IDA_PACKAGE_MGR
+Resource83=IDA_PACKAGE_MGR
+Resource84=IDA_GRAPH
 Class66=CCreateTemplateDlg
 Class67=CCreateTGDlg
-Resource85=IDD_EDIT_TRAP
-Resource86=IDD_ACTION_PROPERTIES
+Resource85=IDD_DATA_QUERY
+Resource86=IDD_NEW_ACTION
 Class68=CTrapEditor
-Resource87=IDD_OBJECT_COND_DATA
-Resource88=IDD_DCI_DATA_EXPORT
-Resource89=IDD_OBJECT_NODE_POLL
+Resource87=IDD_OBJECT_COND_SCRIPT
+Resource88=IDD_LASTVAL_PROP
+Resource89=IDD_OBJECT_NETSRV_GENERAL
 Class69=CDataQueryDlg
-Resource90=IDD_OBJECT_COND_SCRIPT
+Resource90=IDD_OBJECT_COND_GENERAL
 Class70=CTrapEditDlg
 Resource91=IDM_VIEW_SPECIFIC (English (U.S.))
 Class71=CTrapParamDlg
-Resource92=IDD_DCI_COLLECTION
-Resource93=IDD_EDIT_RULE_SEVERITY
+Resource92=IDD_SET_PASSWORD
+Resource93=IDD_OBJECT_PRESENTATION
 Class72=CGraphPropDlg
 Class73=CColorSelector
 Class74=CPackageMgr
-Resource94=IDD_EDIT_RULE_ALARM
+Resource94=IDD_EDIT_RULE_SEVERITY
 Resource95=IDA_SCRIPT_MANAGER (English (U.S.))
 Resource96=IDD_SET_PASSWORD (English (U.S.))
 Resource97=IDD_DCI_TRANSFORM (English (U.S.))
-Resource98=IDD_REQUEST_PROCESSING
+Resource98=IDD_OBJECT_CAPS
 Resource99=IDD_OBJECT_NETSRV_GENERAL (English (U.S.))
 Resource100=IDD_OBJTOOL_OPTIONS (English (U.S.))
 Resource101=IDA_LAST_VALUES (English (U.S.))
@@ -244,7 +244,7 @@ Class102=CWaitView
 Class103=CWebBrowser
 Class104=CSyslogBrowser
 Class105=CLPPList
-Resource129=IDD_DCI_SCHEDULE
+Resource129=IDD_SAVE_AGENT_CFG
 Class106=CDCISchedulePage
 Resource130=IDD_OBJECT_CAPS (English (U.S.))
 Class107=CObjectPropsStatus
@@ -270,54 +270,54 @@ Class119=CMapControlBox
 Resource138=IDD_OBJECT_GENERAL (English (U.S.))
 Class120=CSubmapBkgndDlg
 Resource139=IDD_SUBMAP_BKGND (English (U.S.))
-Resource140=IDD_THRESHOLD
-Resource141=IDD_EDIT_EVENT
-Resource142=IDD_DCI_THRESHOLDS
-Resource143=IDA_TRAP_EDITOR
-Resource144=IDA_ACTION_EDITOR
-Resource145=IDD_OBJECT_SECURITY
-Resource146=IDD_EDIT_RULE_COMMENT
-Resource147=IDD_EDIT_VARIABLE
-Resource148=IDD_ADD_DCI
-Resource149=IDD_SELECT_EVENT
-Resource150=IDD_NEW_USER
-Resource151=IDD_GROUP_PROPERTIES
-Resource152=IDD_SELECT_ACTION
-Resource153=IDD_OBJECT_RELATIONS
-Resource154=IDD_INPUT_BOX
-Resource155=IDD_REMOVE_TEMPLATE
-Resource156=IDD_CHANGE_PASSWORD
-Resource157=IDD_GRAPH_PROP_DATA
-Resource158=IDD_GRAPH_PROP_SETTINGS
-Resource159=IDA_DC_EDITOR
-Resource160=IDD_SNMP_WALK
-Resource161=IDD_SELECT_INTERNAL_ITEM
-Resource162=IDD_USER_PROPERTIES
-Resource163=IDD_COND_DCI_PROP
-Resource164=IDA_SERVER_CFG_EDITOR
-Resource165=IDA_GRAPH
-Resource166=IDA_AGENT_CFG_EDITOR
-Resource167=IDD_LASTVAL_PROP
-Resource168=IDR_MAINFRAME
-Resource169=IDD_SUBMAP_BKGND
-Resource170=IDA_SCRIPT_MANAGER
-Resource171=IDD_SELECT_OBJECT
+Resource140=IDD_DCI_THRESHOLDS
+Resource141=IDD_ABOUTBOX
+Resource142=IDD_DCI_COLLECTION
+Resource143=IDA_ACTION_EDITOR
+Resource144=IDA_EVENT_EDITOR
+Resource145=IDD_OBJECT_GENERAL
+Resource146=IDD_SELECT_OBJECT
+Resource147=IDD_DCI_DATA_EXPORT
+Resource148=IDD_OBJECT_COND_DATA
+Resource149=IDD_EDIT_RULE_COMMENT
+Resource150=IDD_SELECT_USER
+Resource151=IDD_USER_PROPERTIES
+Resource152=IDD_ACTION_PROPERTIES
+Resource153=IDD_OBJECT_NODE_POLL
+Resource154=IDD_SELECT_AGENT_PARAM
+Resource155=IDD_CHANGE_IP
+Resource156=IDD_SUBMAP_BKGND
+Resource157=IDD_GRAPH_PROP_SETTINGS
+Resource158=IDD_DESKTOP_SAVE_AS
+Resource159=IDA_AGENT_CFG_EDITOR
+Resource160=IDD_OBJTOOL_COLUMNS
+Resource161=IDD_EDIT_TRAP_ARG
+Resource162=IDD_NEW_USER
+Resource163=IDD_ADD_DCI
+Resource164=IDA_LAST_VALUES
+Resource165=IDA_TRAP_EDITOR
+Resource166=IDA_SERVER_CFG_EDITOR
+Resource167=IDD_GRAPH_PROP_DATA
+Resource168=IDD_COND_DCI_PROP
+Resource169=IDD_SNMP_WALK
+Resource170=IDA_OBJECT_TOOLS_EDITOR
+Resource171=IDD_MIB_BROWSER
 Class121=CModuleManager
 Class122=CDesktopManager
-Resource172=IDD_SELECT_AGENT_PARAM
-Resource173=IDA_AGENT_CONFIG_MANAGER
+Resource172=IDD_SELECT_INTERNAL_ITEM
+Resource173=IDA_DATA_VIEW
 Class123=CCreateCondDlg
 Class124=CCondPropsGeneral
 Class125=CCondPropsScript
 Class126=CCondPropsData
-Resource174=IDD_CREATE_NODE
+Resource174=IDD_CREATE_CONTAINER
 Class127=CAddDCIDlg
-Resource175=IDD_SET_PASSWORD
+Resource175=IDD_GROUP_PROPERTIES
 Class128=CCondDCIPropDlg
-Resource176=IDD_CREATE_TEMPLATE
+Resource176=IDD_CREATE_TG
 Class129=CAgentConfigMgr
-Resource177=IDD_OBJTOOL_GENERAL
-Resource178=IDD_OBJECT_VPNC_GENERAL
+Resource177=IDD_OBJECT_STATUS
+Resource178=IDD_CREATE_VPNC
 Class130=CAgentCfgDlg
 Class131=CObjectCommentsEditor
 Resource179=IDD_AGENT_CONFIG
index b1d9a9a..168d8b3 100644 (file)
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 shfolder.lib libnxcl.lib libnetxms.lib libnxsnmp.lib libnxcscp.lib nxuilib.lib libnxmap.lib msimg32.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\..\libnxcl\Release" /libpath:"..\..\libnetxms\Release" /libpath:"..\..\libnxsnmp\Release" /libpath:"..\..\libnxcscp\Release" /libpath:"..\nxuilib\Release" /libpath:"..\..\libnxmap\Release"
+# ADD LINK32 shfolder.lib libnxcl.lib libnetxms.lib libnxsnmp.lib nxuilib.lib libnxmap.lib msimg32.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\..\libnxcl\Release" /libpath:"..\..\libnetxms\Release" /libpath:"..\..\libnxsnmp\Release" /libpath:"..\nxuilib\Release" /libpath:"..\..\libnxmap\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 shfolder.lib libnxcl.lib libnetxms.lib libnxsnmp.lib libnxcscp.lib nxuilib.lib libnxmap.lib msimg32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnxcl\Debug" /libpath:"..\..\libnetxms\Debug" /libpath:"..\..\libnxsnmp\Debug" /libpath:"..\..\libnxcscp\Debug" /libpath:"..\nxuilib\Debug" /libpath:"..\..\libnxmap\Debug"
+# ADD LINK32 shfolder.lib libnxcl.lib libnetxms.lib libnxsnmp.lib nxuilib.lib libnxmap.lib msimg32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnxcl\Debug" /libpath:"..\..\libnetxms\Debug" /libpath:"..\..\libnxsnmp\Debug" /libpath:"..\nxuilib\Debug" /libpath:"..\..\libnxmap\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy Debug\nxcon.exe ..\..\..\bin
@@ -117,7 +117,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 shfolder.lib libnxcl.lib libnetxms.lib libnxsnmp.lib libnxcscp.lib nxuilib.lib libnxmap.lib msimg32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnxcl\Debug" /libpath:"..\..\libnetxms\Debug" /libpath:"..\..\libnxsnmp\Debug" /libpath:"..\..\libnxcscp\Debug" /libpath:"..\nxuilib\Debug" /libpath:"..\..\libnxmap\Debug"
-# ADD LINK32 shfolder.lib libnxclw.lib libnetxmsw.lib libnxsnmpw.lib libnxcscpw.lib nxuilibw.lib libnxmapw.lib msimg32.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnxcl\Debug_UNICODE" /libpath:"..\..\libnetxms\Debug_UNICODE" /libpath:"..\..\libnxsnmp\Debug_UNICODE" /libpath:"..\..\libnxcscp\Debug_UNICODE" /libpath:"..\nxuilib\Debug_UNICODE" /libpath:"..\..\libnxmap\Debug_UNICODE"
+# ADD LINK32 shfolder.lib libnxclw.lib libnetxmsw.lib libnxsnmpw.lib nxuilibw.lib libnxmapw.lib msimg32.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnxcl\Debug_UNICODE" /libpath:"..\..\libnetxms\Debug_UNICODE" /libpath:"..\..\libnxsnmp\Debug_UNICODE" /libpath:"..\nxuilib\Debug_UNICODE" /libpath:"..\..\libnxmap\Debug_UNICODE"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy Debug_UNICODE\nxcon.exe ..\..\..\bin
@@ -148,7 +148,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 shfolder.lib libnxcl.lib libnetxms.lib libnxsnmp.lib libnxcscp.lib nxuilib.lib libnxmap.lib msimg32.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\..\libnxcl\Release" /libpath:"..\..\libnetxms\Release" /libpath:"..\..\libnxsnmp\Release" /libpath:"..\..\libnxcscp\Release" /libpath:"..\nxuilib\Release" /libpath:"..\..\libnxmap\Release"
-# ADD LINK32 shfolder.lib libnxclw.lib libnetxmsw.lib libnxsnmpw.lib libnxcscpw.lib nxuilibw.lib libnxmapw.lib msimg32.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /machine:I386 /libpath:"..\..\libnxcl\Release_UNICODE" /libpath:"..\..\libnetxms\Release_UNICODE" /libpath:"..\..\libnxsnmp\Release_UNICODE" /libpath:"..\..\libnxcscp\Release_UNICODE" /libpath:"..\nxuilib\Release_UNICODE" /libpath:"..\..\libnxmap\Release_UNICODE"
+# ADD LINK32 shfolder.lib libnxclw.lib libnetxmsw.lib libnxsnmpw.lib nxuilibw.lib libnxmapw.lib msimg32.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /machine:I386 /libpath:"..\..\libnxcl\Release_UNICODE" /libpath:"..\..\libnetxms\Release_UNICODE" /libpath:"..\..\libnxsnmp\Release_UNICODE" /libpath:"..\nxuilib\Release_UNICODE" /libpath:"..\..\libnxmap\Release_UNICODE"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
index 00d1418..cc48ab9 100644 (file)
@@ -3,8 +3,8 @@
 
 [Setup]
 AppName=NetXMS
-AppVerName=NetXMS 0.2.14-rc6
-AppVersion=0.2.14-rc6
+AppVerName=NetXMS 0.2.14-rc9
+AppVersion=0.2.14-rc9
 AppPublisher=NetXMS Team
 AppPublisherURL=http://www.netxms.org
 AppSupportURL=http://www.netxms.org
@@ -13,7 +13,7 @@ DefaultDirName=C:\NetXMS
 DefaultGroupName=NetXMS
 AllowNoIcons=yes
 LicenseFile=..\..\..\copying
-OutputBaseFilename=netxms-0.2.14-rc6
+OutputBaseFilename=netxms-0.2.14-rc9
 Compression=lzma
 SolidCompression=yes
 LanguageDetectionMethod=none
@@ -36,8 +36,6 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
 Source: "..\..\..\ChangeLog"; DestDir: "{app}\doc"; Flags: ignoreversion; Components: base
 Source: "..\..\libnetxms\Release\libnetxms.dll"; DestDir: "{app}\bin"; BeforeInstall: StopAllServices; Flags: ignoreversion; Components: base
 Source: "..\..\libnetxms\Release_UNICODE\libnetxmsw.dll"; DestDir: "{app}\bin"; BeforeInstall: StopAllServices; Flags: ignoreversion; Components: base
-Source: "..\..\libnxcscp\Release\libnxcscp.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
-Source: "..\..\libnxcscp\Release_UNICODE\libnxcscpw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: base
 ; Executables and DLLs shared between different components (server, console, etc.)
 Source: "..\..\libnxcl\Release\libnxcl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console websrv
 Source: "..\..\libnxcl\Release_UNICODE\libnxclw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: console websrv
index 31133e7..923785d 100644 (file)
@@ -1,7 +1,7 @@
 /* 
 ** NetXMS - Network Management System
-** Utility Library
-** Copyright (C) 2003, 2004 Victor Kirhenshtein
+** NetXMS Foundation Library
+** Copyright (C) 2003, 2004, 2005, 2006 Victor Kirhenshtein
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
index d4206dd..b0970a8 100644 (file)
@@ -57,7 +57,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /version:0.1 /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib /nologo /version:0.1 /dll /machine:I386
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -75,7 +75,7 @@ PostBuild_Cmds=copy Release\libnetxms.dll C:\NetXMS\bin
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 1
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBNETXMS_EXPORTS" /YX /FD /GZ /c
 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBNETXMS_EXPORTS" /YX /FD /GZ /c
@@ -88,7 +88,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -121,7 +121,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 bufferoverflowU.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /version:0.1 /dll /debug /machine:IX86 /pdbtype:sept /machine:AMD64
+# ADD LINK32 bufferoverflowU.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib /nologo /version:0.1 /dll /debug /machine:IX86 /pdbtype:sept /machine:AMD64
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -154,7 +154,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /version:0.1 /dll /machine:I386
-# ADD LINK32 bufferoverflowU.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /version:0.1 /dll /machine:IX86 /machine:AMD64
+# ADD LINK32 bufferoverflowU.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib /nologo /version:0.1 /dll /machine:IX86 /machine:AMD64
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -174,7 +174,7 @@ PostBuild_Cmds=copy Release64\libnetxms.dll C:\NetXMS\bin64
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Debug_UNICODE"
 # PROP Intermediate_Dir "Debug_UNICODE"
-# PROP Ignore_Export_Lib 0
+# PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBNETXMS_EXPORTS" /YX /FD /GZ /c
 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /D "UNICODE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBNETXMS_EXPORTS" /YX /FD /GZ /c
@@ -188,7 +188,7 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /version:0.1 /dll /debug /machine:I386 /out:"Debug_UNICODE/libnetxmsw.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib /nologo /version:0.1 /dll /debug /machine:I386 /out:"Debug_UNICODE/libnetxmsw.dll" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -221,7 +221,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib ntdll.lib /nologo /version:0.1 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /version:0.1 /dll /machine:I386 /out:"Release_UNICODE/libnetxmsw.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib /nologo /version:0.1 /dll /machine:I386 /out:"Release_UNICODE/libnetxmsw.dll"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -247,6 +247,10 @@ SOURCE=.\config.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\crypto.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\dir.c
 # End Source File
 # Begin Source File
@@ -283,6 +287,18 @@ SOURCE=.\md5.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\message.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msgwq.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\nxcp.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\queue.cpp
 # End Source File
 # Begin Source File
@@ -367,6 +383,10 @@ SOURCE=..\..\include\nms_util.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\nxcpapi.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\nxqueue.h
 # End Source File
 # Begin Source File
index 6db6b22..9156781 100644 (file)
 
 #include <nms_common.h>
 #include <nms_util.h>
+#include <nxcpapi.h>
+
+#define LIBNXCL_NO_DECLARATIONS
+#include <nxclapi.h>
 
 #define MAX_CODEPAGE_LEN               64
 
index 5527153..90d37e8 100644 (file)
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib libnxcscp.lib libnxmap.lib /nologo /version:0.1 /dll /machine:I386 /libpath:"..\libnetxms\Release" /libpath:"..\libnxcscp\Release" /libpath:"..\libnxmap\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib libnxmap.lib /nologo /version:0.1 /dll /machine:I386 /libpath:"..\libnetxms\Release" /libpath:"..\libnxmap\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib libnxcscp.lib libnxmap.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug" /libpath:"..\libnxcscp\Debug" /libpath:"..\libnxmap\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib libnxmap.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug" /libpath:"..\libnxmap\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy Debug\libnxcl.dll ..\..\bin
@@ -117,7 +117,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib libnxcscp.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug" /libpath:"..\libnxcscp\Debug"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxmsw.lib ws2_32.lib libnxcscpw.lib libnxmapw.lib /nologo /version:0.1 /dll /debug /machine:I386 /out:"Debug_UNICODE/libnxclw.dll" /pdbtype:sept /libpath:"..\libnetxms\Debug_UNICODE" /libpath:"..\libnxcscp\Debug_UNICODE" /libpath:"..\libnxmap\Debug_UNICODE"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxmsw.lib ws2_32.lib libnxmapw.lib /nologo /version:0.1 /dll /debug /machine:I386 /out:"Debug_UNICODE/libnxclw.dll" /pdbtype:sept /libpath:"..\libnetxms\Debug_UNICODE" /libpath:"..\libnxmap\Debug_UNICODE"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy Debug_UNICODE\libnxclw.dll ..\..\bin
@@ -148,7 +148,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib libnxcscp.lib /nologo /version:0.1 /dll /machine:I386 /libpath:"..\libnetxms\Release" /libpath:"..\libnxcscp\Release"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxmsw.lib ws2_32.lib libnxcscpw.lib libnxmapw.lib /nologo /version:0.1 /dll /machine:I386 /out:"Release_UNICODE/libnxclw.dll" /libpath:"..\libnetxms\Release_UNICODE" /libpath:"..\libnxcscp\Release_UNICODE" /libpath:"..\libnxmap\Release_UNICODE"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxmsw.lib ws2_32.lib libnxmapw.lib /nologo /version:0.1 /dll /machine:I386 /out:"Release_UNICODE/libnxclw.dll" /libpath:"..\libnetxms\Release_UNICODE" /libpath:"..\libnxmap\Release_UNICODE"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
index 700a8b8..ed4f095 100644 (file)
@@ -28,7 +28,7 @@
 #include <nxclapi.h>
 #include <nms_util.h>
 #include <nms_threads.h>
-#include <nxcscpapi.h>
+#include <nxcpapi.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
index a87b1a6..8148f32 100644 (file)
@@ -1507,3 +1507,56 @@ DWORD LIBNXCL_EXPORTABLE NXCExecuteAction(NXC_SESSION hSession, DWORD dwObjectId
    ((NXCL_Session *)hSession)->SendMsg(&msg);
    return ((NXCL_Session *)hSession)->WaitForRCC(dwRqId);
 }
+
+
+//
+// Get object's comments
+//
+
+DWORD LIBNXCL_EXPORTABLE NXCGetObjectComments(NXC_SESSION hSession,
+                                              DWORD dwObjectId, TCHAR **ppszText)
+{
+   DWORD dwRqId, dwResult;
+   CSCPMessage msg, *pResponse;
+
+   dwRqId = ((NXCL_Session *)hSession)->CreateRqId();
+
+   msg.SetCode(CMD_GET_OBJECT_COMMENTS);
+   msg.SetId(dwRqId);
+   msg.SetVariable(VID_OBJECT_ID, dwObjectId);
+   ((NXCL_Session *)hSession)->SendMsg(&msg);
+
+   pResponse = ((NXCL_Session *)hSession)->WaitForMessage(CMD_REQUEST_COMPLETED, dwRqId);
+   if (pResponse != NULL)
+   {
+      dwResult = pResponse->GetVariableLong(VID_RCC);
+      if (dwResult == RCC_SUCCESS)
+         *ppszText = pResponse->GetVariableStr(VID_COMMENT);
+   }
+   else
+   {
+      dwResult = RCC_TIMEOUT;
+   }
+   return dwResult;
+}
+
+
+//
+// Update object's comments
+//
+
+DWORD LIBNXCL_EXPORTABLE NXCUpdateObjectComments(NXC_SESSION hSession,
+                                                 DWORD dwObjectId, TCHAR *pszText)
+{
+   DWORD dwRqId;
+   CSCPMessage msg;
+
+   dwRqId = ((NXCL_Session *)hSession)->CreateRqId();
+
+   msg.SetCode(CMD_UPDATE_OBJECT_COMMENTS);
+   msg.SetId(dwRqId);
+   msg.SetVariable(VID_OBJECT_ID, dwObjectId);
+   msg.SetVariable(VID_COMMENT, pszText);
+   ((NXCL_Session *)hSession)->SendMsg(&msg);
+   return ((NXCL_Session *)hSession)->WaitForRCC(dwRqId);
+}
index f43dbce..10d6b34 100644 (file)
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib libnxcscp.lib /nologo /version:0.1 /dll /machine:I386 /libpath:"..\libnetxms\Release" /libpath:"..\libnxcscp\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib /nologo /version:0.1 /dll /machine:I386 /libpath:"..\libnetxms\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib libnxcscp.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug" /libpath:"..\libnxcscp\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy Debug\libnxmap.dll ..\..\bin
@@ -117,7 +117,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib libnxcscp.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug" /libpath:"..\libnxcscp\Debug"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxmsw.lib ws2_32.lib libnxcscpw.lib /nologo /version:0.1 /dll /debug /machine:I386 /out:"Debug_UNICODE/libnxmapw.dll" /pdbtype:sept /libpath:"..\libnetxms\Debug_UNICODE" /libpath:"..\libnxcscp\Debug_UNICODE"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxmsw.lib ws2_32.lib /nologo /version:0.1 /dll /debug /machine:I386 /out:"Debug_UNICODE/libnxmapw.dll" /pdbtype:sept /libpath:"..\libnetxms\Debug_UNICODE"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy Debug_UNICODE\libnxmapw.dll ..\..\bin
@@ -148,7 +148,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib libnxcscp.lib /nologo /version:0.1 /dll /machine:I386 /libpath:"..\libnetxms\Release" /libpath:"..\libnxcscp\Release"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxmsw.lib ws2_32.lib libnxcscpw.lib /nologo /version:0.1 /dll /machine:I386 /out:"Release_UNICODE/libnxmapw.dll" /libpath:"..\libnetxms\Release_UNICODE" /libpath:"..\libnxcscp\Release_UNICODE"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxmsw.lib ws2_32.lib /nologo /version:0.1 /dll /machine:I386 /out:"Release_UNICODE/libnxmapw.dll" /libpath:"..\libnetxms\Release_UNICODE"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
index 3ba9cf3..ac6d361 100644 (file)
@@ -27,7 +27,7 @@
 #include <nms_common.h>
 #include <nms_util.h>
 #include <nms_threads.h>
-#include <nxcscpapi.h>
+#include <nxcpapi.h>
 #include <netxms_maps.h>
 
 #endif   /* _libnxmap_h_ */
index ed9b3d0..0653d86 100644 (file)
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib ws2_32.lib /nologo /dll /machine:I386 /libpath:"..\libnetxms\Release" /libpath:"..\libnxcscp\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib /nologo /dll /machine:I386 /libpath:"..\libnetxms\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug" /libpath:"..\libnxcscp\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -119,7 +119,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib ws2_32.lib /nologo /dll /machine:I386 /libpath:"..\libnetxms\Release" /libpath:"..\libnxcscp\Release"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib ws2_32.lib bufferoverflowU.lib /nologo /dll /machine:I386 /libpath:"..\libnetxms\Release64" /libpath:"..\libnxcscp\Release64" /machine:AMD64
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib bufferoverflowU.lib /nologo /dll /machine:I386 /libpath:"..\libnetxms\Release64" /machine:AMD64
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -153,7 +153,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug" /libpath:"..\libnxcscp\Debug"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib ws2_32.lib bufferoverflowU.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug64" /libpath:"..\libnxcscp\Debug64" /machine:AMD64
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib ws2_32.lib bufferoverflowU.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug64" /machine:AMD64
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
index 4573d7a..572b822 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <nms_common.h>
 #include <nms_util.h>
-#include <nxcscpapi.h>
+#include <nxcpapi.h>
 #include <nxsl.h>
 #include <FlexLexer.h>
 
index 4650211..9d3c4d2 100644 (file)
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX- /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib libnxcl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\libnetxms\Release" /libpath:"..\libnxcscp\Release" /libpath:"..\libnxcl\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcl.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\libnetxms\Release" /libpath:"..\libnxcl\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -71,7 +71,7 @@ PostBuild_Cmds=copy Release\nxevent.exe C:\NetXMS\bin
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX- /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib libnxcl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug" /libpath:"..\libnxcscp\Debug" /libpath:"..\libnxcl\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcl.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\libnetxms\Debug" /libpath:"..\libnxcl\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
index 927a23e..55a5cc1 100644 (file)
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 minidump.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib libnxsrv.lib libnxsnmp.lib iphlpapi.lib libeay32.lib version.lib psapi.lib libnxsl.lib libnxmap.lib /nologo /dll /machine:I386 /libpath:"..\..\libnetxms\Release" /libpath:"..\..\libnxcscp\Release" /libpath:"..\..\libnxsnmp\Release" /libpath:"..\libnxsrv\Release" /libpath:"..\..\libnxsl\Release" /libpath:"..\..\libnxmap\Release"
+# ADD LINK32 minidump.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxsrv.lib libnxsnmp.lib iphlpapi.lib libeay32.lib version.lib psapi.lib libnxsl.lib libnxmap.lib /nologo /dll /machine:I386 /libpath:"..\..\libnetxms\Release" /libpath:"..\..\libnxsnmp\Release" /libpath:"..\libnxsrv\Release" /libpath:"..\..\libnxsl\Release" /libpath:"..\..\libnxmap\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 minidump.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib libnxsrv.lib libnxsnmp.lib iphlpapi.lib libeay32.lib version.lib psapi.lib libnxsl.lib libnxmap.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug" /libpath:"..\..\libnxcscp\Debug" /libpath:"..\..\libnxsnmp\Debug" /libpath:"..\libnxsrv\Debug" /libpath:"..\..\libnxsl\Debug" /libpath:"..\..\libnxmap\Debug"
+# ADD LINK32 minidump.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxsrv.lib libnxsnmp.lib iphlpapi.lib libeay32.lib version.lib psapi.lib libnxsl.lib libnxmap.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug" /libpath:"..\..\libnxsnmp\Debug" /libpath:"..\libnxsrv\Debug" /libpath:"..\..\libnxsl\Debug" /libpath:"..\..\libnxmap\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -119,7 +119,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib libnxsrv.lib libnxsnmp.lib iphlpapi.lib libeay32.lib minidump.lib version.lib psapi.lib libnxsl.lib /nologo /dll /machine:I386 /libpath:"..\..\libnetxms\Release" /libpath:"..\..\libnxcscp\Release" /libpath:"..\..\libnxsnmp\Release" /libpath:"..\libnxsrv\Release" /libpath:"..\..\libnxsl\Release"
-# ADD LINK32 bufferoverflowU.lib dbghelp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib libnxsrv.lib libnxsnmp.lib iphlpapi.lib libeay32.lib version.lib psapi.lib libnxsl.lib libnxmap.lib /nologo /dll /machine:I386 /libpath:"..\..\libnetxms\Release64" /libpath:"..\..\libnxcscp\Release64" /libpath:"..\..\libnxsnmp\Release64" /libpath:"..\libnxsrv\Release64" /libpath:"..\..\libnxsl\Release64" /libpath:"..\..\libnxmap\Release64" /machine:AMD64
+# ADD LINK32 bufferoverflowU.lib dbghelp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxsrv.lib libnxsnmp.lib iphlpapi.lib libeay32.lib version.lib psapi.lib libnxsl.lib libnxmap.lib /nologo /dll /machine:I386 /libpath:"..\..\libnetxms\Release64" /libpath:"..\..\libnxsnmp\Release64" /libpath:"..\libnxsrv\Release64" /libpath:"..\..\libnxsl\Release64" /libpath:"..\..\libnxmap\Release64" /machine:AMD64
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -153,7 +153,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib libnxsrv.lib libnxsnmp.lib iphlpapi.lib libeay32.lib minidump.lib version.lib psapi.lib libnxsl.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug" /libpath:"..\..\libnxcscp\Debug" /libpath:"..\..\libnxsnmp\Debug" /libpath:"..\libnxsrv\Debug" /libpath:"..\..\libnxsl\Debug"
-# ADD LINK32 bufferoverflowU.lib dbghelp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib libnxsrv.lib libnxsnmp.lib iphlpapi.lib libeay32.lib version.lib psapi.lib libnxsl.lib libnxmap.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug64" /libpath:"..\..\libnxcscp\Debug64" /libpath:"..\..\libnxsnmp\Debug64" /libpath:"..\libnxsrv\Debug64" /libpath:"..\..\libnxsl\Debug64" /libpath:"..\..\libnxmap\Debug64" /machine:AMD64
+# ADD LINK32 bufferoverflowU.lib dbghelp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxsrv.lib libnxsnmp.lib iphlpapi.lib libeay32.lib version.lib psapi.lib libnxsl.lib libnxmap.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug64" /libpath:"..\..\libnxsnmp\Debug64" /libpath:"..\libnxsrv\Debug64" /libpath:"..\..\libnxsl\Debug64" /libpath:"..\..\libnxmap\Debug64" /machine:AMD64
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
index a07161f..af14f34 100644 (file)
@@ -105,7 +105,7 @@ PostBuild_Cmds=copy Debug\sqlite.ddr ..\..\..\..\bin
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Debug64"
 # PROP Intermediate_Dir "Debug64"
-# PROP Ignore_Export_Lib 0
+# PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "sqlite_EXPORTS" /YX /FD /GZ /c
 # ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "sqlite_EXPORTS" /D "__64BIT__" /FD /GZ /c
index 50ef482..954165b 100644 (file)
@@ -68,7 +68,6 @@
 #include <nms_cscp.h>
 #include <uuid.h>
 #include <nxsrvapi.h>
-#include <nxcscpapi.h>
 #include <nximage.h>
 #include <nxqueue.h>
 #include <nxsnmp.h>
index a2a30b3..fa406e8 100644 (file)
@@ -38,7 +38,7 @@
 #define LIBNXCL_NO_DECLARATIONS 1
 #endif
 #include <nxclapi.h>
-#include <nxcscpapi.h>
+#include <nxcpapi.h>
 #include <nms_agent.h>
 #include <messages.h>
 #include <dbdrv.h>
index 6567734..79508bc 100644 (file)
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnxcscp.lib libnetxms.lib /nologo /version:0.1 /dll /machine:I386 /libpath:"..\..\libnetxms\Release" /libpath:"..\..\libnxcscp\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib /nologo /version:0.1 /dll /machine:I386 /libpath:"..\..\libnetxms\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnxcscp.lib libnetxms.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug" /libpath:"..\..\libnxcscp\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -119,7 +119,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnxcscp.lib libnetxms.lib /nologo /version:0.1 /dll /machine:I386 /libpath:"..\..\libnetxms\Release" /libpath:"..\..\libnxcscp\Release"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnxcscp.lib libnetxms.lib bufferoverflowU.lib /nologo /version:0.1 /dll /machine:I386 /libpath:"..\..\libnetxms\Release64" /libpath:"..\..\libnxcscp\Release64" /machine:AMD64
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib bufferoverflowU.lib /nologo /version:0.1 /dll /machine:I386 /libpath:"..\..\libnetxms\Release64" /machine:AMD64
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
@@ -153,7 +153,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnxcscp.lib libnetxms.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug" /libpath:"..\..\libnxcscp\Debug"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnxcscp.lib libnetxms.lib bufferoverflowU.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug64" /libpath:"..\..\libnxcscp\Debug64" /machine:AMD64
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib bufferoverflowU.lib /nologo /version:0.1 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libnetxms\Debug64" /machine:AMD64
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
index 6ba0dee..370f7f8 100644 (file)
@@ -40,7 +40,7 @@
 #include <nms_threads.h>
 #include <dbdrv.h>
 #include <nms_cscp.h>
-#include <nxcscpapi.h>
+#include <nxcpapi.h>
 #include <nxsrvapi.h>
 
 #endif   /* _libnxsrv_h_ */
index 54c6dbd..7a6a422 100644 (file)
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX- /O2 /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib libnxsrv.lib ws2_32.lib /nologo /version:0.1 /subsystem:console /machine:I386 /libpath:"..\..\..\libnetxms\Release" /libpath:"..\..\..\libnxcscp\Release" /libpath:"..\..\libnxsrv\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxsrv.lib ws2_32.lib /nologo /version:0.1 /subsystem:console /machine:I386 /libpath:"..\..\..\libnetxms\Release" /libpath:"..\..\libnxsrv\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -71,7 +71,7 @@ PostBuild_Cmds=copy Release\nxaction.exe C:\NetXMS\bin
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX- /ZI /Od /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib libnxsrv.lib ws2_32.lib /nologo /version:0.1 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug" /libpath:"..\..\..\libnxcscp\Debug" /libpath:"..\..\libnxsrv\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxsrv.lib ws2_32.lib /nologo /version:0.1 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug" /libpath:"..\..\libnxsrv\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
index 1caa9e8..e51ed74 100644 (file)
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX- /O2 /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\libnetxms\Release" /libpath:"..\..\..\libnxcscp\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\libnetxms\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -71,7 +71,7 @@ PostBuild_Cmds=copy Release\nxadm.exe C:\NetXMS\bin
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX- /ZI /Od /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxcscp.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug" /libpath:"..\..\..\libnxcscp\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
index 3128429..46662d6 100644 (file)
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <nms_common.h>
 #include <nms_util.h>
-#include <nxcscpapi.h>
+#include <nxcpapi.h>
 #include <local_admin.h>
 
 
index d3e39eb..b397555 100644 (file)
@@ -78,6 +78,30 @@ static BOOL CreateConfigParam(TCHAR *pszName, TCHAR *pszValue, int iVisible, int
 
 
 //
+// Upgrade from V50 to V51
+//
+
+static BOOL H_UpgradeFromV50(void)
+{
+   static TCHAR m_szBatch[] =
+      "ALTER TABLE event_groups ADD range_start integer\n"
+      "ALTER TABLE event_groups ADD range_END integer\n"
+      "UPDATE event_groups SET range_start=0,range_end=0\n"
+      "<END>";
+
+   if (!SQLBatch(m_szBatch))
+      if (!g_bIgnoreErrors)
+         return FALSE;
+
+   if (!SQLQuery(_T("UPDATE config SET var_value='51' WHERE var_name='DBFormatVersion'")))
+      if (!g_bIgnoreErrors)
+         return FALSE;
+
+   return TRUE;
+}
+
+
+//
 // Upgrade from V49 to V50
 //
 
@@ -2240,6 +2264,7 @@ static struct
    { 47, H_UpgradeFromV47 },
    { 48, H_UpgradeFromV48 },
    { 49, H_UpgradeFromV49 },
+   { 50, H_UpgradeFromV50 },
    { 0, NULL }
 };
 
index ae51eda..664f75e 100644 (file)
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX- /O2 /I "..\..\..\..\include" /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "..\..\..\..\include" /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxsrv.lib libnxcscp.lib /nologo /version:0.1 /subsystem:console /machine:I386 /libpath:"..\..\..\libnetxms\Release" /libpath:"..\..\..\libnxcscp\Release" /libpath:"..\..\libnxsrv\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxsrv.lib /nologo /version:0.1 /subsystem:console /machine:I386 /libpath:"..\..\..\libnetxms\Release" /libpath:"..\..\libnxsrv\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -71,7 +71,7 @@ PostBuild_Cmds=copy Release\nxget.exe C:\NetXMS\bin
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX- /ZI /Od /I "..\..\..\..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\..\..\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxsrv.lib libnxcscp.lib /nologo /version:0.1 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug" /libpath:"..\..\..\libnxcscp\Debug" /libpath:"..\..\libnxsrv\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libnetxms.lib libnxsrv.lib /nologo /version:0.1 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug" /libpath:"..\..\libnxsrv\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy Files
index 77a5379..ce000d5 100644 (file)
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX- /O2 /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib libnxsrv.lib ws2_32.lib /nologo /version:0.1 /subsystem:console /machine:I386 /libpath:"..\..\..\libnetxms\Release" /libpath:"..\..\..\libnxcscp\Release" /libpath:"..\..\libnxsrv\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxsrv.lib ws2_32.lib /nologo /version:0.1 /subsystem:console /machine:I386 /libpath:"..\..\..\libnetxms\Release" /libpath:"..\..\libnxsrv\Release"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files
@@ -71,7 +71,7 @@ PostBuild_Cmds=copy Release\nxupload.exe C:\NetXMS\bin
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX- /ZI /Od /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxcscp.lib libnxsrv.lib ws2_32.lib /nologo /version:0.1 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug" /libpath:"..\..\..\libnxcscp\Debug" /libpath:"..\..\libnxsrv\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnetxms.lib libnxsrv.lib ws2_32.lib /nologo /version:0.1 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libnetxms\Debug" /libpath:"..\..\libnxsrv\Debug"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy files