fixbug

CMakeLists.txt

@@ -1,15 +1,51 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.0.2)
-project(xmlrpcpp)
+project(robot_xmlrpcpp VERSION 1.0.0 LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 17)
+if(DEFINED CATKIN_DEVEL_PREFIX OR DEFINED CATKIN_TOPLEVEL)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(BUILDING_WITH_CATKIN TRUE)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+  message(STATUS "Building robot_xmlrpcpp with Catkin")
 
-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+else()
-  add_compile_options(-Wall -Wextra -Wpedantic -fPIC)
+  set(BUILDING_WITH_CATKIN FALSE)
+  message(STATUS "Building robot_xmlrpcpp with Standalone CMake")
 endif()
 
-add_library(xmlrpcpp
+# C++ Standard - must be set before find_package
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+
+if (NOT BUILDING_WITH_CATKIN)
+
+  # Enable Position Independent Code
+  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+  # Cấu hình RPATH để tránh cycle trong runtime search path
+  set(CMAKE_BUILD_RPATH_USE_ORIGIN TRUE)
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+  set(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}")
+
+else()
+
+# ========================================================
+# Catkin specific configuration
+# ========================================================
+  find_package(catkin REQUIRED)
+
+  catkin_package(
+    INCLUDE_DIRS include
+    LIBRARIES ${PROJECT_NAME}
+  )
+
+  include_directories(
+    include
+    ${catkin_INCLUDE_DIRS}
+  )
+endif()
+
+# Libraries
+add_library(${PROJECT_NAME} SHARED
   src/XmlRpcClient.cpp
   src/XmlRpcDispatch.cpp
   src/XmlRpcServer.cpp
@@ -21,33 +57,87 @@ add_library(xmlrpcpp
   src/XmlRpcValue.cpp
 )
 
-target_include_directories(xmlrpcpp
+if(BUILDING_WITH_CATKIN)
+  add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
+
+  target_include_directories(${PROJECT_NAME}
     PUBLIC
       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
+      $<INSTALL_INTERFACE:include>
-)
+  )
 
-# --- Cài đặt thư viện vào hệ thống khi chạy make install ---
+  target_link_libraries(${PROJECT_NAME}
-install(TARGETS xmlrpcpp
+    PUBLIC ${catkin_LIBRARIES}
-  EXPORT xmlrpcpp-targets
+  )
-  ARCHIVE DESTINATION lib      # Thư viện tĩnh .a
-  LIBRARY DESTINATION lib      # Thư viện động .so
-  RUNTIME DESTINATION bin      # File thực thi (nếu có)
-  INCLUDES DESTINATION include # Cài đặt include
-)
 
-install(
+else()
-    DIRECTORY include/
-    DESTINATION include/
-)
 
-# --- Xuất export set xmlrpcpp-targets thành file CMake module ---
+  target_include_directories(${PROJECT_NAME}
-# --- Tạo file lib/cmake/xmlrpcpp/xmlrpcpp-targets.cmake ---
+    PUBLIC
-# --- File này chứa cấu hình giúp project khác có thể dùng ---
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-# --- Find_package(xmlrpcpp REQUIRED) ---
+      $<INSTALL_INTERFACE:include>
-# --- Target_link_libraries(my_app PRIVATE xmlrpcpp::xmlrpcpp) ---
+  )
-install(EXPORT xmlrpcpp-targets 
+
-  FILE xmlrpcpp-targets.cmake
+  # target_link_libraries(${PROJECT_NAME}
-  NAMESPACE xmlrpcpp::
+    
-  DESTINATION lib/cmake/xmlrpcpp
+  # )
-)
+
+  set_target_properties(${PROJECT_NAME} PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+    BUILD_RPATH "${CMAKE_BINARY_DIR}"
+    INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
+  )
+
+endif()
+
+# Compiler flags
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic -fPIC -Wno-unused-parameter)
+endif()
+
+if(BUILDING_WITH_CATKIN)
+  ## Mark libraries for installation
+  ## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html
+  install(TARGETS ${PROJECT_NAME}
+    ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+    LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+    RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
+  )
+
+  ## Mark cpp header files for installation
+  install(DIRECTORY include/${PROJECT_NAME}/
+    DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+    FILES_MATCHING PATTERN "*.h"
+    PATTERN ".svn" EXCLUDE
+  )
+
+else()
+
+  install(TARGETS ${PROJECT_NAME}
+    EXPORT ${PROJECT_NAME}-targets
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+    RUNTIME DESTINATION bin
+  )
+
+  # Export targets
+  install(EXPORT ${PROJECT_NAME}-targets
+    FILE ${PROJECT_NAME}-targets.cmake
+    NAMESPACE ${PROJECT_NAME}::
+    DESTINATION lib/cmake/${PROJECT_NAME}
+  )
+
+  ## Mark cpp header files for installation
+  install(DIRECTORY include/${PROJECT_NAME}/
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.h"
+    PATTERN ".svn" EXCLUDE
+  )
+
+  # Print configuration info
+  message(STATUS "=================================")
+  message(STATUS "Project: ${PROJECT_NAME}")
+  message(STATUS "Version: ${PROJECT_VERSION}")
+  message(STATUS "C++ Standard: ${CMAKE_CXX_STANDARD}")
+  message(STATUS "=================================")
+endif()

include/robot_xmlrpcpp/XmlRpc.h

@@ -1,5 +1,5 @@
-#ifndef _XMLRPC_H_
+#ifndef _ROBOT_XMLRPC_H_
-#define _XMLRPC_H_
+#define _ROBOT_XMLRPC_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 // This library is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@
 #include "XmlRpcValue.h"
 #include "XmlRpcUtil.h"
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
 
   //! An interface allowing custom handling of error message reporting.
@@ -89,6 +89,6 @@ namespace XmlRpc {
   //! Version identifier
   extern const char XMLRPC_VERSION[];
 
-} // namespace XmlRpc
+} // namespace robot_xmlrpcpp 
 
-#endif // _XMLRPC_H_
+#endif // _ROBOT_XMLRPC_H_

include/robot_xmlrpcpp/XmlRpcClient.h

@@ -1,6 +1,5 @@
-
+#ifndef _ROBOT_XMLRPCCLIENT_H_
-#ifndef _XMLRPCCLIENT_H_
+#define _ROBOT_XMLRPCCLIENT_H_
-#define _XMLRPCCLIENT_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
@@ -13,10 +12,10 @@
 # include <string>
 #endif
 
-#include "xmlrpcpp/XmlRpcDispatch.h"
+#include "robot_xmlrpcpp/XmlRpcDispatch.h"
-#include "xmlrpcpp/XmlRpcSource.h"
+#include "robot_xmlrpcpp/XmlRpcSource.h"
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
   // Arguments and results are represented by XmlRpcValues
   class XmlRpcValue;
@@ -123,6 +122,6 @@ namespace XmlRpc {
 
   };	// class XmlRpcClient
 
-}	// namespace XmlRpc
+}	// namespace robot_xmlrpcpp
 
-#endif	// _XMLRPCCLIENT_H_
+#endif	// _ROBOT_XMLRPCCLIENT_H_

include/robot_xmlrpcpp/XmlRpcDispatch.h

@@ -1,7 +1,6 @@
+#ifndef _ROBOT_XMLRPCDISPATCH_H_
+#define _ROBOT_XMLRPCDISPATCH_H_
 
-#ifndef _XMLRPCDISPATCH_H_
-#define _XMLRPCDISPATCH_H_
-//
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
 #if defined(_MSC_VER)
@@ -12,7 +11,7 @@
 # include <list>
 #endif
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
   // An RPC source represents a file descriptor to monitor
   class XmlRpcSource;
@@ -83,6 +82,6 @@ namespace XmlRpc {
     bool _inWork;
 
   };
-} // namespace XmlRpc
+} // namespace robot_xmlrpcpp 
 
-#endif  // _XMLRPCDISPATCH_H_
+#endif  // _ROBOT_XMLRPCDISPATCH_H_

include/robot_xmlrpcpp/XmlRpcException.h

