[#3729] Removed all code related to Xmsg.

Created api number validator.
Cleaned up api number indentation and wrapped it in guards for clang-format.

CMakeLists.txt

@@ -306,7 +306,6 @@ set(
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcGetRescQuota.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcGetTempPassword.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcGetTempPasswordForOther.cpp
-  ${CMAKE_SOURCE_DIR}/lib/api/src/rcGetXmsgTicket.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcIESClientHints.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcL3FileGetSingleBuf.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcL3FilePutSingleBuf.cpp
@@ -322,7 +321,6 @@ set(
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcPhyPathReg.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcProcStat.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcQuerySpecColl.cpp
-  ${CMAKE_SOURCE_DIR}/lib/api/src/rcRcvXmsg.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcReadCollection.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcRegColl.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcRegDataObj.cpp
@@ -331,7 +329,6 @@ set(
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcRuleExecDel.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcRuleExecMod.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcRuleExecSubmit.cpp
-  ${CMAKE_SOURCE_DIR}/lib/api/src/rcSendXmsg.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcServerReport.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcSimpleQuery.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcSpecificQuery.cpp
@@ -518,7 +515,6 @@ set(
   ${CMAKE_SOURCE_DIR}/server/api/src/rsGetRescQuota.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsGetTempPassword.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsGetTempPasswordForOther.cpp
-  ${CMAKE_SOURCE_DIR}/server/api/src/rsGetXmsgTicket.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsIESClientHints.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsL3FileGetSingleBuf.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsL3FilePutSingleBuf.cpp
@@ -534,7 +530,6 @@ set(
   ${CMAKE_SOURCE_DIR}/server/api/src/rsPhyPathReg.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsProcStat.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsQuerySpecColl.cpp
-  ${CMAKE_SOURCE_DIR}/server/api/src/rsRcvXmsg.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsReadCollection.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsRegColl.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsRegDataObj.cpp
@@ -543,7 +538,6 @@ set(
   ${CMAKE_SOURCE_DIR}/server/api/src/rsRuleExecDel.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsRuleExecMod.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsRuleExecSubmit.cpp
-  ${CMAKE_SOURCE_DIR}/server/api/src/rsSendXmsg.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsServerReport.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsSetRoundRobinContext.cpp
   ${CMAKE_SOURCE_DIR}/server/api/src/rsSimpleQuery.cpp
@@ -584,6 +578,7 @@ set(
   ${CMAKE_SOURCE_DIR}/server/core/src/fileOpr.cpp
   ${CMAKE_SOURCE_DIR}/server/core/src/initServer.cpp
   ${CMAKE_SOURCE_DIR}/server/core/src/irods_api_calling_functions.cpp
+  ${CMAKE_SOURCE_DIR}/server/core/src/irods_api_number_validator.cpp
   ${CMAKE_SOURCE_DIR}/server/core/src/irods_collection_object.cpp
   ${CMAKE_SOURCE_DIR}/server/core/src/irods_data_object.cpp
   ${CMAKE_SOURCE_DIR}/server/core/src/irods_database_factory.cpp
@@ -621,7 +616,6 @@ set(
   ${CMAKE_SOURCE_DIR}/server/core/src/rsIcatOpr.cpp
   ${CMAKE_SOURCE_DIR}/server/core/src/rsLog.cpp
   ${CMAKE_SOURCE_DIR}/server/core/src/specColl.cpp
-  ${CMAKE_SOURCE_DIR}/server/core/src/xmsgLib.cpp
   ${CMAKE_SOURCE_DIR}/server/drivers/src/fileDriver.cpp
   ${CMAKE_SOURCE_DIR}/server/icat/src/icatHighLevelRoutines.cpp
   ${CMAKE_SOURCE_DIR}/server/re/src/extractAvuMS.cpp
@@ -647,7 +641,6 @@ set(
   ${CMAKE_SOURCE_DIR}/server/re/src/reSysDataObjOpr.cpp
   ${CMAKE_SOURCE_DIR}/server/re/src/sharedmemory.cpp
   ${CMAKE_SOURCE_DIR}/server/re/src/testMS.cpp
-  ${CMAKE_SOURCE_DIR}/server/re/src/xmsgMS.cpp
   )
 add_library(
   irods_server
@@ -929,9 +922,6 @@ set(
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcSubStructFileReaddir.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcSubStructFileClosedir.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcGeneralUpdate.cpp
-  ${CMAKE_SOURCE_DIR}/lib/api/src/rcGetXmsgTicket.cpp
-  ${CMAKE_SOURCE_DIR}/lib/api/src/rcSendXmsg.cpp
-  ${CMAKE_SOURCE_DIR}/lib/api/src/rcRcvXmsg.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcSubStructFileGet.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcSubStructFilePut.cpp
   ${CMAKE_SOURCE_DIR}/lib/api/src/rcSyncMountedColl.cpp
@@ -1147,11 +1137,6 @@ set(
   ${CMAKE_SOURCE_DIR}/server/core/src/irods_server_control_plane.cpp
   )
 
-set(
-  IRODS_MAIN_EXECUTABLE_IRODSXMSGSERVER_SOURCES
-  ${CMAKE_SOURCE_DIR}/server/core/src/irodsXmsgServer.cpp
-  )
-
 set(
   IRODS_MAIN_EXECUTABLE_HOSTNAME_RESOLVES_TO_LOCAL_ADDRESS_SOURCES
   ${CMAKE_SOURCE_DIR}/server/core/src/hostname_resolves_to_local_address.cpp
@@ -1161,7 +1146,6 @@ set(
   IRODS_MAIN_EXECUTABLES
 #  irodsAgent
   irodsServer
-  irodsXmsgServer
   hostname_resolves_to_local_address
   )
 
@@ -1521,7 +1505,7 @@ foreach(DATABASE_PLUGIN postgres oracle mysql)
     COMMAND
     python ${CMAKE_SOURCE_DIR}/configuration_schemas/update_schema_ids_for_cmake.py ${CMAKE_INSTALL_PREFIX}/${IRODS_HOME_DIRECTORY}/configuration_schemas/v${IRODS_CONFIGURATION_SCHEMA_VERSION} ${CMAKE_INSTALL_PREFIX}/${IRODS_HOME_DIRECTORY}/configuration_schemas/v${IRODS_CONFIGURATION_SCHEMA_VERSION}
     DEPENDS
-    irodsServer irodsReServer irodsXmsgServer hostname_resolves_to_local_address irodsPamAuthCheck irods_client irods_server irods_common irods_plugin_dependencies RodsAPIs helloworld_server helloworld_client msisync_to_archive msi_update_unixfilesystem_resource_free_space compound deferred load_balanced mockarchive nonblocking passthru random replication roundrobin structfile univmss unixfilesystem irods_rule_engine_plugin-irods_rule_language irods_rule_engine_plugin-cpp_default_policy native_client native_server osauth_client osauth_server pam_client pam_server ssl_client ssl_server tcp_client tcp_server genOSAuth mytest
+    irodsServer irodsReServer hostname_resolves_to_local_address irodsPamAuthCheck irods_client irods_server irods_common irods_plugin_dependencies RodsAPIs helloworld_server helloworld_client msisync_to_archive msi_update_unixfilesystem_resource_free_space compound deferred load_balanced mockarchive nonblocking passthru random replication roundrobin structfile univmss unixfilesystem irods_rule_engine_plugin-irods_rule_language irods_rule_engine_plugin-cpp_default_policy native_client native_server osauth_client osauth_server pam_client pam_server ssl_client ssl_server tcp_client tcp_server genOSAuth mytest
     ${DATABASE_PLUGIN} IRODS_PHONY_TARGET_icatSysTables_${DATABASE_PLUGIN}.sql
     )
 endforeach()

cmake/development_library.cmake

@@ -126,7 +126,6 @@ set(
   ${CMAKE_SOURCE_DIR}/lib/core/include/rodsQuota.h
   ${CMAKE_SOURCE_DIR}/lib/core/include/rodsType.h
   ${CMAKE_SOURCE_DIR}/lib/core/include/rodsUser.h
-  ${CMAKE_SOURCE_DIR}/lib/core/include/rodsXmsg.h
   ${CMAKE_SOURCE_DIR}/lib/core/include/rsyncUtil.h
   ${CMAKE_SOURCE_DIR}/lib/core/include/scanUtil.h
   ${CMAKE_SOURCE_DIR}/lib/core/include/sockComm.h
@@ -231,7 +230,6 @@ set(
   ${CMAKE_SOURCE_DIR}/lib/api/include/getRescQuota.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/getTempPassword.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/getTempPasswordForOther.h
-  ${CMAKE_SOURCE_DIR}/lib/api/include/getXmsgTicket.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/get_hier_from_leaf_id.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/ies_client_hints.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/l3FileGetSingleBuf.h
@@ -248,7 +246,6 @@ set(
   ${CMAKE_SOURCE_DIR}/lib/api/include/phyPathReg.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/procStat.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/querySpecColl.h
-  ${CMAKE_SOURCE_DIR}/lib/api/include/rcvXmsg.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/readCollection.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/regColl.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/regDataObj.h
@@ -257,7 +254,6 @@ set(
   ${CMAKE_SOURCE_DIR}/lib/api/include/ruleExecDel.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/ruleExecMod.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/ruleExecSubmit.h
-  ${CMAKE_SOURCE_DIR}/lib/api/include/sendXmsg.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/server_report.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/set_round_robin_context.h
   ${CMAKE_SOURCE_DIR}/lib/api/include/simpleQuery.h
@@ -381,7 +377,6 @@ set(
   ${CMAKE_SOURCE_DIR}/server/api/include/rsGetRescQuota.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsGetTempPassword.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsGetTempPasswordForOther.hpp
-  ${CMAKE_SOURCE_DIR}/server/api/include/rsGetXmsgTicket.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsIESClientHints.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsL3FileGetSingleBuf.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsL3FilePutSingleBuf.hpp
@@ -397,7 +392,6 @@ set(
   ${CMAKE_SOURCE_DIR}/server/api/include/rsPhyPathReg.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsProcStat.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsQuerySpecColl.hpp
-  ${CMAKE_SOURCE_DIR}/server/api/include/rsRcvXmsg.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsReadCollection.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsRegColl.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsRegDataObj.hpp
@@ -406,7 +400,6 @@ set(
   ${CMAKE_SOURCE_DIR}/server/api/include/rsRuleExecDel.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsRuleExecMod.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsRuleExecSubmit.hpp
-  ${CMAKE_SOURCE_DIR}/server/api/include/rsSendXmsg.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsServerReport.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsSetRoundRobinContext.hpp
   ${CMAKE_SOURCE_DIR}/server/api/include/rsSimpleQuery.hpp
@@ -451,7 +444,6 @@ set(
   ${CMAKE_SOURCE_DIR}/server/core/include/fileOpr.hpp
   ${CMAKE_SOURCE_DIR}/server/core/include/initServer.hpp
   ${CMAKE_SOURCE_DIR}/server/core/include/irodsReServer.hpp
-  ${CMAKE_SOURCE_DIR}/server/core/include/irodsXmsgServer.hpp
   ${CMAKE_SOURCE_DIR}/server/core/include/irods_api_calling_functions.hpp
   ${CMAKE_SOURCE_DIR}/server/core/include/irods_at_scope_exit.hpp
   ${CMAKE_SOURCE_DIR}/server/core/include/irods_collection_object.hpp
@@ -500,7 +492,6 @@ set(
   ${CMAKE_SOURCE_DIR}/server/core/include/rsIcatOpr.hpp
   ${CMAKE_SOURCE_DIR}/server/core/include/rsLog.hpp
   ${CMAKE_SOURCE_DIR}/server/core/include/specColl.hpp
-  ${CMAKE_SOURCE_DIR}/server/core/include/xmsgLib.hpp
   )
 
 set(

cmake/server.cmake

@@ -5,7 +5,6 @@ install(
 #  irodsAgent
   irodsServer
   irodsReServer
-  irodsXmsgServer
   hostname_resolves_to_local_address
   RUNTIME
   DESTINATION usr/sbin

configuration_schemas/samples/sample-grid_status.json

@@ -5,7 +5,6 @@
             "hostname": "awesome",
             "irods_server_pid": 1234,
             "re_server_pid": 1234,
-            "xmsg_server_pid": 1234,
             "status": "perfect",
             "agents": [
                 {
@@ -22,7 +21,6 @@
             "hostname": "again",
             "irods_server_pid": 12345,
             "re_server_pid": 12345,
-            "xmsg_server_pid": 12345,
             "status": "notsogood",
             "agents": [
                 {

configuration_schemas/samples/sample-zone_bundle.json

@@ -265,7 +265,6 @@
                     "server_control_plane_timeout_milliseconds": 10000,
                     "server_port_range_end": 20199,
                     "server_port_range_start": 20000,
-                    "xmsg_port": 1279,
                     "zone_auth_scheme": "native",
                     "zone_key": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
                     "zone_name": "tempZone",

configuration_schemas/v3/server_config.json

@@ -89,7 +89,6 @@
         "server_control_plane_timeout_milliseconds": {"type": "integer"},
         "server_port_range_end": {"type": "integer"},
         "server_port_range_start": {"type": "integer"},
-        "xmsg_port": {"type": "integer"},
         "zone_auth_scheme" : {"type": "string"},
         "zone_key": {"type": "string", "pattern": "^[A-Za-z0-9_]+$", "maxLength": 49},
         "zone_name": {"type": "string", "pattern": "^[A-Za-z0-9_\\.]+$", "maxLength": 63},

configuration_schemas/v3/server_status.json

@@ -17,8 +17,7 @@
         "hostname": {"type": "string"},
         "irods_server_pid": {"type": "integer"},
         "re_server_pid": {"type": "integer"},
-        "status": {"type": "string"},
-        "xmsg_server_pid": {"type": "integer"}
+        "status": {"type": "string"}
     },
-    "required": ["agents","hostname","irods_server_pid","re_server_pid","status","xmsg_server_pid"]
+    "required": ["agents","hostname","irods_server_pid","re_server_pid","status"]
 }

configuration_schemas/v3/service_account_environment.json

@@ -32,9 +32,7 @@
         "irods_ssl_certificate_chain_file":  {"type": "string"},
         "irods_ssl_certificate_key_file":  {"type": "string"},
         "irods_ssl_dh_params_file":  {"type": "string"},
-        "irods_ssl_verify_server":  {"enum": ["cert","hostname","none"]},
-        "irods_xmsg_host": {"type": "string"},
-        "irods_xmsg_port": {"type": "integer"}
+        "irods_ssl_verify_server":  {"enum": ["cert","hostname","none"]}
     },
     "required": [
         "irods_client_server_negotiation",

doxygen/microservices.cpp

@@ -116,16 +116,6 @@
   - #msiPrintGenQueryOutToBuffer - Writes the contents of a GenQueryOut_MS_T into a BUF_LEN_MS_T
   - #msiDeleteUnusedAVUs - Deletes unused AVUs from the iCAT
 
- \subsection msixmsg XMessaging System Microservices
-  - #msiXmsgServerConnect - Connects to the XMessage Server as designate by iRODS Environment file/variable
-  - #msiXmsgCreateStream - Creates a new Message Stream
-  - #msiCreateXmsgInp  - Creates an Xmsg packet, given all information values
-  - #msiSendXmsg - Sends an Xmsg packet
-  - #msiRcvXmsg -  Receives an Xmsg packet
-  - #msiXmsgServerDisConnect  - Disconnects from the XMessage Server
-  - #readXMsg - Reads a message packet from an XMsgStream
-  - #writeXMsg - Writes a given string into an XMsgStream
-
  \subsection msistring String Manipulation Microservices
   - #msiStrlen   - Returns the length of a given string
   - #msiStrchop  - Removes the last character of a given string

doxygen/modules.cpp

@@ -74,8 +74,6 @@
     @defgroup msi_icat iCAT Microservices
     @brief iCAT System Services
 
-    @defgroup msi_xmsg XMessaging System Microservices
-
     @defgroup msi_string String Manipulation Microservices
 
     @defgroup msi_email Email Microservices

lib/api/include/apiHeaderAll.h

@@ -90,9 +90,6 @@
 #include "fileTruncate.h"
 #include "subStructFileTruncate.h"
 #include "generalUpdate.h"
-#include "getXmsgTicket.h"
-#include "sendXmsg.h"
-#include "rcvXmsg.h"
 #include "subStructFileGet.h"
 #include "subStructFilePut.h"
 #include "syncMountedColl.h"