Merge pull request #253 from Nobu19800/feature/ssltransport

SSLTransportの修正

Author: n-ando

OpenRTM_aist/ext/ssl/SSLTransport.py

@@ -27,7 +27,10 @@ def SSLTransportInit(manager):
     key_file_password = prop.getProperty("corba.ssl.key_file_password")
 
     corba_args = prop.getProperty("corba.args")
-    corba_args += " -ORBendPoint giop:ssl::"
+
+    if not ("giop:ssl" in corba_args):
+        corba_args += " -ORBendPoint giop:ssl::"
+
     if not OpenRTM_aist.toBool(prop.getProperty(
             "manager.is_master"), "YES", "NO", True):
         if not prop.getProperty("corba.endpoints"):

OpenRTM_aist/ext/ssl/rtc.ssl.conf

@@ -0,0 +1,13 @@
+logger.enable: YES
+logger.log_level: DEBUG
+#logger.file_name: stdout
+
+manager.modules.load_path: ./
+manager.preload.modules: SSLTransport.py
+
+corba.ssl.certificate_authority_file:test/root.crt
+corba.ssl.key_file:test/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