minor changes
authorVictor Kirhenshtein <victor@netxms.org>
Sat, 22 Oct 2011 23:19:03 +0000 (23:19 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Sat, 22 Oct 2011 23:19:03 +0000 (23:19 +0000)
doc/misc/agent_parameters.xlsx
src/agent/subagents/hpux/main.cpp
src/agent/subagents/hpux/net.cpp

index 054f823..88a6ca0 100644 (file)
Binary files a/doc/misc/agent_parameters.xlsx and b/doc/misc/agent_parameters.xlsx differ
index a832244..f378beb 100644 (file)
@@ -94,34 +94,21 @@ static NETXMS_SUBAGENT_PARAM m_parameters[] =
        { "FileSystem.UsedPerc(*)",       H_DiskInfo,        (char *)DISK_USED_PERC,
                DCI_DT_FLOAT,   DCIDESC_FS_USEDPERC },
 
-       { "Net.Interface.AdminStatus(*)", H_NetIfInfo, (char *)IF_INFO_ADMIN_STATUS,
-               DCI_DT_INT,             DCIDESC_NET_INTERFACE_ADMINSTATUS },
-       { "Net.Interface.BytesIn(*)",     H_NetIfInfo, (char *)IF_INFO_BYTES_IN,
-               DCI_DT_UINT,    DCIDESC_NET_INTERFACE_BYTESIN },
-       { "Net.Interface.BytesOut(*)",    H_NetIfInfo, (char *)IF_INFO_BYTES_OUT,
-               DCI_DT_UINT,    DCIDESC_NET_INTERFACE_BYTESOUT },
-       { "Net.Interface.Description(*)", H_NetIfInfo, (char *)IF_INFO_DESCRIPTION,
-               DCI_DT_STRING, DCIDESC_NET_INTERFACE_DESCRIPTION },
-       { "Net.Interface.InErrors(*)",    H_NetIfInfo, (char *)IF_INFO_IN_ERRORS,
-               DCI_DT_UINT,    DCIDESC_NET_INTERFACE_INERRORS },
-       { "Net.Interface.Link(*)",        H_NetIfInfo, (char *)IF_INFO_OPER_STATUS,
-               DCI_DT_DEPRECATED,      DCIDESC_DEPRECATED },
-       { "Net.Interface.MTU(*)",         H_NetIfInfo, (char *)IF_INFO_MTU,
-               DCI_DT_INT,             DCIDESC_NET_INTERFACE_MTU },
-       { "Net.Interface.OperStatus(*)",  H_NetIfInfo, (char *)IF_INFO_OPER_STATUS,
-               DCI_DT_INT,             DCIDESC_NET_INTERFACE_OPERSTATUS },
-       { "Net.Interface.OutErrors(*)",   H_NetIfInfo, (char *)IF_INFO_OUT_ERRORS,
-               DCI_DT_UINT,    DCIDESC_NET_INTERFACE_OUTERRORS },
-       { "Net.Interface.PacketsIn(*)",   H_NetIfInfo, (char *)IF_INFO_PACKETS_IN,
-               DCI_DT_UINT,    DCIDESC_NET_INTERFACE_PACKETSIN },
-       { "Net.Interface.PacketsOut(*)",  H_NetIfInfo, (char *)IF_INFO_PACKETS_OUT,
-               DCI_DT_UINT,    DCIDESC_NET_INTERFACE_PACKETSOUT },
-       { "Net.Interface.Speed(*)",       H_NetIfInfo, (char *)IF_INFO_SPEED,
-               DCI_DT_INT,             DCIDESC_NET_INTERFACE_SPEED },
-       { "Net.IP.Forwarding",            H_NetIpForwarding, (char *)4,
-               DCI_DT_INT,             DCIDESC_NET_IP_FORWARDING },
-       { "Net.IP6.Forwarding",           H_NetIpForwarding, (char *)6,
-               DCI_DT_INT,             DCIDESC_NET_IP6_FORWARDING },
+       { "Net.Interface.AdminStatus(*)", H_NetIfInfo, (char *)IF_INFO_ADMIN_STATUS, DCI_DT_INT, DCIDESC_NET_INTERFACE_ADMINSTATUS },
+       { "Net.Interface.BytesIn(*)", H_NetIfInfo, (char *)IF_INFO_BYTES_IN, DCI_DT_UINT, DCIDESC_NET_INTERFACE_BYTESIN },
+       { "Net.Interface.BytesOut(*)", H_NetIfInfo, (char *)IF_INFO_BYTES_OUT, DCI_DT_UINT, DCIDESC_NET_INTERFACE_BYTESOUT },
+       { "Net.Interface.Description(*)", H_NetIfInfo, (char *)IF_INFO_DESCRIPTION, DCI_DT_STRING, DCIDESC_NET_INTERFACE_DESCRIPTION },
+       { "Net.Interface.InErrors(*)", H_NetIfInfo, (char *)IF_INFO_IN_ERRORS, DCI_DT_UINT, DCIDESC_NET_INTERFACE_INERRORS },
+       { "Net.Interface.Link(*)", H_NetIfInfo, (char *)IF_INFO_OPER_STATUS, DCI_DT_DEPRECATED, DCIDESC_DEPRECATED },
+       { "Net.Interface.MTU(*)", H_NetIfInfo, (char *)IF_INFO_MTU, DCI_DT_INT, DCIDESC_NET_INTERFACE_MTU },
+       { "Net.Interface.OperStatus(*)", H_NetIfInfo, (char *)IF_INFO_OPER_STATUS, DCI_DT_INT, DCIDESC_NET_INTERFACE_OPERSTATUS },
+       { "Net.Interface.OutErrors(*)", H_NetIfInfo, (char *)IF_INFO_OUT_ERRORS, DCI_DT_UINT, DCIDESC_NET_INTERFACE_OUTERRORS },
+       { "Net.Interface.PacketsIn(*)", H_NetIfInfo, (char *)IF_INFO_PACKETS_IN, DCI_DT_UINT, DCIDESC_NET_INTERFACE_PACKETSIN },
+       { "Net.Interface.PacketsOut(*)", H_NetIfInfo, (char *)IF_INFO_PACKETS_OUT, DCI_DT_UINT, DCIDESC_NET_INTERFACE_PACKETSOUT },
+       { "Net.Interface.Speed(*)", H_NetIfInfo, (char *)IF_INFO_SPEED, DCI_DT_INT, DCIDESC_NET_INTERFACE_SPEED },
+       
+       { "Net.IP.Forwarding", H_NetIpForwarding, (char *)4, DCI_DT_INT, DCIDESC_NET_IP_FORWARDING },
+       { "Net.IP6.Forwarding", H_NetIpForwarding, (char *)6, DCI_DT_INT, DCIDESC_NET_IP6_FORWARDING },
 
        { "Process.Count(*)", H_ProcessCount, NULL, DCI_DT_UINT, DCIDESC_PROCESS_COUNT },
        { "Process.CPUTime(*)", H_ProcessInfo, (char *)PROCINFO_CPUTIME, DCI_DT_UINT64, DCIDESC_PROCESS_CPUTIME },
index 6156227..3dfbdc5 100644 (file)
@@ -366,7 +366,7 @@ LONG H_NetIfInfo(const char *pszParam, const char *pArg, char *pValue)
 
        if (!AgentGetParameterArg(pszParam, 1, buffer, 256))
        {
-               return nRet;
+               return SYSINFO_RC_ERROR;
        }
 
        // Check if we have interface name or index