Skip to content

Commit 61cc6b1

Browse files
committed
SEC-2914 cds example inherit from Generic.Monitoring2
Feedback #752 (comment)
1 parent 72984d1 commit 61cc6b1

3 files changed

Lines changed: 59 additions & 44 deletions

File tree

examples/connext_secure/cds/c++11/CDS_publisher.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void run_publisher_application(
3131
dds::domain::DomainParticipant participant(
3232
domain_id,
3333
dds::core::QosProvider::Default().participant_qos(
34-
"library_cds::peer"));
34+
"library_cds::secure_peer"));
3535

3636
// Create a Topic with a name and a datatype
3737
dds::topic::Topic<Example> topic(participant, "CDS LWS Example");

examples/connext_secure/cds/c++11/CDS_subscriber.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void run_subscriber_application(
4646
dds::domain::DomainParticipant participant(
4747
domain_id,
4848
dds::core::QosProvider::Default().participant_qos(
49-
"library_cds::peer"));
49+
"library_cds::secure_peer"));
5050

5151
// Create a Topic with a name and a datatype
5252
dds::topic::Topic<Example> topic(participant, "CDS LWS Example");

examples/connext_secure/cds/c++11/USER_QOS_PROFILES.xml

Lines changed: 57 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ to use the software. -->
1818
-->
1919
<qos_library name="library_cds">
2020

21-
<qos_profile name="insecure_peer">
21+
<qos_profile name="insecure_snippet">
2222
<domain_participant_qos>
2323
<transport_builtin>
2424
<mask>UDPv4</mask>
@@ -34,49 +34,64 @@ to use the software. -->
3434
</domain_participant_qos>
3535
</qos_profile>
3636

37-
<qos_profile name="secure_common" base_name="insecure_peer" >
38-
<domain_participant_qos>
39-
<property>
40-
<value>
41-
<element>
42-
<name>com.rti.serv.load_plugin</name>
43-
<value>com.rti.serv.secure</value>
44-
</element>
45-
<element>
46-
<name>com.rti.serv.secure.library</name>
47-
<value>nddslightweightsecurity</value>
48-
</element>
49-
<element>
50-
<name>com.rti.serv.secure.create_function</name>
51-
<value>RTI_SecurityLightweight_PluginSuite_create</value>
52-
</element>
53-
<element>
54-
<name>dds.sec.crypto.rtps_psk_secret_passphrase</name>
55-
<value>data:,0:uIqNqiN11xMbRcuUSdT4BGOEUjLapfosAyzCg7uUBFo=</value>
56-
</element>
57-
<element>
58-
<name>dds.sec.crypto.rtps_psk_symmetric_cipher_algorithm</name>
59-
<value>AES256+GCM</value>
60-
</element>
61-
<element>
62-
<name>dds.sec.access.rtps_psk_protection_kind</name>
63-
<value>SIGN</value>
64-
</element>
65-
</value>
66-
</property>
67-
</domain_participant_qos>
37+
<qos_profile name="insecure_peer">
38+
<base_name>
39+
<element>library_cds::insecure_snippet</element>
40+
</base_name>
41+
</qos_profile>
42+
43+
<qos_profile name="secure_snippet">
44+
<?rti-qos_snippet?>
45+
46+
<domain_participant_qos>
47+
<property>
48+
<value>
49+
<element>
50+
<name>com.rti.serv.load_plugin</name>
51+
<value>com.rti.serv.secure</value>
52+
</element>
53+
<element>
54+
<name>com.rti.serv.secure.library</name>
55+
<value>nddslightweightsecurity</value>
56+
</element>
57+
<element>
58+
<name>com.rti.serv.secure.create_function</name>
59+
<value>RTI_SecurityLightweight_PluginSuite_create</value>
60+
</element>
61+
<element>
62+
<name>dds.sec.crypto.rtps_psk_secret_passphrase</name>
63+
<value>data:,0:uIqNqiN11xMbRcuUSdT4BGOEUjLapfosAyzCg7uUBFo=</value>
64+
</element>
65+
<element>
66+
<name>dds.sec.crypto.rtps_psk_symmetric_cipher_algorithm</name>
67+
<value>AES256+GCM</value>
68+
</element>
69+
<element>
70+
<name>dds.sec.access.rtps_psk_protection_kind</name>
71+
<value>SIGN</value>
72+
</element>
73+
</value>
74+
</property>
75+
</domain_participant_qos>
76+
</qos_profile>
77+
78+
<qos_profile name="secure_profile" base_name="BuiltinQosLib::Generic.Monitoring2">
79+
<base_name>
80+
<element>library_cds::insecure_snippet</element>
81+
<element>library_cds::secure_snippet</element>
82+
</base_name>
6883
</qos_profile>
6984

70-
<qos_profile name="peer" base_name="secure_common" is_default_qos="true">
71-
<participant_factory_qos>
72-
<monitoring>
73-
<distribution_settings>
74-
<dedicated_participant>
75-
<participant_qos_profile_name>library_cds::secure_common</participant_qos_profile_name>
76-
</dedicated_participant>
77-
</distribution_settings>
78-
</monitoring>
79-
</participant_factory_qos>
85+
<qos_profile name="secure_peer" base_name="library_cds::secure_profile" is_default_qos="true">
86+
<participant_factory_qos>
87+
<monitoring>
88+
<distribution_settings>
89+
<dedicated_participant>
90+
<participant_qos_profile_name>library_cds::secure_profile</participant_qos_profile_name>
91+
</dedicated_participant>
92+
</distribution_settings>
93+
</monitoring>
94+
</participant_factory_qos>
8095
</qos_profile>
8196
</qos_library>
8297
</dds>

0 commit comments

Comments
 (0)