@@ -1,7 +1,6 @@
+#ifndef _ROBOT_XMLRPCEXCEPTION_H_
+#define _ROBOT_XMLRPCEXCEPTION_H_
 
-#ifndef _XMLRPCEXCEPTION_H_
-#define _XMLRPCEXCEPTION_H_
-//
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
 #if defined(_MSC_VER)
@@ -13,7 +12,7 @@
 #endif
 
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
   //! A class representing an error.
   //! If server methods throw this exception, a fault response is returned
@@ -37,6 +36,6 @@ namespace XmlRpc {
     int _code;
   };
 
-}
+} // namespace robot_xmlrpcpp 
 
-#endif	// _XMLRPCEXCEPTION_H_
+#endif	// _ROBOT_XMLRPCEXCEPTION_H_

include/robot_xmlrpcpp/XmlRpcServer.h

@@ -1,7 +1,6 @@
+#ifndef _ROBOT_XMLRPCSERVER_H_
+#define _ROBOT_XMLRPCSERVER_H_
 
-#ifndef _XMLRPCSERVER_H_
-#define _XMLRPCSERVER_H_
-//
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
 #if defined(_MSC_VER)
@@ -13,10 +12,10 @@
 # include <string>
 #endif
 
-#include "xmlrpcpp/XmlRpcDispatch.h"
+#include "robot_xmlrpcpp/XmlRpcDispatch.h"
-#include "xmlrpcpp/XmlRpcSource.h"
+#include "robot_xmlrpcpp/XmlRpcSource.h"
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
 
   // An abstract class supporting XML RPC methods
@@ -99,6 +98,6 @@ namespace XmlRpc {
     XmlRpcServerMethod* _methodHelp;
 
   };
-} // namespace XmlRpc
+} // namespace robot_xmlrpcpp 
 
-#endif //_XMLRPCSERVER_H_
+#endif //_ROBOT_XMLRPCSERVER_H_

include/robot_xmlrpcpp/XmlRpcServerConnection.h

@@ -1,5 +1,5 @@
-#ifndef _XMLRPCSERVERCONNECTION_H_
+#ifndef _ROBOT_XMLRPCSERVERCONNECTION_H_
-#define _XMLRPCSERVERCONNECTION_H_
+#define _ROBOT_XMLRPCSERVERCONNECTION_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
@@ -11,10 +11,10 @@
 # include <string>
 #endif
 
-#include "xmlrpcpp/XmlRpcValue.h"
+#include "robot_xmlrpcpp/XmlRpcValue.h"
-#include "xmlrpcpp/XmlRpcSource.h"
+#include "robot_xmlrpcpp/XmlRpcSource.h"
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
 
   // The server waits for client connections and provides methods
@@ -97,6 +97,6 @@ namespace XmlRpc {
     // Whether to keep the current client connection open for further requests
     bool _keepAlive;
   };
-} // namespace XmlRpc
+} // namespace robot_xmlrpcpp 
 
-#endif // _XMLRPCSERVERCONNECTION_H_
+#endif // _ROBOT_XMLRPCSERVERCONNECTION_H_

include/robot_xmlrpcpp/XmlRpcServerMethod.h

@@ -1,7 +1,6 @@
-
+#ifndef _ROBOT_XMLRPCSERVERMETHOD_H_
-#ifndef _XMLRPCSERVERMETHOD_H_
 #define _XMLRPCSERVERMETHOD_H_
-//
+#define _ROBOT_XMLRPCSERVERMETHOD_H_
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
 #if defined(_MSC_VER)
@@ -12,7 +11,7 @@
 # include <string>
 #endif
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
   // Representation of a parameter or result value
   class XmlRpcValue;
@@ -42,6 +41,6 @@ namespace XmlRpc {
     std::string _name;
     XmlRpcServer* _server;
   };
-} // namespace XmlRpc
+} // namespace robot_xmlrpcpp 
 
-#endif // _XMLRPCSERVERMETHOD_H_
+#endif // _ROBOT_XMLRPCSERVERMETHOD_H_

include/robot_xmlrpcpp/XmlRpcSocket.h

@@ -1,5 +1,5 @@
-#ifndef _XMLRPCSOCKET_H_
+#ifndef _ROBOT_XMLRPCSOCKET_H_
-#define _XMLRPCSOCKET_H_
+#define _ROBOT_XMLRPCSOCKET_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
@@ -11,7 +11,7 @@
 # include <string>
 #endif
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
   //! A platform-independent socket API.
   class XmlRpcSocket {
@@ -64,6 +64,6 @@ namespace XmlRpc {
     static std::string getErrorMsg(int error);
   };
 
-} // namespace XmlRpc
+} // namespace robot_xmlrpcpp 
 
-#endif
+#endif // _ROBOT_XMLRPCSOCKET_H_

include/robot_xmlrpcpp/XmlRpcSource.h

@@ -1,6 +1,5 @@
-
+#ifndef _ROBOT_XMLRPCSOURCE_H_
-#ifndef _XMLRPCSOURCE_H_
+#define _ROBOT_XMLRPCSOURCE_H_
-#define _XMLRPCSOURCE_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
@@ -8,7 +7,7 @@
 # pragma warning(disable:4786)    // identifier was truncated in debug info
 #endif
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
   //! An RPC source represents a file descriptor to monitor
   class XmlRpcSource {
@@ -50,6 +49,6 @@ namespace XmlRpc {
     // In the client, keep connections open if you intend to make multiple calls.
     bool _keepOpen;
   };
-} // namespace XmlRpc
+} // namespace robot_xmlrpcpp 
 
-#endif //_XMLRPCSOURCE_H_
+#endif //_ROBOT_XMLRPCSOURCE_H_

include/robot_xmlrpcpp/XmlRpcUtil.h

@@ -1,5 +1,5 @@
-#ifndef _XMLRPCUTIL_H_
+#ifndef _ROBOT_XMLRPCUTIL_H_
-#define _XMLRPCUTIL_H_
+#define _ROBOT_XMLRPCUTIL_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
@@ -21,7 +21,7 @@
 # define strncasecmp strnicmp
 #endif
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
   //! Utilities for XML parsing, encoding, and decoding and message handlers.
   class XmlRpcUtil {
@@ -56,6 +56,6 @@ namespace XmlRpc {
     static void error(const char* fmt, ...);
 
   };
-} // namespace XmlRpc
+} // namespace robot_xmlrpcpp 
 
 #endif // _XMLRPCUTIL_H_

include/robot_xmlrpcpp/XmlRpcValue.h

@@ -1,6 +1,5 @@
-
+#ifndef _ROBOT_XMLRPCVALUE_H_
-#ifndef _XMLRPCVALUE_H_
+#define _ROBOT_XMLRPCVALUE_H_
-#define _XMLRPCVALUE_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
@@ -15,7 +14,7 @@
 # include <time.h>
 #endif
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
   //! RPC method arguments and results are represented by Values
   //   should probably refcount them...
@@ -113,6 +112,9 @@ namespace XmlRpc {
     //! Check for the existence of a struct member by name.
     bool hasMember(const std::string& name) const;
 
+    //! If this value is a struct, returns pointer to its members; otherwise nullptr.
+    const ValueStruct *getStructMembers() const;
+
     //! Decode xml. Destroys any existing value.
     bool fromXml(std::string const& valueXml, int* offset);
 
@@ -180,10 +182,9 @@ namespace XmlRpc {
     } _value;
     
   };
-} // namespace XmlRpc
+} // namespace robot_xmlrpcpp 
 
 
-std::ostream& operator<<(std::ostream& os, XmlRpc::XmlRpcValue& v);
+std::ostream& operator<<(std::ostream& os, robot_xmlrpcpp::XmlRpcValue& v);
 
-
+#endif // _ROBOT_XMLRPCVALUE_H_
-#endif // _XMLRPCVALUE_H_

include/robot_xmlrpcpp/base64.h

@@ -6,8 +6,8 @@
 //
 //
 
-#if !defined(__BASE64_H_INCLUDED__)
+#if !defined(__ROBOT_BASE64_H_INCLUDED__)
-#define __BASE64_H_INCLUDED__ 1
+#define __ROBOT_BASE64_H_INCLUDED__ 1
 
 #ifndef MAKEDEPEND
 # include <iterator>
