OpenRTM · Nobu19800 · Jan 11, 2022 · Jan 11, 2022 · Jan 11, 2022 · Jan 11, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,6 +18,8 @@ if(CCACHE_PROGRAM)
    set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
 endif()
 
+set(SSL_ENABLE FALSE CACHE BOOL "set SSL_ENABLE")
+
 if(NOT ORB_ROOT)
 	if(CORBA STREQUAL "omniORB")
 		if(UNIX)
@@ -46,6 +48,9 @@ if(NOT ORB_ROOT)
 			set(ACE_TAO_INCLUDE_DIRS ${TAO_Svc_Utils_INCLUDE_DIRS} ${TAO_CosNaming_INCLUDE_DIRS} ${TAO_IORTable_INCLUDE_DIRS} ${TAO_Utils_INCLUDE_DIRS} ${TAO_Strategies_INCLUDE_DIRS})
 			set(ACE_TAO_CFLAGS ${TAO_Svc_Utils_CFLAGS} ${TAO_CosNaming_CFLAGS} ${TAO_IORTable_CFLAGS} ${TAO_Utils_CFLAGS} ${TAO_Strategies_CFLAGS})
 			set(ACE_TAO_DIR ${TAO_Svc_Utils_PREFIX})
+			if(SSL_ENABLE)
+				set(ACE_TAO_LIBRARIES ${ACE_TAO_LIBRARIES} TAO_Security)
+			endif()
 		else(UNIX)
 			message(FATAL_ERROR "Please set ORB_ROOT.")
 		endif(UNIX)		
@@ -132,7 +137,6 @@ else()
 	set(INSTALL_RTM_SHARE_DIR share)
 endif(MSVC)
 
-set(SSL_ENABLE FALSE CACHE BOOL "set SSL_ENABLE")
 set(HTTP_ENABLE FALSE CACHE BOOL "set HTTP_ENABLE")
 set(OBSERVER_ENABLE FALSE CACHE BOOL "set OBSERVER_ENABLE")
 
@@ -393,6 +397,9 @@ elseif(CORBA STREQUAL "omniORB")
 	endif(VXWORKS)
 elseif(CORBA STREQUAL "TAO")
 	set(CORBA_NAME "TAO" CACHE STRING "CORBA name.")
+	if(SSL_ENABLE)
+		set(ORB_C_FLAGS_LIST ${ORB_C_FLAGS_LIST} -DSSL_ENABLE)
+	endif()
 
 	if(VXWORKS)
 		if("${VX_CPU_FAMILY}" STREQUAL "ppc")
@@ -403,7 +410,7 @@ elseif(CORBA STREQUAL "TAO")
 		set(ORB_C_FLAGS_LIST ${ORB_C_FLAGS_LIST} -DACE_VXWORKS=0x690 -DACE_HAS_PTHREADS -DACE_HAS_AIO_CALLS -DACE_LACKS_ISBLANK)
 
 		set(ORB_LINK_DIR ${ORB_ROOT}/lib)
-		set(ORB_LIBRARIES TAO_AnyTypeCode TAO_PortableServer TAO_Svc_Utils TAO_CosNaming TAO_DynamicInterface TAO_PI TAO_Utils TAO_PortableServer TAO_DiffServPolicy TAO_DynamicInterface TAO_Strategies TAO ACE)
+		set(ORB_LIBRARIES TAO_AnyTypeCode TAO_PortableServer TAO_Svc_Utils TAO_CosNaming TAO_DynamicInterface TAO_PI TAO_Utils TAO_PortableServer TAO_DiffServPolicy TAO_Strategies TAO ACE)
 		set(ORB_INCLUDE_DIR ${ORB_ROOT} ${ORB_ROOT}/TAO ${ORB_ROOT}/TAO/orbsvcs)
 	elseif(UNIX)
 		if(ORB_ROOT)
@@ -424,7 +431,7 @@ elseif(CORBA STREQUAL "TAO")
 		set(ORB_INCLUDE_DIR ${ORB_ROOT} ${ORB_ROOT}/TAO ${ORB_ROOT}/TAO/orbsvcs)
 		set(ORB_C_FLAGS_LIST ${ORB_C_FLAGS_LIST} -DWIN32_LEAN_AND_MEAN -DWITH_ACE)
 
