From 99f4f47df7a8c0233784960e8ad6bc615a1f6833 Mon Sep 17 00:00:00 2001 From: Nobuhiko Miyamoto Date: Sun, 13 Feb 2022 11:11:09 +0900 Subject: [PATCH 1/4] [compat] fixed comment. --- src/lib/rtm/CORBA_RTCUtil.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/lib/rtm/CORBA_RTCUtil.h b/src/lib/rtm/CORBA_RTCUtil.h index 92349dce4..2a4057f33 100644 --- a/src/lib/rtm/CORBA_RTCUtil.h +++ b/src/lib/rtm/CORBA_RTCUtil.h @@ -1304,13 +1304,8 @@ namespace CORBA_RTCUtil * @brief 通信先のアドレスを取得する * * - * context1.kind1/context2.kind2/..../RTC_name * - * rtcloc形式の場合はカテゴリ名/RTC名で取得できる。 - * - * category_name/RTC_name - * - * @return RTC名 + * @return 通信先のアドレス * * @else * From f84832a23adbd8f055711f9a62d577408d750b73 Mon Sep 17 00:00:00 2001 From: Nobuhiko Miyamoto Date: Sun, 13 Feb 2022 23:38:31 +0900 Subject: [PATCH 2/4] [compat] fixed warning. --- utils/openrtmNames/NamingContext.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/openrtmNames/NamingContext.cpp b/utils/openrtmNames/NamingContext.cpp index 7650c03cb..3c46fd3f5 100644 --- a/utils/openrtmNames/NamingContext.cpp +++ b/utils/openrtmNames/NamingContext.cpp @@ -699,6 +699,7 @@ namespace RTM */ bool NamingContext::add_object(const CosNaming::Name& n, CosNaming::BindingType t, CORBA::Object_ptr obj) { + /* if(t == CosNaming::nobject && (strcmp(n[0].kind, RTOBJECT_KIND) == 0)) { m_objects.push_back((ObjectBinding*)(new RTObjectBinding(n, t, obj, this))); @@ -711,6 +712,8 @@ namespace RTM { m_objects.push_back(new ObjectBinding(n, t, obj, this)); } + */ + m_objects.push_back(new ObjectBinding(n, t, obj, this)); return true; } From c445fcd914d1a6b0bb9cb8051c3b6557684cfb35 Mon Sep 17 00:00:00 2001 From: Nobuhiko Miyamoto Date: Fri, 18 Feb 2022 00:57:56 +0900 Subject: [PATCH 3/4] [compat] fixed bugs. --- src/lib/rtm/CORBA_RTCUtil.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/lib/rtm/CORBA_RTCUtil.cpp b/src/lib/rtm/CORBA_RTCUtil.cpp index 0b6c15a77..5982f0e3d 100644 --- a/src/lib/rtm/CORBA_RTCUtil.cpp +++ b/src/lib/rtm/CORBA_RTCUtil.cpp @@ -1847,22 +1847,28 @@ namespace CORBA_RTCUtil } else { - m_rtcpath = addrname; + hostport = addrname; } - - if (protocol == "http" || protocol == "https" || protocol == "ws" || protocol == "wss") + if(hostport != "*") { - m_address = protocol; - m_address += "://"; - m_address += hostport; + if (protocol == "http" || protocol == "https" || protocol == "ws" || protocol == "wss") + { + m_address = protocol; + m_address += "://"; + m_address += hostport; + } + else + { + m_address = "corbaloc:"; + m_address += protocol; + m_address += ":"; + m_address += hostport; + } } else { - m_address = "corbaloc:"; - m_address += protocol; - m_address += ":"; - m_address += hostport; + m_address = hostport; } } From a79443b4cb50ee80f4b01a1c5ba39779ea0bea02 Mon Sep 17 00:00:00 2001 From: Nobuhiko Miyamoto Date: Tue, 14 Apr 2026 17:11:45 +0900 Subject: [PATCH 4/4] [comapt] fixed bugs. --- src/ext/http/rtc.http.conf.in | 2 +- src/ext/http/rtc.https.conf.in | 2 +- src/ext/http/rtc.ws.conf.in | 2 +- src/ext/http/rtc.wss.conf.in | 2 +- src/ext/ssl/root-sample.crt | 39 ++--- src/ext/ssl/server-sample.pem | 153 ++++++++++++------ utils/openrtmNames/ObjectBinding.cpp | 4 + .../rtc.names.http.omniorb.conf.in | 2 +- .../rtc.names.https.omniorb.conf.in | 2 +- .../rtc.names.ssl.omniorb.conf.in | 2 +- .../rtc.names.tcp.omniorb.conf.in | 2 +- .../openrtmNames/rtc.names.ws.omniorb.conf.in | 2 +- .../rtc.names.wss.omniorb.conf.in | 2 +- 13 files changed, 141 insertions(+), 75 deletions(-) diff --git a/src/ext/http/rtc.http.conf.in b/src/ext/http/rtc.http.conf.in index a362c4b20..217d1947e 100644 --- a/src/ext/http/rtc.http.conf.in +++ b/src/ext/http/rtc.http.conf.in @@ -7,6 +7,6 @@ naming.formats: %h.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.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:http:///call -ORBendPoint giop:tcp:: 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 index 1d8c667f1..dcf802b39 100644 --- a/src/ext/http/rtc.https.conf.in +++ b/src/ext/http/rtc.https.conf.in @@ -11,6 +11,6 @@ corba.http.certificate_authority_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_SSL_CE corba.http.key_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_SSL_CERTIFICATE_DIR@/server-sample.pem corba.http.key_file_password:password -corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:https:///call +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:https:///call -ORBendPoint giop:tcp:: 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 index 322703ad2..e5aa6fc52 100644 --- a/src/ext/http/rtc.ws.conf.in +++ b/src/ext/http/rtc.ws.conf.in @@ -7,6 +7,6 @@ naming.formats: %h.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.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -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 index 71bca5825..d5c2d07cd 100644 --- a/src/ext/http/rtc.wss.conf.in +++ b/src/ext/http/rtc.wss.conf.in @@ -11,6 +11,6 @@ corba.http.certificate_authority_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_SSL_CE corba.http.key_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_SSL_CERTIFICATE_DIR@/server-sample.pem corba.http.key_file_password:password -corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:wss:///ws +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -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/root-sample.crt b/src/ext/ssl/root-sample.crt index daf2600b8..ae11878bc 100644 --- a/src/ext/ssl/root-sample.crt +++ b/src/ext/ssl/root-sample.crt @@ -1,21 +1,22 @@ -----BEGIN CERTIFICATE----- -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 +ZEYGDmcroj569PpWIwQekQ7+qWDKQXc= -----END CERTIFICATE----- diff --git a/src/ext/ssl/server-sample.pem b/src/ext/ssl/server-sample.pem index 34927976b..736ef6772 100644 --- a/src/ext/ssl/server-sample.pem +++ b/src/ext/ssl/server-sample.pem @@ -1,48 +1,109 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAxH0SSf1+CuGoO7AtFB3hQUOKXLwsTgXmGk8ytXCa9doGdbHK -X9d4GilcT0fzHPjDa7393pXeHcIlgx4iMHL0xjXq20xDZh5EEkrzFmUM3TMM3YhB -Iifa5W5JCboWrUCC2kvzPleFMx776Eju8Qd8+ndnVc6yEqOI4qT11CTPQfyuFYFF -/ZxbrcIXWNkuGq1biuNRHUDrfQgzgZ2BogD+LZ6NxAUzVcuMQqQdCczap6X4tseG -5fa6blVhkTA4VYgk06LM7OZNXWF6g3sPnF/z8haiOr6reWxrpvzRrt/HgK6ySzDF -3ruZWCCeQnMxC8G9FBHpRgO9mDIqXuhx1LyT7wIDAQABAoIBADrlMmIzNWCVmxOp -DxoEisxBLmv1i2Inqn0gWBbClfAzVdRZYkuwDjPpSd4JtvlsJ0dYP4xEZ7uLwiq3 -EZBsJKp05tys01b8o3LIPGzuBRkYgDa27K8MOzSiBgqAWOO9fntoYJTDLw3Pr7pE -gjqFABUjTToPJpkno5Qr1fOsxOMGD4EjbFnuH0yWs7H1I8EWDu3ehPIjWNfg2Kcg -mB8FJTFw5P2V/jmDXo+m27sambLfg1aXJVCozLbpp7qTh3GmkTnbFLmrXPpkcSAH -SOUwWfR5yJ7yfiNrJpl1HmOpHseFX8X1mOzXfa43NL8rdWLVzp0Ru3T+fAa46Uiy -5GWUgsECgYEA7r1Rpj9vPinVP+NDT9xvj1oRvZpUecQ4qKYjAca5P+PL5enAbC2S -kx/lm6phQQDSM5B+ciUTxqYSaTX9B34YOHrngMjI3QF42xgsnoYGsnD+7cEcL4Ch -YvppbM4pmyidI1x/nKQuX/flAqDFPiSEvkIl/yhogfUPuqhROqkleDkCgYEA0rHB -dVhj8BOdmoNjcCwTyEg0h8YqLUnBngpt8khDXJ6A4zGl8mCoAS0ZX07C2hABZ8LY -Yb+2UBq/yC/kMNOAW6+tSyQPzIzj8ACzFrD+7e64jqxDLiwR9CC4aCbUetcaKysX -I0EdRc/ua4noEG4NLN0SiM87nfygOIp8+xzg3WcCgYBf3jxEYyK7trbAgfVMw3s0 -+Hk5Rxj3ELmj15slInTPWB1PxO8VQbOjSuK8AM4u+TJvrG1qTsNDOPsZrqld8d+u -BoSiLX6jaOzsJif8vFtCGqf0N2CnHqMwCNh+7ca9XLDFO2avMyrANN6MkJzEGIwJ -jqyNat+UmCDp1p9PzA6U2QKBgQChbET/BbiTwEOYlR+DWpHRedidSasYxZCM6Aqy -fMD3Xgz7hBdTKtCtDgOJbMuGzIp3F+Y2he5FUykqU97tta17EY6gqkFcg3lDcRXE -xdibLLHDxaE259bdhpAiY9WZQ+ItvrbccM/fo95UD/V3WQnJHJtNrBBOC7Ype5kj -v01c8wKBgBc2GfncAkaVGggTZHr+zkpASUTBHX9B6jju8s9X49v88MkO933Pidc6 -eysyFBnIvarhH9nTyDIGvTrrjpLC9/bUT6gPT11Z8cO3W6vrENfru/n8M98gdyXp -fjgVr9jeCjkZo/ccNi3fklx6dpZIEQKo3vfSeKQPOrbD/wkLcXzd ------END RSA PRIVATE KEY----- +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIyitN8sxGgO0CAggA +MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBG16ZcFx5s7BIIEyGICZR36fZll +Iu774CYVwnpcuRTeBtX+61CWNwjfYrg/cIMyVBSXS8tql0ydKIcRRLx9ZwvZTtq5 +GnZuOez64N39KFPWkv/XCtbMxS0wYbXYFH2+Zy79XgCOVKJFXsU8uptGpF2THkAd +pnPYEYrQmbdAjIpJb2rlC0svK644QxuKxs6QbohWje0gLZw1XfZ8oB0NzylvGiui +L0t5xbUQviOdEbGIXyk8kFh2CC5WTAj4B9MpRgnDRv6rWZqhk1A8Wc3jFX5MMJQI +AH/g8sOgNNENyJgftAdw9N9VLBp1aCpKwSj6RGZfA7s/lFq64aQn2KRu/sWKIf9X +BMDSt5JfQOqSPk+vP38HaVj2r9NbAATg2LqCg+M5oP6y3k/GuZTD9jtQaJ8UvgzJ +uds6C12giYcUe8lGLa2wWaLtzmbc45Kjki+iiYElXwep+THMak3auf9RB1Zzk3Gr +y8zbRE8/Ok+IMomVqvbWY96LHNoiEOq2f5hUoPrQ+SgJC49P+OuDygHdVUmDf+uG +G0Et89hfwZyUpSNH+0nRF0ISVeIm4CCPMyI4iznE3ZHnBHUiousl0GUuEpISvCUV +H8UgsMXYemPgdd9VwlXE29uFabzNxfE6xs6kiptORRz9yIrOTZYnLwU0WFFDnlYe +AqodgEjFKW0nddJ/Tr1IuNQg+a/L7AzaOatXreTS6uD7tGC7jKzY1IZ/lABWfQX5 +SnrJi+rhQNLT3eHPIyFoRH9g5KdqGuYdLlR6f/nV7GOMVrmjNGiPSc59o1KioQRf +a8yNx484Z0PcQ1tSeEHp9arrsyGaTxd4CkaqFmps9qYYflT2qkZH/oyGSsxQ/X7K +Bjin/hHWrZ1Ie4RveBqF71lygBfmkE5a0sGJnMyHqQcGcnW1KL134SRBdFZgM6aK +DqdcB2NsRhf8e0TUfD2X1XDck/Z6VNghCAlgO9Ao2kbu7e7TzI7cxoScK+qwokOq +XN8HzjIeZ/ckybaDHqwfnqAcm9j7/dNvaSsxuXl/H5semcrCXgJceXgb9HvdvKiI +Ohm8lCjq4vNeXrOrMO8z67wKHyP6MYZDEpox5oovhiannKYP0uZ29gh4CH8QRR/J +OqtEI08NKv6zHvD3Ypo/5aEN5wbvIQuYNBxvscnBIQktNgGgdzqAOCIbRl6aTZ4V +eJ3RAcLN285dHZVyCbwQVAgc07VIzTe9W+DNRhN1/nXzoZ2MA5UWI0IHjr/PmwOe +BBQPzZ9qwVwaCbwNxWa8KUbPM3K0cHdZ8ROXbbKqpSUUYJJeAyqjcrb3jHHgH+GK +D7kmkaQIhUaEGznJkp4rizG4zew5WArmycve0VT5H6A5lpV9HNsl0ZNOQjI2a+zq +pzedAhZqXORn4JofUTASeSB3Gj+eUsL2d7URGPh+2HNXri50Gvr144G0VY992OWV +sFhc3LgnEOwjOZzQqEC55MW9r9N2gBPrw2f5Vd6pByXND7k+7FadMYYI3jD4SbhX +z1q7jU7DcnNwlwuLx6oUJJRYsZ3ZHGLzFTD5w+sD2xJqJaSM1V27Cj7mZlm/5P4S +1KS3sJbLqyiCUGv5lel0ifs1nMdEyp8EqrXyTfgf4dGJztoIzWQzAqZrS6TwB0Tb +0WhN6fgf/tWLjdyIZrrDhQ== +-----END ENCRYPTED PRIVATE KEY----- +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha256WithRSAEncryption + Issuer: C=JP, ST=Ibaraki, L=Tsukuba, O=AIST, OU=ISRI, CN=Test CA + Validity + Not Before: Apr 14 06:38:19 2026 GMT + Not After : Apr 14 06:38:19 2027 GMT + Subject: C=JP, ST=Ibaraki, L=Tsukuba, O=AIST, OU=ISRI, CN=openrtm.org + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (2048 bit) + Modulus: + 00:d4:ca:ac:48:fc:9b:5c:7b:c6:40:82:1d:9f:e7: + a4:52:9c:84:23:e5:26:39:86:9a:12:e8:4e:ee:9c: + 72:de:56:04:94:c7:76:13:5a:d1:1f:9e:42:9f:c4: + db:09:9e:6f:69:a7:46:97:f3:e4:67:5c:35:c1:56: + 9a:29:1a:c3:5e:83:5c:9e:c3:6b:65:05:13:67:7c: + d1:01:f1:a0:e9:9b:c1:1e:7e:29:ec:63:8f:a8:a0: + 33:ae:39:2a:50:3f:75:58:fc:39:ed:66:1b:9a:ca: + 94:b3:72:d2:9c:4c:53:c6:a5:cc:b8:46:1c:17:5c: + 4f:f2:21:b5:11:83:f3:01:cf:aa:ad:fa:22:3a:79: + c7:92:8b:7c:5f:88:2d:b5:d8:99:cf:e5:28:92:ef: + f2:19:92:d2:19:01:c2:ca:57:13:02:88:57:80:dc: + 43:34:9c:25:64:01:ad:46:72:23:2f:b0:e3:c2:ad: + 2e:dd:fc:9a:be:df:3d:48:1e:50:99:c5:26:e6:1c: + 5b:46:25:8e:49:46:03:e8:41:e1:e7:23:f2:20:54: + f4:d1:2a:e3:96:6c:2a:0f:3d:43:fb:c7:2a:9a:71: + 8b:21:2f:cf:5a:1e:bd:32:a1:f8:5c:fd:13:8f:fb: + e0:78:44:4e:f1:4d:9f:ba:37:fa:77:42:3a:29:6f: + 86:a1 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + X509v3 Subject Key Identifier: + 74:75:CD:40:68:74:6E:DE:93:BE:41:CC:75:B6:3D:58:18:30:59:55 + X509v3 Authority Key Identifier: + 91:CF:32:80:C7:75:CC:C4:8C:CA:15:03:73:5F:E8:E6:48:0D:C2:6C + Signature Algorithm: sha256WithRSAEncryption + Signature Value: + 21:6a:d4:4c:f4:41:d5:c2:ba:3a:7f:0f:c6:f7:34:c7:c2:0a: + 41:b6:5a:02:df:1f:6e:b6:3a:e9:e9:3a:79:5c:28:70:6c:3a: + 7c:46:65:c4:eb:f8:0a:88:6c:2e:71:28:29:31:65:56:1a:72: + 59:d9:0e:49:1f:93:a5:bc:c0:ca:6d:b9:34:40:15:1a:39:4d: + 46:9c:f2:36:16:41:74:52:ad:fb:c8:f6:97:da:2f:b4:0f:10: + d6:be:f7:09:08:c8:4c:b1:44:04:7b:42:3d:df:f9:83:aa:78: + b6:1d:77:32:7e:cc:0d:b8:79:10:96:b2:18:0d:0c:ed:04:2d: + bc:2c:32:2c:c0:5a:5c:0f:36:03:d0:f2:74:7a:56:9e:5a:7b: + e5:54:51:ec:51:31:92:bd:b8:db:14:e9:86:0f:27:83:04:7e: + 45:7c:de:ae:8b:7a:6d:80:3e:4e:46:af:87:cf:fb:84:68:10: + 08:c9:c8:aa:e9:58:7a:9b:12:7b:33:83:86:b6:e8:7c:64:e0: + fe:2e:ab:65:ae:54:80:f4:d0:0f:3e:6c:35:82:f0:ce:58:8d: + 3f:8b:be:7d:7f:e5:7c:6b:3f:e7:e4:bf:16:6c:83:18:6c:ca: + 42:32:1b:86:cd:b1:2d:de:1f:a5:49:d7:b8:c1:14:fd:ae:4d: + 67:81:83:7e -----BEGIN CERTIFICATE----- -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 +g34= -----END CERTIFICATE----- diff --git a/utils/openrtmNames/ObjectBinding.cpp b/utils/openrtmNames/ObjectBinding.cpp index 8d18887a7..5dec2c4b7 100644 --- a/utils/openrtmNames/ObjectBinding.cpp +++ b/utils/openrtmNames/ObjectBinding.cpp @@ -182,7 +182,11 @@ namespace RTM */ CORBA::Object_ptr ObjectBinding::get_object() { +#ifdef ORB_IS_RTORB return m_object.out(); +#else + return m_object.inout(); +#endif } /*! * @if jp diff --git a/utils/openrtmNames/rtc.names.http.omniorb.conf.in b/utils/openrtmNames/rtc.names.http.omniorb.conf.in index 8f115fdc4..f6e3c6f1f 100644 --- a/utils/openrtmNames/rtc.names.http.omniorb.conf.in +++ b/utils/openrtmNames/rtc.names.http.omniorb.conf.in @@ -1 +1 @@ -corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:http://localhost:2809/call \ No newline at end of file +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:http://:2809/call \ No newline at end of file diff --git a/utils/openrtmNames/rtc.names.https.omniorb.conf.in b/utils/openrtmNames/rtc.names.https.omniorb.conf.in index f47809a14..afeb0dbb3 100644 --- a/utils/openrtmNames/rtc.names.https.omniorb.conf.in +++ b/utils/openrtmNames/rtc.names.https.omniorb.conf.in @@ -1,4 +1,4 @@ corba.http.certificate_authority_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_SSL_CERTIFICATE_DIR@/root-sample.crt corba.http.key_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_SSL_CERTIFICATE_DIR@/server-sample.pem corba.http.key_file_password:password -corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:https://localhost:2809/call +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:https://:2809/call diff --git a/utils/openrtmNames/rtc.names.ssl.omniorb.conf.in b/utils/openrtmNames/rtc.names.ssl.omniorb.conf.in index 72e728601..78f0f8cde 100644 --- a/utils/openrtmNames/rtc.names.ssl.omniorb.conf.in +++ b/utils/openrtmNames/rtc.names.ssl.omniorb.conf.in @@ -1,4 +1,4 @@ corba.ssl.certificate_authority_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_SSL_CERTIFICATE_DIR@/root-sample.crt corba.ssl.key_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_SSL_CERTIFICATE_DIR@/server-sample.pem corba.ssl.key_file_password:password -corba.args:-ORBserverTransportRule "* ssl" -ORBclientTransportRule "* ssl" -ORBendPoint giop:ssl:localhost:2809 +corba.args:-ORBserverTransportRule "* ssl" -ORBclientTransportRule "* ssl" -ORBendPoint giop:ssl::2809 diff --git a/utils/openrtmNames/rtc.names.tcp.omniorb.conf.in b/utils/openrtmNames/rtc.names.tcp.omniorb.conf.in index 0e8f5b718..3b71fba37 100644 --- a/utils/openrtmNames/rtc.names.tcp.omniorb.conf.in +++ b/utils/openrtmNames/rtc.names.tcp.omniorb.conf.in @@ -1 +1 @@ -corba.args: -ORBendPoint giop:tcp:localhost:2809 \ No newline at end of file +corba.args: -ORBendPoint giop:tcp::2809 \ No newline at end of file diff --git a/utils/openrtmNames/rtc.names.ws.omniorb.conf.in b/utils/openrtmNames/rtc.names.ws.omniorb.conf.in index b4e1349f5..0a3e9b29e 100644 --- a/utils/openrtmNames/rtc.names.ws.omniorb.conf.in +++ b/utils/openrtmNames/rtc.names.ws.omniorb.conf.in @@ -1 +1 @@ -corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:ws://localhost:2809/ws \ No newline at end of file +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:ws://:2809/ws \ No newline at end of file diff --git a/utils/openrtmNames/rtc.names.wss.omniorb.conf.in b/utils/openrtmNames/rtc.names.wss.omniorb.conf.in index 08fb0cc59..5ec32da25 100644 --- a/utils/openrtmNames/rtc.names.wss.omniorb.conf.in +++ b/utils/openrtmNames/rtc.names.wss.omniorb.conf.in @@ -1,4 +1,4 @@ corba.http.certificate_authority_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_SSL_CERTIFICATE_DIR@/root-sample.crt corba.http.key_file:@CMAKE_INSTALL_PREFIX@/@INSTALL_RTM_SSL_CERTIFICATE_DIR@/server-sample.pem corba.http.key_file_password:password -corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:wss://localhost:2809/ws +corba.args:-ORBserverTransportRule "* http" -ORBclientTransportRule "* http" -ORBendPoint giop:http:wss://:2809/ws