@@ -51,7 +51,6 @@ public:
 	// you can fill end of line
 	// it may be crlf, crlfsp, noline or other class like it
 	
-
 	struct crlf
 	{
 		template<class _OI>
@@ -161,7 +160,7 @@ public:
 		{
 			_3to4.zero();
 
-			// áåð¸ì ïî 3 ñèìâîëà
+			// <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> 3 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 			_3to4.set_0(*_First);
 			_First++;
 
@@ -194,7 +193,7 @@ public:
 			*_To = _Tr::to_char_type(_base64Chars[_3to4.b64_2()]); ++_To;
 			*_To = _Tr::to_char_type(_base64Chars[_3to4.b64_3()]); ++_To;
 
-			if(line_octets == 17) // base64 ïîçâîëÿåò äëèíó ñòðîêè íå áîëåå 72 ñèìâîëîâ
+			if(line_octets == 17) // base64 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> 72 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 			{
 				//_To = _Endl(_To);
         *_To = '\n'; ++_To;

package.xml

@@ -1,9 +1,9 @@
 <package>
-  <name>xmlrpcpp</name>
+  <name>robot_xmlrpcpp</name>
   <version>0.7.10</version>
   <description>
-    xmlrpcpp is the second generation of the transform library, which lets
+    robot_xmlrpcpp is the second generation of the transform library, which lets
-    the user keep track of multiple coordinate frames over time. xmlrpcpp
+    the user keep track of multiple coordinate frames over time. robot_xmlrpcpp
     maintains the relationship between coordinate frames in a tree
     structure buffered in time, and lets the user transform points,
     vectors, etc between any two coordinate frames at any desired
@@ -15,12 +15,8 @@
   <maintainer email="tfoote@osrfoundation.org">Tully Foote</maintainer>
   <license>BSD</license>
 
-  <url type="website">http://www.ros.org/wiki/xmlrpcpp</url>
+  <url type="website">http://www.ros.org/wiki/robot_xmlrpcpp</url>
     
   <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
 
-  <build_depend>libconsole-bridge-dev</build_depend>
-
-  <run_depend>libconsole-bridge-dev</run_depend>
-
 </package>

src/XmlRpcClient.cpp

@@ -1,8 +1,8 @@
 
-#include "xmlrpcpp/XmlRpcClient.h"
+#include "robot_xmlrpcpp/XmlRpcClient.h"
 
-#include "xmlrpcpp/XmlRpcSocket.h"
+#include "robot_xmlrpcpp/XmlRpcSocket.h"
-#include "xmlrpcpp/XmlRpc.h"
+#include "robot_xmlrpcpp/XmlRpc.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,7 +11,7 @@
 
 
 
-using namespace XmlRpc;
+using namespace robot_xmlrpcpp;
 
 // Static data
 const char XmlRpcClient::REQUEST_BEGIN[] = 
@@ -252,7 +252,7 @@ XmlRpcClient::generateHeader(std::string const& body)
   header += buff;
   header += "Content-Type: text/xml\r\nContent-length: ";
 
-  sprintf(buff,"%d\r\n\r\n", body.size());
+  sprintf(buff,"%d\r\n\r\n", (int)body.size());
 
   return header + buff;
 }
@@ -397,7 +397,7 @@ XmlRpcClient::parseResponse(XmlRpcValue& result)
   // Expect either <params><param>... or <fault>...
   if ((XmlRpcUtil::nextTagIs(PARAMS_TAG,_response,&offset) &&
        XmlRpcUtil::nextTagIs(PARAM_TAG,_response,&offset)) ||
-      XmlRpcUtil::nextTagIs(FAULT_TAG,_response,&offset) && (_isFault = true))
+      (XmlRpcUtil::nextTagIs(FAULT_TAG,_response,&offset) && (_isFault = true)))
   {
     if ( ! result.fromXml(_response, &offset)) {
       XmlRpcUtil::error("Error in XmlRpcClient::parseResponse: Invalid response value. Response:\n%s", _response.c_str());

src/XmlRpcDispatch.cpp

@@ -1,7 +1,7 @@
 
-#include "xmlrpcpp/XmlRpcDispatch.h"
+#include "robot_xmlrpcpp/XmlRpcDispatch.h"
-#include "xmlrpcpp/XmlRpcSource.h"
+#include "robot_xmlrpcpp/XmlRpcSource.h"
-#include "xmlrpcpp/XmlRpcUtil.h"
+#include "robot_xmlrpcpp/XmlRpcUtil.h"
 
 #include <math.h>
 #include <sys/timeb.h>
@@ -19,7 +19,7 @@
 #endif  // _WINDOWS
 
 
-using namespace XmlRpc;
+using namespace robot_xmlrpcpp;
 
 
 XmlRpcDispatch::XmlRpcDispatch()

src/XmlRpcServer.cpp

@@ -1,13 +1,13 @@
 
-#include "xmlrpcpp/XmlRpcServer.h"
+#include "robot_xmlrpcpp/XmlRpcServer.h"
-#include "xmlrpcpp/XmlRpcServerConnection.h"
+#include "robot_xmlrpcpp/XmlRpcServerConnection.h"
-#include "xmlrpcpp/XmlRpcServerMethod.h"
+#include "robot_xmlrpcpp/XmlRpcServerMethod.h"
-#include "xmlrpcpp/XmlRpcSocket.h"
+#include "robot_xmlrpcpp/XmlRpcSocket.h"
-#include "xmlrpcpp/XmlRpcUtil.h"
+#include "robot_xmlrpcpp/XmlRpcUtil.h"
-#include "xmlrpcpp/XmlRpcException.h"
+#include "robot_xmlrpcpp/XmlRpcException.h"
 
 
-using namespace XmlRpc;
+using namespace robot_xmlrpcpp;
 
 
 XmlRpcServer::XmlRpcServer()

src/XmlRpcServerConnection.cpp

@@ -1,8 +1,8 @@
 
-#include "xmlrpcpp/XmlRpcServerConnection.h"
+#include "robot_xmlrpcpp/XmlRpcServerConnection.h"
 
-#include "xmlrpcpp/XmlRpcSocket.h"
+#include "robot_xmlrpcpp/XmlRpcSocket.h"
-#include "xmlrpcpp/XmlRpc.h"
+#include "robot_xmlrpcpp/XmlRpc.h"
 #ifndef MAKEDEPEND
 # include <stdio.h>
 # include <stdlib.h>
@@ -11,7 +11,7 @@
 
 #endif
 
-using namespace XmlRpc;
+using namespace robot_xmlrpcpp;
 
 // Static data
 const char XmlRpcServerConnection::METHODNAME_TAG[] = "<methodName>";
@@ -348,7 +348,7 @@ XmlRpcServerConnection::generateHeader(std::string const& body)
     "Content-length: ";
 
   char buffLen[40];
-  sprintf(buffLen,"%d\r\n\r\n", body.size());
+  sprintf(buffLen,"%d\r\n\r\n", (int)body.size());
 
   return header + buffLen;
 }

src/XmlRpcServerMethod.cpp

@@ -1,8 +1,8 @@
 
-#include "xmlrpcpp/XmlRpcServerMethod.h"
+#include "robot_xmlrpcpp/XmlRpcServerMethod.h"
-#include "xmlrpcpp/XmlRpcServer.h"
+#include "robot_xmlrpcpp/XmlRpcServer.h"
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
 
   XmlRpcServerMethod::XmlRpcServerMethod(std::string const& name, XmlRpcServer* server)
@@ -18,4 +18,4 @@ namespace XmlRpc {
   }
 
 
-} // namespace XmlRpc
+} // namespace robot_xmlrpcpp 

src/XmlRpcSocket.cpp

@@ -1,6 +1,6 @@
 
-#include "xmlrpcpp/XmlRpcSocket.h"
+#include "robot_xmlrpcpp/XmlRpcSocket.h"
-#include "xmlrpcpp/XmlRpcUtil.h"
+#include "robot_xmlrpcpp/XmlRpcUtil.h"
 
 #ifndef MAKEDEPEND
 