-		set(ORB_LIBRARIES_INSTALL ${ORB_LIBRARIES1};TAO_IDL_FE;TAO_IDL_FEd;TAO_IDL_BE;TAO_IDL_BEd;)
+		set(ORB_LIBRARIES_INSTALL ${ORB_LIBRARIES1};TAO_IDL_FE;TAO_IDL_FEd;TAO_IDL_BE;TAO_IDL_BEd;TAO_Codeset;TAO_Codesetd;TAO_HTIOP;TAO_HTIOPd;ACE_HTBP;ACE_HTBPd;)
 		set(ORB_INSTALL_DIR ${OPENRTM_VERSION}/ACE/${RTM_VC_VER}/)
 		foreach(library ${ORB_LIBRARIES_INSTALL})
 			if((NOT (${library} STREQUAL "optimized")) AND (NOT (${library} STREQUAL "debug")))

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
@@ -8,5 +8,51 @@ else()
 endif()
 
 if(CORBA STREQUAL "TAO")
-	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tao_udp/svc.conf DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_udp COMPONENT ext)
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tao_diop/svc.conf DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_diop COMPONENT ext)
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/tao_diop/rtc.diop.conf.in ${PROJECT_BINARY_DIR}/rtc.diop.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/rtc.diop.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_diop
+		COMPONENT ext)
+
+
+
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tao_htiop/svc.conf DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_htiop COMPONENT ext)
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tao_htiop/HT_Config.conf DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_htiop COMPONENT ext)
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/tao_htiop/rtc.htiop.conf.in ${PROJECT_BINARY_DIR}/rtc.htiop.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/rtc.htiop.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_htiop
+		COMPONENT ext)
+
+
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/tao_ssliop/rtc.ssliop.conf.in ${PROJECT_BINARY_DIR}/rtc.ssliop.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/rtc.ssliop.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_ssliop
+		COMPONENT ext)
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/tao_ssliop/svc.conf.in ${PROJECT_BINARY_DIR}/svc.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/svc.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_ssliop
+		COMPONENT ext)
+
+
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tao_shmiop/svc.conf DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_shmiop COMPONENT ext)
+
+	configure_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/tao_shmiop/rtc.shmiop.conf.in ${PROJECT_BINARY_DIR}/rtc.shmiop.conf @ONLY)
+	install(
+		FILES ${PROJECT_BINARY_DIR}/rtc.shmiop.conf
+		DESTINATION ${INSTALL_RTM_ETC_DIR}/tao_shmiop
+		COMPONENT ext)
+
 endif()
