removed netware-related files
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 24 Feb 2011 09:56:10 +0000 (09:56 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 24 Feb 2011 09:56:10 +0000 (09:56 +0000)
37 files changed:
.gitignore
ChangeLog
Makefile.am
Makefile.nw [deleted file]
README.NetWare [deleted file]
configure.ac
netware.cmd [deleted file]
netware/Makefile.am [deleted file]
netware/Makefile.inc [deleted file]
netware/nlmconv.inc [deleted file]
src/agent/core/Makefile.am
src/agent/core/Makefile.nw [deleted file]
src/agent/core/nxagentd.def [deleted file]
src/agent/subagents/Makefile.am
src/agent/subagents/ecs/Makefile.am
src/agent/subagents/ecs/Makefile.nw [deleted file]
src/agent/subagents/ecs/ecs.def [deleted file]
src/agent/subagents/logwatch/Makefile.am
src/agent/subagents/logwatch/Makefile.nw [deleted file]
src/agent/subagents/logwatch/logwatch.def [deleted file]
src/agent/subagents/netware/Makefile.am [deleted file]
src/agent/subagents/netware/Makefile.nw [deleted file]
src/agent/subagents/netware/netware.cpp [deleted file]
src/agent/subagents/netware/netware.def [deleted file]
src/agent/subagents/netware/nwagent.h [deleted file]
src/agent/subagents/ping/Makefile.am
src/agent/subagents/ping/Makefile.nw [deleted file]
src/agent/subagents/ping/ping.def [deleted file]
src/agent/subagents/skeleton/Makefile.nw [deleted file]
src/agent/subagents/win9x/Makefile.am [deleted file]
src/agent/subagents/win9x/main.cpp [deleted file]
src/agent/subagents/win9x/procinfo.cpp [deleted file]
src/agent/subagents/win9x/win9x_subagent.h [deleted file]
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/PredefinedMap.java
src/libexpat/libexpat/Makefile.nw [deleted file]
src/libnetxms/Makefile.nw [deleted file]
src/libnxlp/Makefile.nw [deleted file]

index 18b4ab1..8ed48d2 100644 (file)
@@ -19,7 +19,6 @@ contrib/mibs/netxms.mib
 /lib
 /libtool
 /m4
-netware/bin/*
 /private
 /release
 sql/dbinit_mssql.sql
index dcaff4f..a66fbc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 - Server switched to UNICODE on Windows platform
 - Windows x64 server version added
 - MIB compiler improved
+- Dropped agent support for Novell NetWare and Windows NT 4.0, 95, 98, Me
 
 
 *
index e67ca08..1692ba0 100644 (file)
@@ -9,8 +9,8 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = reconf configure netxms.sln Makefile.nw README.HPUX
-SUBDIRS = m4 contrib include src doc tools netware
+EXTRA_DIST = reconf configure netxms.sln README.HPUX
+SUBDIRS = m4 contrib include src doc tools
 SUBDIRS += @TOP_LEVEL_MODULES@
 
 install-exec-hook:
diff --git a/Makefile.nw b/Makefile.nw
deleted file mode 100644 (file)
index 4c33399..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Makefile for building all NetXMS for NetWare binaries
-# Copyright (c) 2006 Victor Kirhenshtein
-#
-
-SUBDIRS = src/libexpat/libexpat src/libnetxms src/libnxlp src/agent/core \
-          src/agent/subagents/netware src/agent/subagents/ping \
-          src/agent/subagents/ecs src/agent/subagents/logwatch
-COMMAND = for dir in $(SUBDIRS); do \
-          if ! make -C $$dir -f Makefile.nw $@; then exit $$?; fi; done
-
-all:
-       $(COMMAND)
-
-.PHONY: clean
-clean:
-       $(COMMAND)
diff --git a/README.NetWare b/README.NetWare
deleted file mode 100644 (file)
index 75fc25b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Using NetXMS on Novell NetWare
index 0923427..4ebfd77 100644 (file)
@@ -1742,7 +1742,6 @@ AC_CONFIG_FILES([
        images/Makefile
        include/Makefile
        m4/Makefile
-       netware/Makefile
        src/Makefile
        src/agent/Makefile
        src/agent/core/Makefile
@@ -1757,9 +1756,7 @@ AC_CONFIG_FILES([
        src/agent/subagents/openbsd/Makefile
        src/agent/subagents/netbsd/Makefile
        src/agent/subagents/ipso/Makefile
-       src/agent/subagents/netware/Makefile
        src/agent/subagents/winnt/Makefile
-       src/agent/subagents/win9x/Makefile
        src/agent/subagents/winperf/Makefile
        src/agent/subagents/wmi/Makefile
        src/agent/subagents/portCheck/Makefile
diff --git a/netware.cmd b/netware.cmd
deleted file mode 100644 (file)
index 9c238e4..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-
-set GCC_NLM_HOME=D:\DevTools\gcc-nlm
-
-PATH=%GCC_NLM_HOME%\usr\bin;%GCC_NLM_HOME%\usr\i586-netware\bin;%GCC_NLM_HOME%\usr\lib\gcc-lib\i586-netware\3.2.3;%PATH%
-
-echo *** Welcome to NetWare build environment ***
-
-cmd
-
-echo *** Leaving NetWare build environment ***
diff --git a/netware/Makefile.am b/netware/Makefile.am
deleted file mode 100644 (file)
index 0692d2c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2004 NetXMS Team <bugs@netxms.org>
-#  
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without 
-# modifications, as long as this notice is preserved.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-EXTRA_DIST = \
-    Makefile.inc nlmconv.inc
diff --git a/netware/Makefile.inc b/netware/Makefile.inc
deleted file mode 100644 (file)
index fe9b6af..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Common make options for Novell NetWare
-# Copyright (c) 2004 Victor Kirhenshtein
-#
-
-CFLAGS   = -nostdinc -fno-exceptions -fno-builtin -fpack-struct -fno-rtti \
-           -c -D_NETWARE -D_POSIX_SOURCE -ID:/nwsdk/libc/include \
-           -ID:/nwsdk/fs64/include \
-          -I../../include -I../../../include \
-           -I../../../../include -I../libexpat/libexpat
-LDFLAGS  = --linker=i586-netware-ld.exe --output-target=nlm32-i386 --input-target=elf32-i386
-PLDFLAGS = -r
-
-CC       = i586-netware-g++
-PRELINK  = i586-netware-ld
-LINK     = i586-netware-nlmconv
-PERL    = perl
diff --git a/netware/nlmconv.inc b/netware/nlmconv.inc
deleted file mode 100644 (file)
index 50398c4..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-INPUT d:/nwsdk/libc/imports/libcpre.gcc.o   # clib startup code
-
-IMPORT @d:/nwsdk/libc/imports/libc.imp
-IMPORT @d:/nwsdk/libc/imports/netware.imp
-
-VERSION 1,1,0
-COPYRIGHT "Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 NetXMS Team"
index f85e87b..b0f0d83 100644 (file)
@@ -23,7 +23,6 @@ static_subagents.cpp: @top_srcdir@/config.h Makefile
        @top_builddir@/tools/create_ssa_list.sh "@STATIC_SUBAGENT_LIST@" > static_subagents.cpp
 
 EXTRA_DIST = \
-    Makefile.nw nxagentd.def \
     nxagentd.vcproj \
     messages.mc messages.h messages.c \
     nxagentd.rc \
diff --git a/src/agent/core/Makefile.nw b/src/agent/core/Makefile.nw
deleted file mode 100644 (file)
index 4ea1e0f..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Makefile for building NetXMS Core Agent for Novell NetWare platform
-# Copyright (c) 2004 Victor Kirhenshtein
-#
-
-include ../../../netware/Makefile.inc
-
-OBJECTS  = messages.o actions.o comm.o config.o exec.o getparam.o nxagentd.o \
-           push.o register.o session.o snmpproxy.o subagent.o sysinfo.o \
-           tools.o trap.o upgrade.o watchdog.o
-EXEC     = nxagentd.nlm
-DEF      = nxagentd.def
-OBJTMP   = nxagentd_r.o
-
-all: $(EXEC)
-
-$(OBJECTS): nxagentd.h Makefile.nw
-
-.cpp.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-.c.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-$(EXEC): $(OBJECTS) $(DEF)
-       $(PRELINK) -o $(OBJTMP) $(OBJECTS) $(PLDFLAGS)
-       $(LINK) $(LDFLAGS) -T $(DEF)
-       rm -f $(OBJTMP)
-       cp nxagentd.nlm ../../../netware/bin
-
-messages.c: messages.mc
-       $(PERL) ../../../tools/mc.pl $<
-
-clean:
-       rm -f *.o $(EXEC) messages.c messages.h
diff --git a/src/agent/core/nxagentd.def b/src/agent/core/nxagentd.def
deleted file mode 100644 (file)
index faac300..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# nxagentd.def - NLM Header definition file for nlmconv
-# Copyright (c) 2004 Victor Kirhenshtein
-#
-
-# common definitions
-@../../../netware/nlmconv.inc
-
-# define input object files
-INPUT nxagentd_r.o
-
-# Import/Export
-IMPORT (NETXMS) @../../libnetxms/netxms.imp
-
-# Entry points
-START _LibCPrelude
-EXIT _LibCPostlude
-
-# NLM header
-OUTPUT nxagentd.nlm
-TYPE 0
-DESCRIPTION "NetXMS Core Agent"
-SCREENNAME "NetXMS Agent"
-
-MODULE LIBC, NETXMS
index 83e164c..5e5e053 100644 (file)
@@ -14,4 +14,4 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-SUBDIRS = skeleton winnt win9x winperf wmi netware portCheck ping sms ups ecs logwatch ${SUBAGENT_DIRS} ${UNSTABLE_SUBAGENT_DIRS}
+SUBDIRS = skeleton winnt winperf wmi portCheck ping sms ups ecs logwatch ${SUBAGENT_DIRS} ${UNSTABLE_SUBAGENT_DIRS}
index 684eb65..8cd11ab 100644 (file)
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libnsm_ecs.la
 libnsm_ecs_la_SOURCES = ecs.cpp
 libnsm_ecs_la_LDFLAGS = ../../../libnetxms/libnetxms.la
 
-EXTRA_DIST = ecs.vcproj ecs.def Makefile.nw
+EXTRA_DIST = ecs.vcproj
 
 install-exec-hook:
        if test "x`uname -s`" = "xAIX" ; then \
diff --git a/src/agent/subagents/ecs/Makefile.nw b/src/agent/subagents/ecs/Makefile.nw
deleted file mode 100644 (file)
index d7394b7..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Makefile for building NetXMS ecs Subagent for Novell NetWare platform
-# Copyright (c) 2006 Victor Kirhenshtein
-#
-
-include ../../../../netware/Makefile.inc
-
-OBJECTS  = ecs.o
-EXEC     = ecs.nsm
-DEF      = ecs.def
-
-all: $(EXEC)
-
-$(OBJECTS): Makefile.nw
-
-.cpp.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-$(EXEC): $(OBJECTS) $(DEF)
-       $(LINK) $(LDFLAGS) -T $(DEF)
-       cp ecs.nsm ../../../../netware/bin
-
-clean:
-       rm -f *.o $(EXEC)
diff --git a/src/agent/subagents/ecs/ecs.def b/src/agent/subagents/ecs/ecs.def
deleted file mode 100644 (file)
index c87ce85..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# ecs.def - NLM Header definition file for nlmconv
-# Copyright (c) 2006 Victor Kirhenshtein
-#
-
-# common definitions
-@../../../../netware/nlmconv.inc
-
-# define input object files
-INPUT ecs.o
-
-# Import/Export
-IMPORT (NETXMS) @../../../libnetxms/netxms.imp
-EXPORT NxSubAgentRegister_ECS
-
-# Entry points
-START _LibCPrelude
-EXIT _LibCPostlude
-
-# NLM header
-OUTPUT ecs.nsm
-TYPE 0
-DESCRIPTION "NetXMS Extended Checksum Subagent"
-SCREENNAME "System Console"
-
-MODULE LIBC, NETXMS
index 1a71a73..f6be814 100644 (file)
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libnsm_logwatch.la
 libnsm_logwatch_la_SOURCES = main.cpp
 libnsm_logwatch_la_LIBADD = @top_srcdir@/src/libnetxms/libnetxms.la @top_srcdir@/src/libnxlp/libnxlp.la
 
-EXTRA_DIST = logwatch.h logwatch.vcproj logwatch.def Makefile.nw \
+EXTRA_DIST = logwatch.h logwatch.vcproj \
              eventlog.cpp wevt.cpp
 
 install-exec-hook:
diff --git a/src/agent/subagents/logwatch/Makefile.nw b/src/agent/subagents/logwatch/Makefile.nw
deleted file mode 100644 (file)
index cf15349..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Makefile for building NetXMS LogWatch Subagent for Novell NetWare platform
-# Copyright (c) 2008 Victor Kirhenshtein
-#
-
-include ../../../../netware/Makefile.inc
-
-OBJECTS  = main.o
-EXEC     = logwatch.nsm
-DEF      = logwatch.def
-
-all: $(EXEC)
-
-$(OBJECTS): Makefile.nw logwatch.h
-
-.cpp.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-$(EXEC): $(OBJECTS) $(DEF)
-       $(LINK) $(LDFLAGS) -T $(DEF)
-       cp logwatch.nsm ../../../../netware/bin
-
-clean:
-       rm -f *.o $(EXEC)
diff --git a/src/agent/subagents/logwatch/logwatch.def b/src/agent/subagents/logwatch/logwatch.def
deleted file mode 100644 (file)
index 503c0fd..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# logwatch.def - NLM Header definition file for nlmconv
-# Copyright (c) 2008 Victor Kirhenshtein
-#
-
-# common definitions
-@../../../../netware/nlmconv.inc
-
-# define input object files
-INPUT main.o
-
-# Import/Export
-IMPORT (NETXMS) @../../../libnetxms/netxms.imp
-IMPORT (LIBNXLP) @../../../libnxlp/libnxlp.imp
-EXPORT NxSubAgentRegister_LOGWATCH
-
-# Entry points
-START _LibCPrelude
-EXIT _LibCPostlude
-
-# NLM header
-OUTPUT logwatch.nsm
-TYPE 0
-DESCRIPTION "NetXMS LogWatch Subagent"
-SCREENNAME "System Console"
-
-MODULE LIBC, NETXMS, LIBNXLP
diff --git a/src/agent/subagents/netware/Makefile.am b/src/agent/subagents/netware/Makefile.am
deleted file mode 100644 (file)
index cea66e1..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2004 NetXMS Team <bugs@netxms.org>
-#  
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without 
-# modifications, as long as this notice is preserved.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-EXTRA_DIST = \
-    Makefile.nw \
-    netware.def \
-    netware.cpp \
-    nwagent.h
diff --git a/src/agent/subagents/netware/Makefile.nw b/src/agent/subagents/netware/Makefile.nw
deleted file mode 100644 (file)
index b0f3f84..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Makefile for building NetXMS NetWare Subagent for Novell NetWare platform
-# Copyright (c) 2004 Victor Kirhenshtein
-#
-
-include ../../../../netware/Makefile.inc
-
-OBJECTS  = netware.o
-EXEC     = netware.nsm
-DEF      = netware.def
-
-all: $(EXEC)
-
-$(OBJECTS): Makefile.nw nwagent.h
-
-.cpp.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-$(EXEC): $(OBJECTS) $(DEF)
-       $(LINK) $(LDFLAGS) -T $(DEF)
-       cp netware.nsm ../../../../netware/bin
-
-clean:
-       rm -f *.o $(EXEC)
diff --git a/src/agent/subagents/netware/netware.cpp b/src/agent/subagents/netware/netware.cpp
deleted file mode 100644 (file)
index d5b0265..0000000
+++ /dev/null
@@ -1,446 +0,0 @@
-/* $Id$ */
-
-/*
-** NetXMS subagent for Novell NetWare
-** Copyright (C) 2004, 2005, 2006, 2007 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
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-** File: netware.cpp
-**
-**/
-
-#include "nwagent.h"
-
-
-//
-// Static data
-//
-
-static CONDITION m_hCondShutdown = INVALID_CONDITION_HANDLE;
-static CONDITION m_hCondTerminate = INVALID_CONDITION_HANDLE;
-static THREAD m_hCollectorThread = INVALID_THREAD_HANDLE;
-static int m_iCpuUtilHistory[MAX_CPU][CPU_HISTORY_SIZE];
-static int m_iCpuHPos = 0;
-static int m_iDiskQueuePos = 0;
-static int m_iDiskQueue[60];
-
-
-//
-// Memory information
-//
-
-static LONG H_MemoryInfo(const char *pszParam, const char *pArg, char *pValue)
-{
-       struct memory_info info;
-       size64_t nTotalMem;
-
-       memset(&info, 0, sizeof(struct memory_info));
-       if (netware_mem_info(&info) != 0)
-               return SYSINFO_RC_ERROR;
-
-       // Field info.TotalKnownSystemMemoryUnder4Gb may be zero if
-       // total memory is below 4GB (or it is only on older LibC,
-       // I don't know).
-       if (info.TotalKnownSystemMemory != 0)
-               nTotalMem = info.TotalKnownSystemMemory;
-       else
-               nTotalMem = info.TotalKnownSystemMemoryUnder4Gb;
-
-       switch((int)pArg)
-       {
-               case MEMINFO_PHYSICAL_TOTAL:
-                       ret_uint64(pValue, nTotalMem);
-                       break;
-               case MEMINFO_PHYSICAL_USED:
-                       ret_uint64(pValue, info.TotalWorkMemory);
-                       break;
-               case MEMINFO_PHYSICAL_USED_PCT:
-                       ret_double(pValue, (double)(info.TotalWorkMemory * 100) / (double)nTotalMem);
-                       break;
-               case MEMINFO_PHYSICAL_FREE:
-                       ret_uint64(pValue, nTotalMem - info.TotalWorkMemory);
-                       break;
-               case MEMINFO_PHYSICAL_FREE_PCT:
-                       ret_double(pValue, (double)((nTotalMem - info.TotalWorkMemory) * 100) / (double)nTotalMem);
-                       break;
-               default:
-                       break;
-       }
-
-       return SYSINFO_RC_SUCCESS;
-}
-
-
-//
-// Disk information
-//
-
-static LONG H_DiskInfo(const char *pszParam, const char *pArg, char *pValue)
-{
-       struct volume_info vi;
-       char szVolumeName[MAX_VOLUME_NAME_LEN + 1];
-       DWORD dwClusterSize;    // Cluster size in bytes
-
-       AgentGetParameterArg(pszParam, 1, szVolumeName, MAX_VOLUME_NAME_LEN);
-       memset(&vi, 0, sizeof(struct volume_info));
-       if (netware_vol_info_from_name(&vi, szVolumeName) != 0)
-               return SYSINFO_RC_UNSUPPORTED;
-
-       dwClusterSize = vi.SectorSize * vi.SectorsPerCluster;
-       switch(pArg[0])
-       {
-               case 'T':   // Total size
-                       ret_uint64(pValue, (QWORD)vi.VolumeSizeInClusters * (QWORD)dwClusterSize);
-                       break;
-               case 'F':   // Free space
-                       ret_uint64(pValue, ((QWORD)vi.FreedClusters + (QWORD)vi.SubAllocFreeableClusters) * (QWORD)dwClusterSize + (QWORD)vi.FreeableLimboSectors * (QWORD)vi.SectorSize);
-                       break;
-               case 'U':   // Used space
-                       ret_uint64(pValue, ((QWORD)(vi.VolumeSizeInClusters - vi.FreedClusters - vi.SubAllocFreeableClusters) * (QWORD)vi.SectorsPerCluster - (QWORD)vi.FreeableLimboSectors) * (QWORD)vi.SectorSize);
-                       break;
-               case 'f':   // Free space percentage
-                       ret_double(pValue, (double)(((QWORD)vi.FreedClusters + (QWORD)vi.SubAllocFreeableClusters) * (QWORD)dwClusterSize + (QWORD)vi.FreeableLimboSectors * (QWORD)vi.SectorSize) /
-                                       (double)((QWORD)vi.VolumeSizeInClusters * (QWORD)dwClusterSize) * 100);
-                       break;
-               case 'u':   // Used space percentage
-                       ret_double(pValue, (double)((((QWORD)(vi.VolumeSizeInClusters - vi.FreedClusters - vi.SubAllocFreeableClusters) * (QWORD)vi.SectorsPerCluster - (QWORD)vi.FreeableLimboSectors) * (QWORD)vi.SectorSize)) /
-                                       (double)((QWORD)vi.VolumeSizeInClusters * (QWORD)dwClusterSize) * 100);
-                       break;
-               default:
-                       return SYSINFO_RC_UNSUPPORTED;
-       }
-
-       return SYSINFO_RC_SUCCESS;
-}
-
-
-//
-// Host name
-//
-
-static LONG H_HostName(const char *pszParam, const char *pArg, char *pValue)
-{
-       char szName[256];
-       int iErr;
-
-       iErr = gethostname(szName, 256);
-       if (iErr == 0)
-               ret_string(pValue, szName);
-       return (iErr == 0) ? SYSINFO_RC_SUCCESS : SYSINFO_RC_ERROR;
-}
-
-
-//
-// CPU usage
-//
-
-static LONG H_CpuUsage(const char *pszParam, const char *pArg, char *pValue)
-{
-       int i, j, iSteps, iValue, iCpu, iCpuCount;
-       char szBuffer[256];
-
-       AgentGetParameterArg(pszParam, 1, szBuffer, 256);
-       if (szBuffer[0] == 0)   // All CPUs?
-               iCpu = -1;
-       else
-               iCpu = strtol(szBuffer, NULL, 0);
-
-       iSteps = (int)pArg;
-       iCpuCount = NXGetCpuCount();
-
-       if (iCpu >= iCpuCount)
-               return SYSINFO_RC_UNSUPPORTED;
-
-       for(i = m_iCpuHPos - 1, iValue = 0; iSteps > 0; iSteps--, i--)
-       {
-               if (i < 0)
-                       i = CPU_HISTORY_SIZE - 1;
-               if (iCpu == -1)
-               {
-                       for(j = 0; j < iCpuCount; j++)
-                               iValue += m_iCpuUtilHistory[j][i];
-               }
-               else
-               {
-                       iValue += m_iCpuUtilHistory[iCpu][i];
-               }
-       }
-
-       ret_double(pValue, (iCpu == -1) ? 
-                       (((double)iValue / (int)pArg) / iCpuCount) : 
-                       ((double)iValue / (int)pArg));
-       return SYSINFO_RC_SUCCESS;
-}
-
-
-//
-// CPU count
-//
-
-static LONG H_CpuCount(const char *pszParam, const char *pArg, char *pValue)
-{
-       ret_uint(pValue, NXGetCpuCount());
-       return SYSINFO_RC_SUCCESS;
-}
-
-
-//
-// Platform name
-//
-
-static LONG H_PlatformName(const char *pszParam, const char *pArg, char *pValue)
-{
-       ret_string(pValue, "netware-i386");
-       return SYSINFO_RC_SUCCESS;
-}
-
-
-//
-// Open files
-//
-
-static LONG H_OpenFiles(const char *pszParam, const char *pArg, char *pValue)
-{
-       struct filesystem_info fsi;
-
-       if (netware_fs_info(&fsi) != 0)
-               return SYSINFO_RC_ERROR;
-       ret_int(pValue, fsi.OpenFileCount);
-       return SYSINFO_RC_SUCCESS;
-}
-
-
-//
-// Average disk queue
-//
-
-static LONG H_DiskQueue(const char *pszParam, const char *pArg, char *pValue)
-{
-       int i, iSteps, iValue;
-       char szBuffer[256];
-
-       for(i = m_iDiskQueuePos - 1, iValue = 0, iSteps = 60; iSteps > 0; iSteps--, i--)
-       {
-               if (i < 0)
-                       i = 59;
-               iValue += m_iDiskQueue[i];
-       }
-
-       ret_double(pValue, ((double)iValue / 60.0));
-       return SYSINFO_RC_SUCCESS;
-}
-
-
-//
-// ARP cache
-//
-
-static LONG H_ArpCache(const char *pszParam, const char *pArg, StringList *pValue)
-{
-       return SYSINFO_RC_UNSUPPORTED;
-}
-
-
-//
-// Shutdown system
-//
-
-static LONG H_ActionShutdown(const char *pszAction, StringList *pArgList, const char *pData)
-{
-       LONG nRet;
-
-       switch(*pData)
-       {
-               case 'S':       // Shutdown
-                       ShutdownServer(getscreenhandle(), 1, NULL, SHUTDOWN_POWEROFF);
-                       nRet = ERR_SUCCESS;
-                       break;
-               case 'R':       // Restart
-                       ShutdownServer(getscreenhandle(), 1, NULL, SHUTDOWN_RESET);
-                       nRet = ERR_SUCCESS;
-                       break;
-               default:
-                       nRet = ERR_INTERNAL_ERROR;
-                       break;
-       }
-       return nRet;
-}
-
-
-//
-// Collector thread
-//
-
-static THREAD_RESULT THREAD_CALL CollectorThread(void *pArg)
-{
-       struct cpu_info ci;
-       int iSeq, iCpu, iNumCpu;
-       struct filesystem_info fsi;
-
-       while(1)
-       {
-               // Sleep one second
-               if (ConditionWait(m_hCondShutdown, 1000))
-                       break;
-
-               // CPU utilization
-               iNumCpu = NXGetCpuCount();
-               for(iCpu = 0; iCpu < iNumCpu; iCpu++)
-               {
-                       iSeq = iCpu;   
-                       if (netware_cpu_info(&ci, &iSeq) == 0)
-                       {
-                               m_iCpuUtilHistory[iCpu][m_iCpuHPos] = ci.ProcessorUtilization;
-                       }
-                       else
-                       {
-                               m_iCpuUtilHistory[iCpu][m_iCpuHPos] = 0;
-                       }
-               }
-               m_iCpuHPos++;
-               if (m_iCpuHPos == CPU_HISTORY_SIZE)
-                       m_iCpuHPos = 0;
-
-               // Disk queue
-               if (netware_fs_info(&fsi) == 0)
-               {
-                       m_iDiskQueue[m_iDiskQueuePos] = fsi.CurrentDiskRequests; 
-                       m_iDiskQueuePos++;
-                       if (m_iDiskQueuePos == 60)
-                               m_iDiskQueuePos = 0;
-               }
-       }
-       return THREAD_OK;
-}
-
-
-//
-// Called by master agent at startup
-//
-
-static BOOL SubAgentInit(TCHAR *pszConfigFile)
-{
-       // Setup internal variables
-       memset(m_iCpuUtilHistory, 0, sizeof(int) * CPU_HISTORY_SIZE * MAX_CPU);
-       memset(m_iDiskQueue, 0, sizeof(int) * 60);
-
-       // Start collector thread
-       m_hCondShutdown = ConditionCreate(TRUE);
-       m_hCollectorThread = ThreadCreateEx(CollectorThread, 0, NULL);
-
-       return TRUE;
-}
-
-
-//
-// Called by master agent at unload
-//
-
-static void SubAgentShutdown(void)
-{
-       if (m_hCondShutdown != INVALID_CONDITION_HANDLE)
-               ConditionSet(m_hCondShutdown);
-       ThreadJoin(m_hCollectorThread);
-       ConditionDestroy(m_hCondShutdown);
-
-       // Notify main thread that NLM can exit
-       ConditionSet(m_hCondTerminate);
-}
-
-
-//
-// Subagent information
-//
-
-static NETXMS_SUBAGENT_PARAM m_parameters[] =
-{
-       { "Disk.Free(*)", H_DiskInfo, "F", DCI_DT_DEPRECATED, DCIDESC_DEPRECATED },
-       { "Disk.FreePerc(*)", H_DiskInfo, "f", DCI_DT_DEPRECATED, DCIDESC_DEPRECATED },
-       { "Disk.Total(*)", H_DiskInfo, "T", DCI_DT_DEPRECATED, DCIDESC_DEPRECATED },
-       { "Disk.Used(*)", H_DiskInfo, "U", DCI_DT_DEPRECATED, DCIDESC_DEPRECATED },
-       { "Disk.UsedPerc(*)", H_DiskInfo, "u", DCI_DT_DEPRECATED, DCIDESC_DEPRECATED },
-       { "FileSystem.Free(*)", H_DiskInfo, "F", DCI_DT_INT64, DCIDESC_FS_FREE },
-       { "FileSystem.FreePerc(*)", H_DiskInfo, "f", DCI_DT_FLOAT, DCIDESC_FS_FREEPERC },
-       { "FileSystem.Total(*)", H_DiskInfo, "T", DCI_DT_INT64, DCIDESC_FS_TOTAL },
-       { "FileSystem.Used(*)", H_DiskInfo, "U", DCI_DT_INT64, DCIDESC_FS_USED },
-       { "FileSystem.UsedPerc(*)", H_DiskInfo, "u", DCI_DT_FLOAT, DCIDESC_FS_USEDPERC },
-       { "System.CPU.Count", H_CpuCount, NULL, DCI_DT_UINT, DCIDESC_SYSTEM_CPU_COUNT },
-       { "System.CPU.Usage", H_CpuUsage, (char *)60, DCI_DT_FLOAT, DCIDESC_SYSTEM_CPU_USAGE },
-       { "System.CPU.Usage5", H_CpuUsage, (char *)300, DCI_DT_FLOAT, DCIDESC_SYSTEM_CPU_USAGE5 },
-       { "System.CPU.Usage15", H_CpuUsage, (char *)900, DCI_DT_FLOAT, DCIDESC_SYSTEM_CPU_USAGE15 },
-       { "System.CPU.Usage(*)", H_CpuUsage, (char *)60, DCI_DT_FLOAT, DCIDESC_SYSTEM_CPU_USAGE_EX },
-       { "System.CPU.Usage5(*)", H_CpuUsage, (char *)300, DCI_DT_FLOAT, DCIDESC_SYSTEM_CPU_USAGE5_EX },
-       { "System.CPU.Usage15(*)", H_CpuUsage, (char *)900, DCI_DT_FLOAT, DCIDESC_SYSTEM_CPU_USAGE15_EX },
-       { "System.IO.DiskQueue", H_DiskQueue, NULL, DCI_DT_FLOAT, DCIDESC_SYSTEM_IO_DISKQUEUE },
-       { "System.IO.OpenFiles", H_OpenFiles, NULL, DCI_DT_INT, DCIDESC_SYSTEM_IO_OPENFILES },
-       { "System.Hostname", H_HostName, NULL, DCI_DT_STRING, DCIDESC_SYSTEM_HOSTNAME },
-       { "System.Memory.Physical.Free", H_MemoryInfo, (char *)MEMINFO_PHYSICAL_FREE, DCI_DT_UINT64, DCIDESC_SYSTEM_MEMORY_PHYSICAL_FREE },
-       { "System.Memory.Physical.FreePerc", H_MemoryInfo, (char *)MEMINFO_PHYSICAL_FREE_PCT, DCI_DT_FLOAT, DCIDESC_SYSTEM_MEMORY_PHYSICAL_FREE_PCT },
-       { "System.Memory.Physical.Total", H_MemoryInfo, (char *)MEMINFO_PHYSICAL_TOTAL, DCI_DT_UINT64, DCIDESC_SYSTEM_MEMORY_PHYSICAL_TOTAL },
-       { "System.Memory.Physical.Used", H_MemoryInfo, (char *)MEMINFO_PHYSICAL_USED, DCI_DT_UINT64, DCIDESC_SYSTEM_MEMORY_PHYSICAL_USED },
-       { "System.Memory.Physical.UsedPerc", H_MemoryInfo, (char *)MEMINFO_PHYSICAL_USED_PCT, DCI_DT_FLOAT, DCIDESC_SYSTEM_MEMORY_PHYSICAL_USED_PCT },
-       { "System.PlatformName", H_PlatformName, NULL, DCI_DT_STRING, DCIDESC_SYSTEM_PLATFORMNAME }
-};
-static NETXMS_SUBAGENT_ENUM m_enums[] =
-{
-       { "Net.ArpCache", H_ArpCache, NULL }
-};
-static NETXMS_SUBAGENT_ACTION m_actions[] =
-{
-       { "System.Restart", H_ActionShutdown, "R", "Restart system" },
-       { "System.Shutdown", H_ActionShutdown, "S", "Shutdown system" }
-};
-
-static NETXMS_SUBAGENT_INFO m_info =
-{
-       NETXMS_SUBAGENT_INFO_MAGIC,
-       "NETWARE", 
-       NETXMS_VERSION_STRING,
-       SubAgentInit, SubAgentShutdown, NULL,
-       sizeof(m_parameters) / sizeof(NETXMS_SUBAGENT_PARAM),
-       m_parameters,
-       sizeof(m_enums) / sizeof(NETXMS_SUBAGENT_ENUM),
-       m_enums,
-       sizeof(m_actions) / sizeof(NETXMS_SUBAGENT_ACTION),
-       m_actions
-};
-
-
-//
-// Entry point for NetXMS agent
-//
-
-extern "C" BOOL NxSubAgentRegister_NETWARE(NETXMS_SUBAGENT_INFO **ppInfo)
-{
-       *ppInfo = &m_info;
-       return TRUE;
-}
-
-
-//
-// NetWare entry point
-// We use main() instead of _init() and _fini() to implement
-// automatic unload of the subagent after unload handler is called
-//
-
-int main(int argc, char *argv[])
-{
-       m_hCondTerminate = ConditionCreate(TRUE);
-       ConditionWait(m_hCondTerminate, INFINITE);
-       ConditionDestroy(m_hCondTerminate);
-       sleep(1);
-       return 0;
-}
diff --git a/src/agent/subagents/netware/netware.def b/src/agent/subagents/netware/netware.def
deleted file mode 100644 (file)
index d11fd40..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# netware.def - NLM Header definition file for nlmconv
-# Copyright (c) 2004 Victor Kirhenshtein
-#
-
-# common definitions
-@../../../../netware/nlmconv.inc
-
-# define input object files
-INPUT netware.o
-
-# Import/Export
-IMPORT (NETXMS) @../../../libnetxms/netxms.imp
-EXPORT NxSubAgentRegister_NETWARE
-
-# Entry points
-START _LibCPrelude
-EXIT _LibCPostlude
-
-# NLM header
-OUTPUT netware.nsm
-DESCRIPTION "NetXMS NetWare Platform Subagent"
-SCREENNAME "System Console"
-
-MODULE LIBC, NETXMS
diff --git a/src/agent/subagents/netware/nwagent.h b/src/agent/subagents/netware/nwagent.h
deleted file mode 100644 (file)
index 0a70cd1..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-** NetXMS subagent for Novell NetWare
-** Copyright (C) 2004-2010 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
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-** File: nwagent.h
-**
-**/
-
-#ifndef _nwagent_h_
-#define _nwagent_h_
-
-#include <nms_common.h>
-#include <nms_agent.h>
-#include <nms_threads.h>
-#include <netdb.h>
-#include <monitor.h>
-#include <nks/plat.h>
-#include <netware.h>
-
-
-//
-// Constants
-//
-
-#define CPU_HISTORY_SIZE         1200
-#define MAX_CPU                  32
-
-enum
-{
-       MEMINFO_PHYSICAL_TOTAL,
-       MEMINFO_PHYSICAL_FREE,
-       MEMINFO_PHYSICAL_FREE_PCT,
-       MEMINFO_PHYSICAL_USED,
-       MEMINFO_PHYSICAL_USED_PCT
-};
-
-
-#endif
index e842a39..26f82d2 100644 (file)
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libnsm_ping.la
 libnsm_ping_la_SOURCES = ping.cpp
 libnsm_ping_la_LDFLAGS = ../../../libnetxms/libnetxms.la
 
-EXTRA_DIST = ping.h ping.vcproj ping.def Makefile.nw
+EXTRA_DIST = ping.h ping.vcproj
 
 install-exec-hook:
        if test "x`uname -s`" = "xAIX" ; then \
diff --git a/src/agent/subagents/ping/Makefile.nw b/src/agent/subagents/ping/Makefile.nw
deleted file mode 100644 (file)
index cf94f05..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Makefile for building NetXMS PING Subagent for Novell NetWare platform
-# Copyright (c) 2004 Victor Kirhenshtein
-#
-
-include ../../../../netware/Makefile.inc
-
-OBJECTS  = ping.o
-EXEC     = ping.nsm
-DEF      = ping.def
-
-all: $(EXEC)
-
-$(OBJECTS): Makefile.nw ping.h
-
-.cpp.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-$(EXEC): $(OBJECTS) $(DEF)
-       $(LINK) $(LDFLAGS) -T $(DEF)
-       cp ping.nsm ../../../../netware/bin
-
-clean:
-       rm -f *.o $(EXEC)
diff --git a/src/agent/subagents/ping/ping.def b/src/agent/subagents/ping/ping.def
deleted file mode 100644 (file)
index 3f72eba..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# netware.def - NLM Header definition file for nlmconv
-# Copyright (c) 2004 Victor Kirhenshtein
-#
-
-# common definitions
-@../../../../netware/nlmconv.inc
-
-# define input object files
-INPUT ping.o
-
-# Import/Export
-IMPORT (NETXMS) @../../../libnetxms/netxms.imp
-EXPORT NxSubAgentRegister_PING
-
-# Entry points
-START _LibCPrelude
-EXIT _LibCPostlude
-
-# NLM header
-OUTPUT ping.nsm
-TYPE 0
-DESCRIPTION "NetXMS PING Subagent"
-SCREENNAME "System Console"
-
-MODULE LIBC, NETXMS
diff --git a/src/agent/subagents/skeleton/Makefile.nw b/src/agent/subagents/skeleton/Makefile.nw
deleted file mode 100644 (file)
index 05b82a0..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Makefile for building NetXMS Skeleton Subagent for Novell NetWare platform
-# Copyright (c) 2004 Victor Kirhenshtein
-#
-
-include ../../../../netware/Makefile.inc
-
-OBJECTS  = skeleton.o
-EXEC     = skeleton.nsm
-DEF      = skeleton.def
-
-all: $(EXEC)
-
-$(OBJECTS): Makefile.nw
-
-.cpp.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-$(EXEC): $(OBJECTS) $(DEF)
-       $(LINK) $(LDFLAGS) -T $(DEF)
-
-clean:
-       rm -f *.o $(EXEC)
diff --git a/src/agent/subagents/win9x/Makefile.am b/src/agent/subagents/win9x/Makefile.am
deleted file mode 100644 (file)
index bf0d74e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2004 NetXMS Team <bugs@netxms.org>
-#  
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without 
-# modifications, as long as this notice is preserved.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-EXTRA_DIST = \
-       main.cpp \
-       procinfo.cpp \
-       win9x_subagent.h
diff --git a/src/agent/subagents/win9x/main.cpp b/src/agent/subagents/win9x/main.cpp
deleted file mode 100644 (file)
index 10edb62..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-** Windows 95/98/Me NetXMS subagent
-** Copyright (C) 2003, 2004, 2005 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
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-** $module: main.cpp
-**
-**/
-
-#include "win9x_subagent.h"
-
-
-//
-// Externlals
-//
-
-LONG H_ProcessList(const char *pszCmd, const char *pArg, NETXMS_VALUES_LIST *value);
-LONG H_ProcCount(const char *pszCmd, const char *pArg, char *pValue);
-LONG H_ProcCountSpecific(const char *pszCmd, const char *pArg, char *pValue);
-LONG H_ThreadCount(const char *pszCmd, const char *pArg, char *pValue);
-
-
-//
-// Shutdown system
-//
-
-static LONG H_ActionShutdown(const char *pszAction, NETXMS_VALUES_LIST *pArgList, const char *pData)
-{
-       return ExitWindowsEx(EWX_POWEROFF | EWX_FORCE, 0) ? ERR_SUCCESS : ERR_INTERNAL_ERROR;
-}
-
-
-//
-// Subagent information
-//
-
-static NETXMS_SUBAGENT_PARAM m_parameters[] =
-{
-       { "Process.Count(*)", H_ProcCountSpecific, NULL, DCI_DT_INT, DCIDESC_PROCESS_COUNT },
-       { "System.ProcessCount", H_ProcCount, NULL, DCI_DT_INT, DCIDESC_SYSTEM_PROCESSCOUNT },
-       { "System.ThreadCount", H_ThreadCount, NULL, DCI_DT_INT, DCIDESC_SYSTEM_THREADCOUNT }
-};
-static NETXMS_SUBAGENT_ENUM m_enums[] =
-{
-       { "System.ProcessList", H_ProcessList, NULL }
-};
-static NETXMS_SUBAGENT_ACTION m_actions[] =
-{
-       { "System.Restart", H_ActionShutdown, "R", "Restart system" },
-       { "System.Shutdown", H_ActionShutdown, "S", "Shutdown system" }
-};
-
-static NETXMS_SUBAGENT_INFO m_info =
-{
-       NETXMS_SUBAGENT_INFO_MAGIC,
-       _T("Win9x"), NETXMS_VERSION_STRING,
-       NULL, NULL, NULL,
-       sizeof(m_parameters) / sizeof(NETXMS_SUBAGENT_PARAM),
-       m_parameters,
-       sizeof(m_enums) / sizeof(NETXMS_SUBAGENT_ENUM),
-       m_enums,
-       sizeof(m_actions) / sizeof(NETXMS_SUBAGENT_ACTION),
-       m_actions
-};
-
-
-//
-// Entry point for NetXMS agent
-//
-
-extern "C" BOOL __declspec(dllexport) __cdecl
-NxSubAgentRegister(NETXMS_SUBAGENT_INFO **ppInfo, TCHAR *pszConfigFile)
-{
-       *ppInfo = &m_info;
-       return TRUE;
-}
-
-
-//
-// DLL entry point
-//
-
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
-{
-       if (dwReason == DLL_PROCESS_ATTACH)
-               DisableThreadLibraryCalls(hInstance);
-       return TRUE;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/*
-
-$Log: not supported by cvs2svn $
-Revision 1.4  2007/06/07 22:07:11  alk
-descriptions changed to defines
-
-
-*/
diff --git a/src/agent/subagents/win9x/procinfo.cpp b/src/agent/subagents/win9x/procinfo.cpp
deleted file mode 100644 (file)
index e153a46..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-/* 
-** Windows 95/98/Me NetXMS subagent
-** Copyright (C) 2003, 2004, 2005 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
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-** $module: procinfo.cpp
-** Win32 specific process information parameters
-**
-**/
-
-#include "win9x_subagent.h"
-
-
-//
-// Handler for System.ProcessCount
-//
-
-LONG H_ProcCount(const char *pszCmd, const char *pArg, char *pValue)
-{
-   HANDLE hSnapshot;
-   PROCESSENTRY32 pe;
-   LONG nCount = 0, nRet = SYSINFO_RC_SUCCESS;
-
-   hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-   if (hSnapshot != INVALID_HANDLE_VALUE)
-   {
-      pe.dwSize = sizeof(PROCESSENTRY32);
-      if (Process32First(hSnapshot, &pe))
-      {
-         do
-         {
-            nCount++;
-            pe.dwSize = sizeof(PROCESSENTRY32);
-         } while(Process32Next(hSnapshot, &pe));
-      }
-      CloseHandle(hSnapshot);
-      ret_int(pValue, nCount);
-   }
-   else
-   {
-      nRet = SYSINFO_RC_ERROR;
-   }
-   return nRet;
-}
-
-
-//
-// Handler for Process.Count(*)
-//
-
-LONG H_ProcCountSpecific(const char *pszCmd, const char *pArg, char *pValue)
-{
-   HANDLE hSnapshot;
-   PROCESSENTRY32 pe;
-   TCHAR *pszFileName, szProcName[MAX_PATH];
-   LONG nCount = 0, nRet = SYSINFO_RC_SUCCESS;
-
-   if (!NxGetParameterArg(pszCmd, 1, szProcName, MAX_PATH))
-      return SYSINFO_RC_UNSUPPORTED;
-
-   hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-   if (hSnapshot != INVALID_HANDLE_VALUE)
-   {
-      pe.dwSize = sizeof(PROCESSENTRY32);
-      if (Process32First(hSnapshot, &pe))
-      {
-         do
-         {
-            pszFileName = _tcsrchr(pe.szExeFile, _T('\\'));
-            if (pszFileName != NULL)
-               pszFileName++;
-            else
-               pszFileName = pe.szExeFile;
-            if (!_tcsicmp(szProcName, pszFileName))
-               nCount++;
-            pe.dwSize = sizeof(PROCESSENTRY32);
-         } while(Process32Next(hSnapshot, &pe));
-      }
-      CloseHandle(hSnapshot);
-      ret_int(pValue, nCount);
-   }
-   else
-   {
-      nRet = SYSINFO_RC_ERROR;
-   }
-   return nRet;
-}
-
-
-//
-// Handler for System.ProcessList enum
-//
-
-LONG H_ProcessList(const char *pszCmd, const char *pArg, NETXMS_VALUES_LIST *pValue)
-{
-   HANDLE hSnapshot;
-   PROCESSENTRY32 pe;
-   TCHAR *pszFileName, szBuffer[MAX_PATH + 64];
-   LONG nRet = SYSINFO_RC_SUCCESS;
-
-   hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-   if (hSnapshot != INVALID_HANDLE_VALUE)
-   {
-      pe.dwSize = sizeof(PROCESSENTRY32);
-      if (Process32First(hSnapshot, &pe))
-      {
-         do
-         {
-            pszFileName = _tcsrchr(pe.szExeFile, _T('\\'));
-            if (pszFileName != NULL)
-               pszFileName++;
-            else
-               pszFileName = pe.szExeFile;
-            _sntprintf(szBuffer, MAX_PATH + 64, _T("%u %s"), pe.th32ProcessID, pszFileName);
-            NxAddResultString(pValue, szBuffer);
-            pe.dwSize = sizeof(PROCESSENTRY32);
-         } while(Process32Next(hSnapshot, &pe));
-      }
-      CloseHandle(hSnapshot);
-   }
-   else
-   {
-      nRet = SYSINFO_RC_ERROR;
-   }
-   return nRet;
-}
-
-
-//
-// Handler for System.ThreadCount
-//
-
-LONG H_ThreadCount(const char *pszCmd, const char *pArg, char *pValue)
-{
-   HANDLE hSnapshot;
-   PROCESSENTRY32 pe;
-   LONG nCount = 0, nRet = SYSINFO_RC_SUCCESS;
-
-   hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-   if (hSnapshot != INVALID_HANDLE_VALUE)
-   {
-      pe.dwSize = sizeof(PROCESSENTRY32);
-      if (Process32First(hSnapshot, &pe))
-      {
-         do
-         {
-            nCount += pe.cntThreads;
-            pe.dwSize = sizeof(PROCESSENTRY32);
-         } while(Process32Next(hSnapshot, &pe));
-      }
-      CloseHandle(hSnapshot);
-      ret_int(pValue, nCount);
-   }
-   else
-   {
-      nRet = SYSINFO_RC_ERROR;
-   }
-   return nRet;
-}
diff --git a/src/agent/subagents/win9x/win9x_subagent.h b/src/agent/subagents/win9x/win9x_subagent.h
deleted file mode 100644 (file)
index 764a4b7..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-** Windows NT/2000/XP/2003 NetXMS subagent
-** Copyright (C) 2003, 2004, 2005 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
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-** $module: win9x_subagent.h
-**
-**/
-
-#ifndef _win9x_subagent_h_
-#define _win9x_subagent_h_
-
-#include <nms_common.h>
-#include <nms_agent.h>
-#include <tlhelp32.h>
-
-
-#endif   /* _win9x_subagent_h_ */
index f2c42a6..65eb314 100644 (file)
@@ -42,7 +42,6 @@ import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DropTargetEvent;\r
 import org.eclipse.swt.dnd.Transfer;\r
 import org.eclipse.swt.dnd.TransferData;\r
-import org.eclipse.swt.graphics.Color;\r
 import org.eclipse.swt.graphics.GC;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.graphics.Point;\r
@@ -50,7 +49,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IViewSite;\r
 import org.eclipse.ui.PartInitException;\r
 import org.eclipse.ui.progress.UIJob;\r
-import org.netxms.api.client.images.LibraryImage;\r
 import org.netxms.client.NXCObjectModificationData;\r
 import org.netxms.client.maps.NetworkMapLink;\r
 import org.netxms.client.maps.elements.NetworkMapDecoration;\r
diff --git a/src/libexpat/libexpat/Makefile.nw b/src/libexpat/libexpat/Makefile.nw
deleted file mode 100644 (file)
index d906a6a..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Makefile for building libnetxms for Novell NetWare platform
-# Copyright (c) 2004 Victor Kirhenshtein
-#
-
-include ../../../netware/Makefile.inc
-
-OBJECTS  = libexpat.o xmlparse.o xmlrole.o xmltok.o xmltok_impl.o xmltok_ns.o
-EXEC     = nxexpat.nlm
-DEF      = nxexpat.def
-OBJTMP   = nxexpat_r.o
-IMP      = nxexpat.imp
-
-all: $(EXEC)
-
-$(OBJECTS): Makefile.nw
-
-.cpp.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-.c.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-$(EXEC): $(OBJECTS) $(DEF)
-       $(PRELINK) -o $(OBJTMP) $(OBJECTS) $(PLDFLAGS)
-       $(PERL) ../../../tools/nwmkimp.pl $(OBJTMP) $(IMP)
-       $(LINK) $(LDFLAGS) -T $(DEF)
-       rm -f $(OBJTMP)
-       cp $(EXEC) ../../../netware/bin
-
-clean:
-       rm -f *.o $(EXEC)
diff --git a/src/libnetxms/Makefile.nw b/src/libnetxms/Makefile.nw
deleted file mode 100644 (file)
index 265023f..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Makefile for building libnetxms for Novell NetWare platform
-# Copyright (c) 2004 Victor Kirhenshtein
-#
-
-include ../../netware/Makefile.inc
-
-OBJECTS  = agent.o base64.o c_lgcc3.o config.o crypto.o gen_uuid.o dload.o \
-          hash.o ice.o icmp.o log.o main.o md5.o message.o msgwq.o nxcp.o \
-          qsort.o queue.o sha1.o string.o stringlist.o strmap.o table.o \
-          tools.o unicode.o uuid.o xml.o
-EXEC     = netxms.nlm
-DEF      = netxms.def
-OBJTMP   = netxms_r.o
-IMP      = netxms.imp
-
-all: $(EXEC)
-
-$(OBJECTS): libnetxms.h Makefile.nw
-
-.cpp.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-.c.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-$(EXEC): $(OBJECTS) $(DEF)
-       $(PRELINK) -o $(OBJTMP) $(OBJECTS) $(PLDFLAGS)
-       $(PERL) ../../tools/nwmkimp.pl $(OBJTMP) $(IMP)
-       $(LINK) $(LDFLAGS) -T $(DEF)
-       rm -f $(OBJTMP)
-       cp netxms.nlm ../../netware/bin
-
-clean:
-       rm -f *.o $(EXEC)
diff --git a/src/libnxlp/Makefile.nw b/src/libnxlp/Makefile.nw
deleted file mode 100644 (file)
index cce691d..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Makefile for building libnetxms for Novell NetWare platform
-# Copyright (c) 2004 Victor Kirhenshtein
-#
-
-include ../../netware/Makefile.inc
-
-OBJECTS  = file.o main.o parser.o rule.o
-EXEC     = libnxlp.nlm
-DEF      = libnxlp.def
-OBJTMP   = libnxlp_r.o
-IMP      = libnxlp.imp
-
-all: $(EXEC)
-
-$(OBJECTS): libnxlp.h Makefile.nw
-
-.cpp.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-.c.o:
-       $(CC) $(CFLAGS) -o $*.o $<
-
-$(EXEC): $(OBJECTS) $(DEF)
-       $(PRELINK) -o $(OBJTMP) $(OBJECTS) $(PLDFLAGS)
-       $(PERL) ../../tools/nwmkimp.pl $(OBJTMP) $(IMP)
-       $(LINK) $(LDFLAGS) -T $(DEF)
-       rm -f $(OBJTMP)
-       cp libnxlp.nlm ../../netware/bin
-
-clean:
-       rm -f *.o $(EXEC)