@@ -30,7 +30,7 @@ extern "C" {
 #endif // MAKEDEPEND
 
 
-using namespace XmlRpc;
+using namespace robot_xmlrpcpp;
 
 
 

src/XmlRpcSource.cpp

@@ -1,9 +1,9 @@
 
-#include "xmlrpcpp/XmlRpcSource.h"
+#include "robot_xmlrpcpp/XmlRpcSource.h"
-#include "xmlrpcpp/XmlRpcSocket.h"
+#include "robot_xmlrpcpp/XmlRpcSocket.h"
-#include "xmlrpcpp/XmlRpcUtil.h"
+#include "robot_xmlrpcpp/XmlRpcUtil.h"
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
 
   XmlRpcSource::XmlRpcSource(int fd /*= -1*/, bool deleteOnClose /*= false*/) 
@@ -32,4 +32,4 @@ namespace XmlRpc {
     }
   }
 
-} // namespace XmlRpc
+} // namespace robot_xmlrpcpp 

src/XmlRpcUtil.cpp

@@ -1,5 +1,5 @@
 
-#include "xmlrpcpp/XmlRpcUtil.h"
+#include "robot_xmlrpcpp/XmlRpcUtil.h"
 
 #ifndef MAKEDEPEND
 # include <ctype.h>
@@ -9,9 +9,9 @@
 # include <string.h>
 #endif
 
-#include "xmlrpcpp/XmlRpc.h"
+#include "robot_xmlrpcpp/XmlRpc.h"
 
-using namespace XmlRpc;
+using namespace robot_xmlrpcpp;
 
 
 //#define USE_WINDOWS_DEBUG // To make the error and log messages go to VC++ debug output
@@ -21,7 +21,7 @@ using namespace XmlRpc;
 #endif
 
 // Version id
-const char XmlRpc::XMLRPC_VERSION[] = "XMLRPC++ 0.7";
+const char robot_xmlrpcpp::XMLRPC_VERSION[] = "XMLRPC++ 0.7";
 
 // Default log verbosity: 0 for no messages through 5 (writes everything)
 int XmlRpcLogHandler::_verbosity = 0;
@@ -63,8 +63,8 @@ XmlRpcErrorHandler* XmlRpcErrorHandler::_errorHandler = &defaultErrorHandler;
 
 
 // Easy API for log verbosity
-int XmlRpc::getVerbosity() { return XmlRpcLogHandler::getVerbosity(); }
+int robot_xmlrpcpp::getVerbosity() { return XmlRpcLogHandler::getVerbosity(); }
-void XmlRpc::setVerbosity(int level) { XmlRpcLogHandler::setVerbosity(level); }
+void robot_xmlrpcpp::setVerbosity(int level) { XmlRpcLogHandler::setVerbosity(level); }
 
  
 

src/XmlRpcValue.cpp

@@ -1,8 +1,8 @@
 
-#include "xmlrpcpp/XmlRpcValue.h"
+#include "robot_xmlrpcpp/XmlRpcValue.h"
-#include "xmlrpcpp/XmlRpcException.h"
+#include "robot_xmlrpcpp/XmlRpcException.h"
-#include "xmlrpcpp/XmlRpcUtil.h"
+#include "robot_xmlrpcpp/XmlRpcUtil.h"
-#include "xmlrpcpp/base64.h"
+#include "robot_xmlrpcpp/base64.h"
 
 #ifndef MAKEDEPEND
 # include <iostream>
@@ -11,7 +11,7 @@
 # include <stdio.h>
 #endif
 
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
 
   static const char VALUE_TAG[]     = "<value>";
@@ -209,6 +209,13 @@ namespace XmlRpc {
     return _type == TypeStruct && _value.asStruct->find(name) != _value.asStruct->end();
   }
 
+  const XmlRpcValue::ValueStruct *XmlRpcValue::getStructMembers() const
+  {
+    if (_type != TypeStruct)
+      return nullptr;
+    return _value.asStruct;
+  }
+
   // Set the value from xml. The chars at *offset into valueXml 
   // should be the start of a <value> tag. Destroys any existing value.
   bool XmlRpcValue::fromXml(std::string const& valueXml, int* offset)
@@ -597,11 +604,11 @@ namespace XmlRpc {
     return os;
   }
 
-} // namespace XmlRpc
+} // namespace robot_xmlrpcpp 
 
 
 // ostream
-std::ostream& operator<<(std::ostream& os, XmlRpc::XmlRpcValue& v) 
+std::ostream& operator<<(std::ostream& os, robot_xmlrpcpp::XmlRpcValue& v) 
 { 
   // If you want to output in xml format:
   //return os << v.toXml(); 

test/FileClient.cpp

@@ -1,108 +1,216 @@
 // FileClient.cpp : A simple xmlrpc client. Usage: FileClient serverHost serverPort xmlfile
+
 // Reads an xmlrpc request from the specified xmlfile and calls the method on the server.
+
 // 
+
 // Link against xmlrpc lib and whatever socket libs your system needs (ws2_32.lib on windows)
 
+
+
 #include "XmlRpc.h"
+
 #include <iostream>
+
 #include <fstream>
+
 #include <stdlib.h>
 
-#include "XmlRpc.h"
+
+
+using namespace robot::XmlRpc;
+
+
 
 std::string parseRequest(std::string const& xml, XmlRpcValue& params);
 
 
+
+
+
 int main(int argc, char* argv[])
+
 {
+
   if (argc != 4) {
+
     std::cerr << "Usage: FileClient serverHost serverPort requestXmlFile\n";
+
     return -1;
+
   }
+
   int port = atoi(argv[2]);
 
-
+
+
+  robot::XmlRpc::setVerbosity(5);
+
   XmlRpcClient c(argv[1], port);
 
+
+
   //
+
   std::ifstream infile(argv[3]);
+
   if (infile.fail()) {
+
     std::cerr << "Could not open file '" << argv[3] << "'.\n";
+
     return -1;
+
   }
 
+
+
   // Suck in the file. This is a one-liner in good compilers (which vc++ 6 is not)...
+
   infile.seekg(0L, std::ios::end);
+
   long nb = infile.tellg();
+
   infile.clear();
+
   infile.seekg(0L);
+
   char* b = new char[nb+1];
+
   infile.read(b, nb);
+
   b[nb] = 0;
 
+
+
   std::cout << "Read file.\n";
 
+
+
   // Find the methodName and parse the params
+
   std::string s(b);
+
   XmlRpcValue params;
+
   std::string name = parseRequest(s, params);
 
+
+
   if (name.empty()) {
+
     std::cerr << "Could not parse file\n";
+
     return -1;
+
   }
 
+
+
   for (;;) {
+
     XmlRpcValue result;
+
     std::cout << "Calling " << name << std::endl;
+
     if (c.execute(name.c_str(), params, result))
+
       std::cout << result << "\n\n";
+
     else
+
       std::cout << "Error calling '" << name << "'\n\n";
+
     std::cout << "Again? [y]: ";
+
     std::string ans;
+
     std::cin >> ans;
+
     if (ans != "" && ans != "y") break;
+
   }
 
+
+
   return 0;
+
 }
 
 
+
+
+
 // 
+
 std::string
+
 parseRequest(std::string const& xml, XmlRpcValue& params)
+
 {
+
   const char METHODNAME_TAG[] = "<methodName>";
+
   const char PARAMS_TAG[] = "<params>";
+
   const char PARAMS_ETAG[] = "</params>";
+
   const char PARAM_TAG[] = "<param>";
+
   const char PARAM_ETAG[] = "</param>";
 
+
+
   int offset = 0;   // Number of chars parsed from the request
 
+
+
   std::string methodName = XmlRpcUtil::parseTag(METHODNAME_TAG, xml, &offset);
+
   XmlRpcUtil::log(3, "XmlRpcServerConnection::parseRequest: parsed methodName %s.", methodName.c_str()); 
 
+
+
   if (! methodName.empty() && XmlRpcUtil::findTag(PARAMS_TAG, xml, &offset))
+
   {
+
     int nArgs = 0;
+
     while (XmlRpcUtil::nextTagIs(PARAM_TAG, xml, &offset)) {
+
       std::cout << "Parsing arg " << nArgs+1 << std::endl;
+
       XmlRpcValue arg(xml, &offset);
+
       if ( ! arg.valid()) {
+
         std::cerr << "Invalid argument\n";
+
         return std::string();
+
       }
+
       std::cout << "Adding arg " << nArgs+1 << " to params array." << std::endl;
+
       params[nArgs++] = arg;
+
       (void) XmlRpcUtil::nextTagIs(PARAM_ETAG, xml, &offset);
+
     }
 
+
+
     XmlRpcUtil::log(3, "XmlRpcServerConnection::parseRequest: parsed %d params.", nArgs); 
 
+
+
     (void) XmlRpcUtil::nextTagIs(PARAMS_ETAG, xml, &offset);
+
   }
 
+
+
   return methodName;
+
 }
+

test/HelloClient.cpp

@@ -3,7 +3,7 @@
 // on windows)
 #include "XmlRpc.h"
 #include <iostream>
-using namespace XmlRpc;
+using namespace robot::XmlRpc;
 
 int main(int argc, char* argv[])
 {
@@ -12,7 +12,7 @@ int main(int argc, char* argv[])
     return -1;
   }
   int port = atoi(argv[2]);
-  //XmlRpc::setVerbosity(5);
+  //robot::XmlRpc::setVerbosity(5);
 
   // Use introspection API to look up the supported methods
   XmlRpcClient c(argv[1], port);

test/HelloServer.cpp

@@ -5,7 +5,7 @@
 #include <iostream>
 #include <stdlib.h>
 
-using namespace XmlRpc;
+using namespace robot::XmlRpc;
 
 // The server
 XmlRpcServer s;
@@ -66,7 +66,7 @@ int main(int argc, char* argv[])
   }
   int port = atoi(argv[1]);
 
