* { font-family: Consolas, Lucida Console, Courier New; font-size: 100%; }
h1 { font-size: 150%; }
td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
pre { line-height: 100%; width: 100%; }
.highlight span { width: 100%; display:-moz-inline-stack; display:inline-block; zoom:1; *display:inline; }
body { background: #ffffff; }
body .c { color: #999988; font-style: italic } /* Comment */
body .err { color: #a61717; background-color: #e3d2d2 } /* Error */
body .k { font-weight: bold } /* Keyword */
body .o { font-weight: bold } /* Operator */
body .cm { color: #999988; font-style: italic } /* Comment.Multiline */
body .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
body .c1 { color: #999988; font-style: italic } /* Comment.Single */
body .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
body .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
body .ge { font-style: italic } /* Generic.Emph */
body .gr { color: #aa0000 } /* Generic.Error */
body .gh { color: #999999 } /* Generic.Heading */
body .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
body .go { color: #888888 } /* Generic.Output */
body .gp { color: #555555 } /* Generic.Prompt */
body .gs { font-weight: bold } /* Generic.Strong */
body .gu { color: #aaaaaa } /* Generic.Subheading */
body .gt { color: #aa0000 } /* Generic.Traceback */
body .kc { font-weight: bold } /* Keyword.Constant */
body .kd { font-weight: bold } /* Keyword.Declaration */
body .kp { font-weight: bold } /* Keyword.Pseudo */
body .kr { font-weight: bold } /* Keyword.Reserved */
body .kt { color: #445588; font-weight: bold } /* Keyword.Type */
body .m { color: #009999 } /* Literal.Number */
body .s { color: #bb8844 } /* Literal.String */
body .na { color: #008080 } /* Name.Attribute */
body .nb { color: #999999 } /* Name.Builtin */
body .nc { color: #445588; font-weight: bold } /* Name.Class */
body .no { color: #008080 } /* Name.Constant */
body .ni { color: #800080 } /* Name.Entity */
body .ne { color: #990000; font-weight: bold } /* Name.Exception */
body .nf { color: #990000; font-weight: bold } /* Name.Function */
body .nn { color: #555555 } /* Name.Namespace */
body .nt { color: #000080 } /* Name.Tag */
body .nv { color: #008080 } /* Name.Variable */
body .ow { font-weight: bold } /* Operator.Word */
body .w { color: #bbbbbb } /* Text.Whitespace */
body .mf { color: #009999 } /* Literal.Number.Float */
body .mh { color: #009999 } /* Literal.Number.Hex */
body .mi { color: #009999 } /* Literal.Number.Integer */
body .mo { color: #009999 } /* Literal.Number.Oct */
body .sb { color: #bb8844 } /* Literal.String.Backtick */
body .sc { color: #bb8844 } /* Literal.String.Char */
body .sd { color: #bb8844 } /* Literal.String.Doc */
body .s2 { color: #bb8844 } /* Literal.String.Double */
body .se { color: #bb8844 } /* Literal.String.Escape */
body .sh { color: #bb8844 } /* Literal.String.Heredoc */
body .si { color: #bb8844 } /* Literal.String.Interpol */
body .sx { color: #bb8844 } /* Literal.String.Other */
body .sr { color: #808000 } /* Literal.String.Regex */
body .s1 { color: #bb8844 } /* Literal.String.Single */
body .ss { color: #bb8844 } /* Literal.String.Symbol */
body .bp { color: #999999 } /* Name.Builtin.Pseudo */
body .vc { color: #008080 } /* Name.Variable.Class */
body .vg { color: #008080 } /* Name.Variable.Global */
body .vi { color: #008080 } /* Name.Variable.Instance */
body .il { color: #009999 } /* Literal.Number.Integer.Long */
Info
Revision:3284
Author:victor
Date:2008-05-24 15:14:47 +0300 (Sat, 24 May 2008)
Comment:- Fixed various compilation issues on FreeBSD
- Fixed bug with incorrect MAC address information for interface (issue 201)
- All parameter handlers changed to use const char * instead of char * where possible
Changes
U trunk/ChangeLog
U trunk/include/nms_agent.h
U trunk/include/nms_util.h
U trunk/src/agent/core/actions.cpp
U trunk/src/agent/core/comm.cpp
U trunk/src/agent/core/config.cpp
U trunk/src/agent/core/exec.cpp
U trunk/src/agent/core/getparam.cpp
U trunk/src/agent/core/netinfo.cpp
U trunk/src/agent/core/nxagentd.h
U trunk/src/agent/core/subagent.cpp
U trunk/src/agent/core/sysinfo.cpp
U trunk/src/agent/core/win32.cpp
U trunk/src/agent/subagents/ecs/ecs.cpp
U trunk/src/agent/subagents/freebsd/disk.cpp
U trunk/src/agent/subagents/freebsd/disk.h
U trunk/src/agent/subagents/freebsd/net.cpp
U trunk/src/agent/subagents/freebsd/net.h
U trunk/src/agent/subagents/freebsd/system.cpp
U trunk/src/agent/subagents/freebsd/system.h
U trunk/src/agent/subagents/ping/ping.cpp
U trunk/src/agent/subagents/portCheck/custom.cpp
U trunk/src/agent/subagents/portCheck/http.cpp
U trunk/src/agent/subagents/portCheck/main.h
U trunk/src/agent/subagents/portCheck/pop3.cpp
U trunk/src/agent/subagents/portCheck/smtp.cpp
U trunk/src/agent/subagents/portCheck/ssh.cpp
U trunk/src/agent/subagents/portCheck/telnet.cpp
U trunk/src/agent/subagents/skeleton/skeleton.cpp
U trunk/src/agent/subagents/sms/main.cpp
U trunk/src/agent/subagents/sms/sender.cpp
U trunk/src/agent/subagents/ups/apc.cpp
U trunk/src/agent/subagents/ups/main.cpp
U trunk/src/agent/subagents/ups/microdowell.cpp
U trunk/src/agent/subagents/ups/ups.h
U trunk/src/libnetxms/serial.cpp
Diff
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/ChangeLog 2008-05-24 12:14:47 UTC (rev 3284)
@@ -1,4 +1,12 @@
*
+* 1.0.0
+*
+
+- Stable release
+- Fixed issues: #201
+
+
+*
* 0.2.21
*
Modified: trunk/include/nms_agent.h
===================================================================
--- trunk/include/nms_agent.h 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/include/nms_agent.h 2008-05-24 12:14:47 UTC (rev 3284)
@@ -1,6 +1,6 @@
/*
** NetXMS - Network Management System
-** Copyright (C) 2003, 2004, 2005, 2006 Victor Kirhenshtein
+** Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 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
@@ -284,7 +284,7 @@
typedef struct
{
TCHAR szName[MAX_PARAM_NAME];
- LONG (* fpHandler)(TCHAR *, TCHAR *, TCHAR *);
+ LONG (* fpHandler)(const TCHAR *, const TCHAR *, TCHAR *);
const TCHAR *pArg;
int iDataType;
TCHAR szDescription[MAX_DB_STRING];
@@ -298,7 +298,7 @@
typedef struct
{
TCHAR szName[MAX_PARAM_NAME];
- LONG (* fpHandler)(TCHAR *, TCHAR *, NETXMS_VALUES_LIST *);
+ LONG (* fpHandler)(const TCHAR *, const TCHAR *, NETXMS_VALUES_LIST *);
const TCHAR *pArg;
} NETXMS_SUBAGENT_ENUM;
Modified: trunk/include/nms_util.h
===================================================================
--- trunk/include/nms_util.h 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/include/nms_util.h 2008-05-24 12:14:47 UTC (rev 3284)
@@ -142,12 +142,12 @@
Serial(void);
~Serial(void);
- bool Open(TCHAR *pszPort);
+ bool Open(const TCHAR *pszPort);
void Close(void);
void SetTimeout(int nTimeout);
int Read(char *pBuff, int nSize); /* waits up to timeout and do single read */
int ReadAll(char *pBuff, int nSize); /* read until timeout or out of space */
- bool Write(char *pBuff, int nSize);
+ bool Write(const char *pBuff, int nSize);
void Flush(void);
bool Set(int nSpeed, int nDataBits, int nParity, int nStopBits);
bool Set(int nSpeed, int nDataBits, int nParity, int nStopBits, int nFlowControl);
Modified: trunk/src/agent/core/actions.cpp
===================================================================
--- trunk/src/agent/core/actions.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/core/actions.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -127,7 +127,7 @@
// Enumerate available actions
//
-LONG H_ActionList(char *cmd, char *arg, NETXMS_VALUES_LIST *value)
+LONG H_ActionList(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value)
{
DWORD i;
char szBuffer[1024];
Modified: trunk/src/agent/core/comm.cpp
===================================================================
--- trunk/src/agent/core/comm.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/core/comm.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -285,7 +285,7 @@
// Handler for Agent.ActiveConnections parameter
//
-LONG H_ActiveConnections(char *pszCmd, char *pArg, char *pValue)
+LONG H_ActiveConnections(const char *pszCmd, const char *pArg, char *pValue)
{
int nCounter;
DWORD i;
Modified: trunk/src/agent/core/config.cpp
===================================================================
--- trunk/src/agent/core/config.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/core/config.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -1,6 +1,6 @@
/*
** NetXMS multiplatform core agent
-** Copyright (C) 2003, 2004, 2005, 2006 Victor Kirhenshtein
+** Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 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
@@ -27,7 +27,7 @@
// Externals
//
-LONG H_PlatformName(char *cmd, char *arg, char *value);
+LONG H_PlatformName(const char *cmd, const char *arg, char *value);
//
Modified: trunk/src/agent/core/exec.cpp
===================================================================
--- trunk/src/agent/core/exec.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/core/exec.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -288,10 +288,11 @@
// Handler function for external (user-defined) parameters
//
-LONG H_ExternalParameter(char *pszCmd, char *pszArg, char *pValue)
+LONG H_ExternalParameter(const char *pszCmd, const char *pszArg, char *pValue)
{
- char *pszCmdLine, szBuffer[1024], szTempFile[MAX_PATH], *sptr;
- int i, iSize, iStatus;
+ char *pszCmdLine, szBuffer[1024], szTempFile[MAX_PATH];
+ const char *sptr;
+ int i, iSize, iStatus;
// Substitute $1 .. $9 with actual arguments
iSize = (int)strlen(pszArg);
Modified: trunk/src/agent/core/getparam.cpp
===================================================================
--- trunk/src/agent/core/getparam.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/core/getparam.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -27,31 +27,31 @@
// Externals
//
-LONG H_ActiveConnections(char *pszCmd, char *pArg, char *pValue);
-LONG H_AgentStats(char *cmd, char *arg, char *value);
-LONG H_AgentUptime(char *cmd, char *arg, char *value);
-LONG H_CRC32(char *cmd, char *arg, char *value);
-LONG H_DirInfo(char *cmd, char *arg, char *value);
-LONG H_FileTime(char *cmd, char *arg, char *value);
-LONG H_MD5Hash(char *cmd, char *arg, char *value);
-LONG H_SHA1Hash(char *cmd, char *arg, char *value);
-LONG H_SubAgentList(char *cmd, char *arg, NETXMS_VALUES_LIST *value);
-LONG H_ActionList(char *cmd, char *arg, NETXMS_VALUES_LIST *value);
-LONG H_ExternalParameter(char *pszCmd, char *pszArg, char *pValue);
-LONG H_PlatformName(char *cmd, char *arg, char *value);
+LONG H_ActiveConnections(const char *cmd, const char *arg, char *pValue);
+LONG H_AgentStats(const char *cmd, const char *arg, char *value);
+LONG H_AgentUptime(const char *cmd, const char *arg, char *value);
+LONG H_CRC32(const char *cmd, const char *arg, char *value);
+LONG H_DirInfo(const char *cmd, const char *arg, char *value);
+LONG H_FileTime(const char *cmd, const char *arg, char *value);
+LONG H_MD5Hash(const char *cmd, const char *arg, char *value);
+LONG H_SHA1Hash(const char *cmd, const char *arg, char *value);
+LONG H_SubAgentList(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value);
+LONG H_ActionList(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value);
+LONG H_ExternalParameter(const char *cmd, const char *arg, char *value);
+LONG H_PlatformName(const char *cmd, const char *arg, char *value);
#ifdef _WIN32
-LONG H_ArpCache(char *cmd, char *arg, NETXMS_VALUES_LIST *value);
-LONG H_InterfaceList(char *cmd, char *arg, NETXMS_VALUES_LIST *value);
+LONG H_ArpCache(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value);
+LONG H_InterfaceList(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value);
LONG H_IPRoutingTable(char *pszCmd, char *pArg, NETXMS_VALUES_LIST *pValue);
-LONG H_DiskInfo(char *cmd, char *arg, char *value);
-LONG H_MemoryInfo(char *cmd, char *arg, char *value);
-LONG H_HostName(char *cmd, char *arg, char *value);
-LONG H_SystemUname(char *cmd, char *arg, char *value);
-LONG H_NetIPStats(char *cmd, char *arg, char *value);
-LONG H_NetInterfaceStats(char *cmd, char *arg, char *value);
-LONG H_CPUCount(char *cmd, char *arg, char *value);
-LONG H_PhysicalDiskInfo(char *pszParam, char *pszArg, char *pValue);
+LONG H_DiskInfo(const char *cmd, const char *arg, char *value);
+LONG H_MemoryInfo(const char *cmd, const char *arg, char *value);
+LONG H_HostName(const char *cmd, const char *arg, char *value);
+LONG H_SystemUname(const char *cmd, const char *arg, char *value);
+LONG H_NetIPStats(const char *cmd, const char *arg, char *value);
+LONG H_NetInterfaceStats(const char *cmd, const char *arg, char *value);
+LONG H_CPUCount(const char *cmd, const char *arg, char *value);
+LONG H_PhysicalDiskInfo(const char *cmd, const char *arg, char *pValue);
#endif
@@ -74,7 +74,7 @@
// Handler for parameters which always returns string constant
//
-static LONG H_StringConstant(char *cmd, char *arg, char *value)
+static LONG H_StringConstant(const char *cmd, const char *arg, char *value)
{
ret_string(value, arg);
return SYSINFO_RC_SUCCESS;
@@ -85,7 +85,7 @@
// Handler for parameters which returns floating point value from specific variable
//
-static LONG H_FloatPtr(char *cmd, char *arg, char *value)
+static LONG H_FloatPtr(const char *cmd, const char *arg, char *value)
{
ret_double(value, *((double *)arg));
return SYSINFO_RC_SUCCESS;
@@ -96,7 +96,7 @@
// Handler for parameters which returns DWORD value from specific variable
//
-static LONG H_UIntPtr(char *cmd, char *arg, char *value)
+static LONG H_UIntPtr(const char *cmd, const char *arg, char *value)
{
ret_uint(value, *((DWORD *)arg));
return SYSINFO_RC_SUCCESS;
@@ -107,7 +107,7 @@
// Handler for Agent.SupportedCiphers
//
-static LONG H_SupportedCiphers(char *pszCmd, char *pArg, char *pValue)
+static LONG H_SupportedCiphers(const char *pszCmd, const char *pArg, char *pValue)
{
DWORD dwCiphers;
@@ -137,7 +137,7 @@
// Handler for parameters list
//
-static LONG H_ParamList(char *cmd, char *arg, NETXMS_VALUES_LIST *value)
+static LONG H_ParamList(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value)
{
int i;
@@ -151,7 +151,7 @@
// Handler for enums list
//
-static LONG H_EnumList(char *cmd, char *arg, NETXMS_VALUES_LIST *value)
+static LONG H_EnumList(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value)
{
int i;
@@ -272,7 +272,7 @@
// Add parameter to list
//
-void AddParameter(const char *pszName, LONG (* fpHandler)(char *,char *,char *), const char *pArg,
+void AddParameter(const char *pszName, LONG (* fpHandler)(const char *, const char *, char *), const char *pArg,
int iDataType, const char *pszDescription)
{
int i;
@@ -317,7 +317,7 @@
// Add enum to list
//
-void AddEnum(const char *pszName, LONG (* fpHandler)(char *,char *,NETXMS_VALUES_LIST *), const char *pArg)
+void AddEnum(const char *pszName, LONG (* fpHandler)(const char *, const char *, NETXMS_VALUES_LIST *), const char *pArg)
{
int i;
@@ -383,7 +383,7 @@
for(i = 0; i < m_iNumParams; i++)
if (MatchString(m_pParamList[i].szName, pszParam, FALSE))
{
- rc = m_pParamList[i].fpHandler(pszParam, (TCHAR *)m_pParamList[i].pArg, pszValue);
+ rc = m_pParamList[i].fpHandler(pszParam, m_pParamList[i].pArg, pszValue);
switch(rc)
{
case SYSINFO_RC_SUCCESS:
@@ -428,7 +428,7 @@
for(i = 0; i < m_iNumEnums; i++)
if (MatchString(m_pEnumList[i].szName, pszParam, FALSE))
{
- rc = m_pEnumList[i].fpHandler(pszParam, (char *)m_pEnumList[i].pArg, pValue);
+ rc = m_pEnumList[i].fpHandler(pszParam, m_pEnumList[i].pArg, pValue);
switch(rc)
{
case SYSINFO_RC_SUCCESS:
Modified: trunk/src/agent/core/netinfo.cpp
===================================================================
--- trunk/src/agent/core/netinfo.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/core/netinfo.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -30,7 +30,7 @@
// Get local ARP cache
//
-LONG H_ArpCache(char *cmd, char *arg, NETXMS_VALUES_LIST *value)
+LONG H_ArpCache(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value)
{
MIB_IPNETTABLE *arpCache;
DWORD i, j, dwError, dwSize;
@@ -70,7 +70,7 @@
// Send IP interface list to server (Win2K+ version)
//
-static LONG H_InterfaceListW2K(char *cmd, char *arg, NETXMS_VALUES_LIST *value)
+static LONG H_InterfaceListW2K(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value)
{
DWORD dwSize;
IP_ADAPTER_INFO *pBuffer, *pInfo;
@@ -138,7 +138,7 @@
// Send IP interface list to server (NT4 version)
//
-static LONG H_InterfaceListNT4(char *cmd, char *arg, NETXMS_VALUES_LIST *pValue)
+static LONG H_InterfaceListNT4(const char *cmd, const char *arg, NETXMS_VALUES_LIST *pValue)
{
LONG nRet = SYSINFO_RC_SUCCESS;
MIB_IPADDRTABLE *ifTable;
@@ -182,7 +182,7 @@
// (selects appropriate method for different Windows versions)
//
-LONG H_InterfaceList(char *cmd, char *arg, NETXMS_VALUES_LIST *pValue)
+LONG H_InterfaceList(const char *cmd, const char *arg, NETXMS_VALUES_LIST *pValue)
{
if (g_dwFlags & AF_RUNNING_ON_NT4)
return H_InterfaceListNT4(cmd, arg, pValue);
@@ -195,7 +195,7 @@
// Get IP statistics
//
-LONG H_NetIPStats(char *cmd, char *arg, char *value)
+LONG H_NetIPStats(const char *cmd, const char *arg, char *value)
{
MIB_IPSTATS ips;
LONG iResult = SYSINFO_RC_SUCCESS;
@@ -280,7 +280,7 @@
// Get interface statistics
//
-LONG H_NetInterfaceStats(char *cmd, char *arg, char *value)
+LONG H_NetInterfaceStats(const char *cmd, const char *arg, char *value)
{
LONG iResult = SYSINFO_RC_SUCCESS;
char *eptr, szBuffer[256];
@@ -364,7 +364,7 @@
// Get IP routing table
//
-LONG H_IPRoutingTable(char *pszCmd, char *pArg, NETXMS_VALUES_LIST *pValue)
+LONG H_IPRoutingTable(const char *pszCmd, const char *pArg, NETXMS_VALUES_LIST *pValue)
{
MIB_IPFORWARDTABLE *pRoutingTable;
DWORD i, dwError, dwSize;
Modified: trunk/src/agent/core/nxagentd.h
===================================================================
--- trunk/src/agent/core/nxagentd.h 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/core/nxagentd.h 2008-05-24 12:14:47 UTC (rev 3284)
@@ -317,9 +317,9 @@
BOOL DownloadConfig(TCHAR *pszServer);
BOOL InitParameterList(void);
-void AddParameter(const char *szName, LONG (* fpHandler)(char *,char *,char *), const char *pArg,
+void AddParameter(const char *szName, LONG (* fpHandler)(const char *, const char *, char *), const char *pArg,
int iDataType, const char *pszDescription);
-void AddEnum(const char *szName, LONG (* fpHandler)(char *,char *,NETXMS_VALUES_LIST *), const char *pArg);
+void AddEnum(const char *szName, LONG (* fpHandler)(const char *, const char *, NETXMS_VALUES_LIST *), const char *pArg);
BOOL AddExternalParameter(char *pszCfgLine, BOOL bShellExec);
DWORD GetParameterValue(DWORD dwSessionId, char *pszParam, char *pszValue);
DWORD GetEnumValue(DWORD dwSessionId, char *pszParam, NETXMS_VALUES_LIST *pValue);
Modified: trunk/src/agent/core/subagent.cpp
===================================================================
--- trunk/src/agent/core/subagent.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/core/subagent.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -232,7 +232,7 @@
// Enumerate loaded subagents
//
-LONG H_SubAgentList(char *cmd, char *arg, NETXMS_VALUES_LIST *value)
+LONG H_SubAgentList(const char *cmd, const char *arg, NETXMS_VALUES_LIST *value)
{
DWORD i;
char szBuffer[MAX_PATH + 32];
Modified: trunk/src/agent/core/sysinfo.cpp
===================================================================
--- trunk/src/agent/core/sysinfo.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/core/sysinfo.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -35,7 +35,7 @@
// Handler for Agent.Uptime parameter
//
-LONG H_AgentUptime(char *cmd, char *arg, char *value)
+LONG H_AgentUptime(const char *cmd, const char *arg, char *value)
{
ret_uint(value, (DWORD)(time(NULL) - g_tmAgentStartTime));
return SYSINFO_RC_SUCCESS;
@@ -133,7 +133,7 @@
// Handler for File.Size(*) and File.Count(*)
//
-LONG H_DirInfo(char *cmd, char *arg, char *value)
+LONG H_DirInfo(const char *cmd, const char *arg, char *value)
{
char szPath[MAX_PATH], szPattern[MAX_PATH], szRecursive[10];
bool bRecursive = false;
@@ -179,7 +179,7 @@
// Calculate MD5 hash for file
//
-LONG H_MD5Hash(char *cmd, char *arg, char *value)
+LONG H_MD5Hash(const char *cmd, const char *arg, char *value)
{
char szFileName[MAX_PATH], szHashText[MD5_DIGEST_SIZE * 2 + 1];
BYTE hash[MD5_DIGEST_SIZE];
@@ -204,7 +204,7 @@
// Calculate SHA1 hash for file
//
-LONG H_SHA1Hash(char *cmd, char *arg, char *value)
+LONG H_SHA1Hash(const char *cmd, const char *arg, char *value)
{
char szFileName[MAX_PATH], szHashText[SHA1_DIGEST_SIZE * 2 + 1];
BYTE hash[SHA1_DIGEST_SIZE];
@@ -229,7 +229,7 @@
// Calculate CRC32 for file
//
-LONG H_CRC32(char *cmd, char *arg, char *value)
+LONG H_CRC32(const char *cmd, const char *arg, char *value)
{
char szFileName[MAX_PATH];
DWORD dwCRC32;
@@ -249,7 +249,7 @@
// Handler for System.PlatformName
//
-LONG H_PlatformName(char *cmd, char *arg, char *value)
+LONG H_PlatformName(const char *cmd, const char *arg, char *value)
{
LONG nResult = SYSINFO_RC_SUCCESS;
@@ -334,7 +334,7 @@
// Handler for File.Time.* parameters
//
-LONG H_FileTime(char *cmd, char *arg, char *value)
+LONG H_FileTime(const char *cmd, const char *arg, char *value)
{
char szFilePath[MAX_PATH];
LONG nRet = SYSINFO_RC_SUCCESS;
Modified: trunk/src/agent/core/win32.cpp
===================================================================
--- trunk/src/agent/core/win32.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/core/win32.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -28,7 +28,7 @@
// Handler for System.Memory.XXX parameters
//
-LONG H_MemoryInfo(char *cmd, char *arg, char *value)
+LONG H_MemoryInfo(const char *cmd, const char *arg, char *value)
{
if (imp_GlobalMemoryStatusEx != NULL)
{
@@ -100,7 +100,7 @@
// Handler for System.Hostname parameter
//
-LONG H_HostName(char *pszCmd, char *pArg, char *pValue)
+LONG H_HostName(const char *pszCmd, const char *pArg, char *pValue)
{
DWORD dwSize;
char szBuffer[MAX_COMPUTERNAME_LENGTH + 1];
@@ -116,7 +116,7 @@
// Handler for disk space information parameters
//
-LONG H_DiskInfo(char *pszCmd, char *pArg, char *pValue)
+LONG H_DiskInfo(const char *pszCmd, const char *pArg, char *pValue)
{
char szPath[MAX_PATH];
ULARGE_INTEGER availBytes, freeBytes, totalBytes;
@@ -161,7 +161,7 @@
// Handler for System.Uname parameter
//
-LONG H_SystemUname(char *cmd, char *arg, char *value)
+LONG H_SystemUname(const char *cmd, const char *arg, char *value)
{
DWORD dwSize;
char *cpuType, computerName[MAX_COMPUTERNAME_LENGTH + 1], osVersion[256];
@@ -234,7 +234,7 @@
// Handler for System.CPU.Count parameter
//
-LONG H_CPUCount(char *pszCmd, char *pArg, char *pValue)
+LONG H_CPUCount(const char *pszCmd, const char *pArg, char *pValue)
{
SYSTEM_INFO sysInfo;
Modified: trunk/src/agent/subagents/ecs/ecs.cpp
===================================================================
--- trunk/src/agent/subagents/ecs/ecs.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/ecs/ecs.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -39,7 +39,7 @@
char *uri = strchr(host, '/');
if (uri == NULL)
{
- uri = "";
+ uri = (char *)"";
}
else
{
@@ -160,7 +160,7 @@
// Hanlder functions
//
-static LONG H_DoHttp(char *pszParam, char *pArg, char *pValue)
+static LONG H_DoHttp(const char *pszParam, const char *pArg, char *pValue)
{
LONG ret = SYSINFO_RC_ERROR;
char szArg[256];
Modified: trunk/src/agent/subagents/freebsd/disk.cpp
===================================================================
--- trunk/src/agent/subagents/freebsd/disk.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/freebsd/disk.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -28,7 +28,7 @@
#include "disk.h"
-LONG H_DiskInfo(char *pszParam, char *pArg, char *pValue)
+LONG H_DiskInfo(const char *pszParam, const char *pArg, char *pValue)
{
int nRet = SYSINFO_RC_ERROR;
char szArg[512] = {0};
Modified: trunk/src/agent/subagents/freebsd/disk.h
===================================================================
--- trunk/src/agent/subagents/freebsd/disk.h 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/freebsd/disk.h 2008-05-24 12:14:47 UTC (rev 3284)
@@ -34,7 +34,7 @@
DISK_TOTAL,
};
-LONG H_DiskInfo(char *, char *, char *);
+LONG H_DiskInfo(const char *, const char *, char *);
#endif // __DISK_H__
Modified: trunk/src/agent/subagents/freebsd/net.cpp
===================================================================
--- trunk/src/agent/subagents/freebsd/net.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/freebsd/net.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -56,7 +56,7 @@
int index;
} IFLIST;
-LONG H_NetIpForwarding(char *pszParam, char *pArg, char *pValue)
+LONG H_NetIpForwarding(const char *pszParam, const char *pArg, char *pValue)
{
int nVer = (int)pArg;
int nRet = SYSINFO_RC_ERROR;
@@ -87,7 +87,7 @@
return nRet;
}
-LONG H_NetIfAdmStatus(char *pszParam, char *pArg, char *pValue)
+LONG H_NetIfAdmStatus(const char *pszParam, const char *pArg, char *pValue)
{
int nRet = SYSINFO_RC_SUCCESS;
char szArg[512];
@@ -143,7 +143,7 @@
return nRet;
}
-LONG H_NetIfLink(char *pszParam, char *pArg, char *pValue)
+LONG H_NetIfLink(const char *pszParam, const char *pArg, char *pValue)
{
int nRet = SYSINFO_RC_SUCCESS;
char szArg[512];
@@ -197,7 +197,7 @@
return nRet;
}
-LONG H_NetArpCache(char *pszParam, char *pArg, NETXMS_VALUES_LIST *pValue)
+LONG H_NetArpCache(const char *pszParam, const char *pArg, NETXMS_VALUES_LIST *pValue)
{
int nRet = SYSINFO_RC_ERROR;
FILE *hFile;
@@ -266,7 +266,7 @@
return nRet;
}
-LONG H_NetRoutingTable(char *pszParam, char *pArg, NETXMS_VALUES_LIST *pValue)
+LONG H_NetRoutingTable(const char *pszParam, const char *pArg, NETXMS_VALUES_LIST *pValue)
{
#define sa2sin(x) ((struct sockaddr_in *)x)
#define ROUNDUP(a) \
@@ -382,7 +382,7 @@
return nRet;
}
-LONG H_NetIfList(char *pszParam, char *pArg, NETXMS_VALUES_LIST *pValue)
+LONG H_NetIfList(const char *pszParam, const char *pArg, NETXMS_VALUES_LIST *pValue)
{
int nRet = SYSINFO_RC_ERROR;
struct ifaddrs *pIfAddr, *pNext;
@@ -460,17 +460,17 @@
if (nRet == SYSINFO_RC_SUCCESS)
{
+ int j;
+ char szOut[1024], macAddr[32];
+
for (i = 0; i < nIfCount; i++)
{
- int j;
- char szOut[1024];
-
if (pList[i].addrCount == 0)
{
snprintf(szOut, sizeof(szOut), "%d 0.0.0.0/0 %d %s %s",
pList[i].index,
IFTYPE_OTHER,
- ether_ntoa(pList[i].mac),
+ BinToStr((BYTE *)pList[i].mac, 6, macAddr),
pList[i].name);
NxAddResultString(pValue, szOut);
}
@@ -485,7 +485,7 @@
inet_ntoa(pList[i].addr[j].ip),
pList[i].addr[j].mask,
IFTYPE_OTHER,
- ether_ntoa(pList[i].mac),
+ BinToStr((BYTE *)pList[i].mac, 6, macAddr),
pList[i].name,
j - 1);
}
@@ -496,7 +496,7 @@
inet_ntoa(pList[i].addr[j].ip),
pList[i].addr[j].mask,
IFTYPE_OTHER,
- ether_ntoa(pList[i].mac),
+ BinToStr((BYTE *)pList[i].mac, 6, macAddr),
pList[i].name);
}
NxAddResultString(pValue, szOut);
Modified: trunk/src/agent/subagents/freebsd/net.h
===================================================================
--- trunk/src/agent/subagents/freebsd/net.h 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/freebsd/net.h 2008-05-24 12:14:47 UTC (rev 3284)
@@ -23,12 +23,12 @@
#ifndef __NET_H__
#define __NET_H__
-LONG H_NetIpForwarding(char *, char *, char *);
-LONG H_NetIfAdmStatus(char *, char *, char *);
-LONG H_NetIfLink(char *, char *, char *);
-LONG H_NetArpCache(char *, char *, NETXMS_VALUES_LIST *);
-LONG H_NetIfList(char *, char *, NETXMS_VALUES_LIST *);
-LONG H_NetRoutingTable(char *, char *, NETXMS_VALUES_LIST *);
+LONG H_NetIpForwarding(const char *, const char *, char *);
+LONG H_NetIfAdmStatus(const char *, const char *, char *);
+LONG H_NetIfLink(const char *, const char *, char *);
+LONG H_NetArpCache(const char *, const char *, NETXMS_VALUES_LIST *);
+LONG H_NetIfList(const char *, const char *, NETXMS_VALUES_LIST *);
+LONG H_NetRoutingTable(const char *, const char *, NETXMS_VALUES_LIST *);
#endif // __NET_H__
Modified: trunk/src/agent/subagents/freebsd/system.cpp
===================================================================
--- trunk/src/agent/subagents/freebsd/system.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/freebsd/system.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -22,7 +22,7 @@
#undef _XOPEN_SOURCE
-#if __FreeBSD__ < 5
+#if __FreeBSD__ < 8
#define _SYS_LOCK_PROFILE_H_ /* prevent include of sys/lock_profile.h which can be C++ incompatible) */
#endif
@@ -47,7 +47,7 @@
#include "system.h"
-LONG H_Uptime(char *pszParam, char *pArg, char *pValue)
+LONG H_Uptime(const char *pszParam, const char *pArg, char *pValue)
{
int mib[2] = { CTL_KERN, KERN_BOOTTIME };
time_t nNow;
@@ -75,7 +75,7 @@
return nUptime > 0 ? SYSINFO_RC_SUCCESS : SYSINFO_RC_ERROR;
}
-LONG H_Uname(char *pszParam, char *pArg, char *pValue)
+LONG H_Uname(const char *pszParam, const char *pArg, char *pValue)
{
struct utsname utsName;
int nRet = SYSINFO_RC_ERROR;
@@ -97,7 +97,7 @@
return nRet;
}
-LONG H_Hostname(char *pszParam, char *pArg, char *pValue)
+LONG H_Hostname(const char *pszParam, const char *pArg, char *pValue)
{
int nRet = SYSINFO_RC_ERROR;
char szBuff[128];
@@ -111,7 +111,7 @@
return nRet;
}
-LONG H_CpuLoad(char *pszParam, char *pArg, char *pValue)
+LONG H_CpuLoad(const char *pszParam, const char *pArg, char *pValue)
{
int nRet = SYSINFO_RC_ERROR;
char szArg[128] = {0};
@@ -141,12 +141,12 @@
return nRet;
}
-LONG H_CpuUsage(char *pszParam, char *pArg, char *pValue)
+LONG H_CpuUsage(const char *pszParam, const char *pArg, char *pValue)
{
return SYSINFO_RC_UNSUPPORTED;
}
-LONG H_CpuCount(char *pszParam, char *pArg, char *pValue)
+LONG H_CpuCount(const char *pszParam, const char *pArg, char *pValue)
{
int nRet = SYSINFO_RC_ERROR;
int mib[2];
@@ -168,7 +168,7 @@
return nRet;
}
-LONG H_ProcessCount(char *pszParam, char *pArg, char *pValue)
+LONG H_ProcessCount(const char *pszParam, const char *pArg, char *pValue)
{
int nRet = SYSINFO_RC_ERROR;
// struct statvfs s;
@@ -221,7 +221,7 @@
return nRet;
}
-LONG H_MemoryInfo(char *pszParam, char *pArg, char *pValue)
+LONG H_MemoryInfo(const char *pszParam, const char *pArg, char *pValue)
{
int nRet = SYSINFO_RC_ERROR;
FILE *hFile;
@@ -335,7 +335,7 @@
return nRet;
}
-LONG H_ProcessList(char *pszParam, char *pArg, NETXMS_VALUES_LIST *pValue)
+LONG H_ProcessList(const char *pszParam, const char *pArg, NETXMS_VALUES_LIST *pValue)
{
int nRet = SYSINFO_RC_ERROR;
int nCount = -1;
@@ -381,7 +381,7 @@
//
// stub
//
-LONG H_SourcePkgSupport(char *pszParam, char *pArg, char *pValue)
+LONG H_SourcePkgSupport(const char *pszParam, const char *pArg, char *pValue)
{
ret_int(pValue, 1);
return SYSINFO_RC_SUCCESS;
Modified: trunk/src/agent/subagents/freebsd/system.h
===================================================================
--- trunk/src/agent/subagents/freebsd/system.h 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/freebsd/system.h 2008-05-24 12:14:47 UTC (rev 3284)
@@ -36,17 +36,17 @@
VIRTUAL_TOTAL,
};
-LONG H_ProcessList(char *, char *, NETXMS_VALUES_LIST *);
-LONG H_Uptime(char *, char *, char *);
-LONG H_Uname(char *, char *, char *);
-LONG H_Hostname(char *, char *, char *);
-LONG H_Hostname(char *, char *, char *);
-LONG H_CpuCount(char *, char *, char *);
-LONG H_CpuLoad(char *, char *, char *);
-LONG H_CpuUsage(char *, char *, char *);
-LONG H_ProcessCount(char *, char *, char *);
-LONG H_MemoryInfo(char *, char *, char *);
-LONG H_SourcePkgSupport(char *, char *, char *);
+LONG H_ProcessList(const char *, const char *, NETXMS_VALUES_LIST *);
+LONG H_Uptime(const char *, const char *, char *);
+LONG H_Uname(const char *, const char *, char *);
+LONG H_Hostname(const char *, const char *, char *);
+LONG H_Hostname(const char *, const char *, char *);
+LONG H_CpuCount(const char *, const char *, char *);
+LONG H_CpuLoad(const char *, const char *, char *);
+LONG H_CpuUsage(const char *, const char *, char *);
+LONG H_ProcessCount(const char *, const char *, char *);
+LONG H_MemoryInfo(const char *, const char *, char *);
+LONG H_SourcePkgSupport(const char *, const char *, char *);
#endif // __SYSTEM_H__
Modified: trunk/src/agent/subagents/ping/ping.cpp
===================================================================
--- trunk/src/agent/subagents/ping/ping.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/ping/ping.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -94,7 +94,7 @@
// Hanlder for immediate ping request
//
-static LONG H_IcmpPing(TCHAR *pszParam, TCHAR *pArg, TCHAR *pValue)
+static LONG H_IcmpPing(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
{
TCHAR szHostName[256], szTimeOut[32], szPacketSize[32];
DWORD dwAddr, dwTimeOut = m_dwTimeout, dwRTT, dwPacketSize = m_dwDefPacketSize;
@@ -134,7 +134,7 @@
// Handler for poller information
//
-static LONG H_PollResult(TCHAR *pszParam, TCHAR *pArg, TCHAR *pValue)
+static LONG H_PollResult(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
{
TCHAR szTarget[MAX_DB_STRING];
DWORD i, dwIpAddr;
@@ -188,7 +188,7 @@
// Handler for configured target list
//
-static LONG H_TargetList(TCHAR *pszParam, TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
+static LONG H_TargetList(const TCHAR *pszParam, const TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
{
DWORD i;
TCHAR szBuffer[MAX_DB_STRING + 64], szIpAddr[16];
Modified: trunk/src/agent/subagents/portCheck/custom.cpp
===================================================================
--- trunk/src/agent/subagents/portCheck/custom.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/portCheck/custom.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -6,7 +6,7 @@
#include "main.h"
#include "net.h"
-LONG H_CheckCustom(char *pszParam, char *pArg, char *pValue)
+LONG H_CheckCustom(const char *pszParam, const char *pArg, char *pValue)
{
LONG nRet = SYSINFO_RC_SUCCESS;
Modified: trunk/src/agent/subagents/portCheck/http.cpp
===================================================================
--- trunk/src/agent/subagents/portCheck/http.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/portCheck/http.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -11,7 +11,7 @@
#include "main.h"
#include "net.h"
-LONG H_CheckHTTP(char *pszParam, char *pArg, char *pValue)
+LONG H_CheckHTTP(const char *pszParam, const char *pArg, char *pValue)
{
LONG nRet = SYSINFO_RC_SUCCESS;
Modified: trunk/src/agent/subagents/portCheck/main.h
===================================================================
--- trunk/src/agent/subagents/portCheck/main.h 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/portCheck/main.h 2008-05-24 12:14:47 UTC (rev 3284)
@@ -9,17 +9,17 @@
PC_ERR_HANDSHAKE
};
-LONG H_CheckPOP3(char *, char *, char *);
+LONG H_CheckPOP3(const char *, const char *, char *);
int CheckPOP3(char *, DWORD, short, char *, char *);
-LONG H_CheckSSH(char *, char *, char *);
+LONG H_CheckSSH(const char *, const char *, char *);
int CheckSSH(char *, DWORD, short, char *, char *);
-LONG H_CheckSMTP(char *, char *, char *);
+LONG H_CheckSMTP(const char *, const char *, char *);
int CheckSMTP(char *, DWORD, short, char *);
-LONG H_CheckHTTP(char *, char *, char *);
+LONG H_CheckHTTP(const char *, const char *, char *);
int CheckHTTP(char *, DWORD, short, char *, char *, char *);
-LONG H_CheckCustom(char *, char *, char *);
+LONG H_CheckCustom(const char *, const char *, char *);
int CheckCustom(char *, DWORD, short, char *, char *);
-LONG H_CheckTelnet(char *, char *, char *);
+LONG H_CheckTelnet(const char *, const char *, char *);
int CheckTelnet(char *, DWORD, short, char *, char *);
#endif // __MAIN__H__
Modified: trunk/src/agent/subagents/portCheck/pop3.cpp
===================================================================
--- trunk/src/agent/subagents/portCheck/pop3.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/portCheck/pop3.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -6,7 +6,7 @@
#include "main.h"
#include "net.h"
-LONG H_CheckPOP3(char *pszParam, char *pArg, char *pValue)
+LONG H_CheckPOP3(const char *pszParam, const char *pArg, char *pValue)
{
LONG nRet = SYSINFO_RC_SUCCESS;
char szHost[256];
Modified: trunk/src/agent/subagents/portCheck/smtp.cpp
===================================================================
--- trunk/src/agent/subagents/portCheck/smtp.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/portCheck/smtp.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -4,7 +4,7 @@
#include "main.h"
#include "net.h"
-LONG H_CheckSMTP(char *pszParam, char *pArg, char *pValue)
+LONG H_CheckSMTP(const char *pszParam, const char *pArg, char *pValue)
{
LONG nRet = SYSINFO_RC_SUCCESS;
char szHost[256];
Modified: trunk/src/agent/subagents/portCheck/ssh.cpp
===================================================================
--- trunk/src/agent/subagents/portCheck/ssh.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/portCheck/ssh.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -6,7 +6,7 @@
#include "main.h"
#include "net.h"
-LONG H_CheckSSH(char *pszParam, char *pArg, char *pValue)
+LONG H_CheckSSH(const char *pszParam, const char *pArg, char *pValue)
{
LONG nRet = SYSINFO_RC_SUCCESS;
Modified: trunk/src/agent/subagents/portCheck/telnet.cpp
===================================================================
--- trunk/src/agent/subagents/portCheck/telnet.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/portCheck/telnet.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -6,7 +6,7 @@
#include "main.h"
#include "net.h"
-LONG H_CheckTelnet(char *pszParam, char *pArg, char *pValue)
+LONG H_CheckTelnet(const char *pszParam, const char *pArg, char *pValue)
{
LONG nRet = SYSINFO_RC_SUCCESS;
Modified: trunk/src/agent/subagents/skeleton/skeleton.cpp
===================================================================
--- trunk/src/agent/subagents/skeleton/skeleton.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/skeleton/skeleton.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -35,13 +35,13 @@
// Hanlder functions
//
-static LONG H_Version(char *pszParam, char *pArg, char *pValue)
+static LONG H_Version(const char *pszParam, const char *pArg, char *pValue)
{
ret_uint(pValue, 0x01000000);
return SYSINFO_RC_SUCCESS;
}
-static LONG H_Echo(char *pszParam, char *pArg, char *pValue)
+static LONG H_Echo(const char *pszParam, const char *pArg, char *pValue)
{
char szArg[256];
@@ -50,7 +50,7 @@
return SYSINFO_RC_SUCCESS;
}
-static LONG H_Enum(char *pszParam, char *pArg, NETXMS_VALUES_LIST *pValue)
+static LONG H_Enum(const char *pszParam, const char *pArg, NETXMS_VALUES_LIST *pValue)
{
int i;
char szValue[256];
Modified: trunk/src/agent/subagents/sms/main.cpp
===================================================================
--- trunk/src/agent/subagents/sms/main.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/sms/main.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -46,7 +46,7 @@
// Handler for SMS.SerialConfig and SMS.DeviceModel
//
-static LONG H_StringConst(TCHAR *pszParam, TCHAR *pArg, TCHAR *pValue)
+static LONG H_StringConst(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
{
ret_string(pValue, pArg);
return SYSINFO_RC_SUCCESS;
Modified: trunk/src/agent/subagents/sms/sender.cpp
===================================================================
--- trunk/src/agent/subagents/sms/sender.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/sms/sender.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -57,6 +57,7 @@
NxWriteAgentLog(EVENTLOG_DEBUG_TYPE, "SMS Sender: initializing GSM modem at %s", pszInitArgs);
char *p;
+ const char *parityAsText;
int portSpeed = 9600;
int dataBits = 8;
int parity = NOPARITY;
@@ -114,17 +115,17 @@
switch (parity)
{
case ODDPARITY:
- p = "ODD";
+ parityAsText = "ODD";
break;
case EVENPARITY:
- p = "EVEN";
+ parityAsText = "EVEN";
break;
default:
- p = "NONE";
+ parityAsText = "NONE";
break;
}
NxWriteAgentLog(EVENTLOG_DEBUG_TYPE, "SMS init: port={%s}, speed=%d, data=%d, parity=%s, stop=%d",
- portName, portSpeed, dataBits, p, stopBits == TWOSTOPBITS ? 2 : 1);
+ portName, portSpeed, dataBits, parityAsText, stopBits == TWOSTOPBITS ? 2 : 1);
bRet = m_serial.Open(pszInitArgs);
if (bRet)
Modified: trunk/src/agent/subagents/ups/apc.cpp
===================================================================
--- trunk/src/agent/subagents/ups/apc.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/ups/apc.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -85,7 +85,7 @@
// Query parameter from device
//
-void APCInterface::QueryParameter(char *pszRq, UPS_PARAMETER *p, int nType, int chSep)
+void APCInterface::QueryParameter(const char *pszRq, UPS_PARAMETER *p, int nType, int chSep)
{
char *pch;
Modified: trunk/src/agent/subagents/ups/main.cpp
===================================================================
--- trunk/src/agent/subagents/ups/main.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/ups/main.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -34,7 +34,7 @@
// Universal handler
//
-static LONG H_UPSData(TCHAR *pszParam, TCHAR *pArg, TCHAR *pValue)
+static LONG H_UPSData(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
{
LONG nDev;
TCHAR *pErr, szArg[256];
@@ -60,7 +60,7 @@
// UPS connection status
//
-static LONG H_UPSConnStatus(TCHAR *pszParam, TCHAR *pArg, TCHAR *pValue)
+static LONG H_UPSConnStatus(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
{
LONG nDev;
TCHAR *pErr, szArg[256];
@@ -84,7 +84,7 @@
// List configured devices
//
-static LONG H_DeviceList(TCHAR *pszParam, TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
+static LONG H_DeviceList(const TCHAR *pszParam, const TCHAR *pArg, NETXMS_VALUES_LIST *pValue)
{
TCHAR szBuffer[256];
int i;
Modified: trunk/src/agent/subagents/ups/microdowell.cpp
===================================================================
--- trunk/src/agent/subagents/ups/microdowell.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/ups/microdowell.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -28,7 +28,7 @@
//
// Prepare and send data packet
//
-BOOL MicrodowellInterface::SendCmd(char *cmd, int cmdLen, char *ret, int *retLen)
+BOOL MicrodowellInterface::SendCmd(const char *cmd, int cmdLen, char *ret, int *retLen)
{
char buff[512];
int i, crc;
Modified: trunk/src/agent/subagents/ups/ups.h
===================================================================
--- trunk/src/agent/subagents/ups/ups.h 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/agent/subagents/ups/ups.h 2008-05-24 12:14:47 UTC (rev 3284)
@@ -133,7 +133,7 @@
const TCHAR *Device(void) { return m_pszDevice; }
const TCHAR *Name(void) { return CHECK_NULL(m_pszName); }
- virtual TCHAR *Type(void) { return _T("GENERIC"); }
+ virtual const TCHAR *Type(void) { return _T("GENERIC"); }
BOOL IsConnected(void) { return m_bIsConnected; }
void SetName(TCHAR *pszName);
@@ -189,12 +189,12 @@
virtual BOOL Open(void);
virtual BOOL ValidateConnection(void);
- void QueryParameter(char *pszRq, UPS_PARAMETER *p, int nType, int chSep);
+ void QueryParameter(const char *pszRq, UPS_PARAMETER *p, int nType, int chSep);
public:
APCInterface(TCHAR *pszDevice) : SerialInterface(pszDevice) { }
- virtual TCHAR *Type(void) { return _T("APC"); }
+ virtual const TCHAR *Type(void) { return _T("APC"); }
virtual void QueryModel(void);
virtual void QueryFirmwareVersion(void);
@@ -239,7 +239,7 @@
public:
BCMXCPInterface(TCHAR *pszDevice) : SerialInterface(pszDevice) { }
- virtual TCHAR *Type(void) { return _T("BCMXCP"); }
+ virtual const TCHAR *Type(void) { return _T("BCMXCP"); }
virtual void QueryTemperature(void);
virtual void QueryLineFrequency(void);
@@ -262,18 +262,17 @@
class MicrodowellInterface : public SerialInterface
{
protected:
- virtual BOOL Open(void);
- virtual BOOL ValidateConnection(void);
+ virtual BOOL Open(void);
+ virtual BOOL ValidateConnection(void);
- void QueryParameter(char *req, int reqLen, UPS_PARAMETER *p, int nType);
- BOOL SendCmd(char *cmd, int cmdLen, char *ret, int *retLen);
+ BOOL SendCmd(const char *cmd, int cmdLen, char *ret, int *retLen);
int ge2kva;
public:
MicrodowellInterface(TCHAR *pszDevice) : SerialInterface(pszDevice) { }
- virtual TCHAR *Type(void) { return _T("MICRODOWELL"); }
+ virtual const TCHAR *Type(void) { return _T("MICRODOWELL"); }
virtual void QueryModel(void);
virtual void QueryFirmwareVersion(void);
@@ -320,7 +319,7 @@
USBInterface(TCHAR *pszDevice);
virtual ~USBInterface();
- virtual TCHAR *Type(void) { return _T("USB"); }
+ virtual const TCHAR *Type(void) { return _T("USB"); }
virtual void QueryModel(void);
virtual void QuerySerialNumber(void);
Modified: trunk/src/libnetxms/serial.cpp
===================================================================
--- trunk/src/libnetxms/serial.cpp 2008-05-23 14:17:19 UTC (rev 3283)
+++ trunk/src/libnetxms/serial.cpp 2008-05-24 12:14:47 UTC (rev 3284)
@@ -77,7 +77,7 @@
// Open serial device
//
-bool Serial::Open(TCHAR *pszPort)
+bool Serial::Open(const TCHAR *pszPort)
{
bool bRet = false;
@@ -91,82 +91,82 @@
if (m_hPort != INVALID_HANDLE_VALUE)
{
#else // UNIX
- m_hPort = _topen(pszPort, O_RDWR | O_NOCTTY | O_NDELAY);
- if (m_hPort != -1)
- {
- tcgetattr(m_hPort, &m_originalSettings);
+ m_hPort = _topen(pszPort, O_RDWR | O_NOCTTY | O_NDELAY);
+ if (m_hPort != -1)
+ {
+ tcgetattr(m_hPort, &m_originalSettings);
#endif
- Set(38400, 8, NOPARITY, ONESTOPBIT, FLOW_NONE);
- bRet = true;
- }
- return bRet;
+ Set(38400, 8, NOPARITY, ONESTOPBIT, FLOW_NONE);
+ bRet = true;
}
+ return bRet;
+}
- //
- // Set communication parameters
- //
- bool Serial::Set(int nSpeed, int nDataBits, int nParity, int nStopBits)
- {
- return Set(nSpeed, nDataBits, nParity, nStopBits, FLOW_NONE);
- }
+//
+// Set communication parameters
+//
+bool Serial::Set(int nSpeed, int nDataBits, int nParity, int nStopBits)
+{
+ return Set(nSpeed, nDataBits, nParity, nStopBits, FLOW_NONE);
+}
- bool Serial::Set(int nSpeed, int nDataBits, int nParity, int nStopBits, int nFlowControl)
- {
- bool bRet = false;
+bool Serial::Set(int nSpeed, int nDataBits, int nParity, int nStopBits, int nFlowControl)
+{
+ bool bRet = false;
- m_nDataBits = nDataBits;
- m_nSpeed = nSpeed;
- m_nParity = nParity;
- m_nStopBits = nStopBits;
- m_nFlowControl = nFlowControl;
-
+ m_nDataBits = nDataBits;
+ m_nSpeed = nSpeed;
+ m_nParity = nParity;
+ m_nStopBits = nStopBits;
+ m_nFlowControl = nFlowControl;
+
#ifdef _WIN32
- DCB dcb;
+ DCB dcb;
- dcb.DCBlength = sizeof(DCB);
- if (GetCommState(m_hPort, &dcb))
- {
- dcb.BaudRate = nSpeed;
- dcb.ByteSize = nDataBits;
- dcb.Parity = nParity;
- dcb.StopBits = nStopBits;
- dcb.fDtrControl = DTR_CONTROL_ENABLE;
- dcb.fBinary = TRUE;
- dcb.fParity = FALSE;
- dcb.fOutxCtsFlow = FALSE;
- dcb.fOutxDsrFlow = FALSE;
- dcb.fDsrSensitivity = FALSE;
- dcb.fOutX = FALSE;
- dcb.fInX = FALSE;
- dcb.fRtsControl = RTS_CONTROL_ENABLE;
- dcb.fAbortOnError = FALSE;
+ dcb.DCBlength = sizeof(DCB);
+ if (GetCommState(m_hPort, &dcb))
+ {
+ dcb.BaudRate = nSpeed;
+ dcb.ByteSize = nDataBits;
+ dcb.Parity = nParity;
+ dcb.StopBits = nStopBits;
+ dcb.fDtrControl = DTR_CONTROL_ENABLE;
+ dcb.fBinary = TRUE;
+ dcb.fParity = FALSE;
+ dcb.fOutxCtsFlow = FALSE;
+ dcb.fOutxDsrFlow = FALSE;
+ dcb.fDsrSensitivity = FALSE;
+ dcb.fOutX = FALSE;
+ dcb.fInX = FALSE;
+ dcb.fRtsControl = RTS_CONTROL_ENABLE;
+ dcb.fAbortOnError = FALSE;
- if (SetCommState(m_hPort, &dcb))
- {
- COMMTIMEOUTS ct;
+ if (SetCommState(m_hPort, &dcb))
+ {
+ COMMTIMEOUTS ct;
- memset(&ct, 0, sizeof(COMMTIMEOUTS));
- ct.ReadTotalTimeoutConstant = m_nTimeout;
- ct.WriteTotalTimeoutConstant = m_nTimeout;
- SetCommTimeouts(m_hPort, &ct);
- bRet = true;
- }
+ memset(&ct, 0, sizeof(COMMTIMEOUTS));
+ ct.ReadTotalTimeoutConstant = m_nTimeout;
+ ct.WriteTotalTimeoutConstant = m_nTimeout;
+ SetCommTimeouts(m_hPort, &ct);
+ bRet = true;
}
+ }
-#else // UNIX
- struct termios newTio;
+#else /* UNIX */
+ struct termios newTio;
- tcgetattr(m_hPort, &newTio);
+ tcgetattr(m_hPort, &newTio);
- newTio.c_cc[VMIN] = 1;
- newTio.c_cc[VTIME] = m_nTimeout;
+ newTio.c_cc[VMIN] = 1;
+ newTio.c_cc[VTIME] = m_nTimeout;
- newTio.c_cflag |= CLOCAL | CREAD;
+ newTio.c_cflag |= CLOCAL | CREAD;
- int baud;
- switch(nSpeed)
- {
+ int baud;
+ switch(nSpeed)
+ {
case 50: baud = B50; break;
case 75: baud = B75; break;
case 110: baud = B110; break;
@@ -183,18 +183,18 @@
case 19200: baud = B19200; break;
case 38400: baud = B38400; break;
default: baud = B38400; break;
- }
+ }
#ifdef _NETWARE
- cfsetispeed(&newTio, (speed_t)baud);
- cfsetospeed(&newTio, (speed_t)baud);
+ cfsetispeed(&newTio, (speed_t)baud);
+ cfsetospeed(&newTio, (speed_t)baud);
#else
- cfsetispeed(&newTio, baud);
- cfsetospeed(&newTio, baud);
+ cfsetispeed(&newTio, baud);
+ cfsetospeed(&newTio, baud);
#endif
- newTio.c_cflag &= ~(CSIZE);
- switch(nDataBits)
- {
+ newTio.c_cflag &= ~(CSIZE);
+ switch(nDataBits)
+ {
case 5:
newTio.c_cflag |= CS5;
break;
@@ -208,11 +208,11 @@
default:
newTio.c_cflag |= CS8;
break;
- }
+ }
- newTio.c_cflag &= ~(PARODD | PARENB);
- switch(nParity)
- {
+ newTio.c_cflag &= ~(PARODD | PARENB);
+ switch(nParity)
+ {
case ODDPARITY:
newTio.c_cflag |= PARODD | PARENB;
break;
@@ -221,22 +221,22 @@
break;
default:
break;
- }
+ }
- newTio.c_cflag &= ~(CSTOPB);
- if (nStopBits != ONESTOPBIT)
- {
- newTio.c_cflag |= CSTOPB;
- }
+ newTio.c_cflag &= ~(CSTOPB);
+ if (nStopBits != ONESTOPBIT)
+ {
+ newTio.c_cflag |= CSTOPB;
+ }
- //newTio.c_cflag &= ~(CRTSCTS | IXON | IXOFF);
- newTio.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHOK | ECHOKE | ECHOCTL | ISIG | IEXTEN);
- newTio.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL);
- newTio.c_iflag |= IGNBRK;
- newTio.c_oflag &= ~(OPOST | ONLCR);
+ //newTio.c_cflag &= ~(CRTSCTS | IXON | IXOFF);
+ newTio.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHOK | ECHOKE | ECHOCTL | ISIG | IEXTEN);
+ newTio.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL);
+ newTio.c_iflag |= IGNBRK;
+ newTio.c_oflag &= ~(OPOST | ONLCR);
- switch(nFlowControl)
- {
+ switch(nFlowControl)
+ {
case FLOW_HARDWARE:
newTio.c_cflag |= CRTSCTS;
break;
@@ -245,13 +245,12 @@
break;
default:
break;
- }
+ }
- tcsetattr(m_hPort, TCSANOW, &newTio);
+ tcsetattr(m_hPort, TCSANOW, &newTio);
#endif // _WIN32
-
- return bRet;
+ return bRet;
}
@@ -440,7 +439,7 @@
// Write character(s) to port
//
-bool Serial::Write(char *pBuff, int nSize)
+bool Serial::Write(const char *pBuff, int nSize)
{
bool bRet = false;
@@ -467,7 +466,7 @@
#else // UNIX
usleep(100);
- if (write(m_hPort, pBuff, nSize) == nSize)
+ if (write(m_hPort, (char *)pBuff, nSize) == nSize)
{
bRet = true;
}
Received on Sat May 24 2008 - 15:14:48 EEST
This archive was generated by hypermail 2.2.0 : Sat May 24 2008 - 15:13:14 EEST