diff --git a/etc/tao_diop/rtc.diop.conf.in b/etc/tao_diop/rtc.diop.conf.in
@@ -0,0 +1,5 @@
+logger.enable: YES
+logger.log_level: DEBUG
+#logger.file_name: stdout
+
+corba.args: -ORBEndpoint iiop://: -ORBEndpoint diop://: -ORBSvcConf @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@tao_udp/svc.conf
diff --git a/etc/tao_udp/svc.conf → etc/tao_diop/svc.conf b/etc/tao_udp/svc.conf → etc/tao_diop/svc.conf
diff --git a/etc/tao_htiop/HT_Config.conf b/etc/tao_htiop/HT_Config.conf
@@ -0,0 +1,10 @@
+
+[htbp]
+# The Proxy_port and proxy_host values control how the HTIOP "inside" peers
+# to connect to "outside" peers. In situations where the process inside a
+# protected enclave is required to vector all HTTP traffic through some
+# third-party proxy, such as Squid, then put the host and port for that
+# proxy here.
+
+#proxy_port=3128
+#proxy_host=rtai.ociweb.com
diff --git a/etc/tao_htiop/rtc.htiop.conf.in b/etc/tao_htiop/rtc.htiop.conf.in
@@ -0,0 +1,8 @@
+logger.enable: YES
+logger.log_level: DEBUG
+#logger.file_name: stdout
+
+corba.args: -ORBEndpoint htiop:// -ORBSvcConf @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@tao_http/svc.conf
+
+#corba.nameservers: corbaloc:htiop:127.0.0.1:2809
+#corba.master_manager: htiop://127.0.0.1:2810
diff --git a/etc/tao_htiop/svc.conf b/etc/tao_htiop/svc.conf
@@ -0,0 +1,6 @@
+
+dynamic HTIOP_Factory Service_Object *
+        TAO_HTIOP:_make_TAO_HTIOP_Protocol_Factory ()
+        "-config ./HT_Config.conf"
+
+static Advanced_Resource_Factory "-ORBProtocolFactory HTIOP_Factory"
diff --git a/etc/tao_shmiop/rtc.shmiop.conf.in b/etc/tao_shmiop/rtc.shmiop.conf.in
@@ -0,0 +1,9 @@
+logger.enable: YES
+logger.log_level: DEBUG
+#logger.file_name: stdout
+
+corba.args: -ORBEndpoint shmiop://: -ORBSvcConf @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@tao_shm/svc.conf
+
+
+#corba.nameservers: corbaloc:shmiop:1.0@:2809
+#corba.master_manager: shmiop://1.0@hostname:2810
diff --git a/etc/tao_shmiop/svc.conf b/etc/tao_shmiop/svc.conf
@@ -0,0 +1 @@
+static Advanced_Resource_Factory "-ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory IIOP_Factory -ORBReactorType select_st"
diff --git a/etc/tao_ssliop/rtc.ssliop.conf.in b/etc/tao_ssliop/rtc.ssliop.conf.in
@@ -0,0 +1,8 @@
+logger.enable: YES
+logger.log_level: DEBUG
+#logger.file_name: stdout
+
+corba.args: -ORBEndpoint ssliop://: -ORBSvcConf @CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@tao_ssl/svc.conf
+
+corba.nameservers: corbaloc:ssliop:127.0.0.1:2809
+corba.master_manager: ssliop://127.0.0.1:2810
diff --git a/etc/tao_ssliop/svc.conf.in b/etc/tao_ssliop/svc.conf.in
@@ -0,0 +1,4 @@
+dynamic SSLIOP_Factory Service_Object *
+        TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
+        "-SSLPrivateKey PEM:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@ssl/server.pem -SSLCertificate PEM:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@ssl/root.crt -SSLPassword passward"
+static Advanced_Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/src/ext/http/rtc.http.conf.in b/src/ext/http/rtc.http.conf.in
@@ -2,9 +2,11 @@ logger.enable: YES
 logger.log_level: DEBUG
 #logger.file_name: stdout
 
+naming.formats: test.host_cxt/%n.rtc
+
 manager.modules.load_path: @CMAKE_INSTALL_PREFIX@/@INSTALL_HTTPTRANSPORT_DIR@
 manager.preload.modules: HTTPTransport@CMAKE_SHARED_LIBRARY_SUFFIX@
 
 corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:http:///call
-corba.nameservers: http://127.0.0.1:2809/call
-corba.master_manager: giop:http:http://127.0.0.1:2810/call
+corba.nameservers: http://localhost:2809/call
+corba.master_manager: giop:http:http://localhost:2810/call
diff --git a/src/ext/http/rtc.https.conf.in b/src/ext/http/rtc.https.conf.in
@@ -2,6 +2,8 @@ logger.enable: YES
 logger.log_level: DEBUG
 #logger.file_name: stdout
 
+naming.formats: test.host_cxt/%n.rtc
+
 manager.modules.load_path: @CMAKE_INSTALL_PREFIX@/@INSTALL_HTTPTRANSPORT_DIR@
 manager.preload.modules: HTTPTransport@CMAKE_SHARED_LIBRARY_SUFFIX@
 
@@ -10,5 +12,5 @@ corba.http.key_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/ssl/server.pem
 corba.http.key_file_password:password
 
 corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:https:///call
-corba.nameservers: https://127.0.0.1:2809/call
-corba.master_manager: giop:http:https://127.0.0.1:2810/call
+corba.nameservers: https://localhost:2809/call
+corba.master_manager: giop:http:https://localhost:2810/call
diff --git a/src/ext/http/rtc.ws.conf.in b/src/ext/http/rtc.ws.conf.in
@@ -2,9 +2,11 @@ logger.enable: YES
 logger.log_level: DEBUG
 #logger.file_name: stdout
 