-  XmlRpc::setVerbosity(5);
+  robot::XmlRpc::setVerbosity(5);
 
   // Create the server socket on the specified port
   s.bindAndListen(port);

test/TestBase64Client.cpp

@@ -1,45 +1,90 @@
 // TestBase64Client.cpp : A simple xmlrpc client that returns a png file
+
 // encoded as base64 data to the client.
+
 //
+
 // Usage: TestBase64Client serverHost serverPort outputfile
+
 // Requests a png file from the specified server and saves it in outputfile.
+
 // Link against xmlrpc lib and whatever socket libs your system needs (ws2_32.lib on windows)
 
+
+
 #include "XmlRpc.h"
+
 #include <iostream>
+
 #include <fstream>
+
 #include <stdlib.h>
 
-
+
+
+using namespace robot::XmlRpc;
+
+
 
 int main(int argc, char* argv[])
+
 {
+
   if (argc != 4) {
+
     std::cerr << "Usage: TestBase64Client serverHost serverPort outputFile\n";
+
     return -1;
+
   }
+
   int port = atoi(argv[2]);
 
-
+
+
+  //robot::XmlRpc::setVerbosity(5);
+
   XmlRpcClient c(argv[1], port);
 
+
+
   XmlRpcValue noArgs, result;
+
   if (c.execute("TestBase64", noArgs, result))
+
   {
+
     const XmlRpcValue::BinaryData& data = result;
+
     std::ofstream outfile(argv[3], std::ios::binary | std::ios::trunc);
+
     if (outfile.fail())
+
       std::cerr << "Error opening " << argv[3] << " for output.\n";
+
     else
+
     {
+
       int n = int(data.size());
+
       for (int i=0; i<n; ++i)
+
         outfile << data[i];
+
     }
+
   }
+
   else
+
     std::cout << "Error calling 'TestBase64'\n\n";
 
+
+
   return 0;
+
 }
 
+
+

test/TestBase64Server.cpp

@@ -1,68 +1,136 @@
 // TestBase64Server.cpp : Simple XMLRPC server example. Usage: TestBase64Server serverPort
+
 //
+
 #if defined(_MSC_VER)
+
 # pragma warning(disable:4786)    // identifier was truncated in debug info
+
 #endif
 
 
+
+
+
 #include <iostream>
+
 #include <fstream>
+
 #include <algorithm>
+
 #include <stdlib.h>
 
 
+
+
+
 #include "XmlRpc.h"
-#include <iostream>
+
+using namespace robot::XmlRpc;
+
+
+
 
 
 // The server
+
 XmlRpcServer s;
 
+
+
 // No arguments, result is Base64-encoded pngnow.png data.
+
 class TestBase64 : public XmlRpcServerMethod
+
 {
+
 public:
+
   TestBase64(XmlRpcServer* s) : XmlRpcServerMethod("TestBase64", s) {}
 
+
+
   void execute(XmlRpcValue& params, XmlRpcValue& result)
+
   {
+
     std::ifstream infile("pngnow.png", std::ios::binary);
+
     if (infile.fail())
+
       infile.open("../pngnow.png", std::ios::binary);
+
     if (infile.fail())
+
       result = "Could not open file pngnow.png";
+
     else {
 
+
+
       XmlRpcValue::BinaryData& data = result;
+
       int n = 0;
+
       for (;; ++n) {
+
         char c = infile.get();
+
         if (infile.eof()) break;
+
         data.push_back(c);
+
       }
+
       std::cerr << "Read " << n << " bytes from pngnow.png\n";
+
     }
+
   }
+
 } TestBase64(&s);    // This constructor registers the method with the server
 
 
 
+
+
+
+
 int main(int argc, char* argv[])
+
 {
+
   if (argc != 2) {
+
     std::cerr << "Usage: TestBase64Server serverPort\n";
+
     return -1;
+
   }
+
   int port = atoi(argv[1]);
 
-
+
+
+  //robot::XmlRpc::setVerbosity(5);
+
+
 
   // Create the server socket on the specified port
+
   s.bindAndListen(port);
 
+
+
   // Wait for requests indefinitely
+
   s.work(-1.0);
 
+
+
   return 0;
+
 }
 
+
+

test/TestValues.cpp

@@ -1,233 +1,466 @@
 // TestValues.cpp : Test XML encoding and decoding of XmlRpcValues.
 
+
+
 #include <stdlib.h>
 
+
+
 #include "XmlRpcValue.h"
 
 
+
+
+
 #include <assert.h>
+
 #include <iostream>
 
 
-
+
+
+
+using namespace robot::XmlRpc;
+
+
+
 
 
 void testBoolean()
+
 {
+
   XmlRpcValue booleanFalse(false);
+
   XmlRpcValue booleanTrue(true);
+
   int offset = 0;
+
   XmlRpcValue booleanFalseXml("<value><boolean>0</boolean></value>", &offset);
+
   offset = 0;
+
   XmlRpcValue booleanTrueXml("<value><boolean>1</boolean></value>", &offset);
+
   assert(booleanFalse != booleanTrue);
+
   assert(booleanFalse == booleanFalseXml);
+
   assert(booleanFalse != booleanTrueXml);
 
+
+
   if (bool(booleanFalse))
+
     assert(false);
 
+
+
   if ( ! bool(booleanTrue))
+
     assert(false);
+
 }
 
+
+
 // Int
+
 void testInt()
+
 {
+
   XmlRpcValue int0(0);
+
   XmlRpcValue int1(1);
+
   XmlRpcValue int10(10);
+
   XmlRpcValue int_1(-1);
+
   int offset = 0;
+
   XmlRpcValue int0Xml("<value><int>0</int></value>", &offset);
+
   offset = 0;
+
   XmlRpcValue int9Xml("<value><i4>9</i4></value>", &offset);
+
   assert(int0 == int0Xml);
+
   assert(int(int10) - int(int1) == int(int9Xml));
+
   assert(9 == int(int9Xml));
+
   assert(int(int10) + int(int_1) == int(int9Xml));
+
 }
 
+
+
 void testDouble()
+
 {
+
   // Double
+
   XmlRpcValue d(43.7);
+
   int offset = 0;
+
   XmlRpcValue dXml("<value><double>56.3</double></value>", &offset);
+
   assert(double(d) + double(dXml) == 100.0);  // questionable practice...
+
 }
 
+
+
 void testString()
