"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/agent/subagents/freebsd/freebsd.cpp" between
netxms-3.8.382.tar.gz and netxms-3.8.405.tar.gz

About: NetXMS is a multi-platform open source network management and monitoring system.

freebsd.cpp  (netxms-3.8.382):freebsd.cpp  (netxms-3.8.405)
/* /*
** NetXMS subagent for FreeBSD ** NetXMS subagent for FreeBSD
** Copyright (C) 2004-2020 Raden Solutions ** Copyright (C) 2004-2021 Raden Solutions
** **
** This program is free software; you can redistribute it and/or modify ** 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 ** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 2 of the License, or ** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version. ** (at your option) any later version.
** **
** This program is distributed in the hope that it will be useful, ** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of ** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details. ** GNU General Public License for more details.
skipping to change at line 150 skipping to change at line 150
{ _T("Hardware.System.Manufacturer"), SMBIOS_ParameterHandler, _T("HM"), DCI_ DT_STRING, DCIDESC_HARDWARE_SYSTEM_MANUFACTURER }, { _T("Hardware.System.Manufacturer"), SMBIOS_ParameterHandler, _T("HM"), DCI_ DT_STRING, DCIDESC_HARDWARE_SYSTEM_MANUFACTURER },
{ _T("Hardware.System.Product"), SMBIOS_ParameterHandler, _T("HP"), DCI_DT_ST RING, DCIDESC_HARDWARE_SYSTEM_PRODUCT }, { _T("Hardware.System.Product"), SMBIOS_ParameterHandler, _T("HP"), DCI_DT_ST RING, DCIDESC_HARDWARE_SYSTEM_PRODUCT },
{ _T("Hardware.System.ProductCode"), SMBIOS_ParameterHandler, _T("HC"), DCI_D T_STRING, DCIDESC_HARDWARE_SYSTEM_PRODUCTCODE }, { _T("Hardware.System.ProductCode"), SMBIOS_ParameterHandler, _T("HC"), DCI_D T_STRING, DCIDESC_HARDWARE_SYSTEM_PRODUCTCODE },
{ _T("Hardware.System.SerialNumber"), SMBIOS_ParameterHandler, _T("HS"), DCI_ DT_STRING, DCIDESC_HARDWARE_SYSTEM_SERIALNUMBER }, { _T("Hardware.System.SerialNumber"), SMBIOS_ParameterHandler, _T("HS"), DCI_ DT_STRING, DCIDESC_HARDWARE_SYSTEM_SERIALNUMBER },
{ _T("Hardware.System.Version"), SMBIOS_ParameterHandler, _T("HV"), DCI_DT_ST RING, DCIDESC_HARDWARE_SYSTEM_VERSION }, { _T("Hardware.System.Version"), SMBIOS_ParameterHandler, _T("HV"), DCI_DT_ST RING, DCIDESC_HARDWARE_SYSTEM_VERSION },
{ _T("Hardware.WakeUpEvent"), SMBIOS_ParameterHandler, _T("W"), DCI_DT_STRING , DCIDESC_HARDWARE_WAKEUPEVENT }, { _T("Hardware.WakeUpEvent"), SMBIOS_ParameterHandler, _T("W"), DCI_DT_STRING , DCIDESC_HARDWARE_WAKEUPEVENT },
{ _T("Hypervisor.Type"), H_HypervisorType, NULL, DCI_DT_STRING, DCIDESC_HYPER VISOR_TYPE }, { _T("Hypervisor.Type"), H_HypervisorType, NULL, DCI_DT_STRING, DCIDESC_HYPER VISOR_TYPE },
{ _T("Hypervisor.Version"), H_HypervisorVersion, NULL, DCI_DT_STRING, DCIDESC _HYPERVISOR_VERSION }, { _T("Hypervisor.Version"), H_HypervisorVersion, NULL, DCI_DT_STRING, DCIDESC _HYPERVISOR_VERSION },
{ _T("Net.Interface.64BitCounters"), H_NetInterface64bitSupport, NULL, DCI_DT _INT, DCIDESC_NET_INTERFACE_64BITCOUNTERS }, { _T("Net.Interface.64BitCounters"), H_NetInterface64bitSupport, nullptr, DCI _DT_INT, DCIDESC_NET_INTERFACE_64BITCOUNTERS },
{ _T("Net.Interface.AdminStatus(*)"), H_NetIfAdminStatus, NULL, { _T("Net.Interface.AdminStatus(*)"), H_NetIfAdminStatus, nullptr, DCI_DT_INT
DCI_DT_INT, DCIDESC_NET_INTERFACE_ADMINSTATUS }, , DCIDESC_NET_INTERFACE_ADMINSTATUS },
{ _T("Net.Interface.BytesIn(*)"), H_NetIfInfoFromKVM, (const TCHAR *)IF_I { _T("Net.Interface.BytesIn(*)"), H_NetIfInfo, (const TCHAR *)IF_INFO_BYTES_I
NFO_BYTES_IN, DCI_DT_UINT, DCIDESC_NET_INTERFACE_BYTESIN }, N, DCI_DT_UINT, DCIDESC_NET_INTERFACE_BYTESIN },
{ _T("Net.Interface.BytesOut(*)"), H_NetIfInfoFromKVM, (const TCHAR *)IF_I { _T("Net.Interface.BytesOut(*)"), H_NetIfInfo, (const TCHAR *)IF_INFO_BYTES_
NFO_BYTES_OUT, DCI_DT_UINT, DCIDESC_NET_INTERFACE_BYTESOUT }, OUT, DCI_DT_UINT, DCIDESC_NET_INTERFACE_BYTESOUT },
{ _T("Net.Interface.InErrors(*)"), H_NetIfInfoFromKVM, (const TCHAR *)IF_I { _T("Net.Interface.InErrors(*)"), H_NetIfInfo, (const TCHAR *)IF_INFO_IN_ERR
NFO_IN_ERRORS, DCI_DT_UINT, DCIDESC_NET_INTERFACE_INERRORS }, ORS, DCI_DT_UINT, DCIDESC_NET_INTERFACE_INERRORS },
{ _T("Net.Interface.Link(*)"), H_NetIfOperStatus, NULL, { _T("Net.Interface.Link(*)"), H_NetIfOperStatus, nullptr, DCI_DT_DEPRECATED,
DCI_DT_DEPRECATED, DCIDESC_DEPRECATED }, DCIDESC_DEPRECATED },
{ _T("Net.Interface.OperStatus(*)"), H_NetIfOperStatus, NULL, { _T("Net.Interface.OperStatus(*)"), H_NetIfOperStatus, NULL, DCI_DT_INT, DCI
DCI_DT_INT, DCIDESC_NET_INTERFACE_OPERSTATUS }, DESC_NET_INTERFACE_OPERSTATUS },
{ _T("Net.Interface.OutErrors(*)"), H_NetIfInfoFromKVM, (const TCHAR *)IF_I { _T("Net.Interface.OutErrors(*)"), H_NetIfInfo, (const TCHAR *)IF_INFO_OUT_E
NFO_OUT_ERRORS, DCI_DT_UINT, DCIDESC_NET_INTERFACE_OUTERRORS }, RRORS, DCI_DT_UINT, DCIDESC_NET_INTERFACE_OUTERRORS },
{ _T("Net.Interface.PacketsIn(*)"), H_NetIfInfoFromKVM, (const TCHAR *)IF_I { _T("Net.Interface.PacketsIn(*)"), H_NetIfInfo, (const TCHAR *)IF_INFO_PACKE
NFO_PACKETS_IN, DCI_DT_UINT, DCIDESC_NET_INTERFACE_PACKETSIN }, TS_IN, DCI_DT_UINT, DCIDESC_NET_INTERFACE_PACKETSIN },
{ _T("Net.Interface.PacketsOut(*)"), H_NetIfInfoFromKVM, (const TCHAR *)IF_I { _T("Net.Interface.PacketsOut(*)"), H_NetIfInfo, (const TCHAR *)IF_INFO_PACK
NFO_PACKETS_OUT, DCI_DT_UINT, DCIDESC_NET_INTERFACE_PACKETSOUT }, ETS_OUT, DCI_DT_UINT, DCIDESC_NET_INTERFACE_PACKETSOUT },
#if __FreeBSD__ >= 10 #if __FreeBSD__ >= 10
{ _T("Net.Interface.BytesIn64(*)"), H_NetIfInfoFromKVM, (const TCHAR * { _T("Net.Interface.BytesIn64(*)"), H_NetIfInfo, (const TCHAR *)IF_INFO_BYTES
)IF_INFO_BYTES_IN_64, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_BYTESIN }, _IN_64, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_BYTESIN },
{ _T("Net.Interface.BytesOut64(*)"), H_NetIfInfoFromKVM, (const TCHAR * { _T("Net.Interface.BytesOut64(*)"), H_NetIfInfo, (const TCHAR *)IF_INFO_BYTE
)IF_INFO_BYTES_OUT_64, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_BYTESOUT }, S_OUT_64, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_BYTESOUT },
{ _T("Net.Interface.InErrors64(*)"), H_NetIfInfoFromKVM, (const TCHAR * { _T("Net.Interface.InErrors64(*)"), H_NetIfInfo, (const TCHAR *)IF_INFO_IN_E
)IF_INFO_IN_ERRORS_64, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_INERRORS }, RRORS_64, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_INERRORS },
{ _T("Net.Interface.OutErrors64(*)"), H_NetIfInfoFromKVM, (const TCHAR * { _T("Net.Interface.OutErrors64(*)"), H_NetIfInfo, (const TCHAR *)IF_INFO_OUT
)IF_INFO_OUT_ERRORS_64, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_OUTERRORS }, _ERRORS_64, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_OUTERRORS },
{ _T("Net.Interface.PacketsIn64(*)"), H_NetIfInfoFromKVM, (const TCHAR * { _T("Net.Interface.PacketsIn64(*)"), H_NetIfInfo, (const TCHAR *)IF_INFO_PAC
)IF_INFO_PACKETS_IN_64, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_PACKETSIN }, KETS_IN_64, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_PACKETSIN },
{ _T("Net.Interface.PacketsOut64(*)"), H_NetIfInfoFromKVM, (const TCHAR * { _T("Net.Interface.PacketsOut64(*)"), H_NetIfInfo, (const TCHAR *)IF_INFO_PA
)IF_INFO_PACKETS_OUT_64, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_PACKETSOUT }, CKETS_OUT_64, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_PACKETSOUT },
#endif #endif
{ _T("Net.IP.Forwarding"), H_NetIpForwarding, (const TCHAR *)4 { _T("Net.IP.Forwarding"), H_NetIpForwarding, (const TCHAR *)4, DCI_DT_INT, D
, DCI_DT_INT, DCIDESC_NET_IP_FORWARDING }, CIDESC_NET_IP_FORWARDING },
{ _T("Net.IP6.Forwarding"), H_NetIpForwarding, (const TCHAR *)6 { _T("Net.IP6.Forwarding"), H_NetIpForwarding, (const TCHAR *)6, DCI_DT_INT,
, DCI_DT_INT, DCIDESC_NET_IP6_FORWARDING }, DCIDESC_NET_IP6_FORWARDING },
{ _T("Process.Count(*)"), H_ProcessCount, _T("P"), { _T("Process.Count(*)"), H_ProcessCount, _T("P"), DCI_DT_UINT, DCIDESC_PROCE
DCI_DT_UINT, DCIDESC_PROCESS_COUNT }, SS_COUNT },
{ _T("Process.CountEx(*)"), H_ProcessCount, _T("E"), { _T("Process.CountEx(*)"), H_ProcessCount, _T("E"), DCI_DT_UINT, DCIDESC_PRO
DCI_DT_UINT, DCIDESC_PROCESS_COUNTEX }, CESS_COUNTEX },
{ _T("Process.CPUTime(*)"), H_ProcessInfo, CAST_TO_POINTER( { _T("Process.CPUTime(*)"), H_ProcessInfo, CAST_TO_POINTER(PROCINFO_CPUTIME,
PROCINFO_CPUTIME, const TCHAR *), const TCHAR *), DCI_DT_INT64, DCIDESC_PROCESS_CPUTIME },
DCI_DT_INT64, DCIDESC_PROCESS_CPUTIME }, { _T("Process.Threads(*)"), H_ProcessInfo, CAST_TO_POINTER(PROCINFO_THREADS,
{ _T("Process.Threads(*)"), H_ProcessInfo, CAST_TO_POINTER( const TCHAR *), DCI_DT_INT64, DCIDESC_PROCESS_THREADS },
PROCINFO_THREADS, const TCHAR *), { _T("Process.VMSize(*)"), H_ProcessInfo, CAST_TO_POINTER(PROCINFO_VMSIZE, co
DCI_DT_INT64, DCIDESC_PROCESS_THREADS }, nst TCHAR *), DCI_DT_INT64, DCIDESC_PROCESS_VMSIZE },
{ _T("Process.VMSize(*)"), H_ProcessInfo, CAST_TO_POINTER( { _T("Process.WkSet(*)"), H_ProcessInfo, CAST_TO_POINTER(PROCINFO_WKSET, cons
PROCINFO_VMSIZE, const TCHAR *), t TCHAR *), DCI_DT_INT64, DCIDESC_PROCESS_WKSET },
DCI_DT_INT64, DCIDESC_PROCESS_VMSIZE },
{ _T("Process.WkSet(*)"), H_ProcessInfo, CAST_TO_POINTER(
PROCINFO_WKSET, const TCHAR *),
DCI_DT_INT64, DCIDESC_PROCESS_WKSET },
{ _T("System.BIOS.Date"), SMBIOS_ParameterHandler, _T("BD"), DCI_DT_STRING, D CIDESC_SYSTEM_BIOS_DATE }, { _T("System.BIOS.Date"), SMBIOS_ParameterHandler, _T("BD"), DCI_DT_STRING, D CIDESC_SYSTEM_BIOS_DATE },
{ _T("System.BIOS.Vendor"), SMBIOS_ParameterHandler, _T("Bv"), DCI_DT_STRING, DCIDESC_SYSTEM_BIOS_VENDOR }, { _T("System.BIOS.Vendor"), SMBIOS_ParameterHandler, _T("Bv"), DCI_DT_STRING, DCIDESC_SYSTEM_BIOS_VENDOR },
{ _T("System.BIOS.Version"), SMBIOS_ParameterHandler, _T("BV"), DCI_DT_STRING , DCIDESC_SYSTEM_BIOS_VERSION }, { _T("System.BIOS.Version"), SMBIOS_ParameterHandler, _T("BV"), DCI_DT_STRING , DCIDESC_SYSTEM_BIOS_VERSION },
{ _T("System.CPU.Count"), H_CpuInfo, _T("C"), DCI_DT_INT, DCIDESC_SYSTEM_ CPU_COUNT }, { _T("System.CPU.Count"), H_CpuInfo, _T("C"), DCI_DT_INT, DCIDESC_SYSTEM_ CPU_COUNT },
{ _T("System.CPU.Frequency"), H_CpuInfo, _T("F"), DCI_DT_INT, DCIDESC_SYS TEM_CPU_FREQUENCY }, { _T("System.CPU.Frequency"), H_CpuInfo, _T("F"), DCI_DT_INT, DCIDESC_SYS TEM_CPU_FREQUENCY },
{ _T("System.CPU.LoadAvg"), H_CpuLoad, NULL, DCI_DT_FLOAT, DCIDESC_SYSTEM _CPU_LOADAVG }, { _T("System.CPU.LoadAvg"), H_CpuLoad, NULL, DCI_DT_FLOAT, DCIDESC_SYSTEM _CPU_LOADAVG },
{ _T("System.CPU.LoadAvg5"), H_CpuLoad, NULL, DCI_DT_FLOAT, DCIDESC_SYSTE M_CPU_LOADAVG5 }, { _T("System.CPU.LoadAvg5"), H_CpuLoad, NULL, DCI_DT_FLOAT, DCIDESC_SYSTE M_CPU_LOADAVG5 },
{ _T("System.CPU.LoadAvg15"), H_CpuLoad, NULL, DCI_DT_FLOAT, DCIDESC_SYST EM_CPU_LOADAVG15 }, { _T("System.CPU.LoadAvg15"), H_CpuLoad, NULL, DCI_DT_FLOAT, DCIDESC_SYST EM_CPU_LOADAVG15 },
 End of changes. 6 change blocks. 
52 lines changed or deleted 48 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)