+naming.formats: test.host_cxt/%n.rtc
+
 manager.modules.load_path: @CMAKE_INSTALL_PREFIX@/@INSTALL_HTTPTRANSPORT_DIR@
 manager.preload.modules: HTTPTransport@CMAKE_SHARED_LIBRARY_SUFFIX@
 
-corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:ws:///ws
-corba.nameservers: ws://127.0.0.1:2809/ws
-corba.master_manager: giop:http:ws://127.0.0.1:2810/ws
+corba.args:-ORBserverTransportRule "* http,tcp" -ORBclientTransportRule "* http,tcp" -ORBendPoint giop:http:ws:///ws -ORBendPoint giop:tcp::
+corba.nameservers: ws://localhost:2809/ws
+corba.master_manager: giop:http:ws://localhost:2810/ws
diff --git a/src/ext/http/rtc.wss.conf.in b/src/ext/http/rtc.wss.conf.in
@@ -2,13 +2,15 @@ logger.enable: YES
 logger.log_level: DEBUG
 #logger.file_name: stdout
 
+naming.formats: test.host_cxt/%n.rtc
+
 manager.modules.load_path: @CMAKE_INSTALL_PREFIX@/@INSTALL_HTTPTRANSPORT_DIR@
 manager.preload.modules: HTTPTransport@CMAKE_SHARED_LIBRARY_SUFFIX@
 
 corba.http.certificate_authority_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/ssl/root.crt
 corba.http.key_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/ssl/server.pem
 corba.http.key_file_password:password
 
-corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:wss:///ws
-corba.nameservers: wss://127.0.0.1:2809/ws
-corba.master_manager: giop:http:wss://127.0.0.1:2810/ws
+corba.args:-ORBserverTransportRule "* http,tcp" -ORBclientTransportRule "* http,tcp" -ORBendPoint giop:http:wss:///ws -ORBendPoint giop:tcp::
+corba.nameservers: wss://localhost:2809/ws
+corba.master_manager: giop:http:wss://localhost:2810/ws
diff --git a/src/ext/ssl/CMakeLists.txt b/src/ext/ssl/CMakeLists.txt
@@ -5,6 +5,14 @@ project (SSLTransport
 	LANGUAGES CXX)
 
 
+set(SSL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/root.crt ${CMAKE_CURRENT_SOURCE_DIR}/server.pem)
+install(FILES ${SSL_FILES} DESTINATION ${INSTALL_RTM_ETC_DIR}/ssl COMPONENT ext)
+
+if(NOT CORBA STREQUAL "omniORB")
+  return()
+endif()
+
+
 set(OPENSSL_ROOT ${OPENSSL_ROOT} CACHE PATH "set OPENSSL_ROOT")
 
 if(OPENSSL_ROOT)
@@ -55,9 +63,6 @@ if(WIN32)
 else(WIN32)
 endif(WIN32)
 
-set(SSL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/root.crt ${CMAKE_CURRENT_SOURCE_DIR}/server.pem)
-install(FILES ${SSL_FILES} DESTINATION ${INSTALL_RTM_ETC_DIR}/ssl COMPONENT ext)
-
 
 set(INSTALL_SSLTRANSPORT_DIR ${INSTALL_RTM_EXT_DIR}/ssl)
 configure_file(

diff --git a/src/ext/ssl/rtc.ssl.conf.in b/src/ext/ssl/rtc.ssl.conf.in
@@ -9,5 +9,5 @@ corba.ssl.certificate_authority_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR
 corba.ssl.key_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_ETC_DIR@/ssl/server.pem
 corba.ssl.key_file_password:password
 corba.args:-ORBserverTransportRule "* ssl" -ORBclientTransportRule "* ssl" -ORBendPoint giop:ssl::
-corba.nameservers: corbaloc:ssliop:127.0.0.1:2809
-corba.master_manager: giop:ssl:127.0.0.1:2810
+corba.nameservers: corbaloc:ssliop:localhost:2809
+corba.master_manager: giop:ssl:localhost:2810
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		static Advanced_Resource_Factory "-ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory IIOP_Factory -ORBReactorType select_st"