+
 {
+
   // String
+
   XmlRpcValue s("Now is the time <&");
+
   char csxml[] = "<value><string>Now is the time &lt;&amp;</string></value>";
+
   std::string ssxml = csxml;
+
   int offset = 0;
+
   XmlRpcValue vscXml(csxml, &offset);
+
   offset = 0;
+
   XmlRpcValue vssXml(ssxml, &offset);
+
   assert(s == vscXml);
+
   assert(s == vssXml);
+
   offset = 0;
+
   XmlRpcValue fromXml(vssXml.toXml(), &offset);
+
   assert(s == fromXml);
 
+
+
   // Empty or blank strings with no <string> tags
+
   std::string emptyStringXml("<value></value>");
+
   offset = 0;
+
   XmlRpcValue emptyStringVal1(emptyStringXml, &offset);
+
   XmlRpcValue emptyStringVal2("");
+
   assert(emptyStringVal1 == emptyStringVal2);
 
+
+
   emptyStringXml = "<value>  </value>";
+
   offset = 0;
+
   XmlRpcValue blankStringVal(emptyStringXml, &offset);
+
   assert(std::string(blankStringVal) == "  ");
+
 }
 
 
+
+
+
 void testDateTime()
+
 {
+
   // DateTime
+
   int offset = 0;
+
   XmlRpcValue dateTime("<value><dateTime.iso8601>19040101T03:12:35</dateTime.iso8601></value>", &offset);
+
   struct tm &t = dateTime;
+
   assert(t.tm_year == 1904 && t.tm_min == 12);
+
 }
 
 
+
+
+
 void testArray(XmlRpcValue const& d)
+
 {
+
   // Array
+
   XmlRpcValue a;
+
   a.setSize(4);
+
   a[0] = 1;
+
   a[1] = std::string("two");
+
   a[2] = 43.7;
+
   a[3] = "four";
+
   assert(int(a[0]) == 1);
+
   assert(a[2] == d);
 
+
+
   char csaXml[] =
+
     "<value><array>\n"
+
     "  <data>\n"
+
     "    <value><i4>1</i4></value> \n"
+
     "    <value> <string>two</string></value>\n"
+
     "    <value><double>43.7</double></value>\n"
+
     "    <value>four</value>\n"
+
     "  </data>\n"
+
     "</array></value>";
 
+    
+
   int offset = 0;
+
   XmlRpcValue aXml(csaXml, &offset);
+
   assert(a == aXml);
+
 }
 
+
+
 void testStruct()
+
 {
+
   // Struct
+
   XmlRpcValue struct1;
+
   struct1["i4"] = 1;
+
   struct1["str"] = "two";
+
   struct1["d"] = 43.7;
 
+
+
   XmlRpcValue a;
+
   a.setSize(4);
+
   a[0] = 1;
+
   a[1] = std::string("two");
+
   a[2] = 43.7;
+
   a[3] = "four";
 
+
+
   assert(struct1["d"] == a[2]);
 
+
+
   char csStructXml[] =
+
     "<value><struct>\n"
+
     "  <member>\n"
+
     "    <name>i4</name> \n"
+
     "    <value><i4>1</i4></value> \n"
+
     "  </member>\n"
+
     "  <member>\n"
+
     "    <name>d</name> \n"
+
     "    <value><double>43.7</double></value>\n"
+
     "  </member>\n"
+
     "  <member>\n"
+
     "    <name>str</name> \n"
+
     "    <value> <string>two</string></value>\n"
+
     "  </member>\n"
+
     "</struct></value>";
 
+    
+
   int offset = 0;
+
   XmlRpcValue structXml(csStructXml, &offset);
+
   assert(struct1 == structXml);
 
+
+
   XmlRpcValue astruct;
+
   astruct["array"] = a;
+
   assert(astruct["array"][2] == struct1["d"]);
 
+
+
   for (int i=0; i<10; i++) {
+
     XmlRpcValue Event;
+
     Event["Name"] = "string";
 
+
+
     Event.clear();
 
+
+
     const int NELMTS = 100;
+
     int ii;
 
+
+
     for (ii=0; ii< NELMTS; ++ii) {
+
       char buf[40];
+
       sprintf(buf,"%d", ii);
+
       Event[std::string(buf)] = buf;
+
     }
 
+
+
     Event.clear();
 
-  int offset = 0;
+
-
-  XmlRpcValue dateTime("<value><dateTime.iso8601>19040101T03:12:35</dateTime.iso8601></value>", &offset);
-
-  struct tm &t = dateTime;
-
-  assert(t.tm_year == 1904 && t.tm_min == 12);
-
-}
-
-
-
 
     for (ii=0; ii< NELMTS; ++ii) {
+
       char buf[40];
+
       sprintf(buf,"%d", ii);
+
       if (ii != NELMTS/2)
-
+
+        Event[std::string(buf)] = ii;
+
       else
+
+        for (int jj=0; jj< NELMTS; ++jj) {
+
+          char bufj[40];
+
+          sprintf(bufj,"%d", jj);
+
+          Event[std::string(buf)][std::string(bufj)] = bufj;
+
+        }
+
+    }
+
+
+
+    for (ii=0; ii< NELMTS; ++ii) {
+
+      char buf[40];
+
+      sprintf(buf,"%d", ii);
+
+      if (ii != NELMTS/2)
+
+        assert(Event[std::string(buf)] == XmlRpcValue(ii));
+
+      else
+
         assert(Event[std::string(buf)].size() == NELMTS);
+
     }
+
   }
+
 }
 
 
 
+
+
+
+
 int main(int argc, char* argv[])
+
 {
+
   testBoolean();
 
+
+
   testInt();
 
 
+
+
+
   testDouble();
 
 
+
+
+
   testString();
 
 
+
+
+
   testDateTime();
 
 
+
+
+
   testArray(43.7);
 
 
+
+
+
   testStruct();
 
+
+
   return 0;
+
 }
+

test/TestValuesWin32.cpp

@@ -1,253 +1,506 @@
 // TestValues.cpp : Test XML encoding and decoding of XmlRpcValues.
 
+
+
 #define _CRTDBG_MAP_ALLOC
+
 #include <stdlib.h>
+
 #include <crtdbg.h>
 
+
+
 #include "XmlRpcValue.h"
 
 
+
+
+
 #include <assert.h>
+
 #include <iostream>
 
 
-
+
+
+
+using namespace robot::XmlRpc;
+
+
+
 
 
 void testBoolean()
+
 {
+
   XmlRpcValue booleanFalse(false);
+
   XmlRpcValue booleanTrue(true);
+
   int offset = 0;
+
   XmlRpcValue booleanFalseXml("<value><boolean>0</boolean></value>", &offset);
+
   offset = 0;
+
   XmlRpcValue booleanTrueXml("<value><boolean>1</boolean></value>", &offset);
+
   assert(booleanFalse != booleanTrue);
+
   assert(booleanFalse == booleanFalseXml);
+
   assert(booleanFalse == booleanFalseXml);
+
   if (booleanFalse)
+
     assert(false);
 
+
+
   if (booleanTrue)
+
     assert( ! false);
+
   else
+
     assert(false);
+
 }
 
+
+
 // Int
+
 void testInt()
+
 {
+
   XmlRpcValue int0(0);
+
   XmlRpcValue int1(1);
+
   XmlRpcValue int10(10);
+
   XmlRpcValue int_1(-1);
+
   int offset = 0;
+
   XmlRpcValue int0Xml("<value><int>0</int></value>", &offset);
+
   offset = 0;
+
   XmlRpcValue int9Xml("<value><i4>9</i4></value>", &offset);
+
   assert(int0 == int0Xml);
+
   assert(int(int10) - int(int1) == int(int9Xml));
+
   assert(9 == int(int9Xml));
+
   assert(int(int10) + int(int_1) == int(int9Xml));
+
 }
 
+
+
 void testDouble()
+
 {
+
   // Double
+
   XmlRpcValue d(43.7);
+
   int offset = 0;
+
   XmlRpcValue dXml("<value><double>56.3</double></value>", &offset);
+
   assert(double(d) + double(dXml) == 100.0);  // questionable practice...
+
 }
 
