* { 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:3290
Author:victor
Date:2008-05-31 13:08:26 +0300 (Sat, 31 May 2008)
Comment:- nxcptest fully functional
- minor fixes
Changes
U trunk/ChangeLog
U trunk/include/nms_util.h
U trunk/src/agent/core/nxagentd.h
U trunk/src/agent/core/win32.cpp
U trunk/src/libnetxms/Makefile.am
U trunk/src/libnetxms/libnetxms.dsp
U trunk/src/libnetxms/message.cpp
U trunk/src/libnetxms/strtoll.c
U trunk/src/libnetxms/strtoull.c
A trunk/src/libnetxms/wcstoll.c
A trunk/src/libnetxms/wcstoull.c
U trunk/src/libnetxms/xml.cpp
U trunk/src/nxcptest/nxcptest.cpp
Diff
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-05-30 21:15:47 UTC (rev 3289)
+++ trunk/ChangeLog 2008-05-31 10:08:26 UTC (rev 3290)
@@ -1,8 +1,8 @@
*
-* 1.0.0
+* 0.2.22
*
-- Stable release
+- Implemented XML encoding for NXCP messages
- Fixed issues: #201
Modified: trunk/include/nms_util.h
===================================================================
--- trunk/include/nms_util.h 2008-05-30 21:15:47 UTC (rev 3289)
+++ trunk/include/nms_util.h 2008-05-31 10:08:26 UTC (rev 3290)
@@ -550,12 +550,6 @@
#ifdef UNICODE
-#if !HAVE_WCSTOLL
- INT64 LIBNETXMS_EXPORTABLE wcstoll(const WCHAR *nptr, WCHAR **endptr, int base);
-#endif
-#if !HAVE_WCSTOULL
- QWORD LIBNETXMS_EXPORTABLE wcstoull(const WCHAR *nptr, WCHAR **endptr, int base);
-#endif
#if !HAVE_WFOPEN
FILE LIBNETXMS_EXPORTABLE *wfopen(const WCHAR *_name, const WCHAR *_type);
#endif
@@ -568,15 +562,23 @@
#if !HAVE_WGETENV
WCHAR *wgetenv(const WCHAR *_string);
#endif
-#else /* UNICODE */
+
+#endif /* UNICODE */
+
#if !HAVE_STRTOLL
INT64 LIBNETXMS_EXPORTABLE strtoll(const char *nptr, char **endptr, int base);
#endif
#if !HAVE_STRTOULL
QWORD LIBNETXMS_EXPORTABLE strtoull(const char *nptr, char **endptr, int base);
#endif
-#endif /* UNICODE */
+#if !HAVE_WCSTOLL
+ INT64 LIBNETXMS_EXPORTABLE wcstoll(const WCHAR *nptr, WCHAR **endptr, int base);
+#endif
+#if !HAVE_WCSTOULL
+ QWORD LIBNETXMS_EXPORTABLE wcstoull(const WCHAR *nptr, WCHAR **endptr, int base);
+#endif
+
#ifdef _WIN32
#ifndef SWIGPERL
DIR LIBNETXMS_EXPORTABLE *opendir(const char *filename);
Modified: trunk/src/agent/core/nxagentd.h
===================================================================
--- trunk/src/agent/core/nxagentd.h 2008-05-30 21:15:47 UTC (rev 3289)
+++ trunk/src/agent/core/nxagentd.h 2008-05-31 10:08:26 UTC (rev 3290)
@@ -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
@@ -16,7 +16,7 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
**
-** $module: nxagentd.h
+** File: nxagentd.h
**
**/
Modified: trunk/src/agent/core/win32.cpp
===================================================================
--- trunk/src/agent/core/win32.cpp 2008-05-30 21:15:47 UTC (rev 3289)
+++ trunk/src/agent/core/win32.cpp 2008-05-31 10:08:26 UTC (rev 3290)
@@ -224,7 +224,7 @@
break;
}
- sprintf(value, "Windows %s %d.%d.%d %s %s\r\n", computerName, versionInfo.dwMajorVersion,
+ sprintf(value, "Windows %s %d.%d.%d %s %s", computerName, versionInfo.dwMajorVersion,
versionInfo.dwMinorVersion, versionInfo.dwBuildNumber, osVersion, cpuType);
return SYSINFO_RC_SUCCESS;
}
Modified: trunk/src/libnetxms/Makefile.am
===================================================================
--- trunk/src/libnetxms/Makefile.am 2008-05-30 21:15:47 UTC (rev 3289)
+++ trunk/src/libnetxms/Makefile.am 2008-05-31 10:08:26 UTC (rev 3290)
@@ -1,5 +1,9 @@
INCLUDES=-I_at_top_srcdir@/include
-SOURCES = base64.cpp config.cpp crypto.cpp gen_uuid.c dload.cpp hash.cpp icmp.cpp inline.cpp main.cpp md5.cpp message.cpp msgwq.cpp nxcp.cpp qsort.c queue.cpp rwlock.cpp scandir.c serial.cpp sha1.cpp string.cpp strmap.cpp strtoll.c strtoull.c table.cpp threads.cpp tools.cpp unicode.cpp uuid.c xml.cpp
+SOURCES = base64.cpp config.cpp crypto.cpp gen_uuid.c dload.cpp hash.cpp \
+ icmp.cpp inline.cpp main.cpp md5.cpp message.cpp msgwq.cpp \
+ nxcp.cpp qsort.c queue.cpp rwlock.cpp scandir.c serial.cpp \
+ sha1.cpp string.cpp strmap.cpp strtoll.c strtoull.c table.cpp \
+ threads.cpp tools.cpp unicode.cpp uuid.c wcstoll.c wcstoull.c xml.cpp
if BUILD_UNICODE_LIBS
lib_LTLIBRARIES = libnetxms.la libnetxmsw.la
Modified: trunk/src/libnetxms/libnetxms.dsp
===================================================================
--- trunk/src/libnetxms/libnetxms.dsp 2008-05-30 21:15:47 UTC (rev 3289)
+++ trunk/src/libnetxms/libnetxms.dsp 2008-05-31 10:08:26 UTC (rev 3290)
@@ -371,6 +371,14 @@
# End Source File
# Begin Source File
+SOURCE=.\wcstoll.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\wcstoull.c
+# End Source File
+# Begin Source File
+
SOURCE=.\xml.cpp
# End Source File
# End Group
Modified: trunk/src/libnetxms/message.cpp
===================================================================
--- trunk/src/libnetxms/message.cpp 2008-05-30 21:15:47 UTC (rev 3289)
+++ trunk/src/libnetxms/message.cpp 2008-05-31 10:08:26 UTC (rev 3290)
@@ -867,7 +867,7 @@
#endif
static const TCHAR *dtString[] = { _T("int32"), _T("string"), _T("int64"), _T("int16"), _T("binary"), _T("float") };
- xml.AddFormattedString(_T("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<nxcp version=\"%d\">\r\n <message code=\"%s\" id=\"%d\">\r\n"), m_nVersion, m_wCode, m_dwId);
+ xml.AddFormattedString(_T("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<nxcp version=\"%d\">\r\n <message code=\"%d\" id=\"%d\">\r\n"), m_nVersion, m_wCode, m_dwId);
for(i = 0; i < m_dwNumVar; i++)
{
xml.AddFormattedString(_T(" <variable id=\"%d\" type=\"%s\">\r\n <value>"),
@@ -888,10 +888,10 @@
xml.AddDynamicString(EscapeStringForXML(m_ppVarList[i]->data.string.szValue, m_ppVarList[i]->data.string.dwLen));
#else
bytes = WideCharToMultiByte(CP_UTF8, 0, m_ppVarList[i]->data.string.szValue,
- m_ppVarList[i]->data.string.dwLen, NULL, 0, NULL, NULL);
+ m_ppVarList[i]->data.string.dwLen / 2, NULL, 0, NULL, NULL);
tempStr = (char *)malloc(bytes + 1);
bytes = WideCharToMultiByte(CP_UTF8, 0, m_ppVarList[i]->data.string.szValue,
- m_ppVarList[i]->data.string.dwLen, tempStr, bytes + 1, NULL, NULL);
+ m_ppVarList[i]->data.string.dwLen / 2, tempStr, bytes + 1, NULL, NULL);
xml.AddDynamicString(EscapeStringForXML(tempStr, bytes));
free(tempStr);
#endif
@@ -915,7 +915,7 @@
default:
break;
}
- xml += _T(" </value>\r\n </variable>\r\n");
+ xml += _T("</value>\r\n </variable>\r\n");
}
xml += _T(" </message>\r\n</nxcp>\r\n");
Modified: trunk/src/libnetxms/strtoll.c
===================================================================
--- trunk/src/libnetxms/strtoll.c 2008-05-30 21:15:47 UTC (rev 3289)
+++ trunk/src/libnetxms/strtoll.c 2008-05-31 10:08:26 UTC (rev 3290)
@@ -29,7 +29,7 @@
#include "libnetxms.h"
-#if (!defined(UNICODE) && !(HAVE_STRTOLL)) || (defined(UNICODE) && !(HAVE_WCSTOLL))
+#if !(HAVE_STRTOLL)
#ifndef UNDER_CE
#include <sys/types.h>
@@ -46,19 +46,11 @@
* alphabets and digits are each contiguous.
*/
-#ifdef UNICODE
-INT64 LIBNETXMS_EXPORTABLE wcstoll(const WCHAR *nptr, WCHAR **endptr, int base)
-#else
INT64 LIBNETXMS_EXPORTABLE strtoll(const char *nptr, char **endptr, int base)
-#endif
{
- const TCHAR *s;
+ const char *s;
INT64 acc, cutoff;
-#ifdef UNICODE
- _TINT c;
-#else
int c;
-#endif
int neg, any, cutlim;
/*
@@ -69,23 +61,23 @@
s = nptr;
do {
c = *s++;
- } while (_istspace(c));
- if (c == _T('-')) {
+ } while (isspace(c));
+ if (c == '-') {
neg = 1;
c = *s++;
} else {
neg = 0;
- if (c == _T('+'))
+ if (c == '+')
c = *s++;
}
if ((base == 0 || base == 16) &&
- c == _T('0') && (*s == _T('x') || *s == 'X')) {
+ c == '0' && (*s == 'x' || *s == 'X')) {
c = s[1];
s += 2;
base = 16;
}
if (base == 0)
- base = c == _T('0') ? 8 : 10;
+ base = c == '0' ? 8 : 10;
/*
* Compute the cutoff value between legal numbers and illegal
@@ -116,10 +108,10 @@
cutlim = -cutlim;
}
for (acc = 0, any = 0;; c = *s++) {
- if (_istdigit(c))
- c -= _T('0');
- else if (_istalpha(c))
- c -= _istupper(c) ? _T('A') - 10 : _T('a') - 10;
+ if (isdigit(c))
+ c -= '0';
+ else if (isalpha(c))
+ c -= isupper(c) ? 'A' - 10 : 'a' - 10;
else
break;
if (c >= base)
@@ -153,7 +145,7 @@
}
}
if (endptr != 0)
- *endptr = (TCHAR *) (any ? s - 1 : nptr);
+ *endptr = (char *) (any ? s - 1 : nptr);
return (acc);
}
Modified: trunk/src/libnetxms/strtoull.c
===================================================================
--- trunk/src/libnetxms/strtoull.c 2008-05-30 21:15:47 UTC (rev 3289)
+++ trunk/src/libnetxms/strtoull.c 2008-05-31 10:08:26 UTC (rev 3290)
@@ -29,7 +29,7 @@
#include "libnetxms.h"
-#if (!defined(UNICODE) && !(HAVE_STRTOULL)) || (defined(UNICODE) && !(HAVE_WCSTOULL))
+#if !(HAVE_STRTOULL)
#ifndef UNDER_CE
#include <sys/types.h>
@@ -47,19 +47,11 @@
* alphabets and digits are each contiguous.
*/
-#ifdef UNICODE
-QWORD LIBNETXMS_EXPORTABLE wcstoull(const WCHAR *nptr, WCHAR **endptr, int base)
-#else
QWORD LIBNETXMS_EXPORTABLE strtoull(const char *nptr, char **endptr, int base)
-#endif
{
- const TCHAR *s;
+ const char *s;
QWORD acc, cutoff;
-#ifdef UNICODE
- _TINT c;
-#else
int c;
-#endif
int neg, any, cutlim;
/*
@@ -68,31 +60,31 @@
s = nptr;
do {
c = *s++;
- } while (_istspace(c));
- if (c == _T('-')) {
+ } while (isspace(c));
+ if (c == '-') {
neg = 1;
c = *s++;
} else {
neg = 0;
- if (c == _T('+'))
+ if (c == '+')
c = *s++;
}
if ((base == 0 || base == 16) &&
- c == _T('0') && (*s == _T('x') || *s == _T('X'))) {
+ c == '0' && (*s == 'x' || *s == 'X')) {
c = s[1];
s += 2;
base = 16;
}
if (base == 0)
- base = c == _T('0') ? 8 : 10;
+ base = c == '0' ? 8 : 10;
cutoff = ULLONG_MAX / (QWORD)base;
cutlim = (int)(ULLONG_MAX % (QWORD)base);
for (acc = 0, any = 0;; c = *s++) {
- if (_istdigit(c))
- c -= _T('0');
- else if (_istalpha(c))
- c -= _istupper(c) ? _T('A') - 10 : _T('a') - 10;
+ if (isdigit(c))
+ c -= '0';
+ else if (isalpha(c))
+ c -= isupper(c) ? 'A' - 10 : 'a' - 10;
else
break;
if (c >= base)
@@ -114,7 +106,7 @@
if (neg && any > 0)
acc = ~acc + 1;
if (endptr != 0)
- *endptr = (TCHAR *) (any ? s - 1 : nptr);
+ *endptr = (char *) (any ? s - 1 : nptr);
return (acc);
}
Added: trunk/src/libnetxms/wcstoll.c
===================================================================
--- trunk/src/libnetxms/wcstoll.c (rev 0)
+++ trunk/src/libnetxms/wcstoll.c 2008-05-31 10:08:26 UTC (rev 3290)
@@ -0,0 +1,152 @@
+/*-
+ * Copyright (c) 1992 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "libnetxms.h"
+
+#if !(HAVE_WCSTOLL)
+
+#ifndef UNDER_CE
+#include <sys/types.h>
+#include <errno.h>
+#endif
+
+#include <ctype.h>
+#include <stdlib.h>
+
+/*
+ * Convert a string to a long long.
+ *
+ * Ignores `locale' stuff. Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+
+INT64 LIBNETXMS_EXPORTABLE wcstoll(const WCHAR *nptr, WCHAR **endptr, int base)
+{
+ const WCHAR *s;
+ INT64 acc, cutoff;
+ wint_t c;
+ int neg, any, cutlim;
+
+ /*
+ * Skip white space and pick up leading +/- sign if any.
+ * If base is 0, allow 0x for hex and 0 for octal, else
+ * assume decimal; if base is already 16, allow 0x.
+ */
+ s = nptr;
+ do {
+ c = *s++;
+ } while (iswspace(c));
+ if (c == L'-') {
+ neg = 1;
+ c = *s++;
+ } else {
+ neg = 0;
+ if (c == L'+')
+ c = *s++;
+ }
+ if ((base == 0 || base == 16) &&
+ c == L'0' && (*s == L'x' || *s == L'X')) {
+ c = s[1];
+ s += 2;
+ base = 16;
+ }
+ if (base == 0)
+ base = c == L'0' ? 8 : 10;
+
+ /*
+ * Compute the cutoff value between legal numbers and illegal
+ * numbers. That is the largest legal value, divided by the
+ * base. An input number that is greater than this value, if
+ * followed by a legal input character, is too big. One that
+ * is equal to this value may be valid or not; the limit
+ * between valid and invalid numbers is then based on the last
+ * digit. For instance, if the range for long longs is
+ * [-9223372036854775808..9223372036854775807] and the input base
+ * is 10, cutoff will be set to 922337203685477580 and cutlim to
+ * either 7 (neg==0) or 8 (neg==1), meaning that if we have
+ * accumulated a value > 922337203685477580, or equal but the
+ * next digit is > 7 (or 8), the number is too big, and we will
+ * return a range error.
+ *
+ * Set any if any `digits' consumed; make it negative to indicate
+ * overflow.
+ */
+ cutoff = neg ? LLONG_MIN : LLONG_MAX;
+ cutlim = (int)(cutoff % base);
+ cutoff /= base;
+ if (neg) {
+ if (cutlim > 0) {
+ cutlim -= base;
+ cutoff += 1;
+ }
+ cutlim = -cutlim;
+ }
+ for (acc = 0, any = 0;; c = *s++) {
+ if (iswdigit(c))
+ c -= L'0';
+ else if (iswalpha(c))
+ c -= iswupper(c) ? L'A' - 10 : L'a' - 10;
+ else
+ break;
+ if (c >= base)
+ break;
+ if (any < 0)
+ continue;
+ if (neg) {
+ if (acc < cutoff || (acc == cutoff && c > cutlim)) {
+ any = -1;
+ acc = LLONG_MIN;
+#ifndef UNDER_CE
+ errno = ERANGE;
+#endif
+ } else {
+ any = 1;
+ acc *= base;
+ acc -= c;
+ }
+ } else {
+ if (acc > cutoff || (acc == cutoff && c > cutlim)) {
+ any = -1;
+ acc = LLONG_MAX;
+#ifndef UNDER_CE
+ errno = ERANGE;
+#endif
+ } else {
+ any = 1;
+ acc *= base;
+ acc += c;
+ }
+ }
+ }
+ if (endptr != 0)
+ *endptr = (WCHAR *) (any ? s - 1 : nptr);
+ return (acc);
+}
+
+#endif /* !(HAVE_STRTOLL) */
Added: trunk/src/libnetxms/wcstoull.c
===================================================================
--- trunk/src/libnetxms/wcstoull.c (rev 0)
+++ trunk/src/libnetxms/wcstoull.c 2008-05-31 10:08:26 UTC (rev 3290)
@@ -0,0 +1,113 @@
+/*-
+ * Copyright (c) 1992 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "libnetxms.h"
+
+#if !(HAVE_WCSTOULL)
+
+#ifndef UNDER_CE
+#include <sys/types.h>
+#include <errno.h>
+#endif
+
+#include <ctype.h>
+#include <limits.h>
+#include <stdlib.h>
+
+/*
+ * Convert a string to an 64 bit unsigned integer.
+ *
+ * Ignores `locale' stuff. Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+
+QWORD LIBNETXMS_EXPORTABLE wcstoull(const WCHAR *nptr, WCHAR **endptr, int base)
+{
+ const WCHAR *s;
+ QWORD acc, cutoff;
+ wint_t c;
+ int neg, any, cutlim;
+
+ /*
+ * See strtoq for comments as to the logic used.
+ */
+ s = nptr;
+ do {
+ c = *s++;
+ } while (iswspace(c));
+ if (c == L'-') {
+ neg = 1;
+ c = *s++;
+ } else {
+ neg = 0;
+ if (c == L'+')
+ c = *s++;
+ }
+ if ((base == 0 || base == 16) &&
+ c == L'0' && (*s == L'x' || *s == L'X')) {
+ c = s[1];
+ s += 2;
+ base = 16;
+ }
+ if (base == 0)
+ base = c == L'0' ? 8 : 10;
+
+ cutoff = ULLONG_MAX / (QWORD)base;
+ cutlim = (int)(ULLONG_MAX % (QWORD)base);
+ for (acc = 0, any = 0;; c = *s++) {
+ if (iswdigit(c))
+ c -= L'0';
+ else if (iswalpha(c))
+ c -= iswupper(c) ? L'A' - 10 : L'a' - 10;
+ else
+ break;
+ if (c >= base)
+ break;
+ if (any < 0)
+ continue;
+ if (acc > cutoff || (acc == cutoff && c > cutlim)) {
+ any = -1;
+ acc = ULLONG_MAX;
+#ifndef UNDER_CE
+ errno = ERANGE;
+#endif
+ } else {
+ any = 1;
+ acc *= (QWORD)base;
+ acc += c;
+ }
+ }
+ if (neg && any > 0)
+ acc = ~acc + 1;
+ if (endptr != 0)
+ *endptr = (WCHAR *) (any ? s - 1 : nptr);
+ return (acc);
+}
+
+#endif /* !(HAVE_STRTOULL) */
Modified: trunk/src/libnetxms/xml.cpp
===================================================================
--- trunk/src/libnetxms/xml.cpp 2008-05-30 21:15:47 UTC (rev 3289)
+++ trunk/src/libnetxms/xml.cpp 2008-05-31 10:08:26 UTC (rev 3290)
@@ -38,7 +38,8 @@
inLen = (length == -1) ? _tcslen(string) : length;
for(in = string, outLen = 0; (inLen > 0) && (*in != 0); in++, outLen++, inLen--)
if ((*in == _T('&')) || (*in == _T('<')) ||
- (*in == _T('>')) || (*in == _T('"')))
+ (*in == _T('>')) || (*in == _T('"')) ||
+ (*in < 32))
outLen += 5;
outLen++;
@@ -50,23 +51,35 @@
switch(*in)
{
case _T('&'):
- _tcscat(&out[pos], _T("&amp;"));
+ _tcscpy(&out[pos], _T("&amp;"));
pos += 5;
break;
case _T('<'):
- _tcscat(&out[pos], _T("&lt;"));
+ _tcscpy(&out[pos], _T("&lt;"));
pos += 4;
break;
case _T('>'):
- _tcscat(&out[pos], _T("&gt;"));
+ _tcscpy(&out[pos], _T("&gt;"));
pos += 4;
break;
case _T('"'):
- _tcscat(&out[pos], _T("&quot;"));
+ _tcscpy(&out[pos], _T("&quot;"));
pos += 6;
break;
+ case _T('\''):
+ _tcscpy(&out[pos], _T("&apos;"));
+ pos += 6;
+ break;
default:
- out[pos++] = *in;
+ if (*in < 32)
+ {
+ _stprintf(&out[pos], _T("&#x%02d;"), *in);
+ pos += 6;
+ }
+ else
+ {
+ out[pos++] = *in;
+ }
break;
}
}
Modified: trunk/src/nxcptest/nxcptest.cpp
===================================================================
--- trunk/src/nxcptest/nxcptest.cpp 2008-05-30 21:15:47 UTC (rev 3289)
+++ trunk/src/nxcptest/nxcptest.cpp 2008-05-31 10:08:26 UTC (rev 3290)
@@ -26,6 +26,13 @@
//
+// Constants
+//
+
+#define RAW_MSG_SIZE 262144
+
+
+//
// Help text
//
@@ -42,6 +49,87 @@
//
+// Receiver thread
+//
+
+static THREAD_RESULT THREAD_CALL RecvThread(void *arg)
+{
+ CSCP_MESSAGE *pRawMsg;
+ CSCPMessage *pMsg;
+ CSCP_BUFFER *pMsgBuffer;
+ CSCP_ENCRYPTION_CONTEXT *pCtx = NULL;
+ BYTE *pDecryptionBuffer = NULL;
+ int iErr;
+ char *xml;
+ WORD wFlags;
+
+ // Initialize raw message receiving function
+ pMsgBuffer = (CSCP_BUFFER *)malloc(sizeof(CSCP_BUFFER));
+ RecvNXCPMessage(0, NULL, pMsgBuffer, 0, NULL, NULL, 0);
+
+ pRawMsg = (CSCP_MESSAGE *)malloc(RAW_MSG_SIZE);
+#ifdef _WITH_ENCRYPTION
+ pDecryptionBuffer = (BYTE *)malloc(RAW_MSG_SIZE);
+#endif
+ while(1)
+ {
+ if ((iErr = RecvNXCPMessage((SOCKET)arg, pRawMsg, pMsgBuffer, RAW_MSG_SIZE,
+ &pCtx, pDecryptionBuffer, INFINITE)) <= 0)
+ {
+ break;
+ }
+
+ // Check if message is too large
+ if (iErr == 1)
+ {
+ printf("RECV ERROR: message is too large\n");
+ continue;
+ }
+
+ // Check for decryption failure
+ if (iErr == 2)
+ {
+ printf("RECV ERROR: decryption failure\n");
+ continue;
+ }
+
+ // Check that actual received packet size is equal to encoded in packet
+ if ((int)ntohl(pRawMsg->dwSize) != iErr)
+ {
+ printf("RECV ERROR: Actual message size doesn't match wSize value (%d,%d)\n", iErr, ntohl(pRawMsg->dwSize));
+ continue; // Bad packet, wait for next
+ }
+
+ wFlags = ntohs(pRawMsg->wFlags);
+ if (wFlags & MF_BINARY)
+ {
+ printf("WARNING: Binary message received\n");
+ }
+ else
+ {
+ // Create message object from raw message
+ pMsg = new CSCPMessage(pRawMsg);
+ xml = pMsg->CreateXML();
+ if (xml != NULL)
+ {
+ puts(xml);
+ free(xml);
+ }
+ }
+ }
+ if (iErr < 0)
+ printf("Session terminated (socket error %d)\n", WSAGetLastError());
+ free(pMsgBuffer);
+ free(pRawMsg);
+#ifdef _WITH_ENCRYPTION
+ free(pDecryptionBuffer);
+#endif
+
+ return THREAD_OK;
+}
+
+
+//
// Read XML document from stdin
//
@@ -73,6 +161,7 @@
CSCPMessage *msg;
CSCP_MESSAGE *rawMsg;
+ ThreadCreate(RecvThread, 0, (void *)hSocket);
printf("Enter XML messages separated by %%%% string\n");
while(1)
{
@@ -84,6 +173,7 @@
SendEx(hSocket, rawMsg, ntohl(rawMsg->dwSize), 0);
free(rawMsg);
}
+ shutdown(hSocket, 2);
}
Received on Sat May 31 2008 - 13:08:28 EEST
This archive was generated by hypermail 2.2.0 : Sat May 31 2008 - 13:06:22 EEST