+
+
 void testString()
+
 {
+
   // String
+
   XmlRpcValue s("Now is the time <&");
+
   char csxml[] = "<value><string>Now is the time &lt;&amp;</string></value>";
+
   std::string ssxml = csxml;
+
   int offset = 0;
+
   XmlRpcValue vscXml(csxml, &offset);
+
   offset = 0;
+
   XmlRpcValue vssXml(ssxml, &offset);
+
   assert(s == vscXml);
+
   assert(s == vssXml);
+
   offset = 0;
+
   XmlRpcValue fromXml(vssXml.toXml(), &offset);
+
   assert(s == fromXml);
 
+
+
   // Empty or blank strings with no <string> tags
+
   std::string emptyStringXml("<value></value>");
+
   offset = 0;
+
   XmlRpcValue emptyStringVal1(emptyStringXml, &offset);
+
   XmlRpcValue emptyStringVal2("");
+
   assert(emptyStringVal1 == emptyStringVal2);
 
+
+
   emptyStringXml = "<value>  </value>";
+
   offset = 0;
+
   XmlRpcValue blankStringVal(emptyStringXml, &offset);
+
   assert(std::string(blankStringVal) == "  ");
+
 }
 
 
+
+
+
 void testDateTime()
+
 {
+
   // DateTime
+
   int offset = 0;
+
   XmlRpcValue dateTime("<value><dateTime.iso8601>19040101T03:12:35</dateTime.iso8601></value>", &offset);
+
   struct tm &t = dateTime;
+
   assert(t.tm_year == 1904 && t.tm_min == 12);
+
 }
 
 
+
+
+
 void testArray(XmlRpcValue const& d)
+
 {
+
   // Array
+
   XmlRpcValue a;
+
   a.setSize(4);
+
   a[0] = 1;
+
   a[1] = std::string("two");
+
   a[2] = 43.7;
+
   a[3] = "four";
+
   assert(int(a[0]) == 1);
+
   assert(a[2] == d);
 
+
+
   char csaXml[] =
+
     "<value><array>\n"
+
     "  <data>\n"
+
     "    <value><i4>1</i4></value> \n"
+
     "    <value> <string>two</string></value>\n"
+
     "    <value><double>43.7</double></value>\n"
+
     "    <value>four</value>\n"
+
     "  </data>\n"
+
     "</array></value>";
 
+    
+
   int offset = 0;
+
   XmlRpcValue aXml(csaXml, &offset);
+
   assert(a == aXml);
+
 }
 
+
+
 void testStruct()
+
 {
+
   // Struct
+
   XmlRpcValue struct1;
+
   struct1["i4"] = 1;
+
   struct1["str"] = "two";
+
   struct1["d"] = 43.7;
 
+
+
   XmlRpcValue a;
+
   a.setSize(4);
+
   a[0] = 1;
+
   a[1] = std::string("two");
+
   a[2] = 43.7;
+
   a[3] = "four";
 
+
+
   assert(struct1["d"] == a[2]);
 
+
+
   char csStructXml[] =
+
     "<value><struct>\n"
+
     "  <member>\n"
+
     "    <name>i4</name> \n"
+
     "    <value><i4>1</i4></value> \n"
+
     "  </member>\n"
+
     "  <member>\n"
+
     "    <name>d</name> \n"
+
     "    <value><double>43.7</double></value>\n"
+
     "  </member>\n"
+
     "  <member>\n"
+
     "    <name>str</name> \n"
+
     "    <value> <string>two</string></value>\n"
+
     "  </member>\n"
+
     "</struct></value>";
 
+    
+
   int offset = 0;
+
   XmlRpcValue structXml(csStructXml, &offset);
+
   assert(struct1 == structXml);
 
+
+
   XmlRpcValue astruct;
+
   astruct["array"] = a;
+
   assert(astruct["array"][2] == struct1["d"]);
 
+
+
   for (int i=0; i<10; i++) {
+
     XmlRpcValue Event;
+
     Event["Name"] = "string";
 
+
+
     Event.clear();
 
+
+
     const int NELMTS = 100;
+
     int ii;
 
+
+
     for (ii=0; ii< NELMTS; ++ii) {
+
       char buf[40];
+
       sprintf(buf,"%d", ii);
+
       Event[buf] = buf;
+
     }
 
+
+
     Event.clear();
 
-
+
-  // DateTime
-
-  int offset = 0;
-
-  XmlRpcValue dateTime("<value><dateTime.iso8601>19040101T03:12:35</dateTime.iso8601></value>", &offset);
-
-  struct tm &t = dateTime;
-
-  assert(t.tm_year == 1904 && t.tm_min == 12);
-
-}
 
     for (ii=0; ii< NELMTS; ++ii) {
+
       char buf[40];
+
       sprintf(buf,"%d", ii);
+
       if (ii != NELMTS/2)
-void testArray(XmlRpcValue const& d)
+
+        Event[buf] = ii;
+
       else
+
+        for (int jj=0; jj< NELMTS; ++jj) {
+
+          char bufj[40];
+
+          sprintf(bufj,"%d", jj);
+
+          Event[buf][bufj] = bufj;
+
+        }
+
+    }
+
+
+
+    for (ii=0; ii< NELMTS; ++ii) {
+
+      char buf[40];
+
+      sprintf(buf,"%d", ii);
+
+      if (ii != NELMTS/2)
+
+        assert(Event[buf] == XmlRpcValue(ii));
+
+      else
+
         assert(Event[buf].size() == NELMTS);
+
     }
+
   }
+
 }
 
 
 
+
+
+
+
 int main(int argc, char* argv[])
+
 {
+
   _CrtDumpMemoryLeaks();
+
   _CrtCheckMemory( );
 
+
+
   testBoolean();
+
   _CrtDumpMemoryLeaks();
+
   _CrtCheckMemory( );
 
+
+
   testInt();
+
   _CrtDumpMemoryLeaks();
+
   _CrtCheckMemory( );
 
 
+
+
+
   testDouble();
+
   _CrtDumpMemoryLeaks();
+
   _CrtCheckMemory( );
 
 
+
+
+
   testString();
+
   _CrtDumpMemoryLeaks();
+
   _CrtCheckMemory( );
 
 
+
+
+
   testDateTime();
+
   _CrtDumpMemoryLeaks();
+
   _CrtCheckMemory( );
 
 
+
+
+
   testArray(43.7);
+
   _CrtDumpMemoryLeaks();
+
   _CrtCheckMemory( );
 
 
+
+
+
   testStruct();
+
   _CrtDumpMemoryLeaks();
+
   _CrtCheckMemory( );
 
+
+
   return 0;
+
 }
+

test/TestXml.cpp

@@ -1,53 +1,106 @@
 // TestXml.cpp : Test XML encoding and decoding.
+
 // The characters <>&'" are illegal in xml and must be encoded.
 
 
+
+
+
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 
+
+
 #include <iostream>
+
 // If you are using MSVC++6, you should update <string> to fix
+
 // BUG: getline Template Function Reads Extra Character
+
 #include <string>
+
 #include <assert.h>
+
 #include <stdlib.h>
 
+
+
 #include "XmlRpcUtil.h"
 
-
+
+
+using namespace robot::XmlRpc;
+
+
+
 
 
 int main(int argc, char* argv[])
+
 {
+
   // Basic tests
+
   std::string empty;
+
   assert(empty == XmlRpcUtil::xmlEncode(empty));
+
   assert(empty == XmlRpcUtil::xmlDecode(empty));
+
   assert(empty == XmlRpcUtil::xmlEncode(""));
+
   assert(empty == XmlRpcUtil::xmlDecode(""));
 
+
+
   std::string raw("<>&'\"");
+
   assert(XmlRpcUtil::xmlDecode(XmlRpcUtil::xmlEncode(raw)) == raw);
 
+  
+
   std::cout << "Basic tests passed.\n";
 
+
+
   // Interactive tests
+
   std::string s;
+
   for (;;) {
+
     std::cout << "\nEnter line of raw text to encode:\n";
+
     std::getline(std::cin, s);
+
     if (s.empty()) break;
 
+
+
     std::cout << XmlRpcUtil::xmlEncode(s) << std::endl;
+
   }
 
+
+
   for (;;) {
+
     std::cout << "\nEnter line of xml-encoded text to decode:\n";
+
     std::getline(std::cin, s);
+
     if (s.empty()) break;
 
+
+
     std::cout << XmlRpcUtil::xmlDecode(s) << std::endl;
+
   }
 
+
+
   return 0;
+
 }
 
+
+

test/Validator.cpp

@@ -1,207 +1,414 @@
 // Validator.cpp : XMLRPC server based on the compliancy test at validator.xmlrpc.com.
+
 //
+
 #include "XmlRpc.h"
-
+
+using namespace robot::XmlRpc;
+
+
 
 #include <iostream>
 
 
+
+
+
 XmlRpcServer s;
 
 
+
+
+
 // One argument is passed, an array of structs, each with a member named curly with 
+
 // an integer value. Return the sum of those values.
 
+
+
 class ArrayOfStructsTest : public XmlRpcServerMethod
+
 {
+
 public:
+
   ArrayOfStructsTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.arrayOfStructsTest", s) {}
 
+
+
   void execute(XmlRpcValue& params, XmlRpcValue& result)
+
   {
+
     std::cerr << "ArrayOfStructsTest\n";
+
     XmlRpcValue& arg1 = params[0];
+
     int n = arg1.size(), sum = 0;
+
     for (int i=0; i<n; ++i) 
+
       sum += int(arg1[i]["curly"]);
 
+
+
     result = sum;
+
   }
+
 } arrayOfStructsTest(&s);
 
 
+
+
+
 // This handler takes a single parameter, a string, that contains any number of predefined 
+
 // entities, namely <, >, &, ' and ".
+
 // The handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, 
+
 // ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes. 
+
 // To validate, the numbers must be correct.
 
+
+
 class CountTheEntities : public XmlRpcServerMethod
+
 {
+
 public:
+
   CountTheEntities(XmlRpcServer* s) : XmlRpcServerMethod("validator1.countTheEntities", s) {}
 
+
+
   void execute(XmlRpcValue& params, XmlRpcValue& result)
+
   {
+
     std::cerr << "CountTheEntities\n";
+
     std::string& arg = params[0];
+
     int ctLeftAngleBrackets = 0;
+
     int ctRightAngleBrackets = 0;
+
     int ctAmpersands = 0;
+
     int ctApostrophes = 0;
+
     int ctQuotes = 0;
 
+
+
     int n = int(arg.length());
+
     for (int i=0; i<n; ++i)
+
       switch (arg[i])
+
       {
+
         case '<': ++ctLeftAngleBrackets; break;
+
         case '>': ++ctRightAngleBrackets; break;
+
         case '&': ++ctAmpersands; break;
+
         case '\'': ++ctApostrophes; break;
+
         case '\"': ++ctQuotes; break;
+
       }
 
+
+
     result["ctLeftAngleBrackets"] = ctLeftAngleBrackets;
+
     result["ctRightAngleBrackets"] = ctRightAngleBrackets;
+
     result["ctAmpersands"] = ctAmpersands;
+
     result["ctApostrophes"] = ctApostrophes;
+
     result["ctQuotes"] = ctQuotes;
+
   }
+
 } countTheEntities(&s);
 
 
 
+
+
+
+
 // This handler takes a single parameter, a struct, containing at least three elements 
+
 // named moe, larry and curly, all <i4>s. Your handler must add the three numbers and 
+
 // return the result.
 
+
+
 class EasyStructTest : public XmlRpcServerMethod
+
 {
+
 public:
+
   EasyStructTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.easyStructTest", s) {}
 
+
+
   void execute(XmlRpcValue& params, XmlRpcValue& result)
+
   {
+
     std::cerr << "EasyStructTest\n";
+
     XmlRpcValue& arg1 = params[0];
+
     int sum = int(arg1["moe"]) + int(arg1["larry"]) + int(arg1["curly"]);
+
     result = sum;
+
   }
+
 } easyStructTest(&s);
 
 
+
+
+
 // This handler takes a single parameter, a struct. Your handler must return the struct.
 
+
+
 class EchoStructTest : public XmlRpcServerMethod
+
 {
+
 public:
+
   EchoStructTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.echoStructTest", s) {}
 
+
+
   void execute(XmlRpcValue& params, XmlRpcValue& result)
+
   {
+
     std::cerr << "EchoStructTest\n";
+
     result = params[0];
+
   }
+
 } echoStructTest(&s);
 
 
 
+
+
+
+
 // This handler takes six parameters, and returns an array containing all the parameters.
 
+
+
 class ManyTypesTest : public XmlRpcServerMethod
+
 {
+
 public:
+
   ManyTypesTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.manyTypesTest", s) {}
 
+
+
   void execute(XmlRpcValue& params, XmlRpcValue& result)
+
   {
+
     std::cerr << "ManyTypesTest\n";
+
     result = params;
+
   }
+
 } manyTypesTest(&s);
 
 
 
+
+
+
+
 // This handler takes a single parameter, which is an array containing between 100 and 
+
 // 200 elements. Each of the items is a string, your handler must return a string 
+
 // containing the concatenated text of the first and last elements.
 
 
+
+
+
 class ModerateSizeArrayCheck : public XmlRpcServerMethod
+
 {
+
 public:
+
   ModerateSizeArrayCheck(XmlRpcServer* s) : XmlRpcServerMethod("validator1.moderateSizeArrayCheck", s) {}
 
+
+
   void execute(XmlRpcValue& params, XmlRpcValue& result)
+
   {
+
     std::cerr << "ModerateSizeArrayCheck\n";
+
     std::string s = params[0][0];
+
     s += params[0][params[0].size()-1];
+
     result = s;
+
   }
+
 } moderateSizeArrayCheck(&s);
 
 
+
+
+
 // This handler takes a single parameter, a struct, that models a daily calendar.
+
 // At the top level, there is one struct for each year. Each year is broken down
+
 // into months, and months into days. Most of the days are empty in the struct
+
 // you receive, but the entry for April 1, 2000 contains a least three elements
+
 // named moe, larry and curly, all <i4>s. Your handler must add the three numbers
+
 // and return the result.
 
+
+
 class NestedStructTest : public XmlRpcServerMethod
+
 {
+
 public:
+
   NestedStructTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.nestedStructTest", s) {}
 
+
+
   void execute(XmlRpcValue& params, XmlRpcValue& result)
+
   {
+
     std::cerr << "NestedStructTest\n";
+
     XmlRpcValue& dayStruct = params[0]["2000"]["04"]["01"];
+
     int sum = int(dayStruct["moe"]) + int(dayStruct["larry"]) + int(dayStruct["curly"]);
+
     result = sum;
+
   }
+
 } nestedStructTest(&s);
 
 
 
+
+
+
+
 // This handler takes one parameter, and returns a struct containing three elements, 
+
 // times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000.
 
+
+
 class SimpleStructReturnTest : public XmlRpcServerMethod
+
 {
+
 public:
+
   SimpleStructReturnTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.simpleStructReturnTest", s) {}
 
+
+
   void execute(XmlRpcValue& params, XmlRpcValue& result)
+
   {
+
     std::cerr << "SimpleStructReturnTest\n";
+
     int n = params[0];
+
     result["times10"] = n * 10;
+
     result["times100"] = n * 100;
+
     result["times1000"] = n * 1000;
+
   }
+
 } simpleStructReturnTest(&s);
 
 
 
+
+
+
+
 int main(int argc, char* argv[])
+
 {
+
   if (argc != 2) {
+
     std::cerr << "Usage: Validator port\n";
+
     return -1;
+
   }
+
   int port = atoi(argv[1]);
 
-  EchoStructTest(XmlRpcServer* s) : XmlRpcServerMethod("validator1.echoStructTest", s) {}
+
+
+  robot::XmlRpc::setVerbosity(5);
+
+
 
   // Create the server socket on the specified port
+
   s.bindAndListen(port);
 
+
+
   // Wait for requests indefinitely
+
   s.work(-1.0);
 
+
+
   return 0;
+
 }
 
+
+