niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change PrismTech references to Adlink

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-03-10 10:43:57 +01:00 • committed by eboasson
parent 89001a0f6a
commit 59459b9b8b
17 changed files with 151 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/core/ddsc/src/dds__qos.h
View file

@ -25,29 +25,29 @@ extern "C" {
QP_DESTINATION_ORDER | QP_HISTORY | QP_RESOURCE_LIMITS) QP_DESTINATION_ORDER | QP_HISTORY | QP_RESOURCE_LIMITS)
#define DDS_PARTICIPANT_QOS_MASK \ #define DDS_PARTICIPANT_QOS_MASK \
(QP_USER_DATA | QP_PRISMTECH_ENTITY_FACTORY | QP_CYCLONE_IGNORELOCAL) (QP_USER_DATA | QP_ADLINK_ENTITY_FACTORY | QP_CYCLONE_IGNORELOCAL)
#define DDS_PUBLISHER_QOS_MASK \ #define DDS_PUBLISHER_QOS_MASK \
(QP_PARTITION | QP_PRESENTATION | QP_GROUP_DATA | \ (QP_PARTITION | QP_PRESENTATION | QP_GROUP_DATA | \
QP_PRISMTECH_ENTITY_FACTORY | QP_CYCLONE_IGNORELOCAL) QP_ADLINK_ENTITY_FACTORY | QP_CYCLONE_IGNORELOCAL)
#define DDS_READER_QOS_MASK \ #define DDS_READER_QOS_MASK \
(QP_USER_DATA | QP_DURABILITY | QP_DEADLINE | QP_LATENCY_BUDGET | \ (QP_USER_DATA | QP_DURABILITY | QP_DEADLINE | QP_LATENCY_BUDGET | \
QP_OWNERSHIP | QP_LIVELINESS | QP_TIME_BASED_FILTER | \ QP_OWNERSHIP | QP_LIVELINESS | QP_TIME_BASED_FILTER | \
QP_RELIABILITY | QP_DESTINATION_ORDER | QP_HISTORY | \ QP_RELIABILITY | QP_DESTINATION_ORDER | QP_HISTORY | \
QP_RESOURCE_LIMITS | QP_PRISMTECH_READER_DATA_LIFECYCLE | \ QP_RESOURCE_LIMITS | QP_ADLINK_READER_DATA_LIFECYCLE | \
QP_CYCLONE_IGNORELOCAL) QP_CYCLONE_IGNORELOCAL)
#define DDS_SUBSCRIBER_QOS_MASK \ #define DDS_SUBSCRIBER_QOS_MASK \
(QP_PARTITION | QP_PRESENTATION | QP_GROUP_DATA | \ (QP_PARTITION | QP_PRESENTATION | QP_GROUP_DATA | \
QP_PRISMTECH_ENTITY_FACTORY | QP_CYCLONE_IGNORELOCAL) QP_ADLINK_ENTITY_FACTORY | QP_CYCLONE_IGNORELOCAL)
#define DDS_WRITER_QOS_MASK \ #define DDS_WRITER_QOS_MASK \
(QP_USER_DATA | QP_DURABILITY | QP_DURABILITY_SERVICE | QP_DEADLINE | \ (QP_USER_DATA | QP_DURABILITY | QP_DURABILITY_SERVICE | QP_DEADLINE | \
QP_LATENCY_BUDGET | QP_OWNERSHIP | QP_OWNERSHIP_STRENGTH | \ QP_LATENCY_BUDGET | QP_OWNERSHIP | QP_OWNERSHIP_STRENGTH | \
QP_LIVELINESS | QP_RELIABILITY | QP_TRANSPORT_PRIORITY | \ QP_LIVELINESS | QP_RELIABILITY | QP_TRANSPORT_PRIORITY | \
QP_LIFESPAN | QP_DESTINATION_ORDER | QP_HISTORY | \ QP_LIFESPAN | QP_DESTINATION_ORDER | QP_HISTORY | \
QP_RESOURCE_LIMITS | QP_PRISMTECH_WRITER_DATA_LIFECYCLE | \ QP_RESOURCE_LIMITS | QP_ADLINK_WRITER_DATA_LIFECYCLE | \
QP_CYCLONE_IGNORELOCAL) QP_CYCLONE_IGNORELOCAL)
#if defined (__cplusplus) #if defined (__cplusplus)

8
src/core/ddsc/src/dds_qos.c
View file

@ -302,7 +302,7 @@ void dds_qset_writer_data_lifecycle (dds_qos_t * __restrict qos, bool autodispos
if (qos == NULL) if (qos == NULL)
return; return;
qos->writer_data_lifecycle.autodispose_unregistered_instances = autodispose; qos->writer_data_lifecycle.autodispose_unregistered_instances = autodispose;
qos->present |= QP_PRISMTECH_WRITER_DATA_LIFECYCLE; qos->present |= QP_ADLINK_WRITER_DATA_LIFECYCLE;
} }
void dds_qset_reader_data_lifecycle (dds_qos_t * __restrict qos, dds_duration_t autopurge_nowriter_samples_delay, dds_duration_t autopurge_disposed_samples_delay) void dds_qset_reader_data_lifecycle (dds_qos_t * __restrict qos, dds_duration_t autopurge_nowriter_samples_delay, dds_duration_t autopurge_disposed_samples_delay)
@ -311,7 +311,7 @@ void dds_qset_reader_data_lifecycle (dds_qos_t * __restrict qos, dds_duration_t
return; return;
qos->reader_data_lifecycle.autopurge_nowriter_samples_delay = autopurge_nowriter_samples_delay; qos->reader_data_lifecycle.autopurge_nowriter_samples_delay = autopurge_nowriter_samples_delay;
qos->reader_data_lifecycle.autopurge_disposed_samples_delay = autopurge_disposed_samples_delay; qos->reader_data_lifecycle.autopurge_disposed_samples_delay = autopurge_disposed_samples_delay;
qos->present |= QP_PRISMTECH_READER_DATA_LIFECYCLE; qos->present |= QP_ADLINK_READER_DATA_LIFECYCLE;
} }
void dds_qset_durability_service (dds_qos_t * __restrict qos, dds_duration_t service_cleanup_delay, dds_history_kind_t history_kind, int32_t history_depth, int32_t max_samples, int32_t max_instances, int32_t max_samples_per_instance) void dds_qset_durability_service (dds_qos_t * __restrict qos, dds_duration_t service_cleanup_delay, dds_history_kind_t history_kind, int32_t history_depth, int32_t max_samples, int32_t max_instances, int32_t max_samples_per_instance)
@ -520,7 +520,7 @@ bool dds_qget_destination_order (const dds_qos_t * __restrict qos, dds_destinati
bool dds_qget_writer_data_lifecycle (const dds_qos_t * __restrict qos, bool *autodispose) bool dds_qget_writer_data_lifecycle (const dds_qos_t * __restrict qos, bool *autodispose)
{ {
if (qos == NULL || !(qos->present & QP_PRISMTECH_WRITER_DATA_LIFECYCLE)) if (qos == NULL || !(qos->present & QP_ADLINK_WRITER_DATA_LIFECYCLE))
return false; return false;
if (autodispose) if (autodispose)
*autodispose = qos->writer_data_lifecycle.autodispose_unregistered_instances; *autodispose = qos->writer_data_lifecycle.autodispose_unregistered_instances;
@ -529,7 +529,7 @@ bool dds_qget_writer_data_lifecycle (const dds_qos_t * __restrict qos, bool *aut
bool dds_qget_reader_data_lifecycle (const dds_qos_t * __restrict qos, dds_duration_t *autopurge_nowriter_samples_delay, dds_duration_t *autopurge_disposed_samples_delay) bool dds_qget_reader_data_lifecycle (const dds_qos_t * __restrict qos, dds_duration_t *autopurge_nowriter_samples_delay, dds_duration_t *autopurge_disposed_samples_delay)
{ {
if (qos == NULL || !(qos->present & QP_PRISMTECH_READER_DATA_LIFECYCLE)) if (qos == NULL || !(qos->present & QP_ADLINK_READER_DATA_LIFECYCLE))
return false; return false;
if (autopurge_nowriter_samples_delay) if (autopurge_nowriter_samples_delay)
*autopurge_nowriter_samples_delay = qos->reader_data_lifecycle.autopurge_nowriter_samples_delay; *autopurge_nowriter_samples_delay = qos->reader_data_lifecycle.autopurge_nowriter_samples_delay;

4
src/core/ddsc/src/dds_topic.c
View file

@ -434,11 +434,11 @@ dds_entity_t dds_create_topic (dds_entity_t participant, const dds_topic_descrip
if (desc->m_meta) if (desc->m_meta)
{ {
plist.type_description = dds_string_dup (desc->m_meta); plist.type_description = dds_string_dup (desc->m_meta);
plist.present |= PP_PRISMTECH_TYPE_DESCRIPTION; plist.present |= PP_ADLINK_TYPE_DESCRIPTION;
} }
if (desc->m_nkeys) if (desc->m_nkeys)
{ {
plist.qos.present |= QP_PRISMTECH_SUBSCRIPTION_KEYS; plist.qos.present |= QP_ADLINK_SUBSCRIPTION_KEYS;
plist.qos.subscription_keys.use_key_list = 1; plist.qos.subscription_keys.use_key_list = 1;
plist.qos.subscription_keys.key_list.n = desc->m_nkeys; plist.qos.subscription_keys.key_list.n = desc->m_nkeys;
plist.qos.subscription_keys.key_list.strs = dds_alloc (desc->m_nkeys * sizeof (char*)); plist.qos.subscription_keys.key_list.strs = dds_alloc (desc->m_nkeys * sizeof (char*));

26
src/core/ddsi/include/dds/ddsi/ddsi_plist.h
View file

@ -45,8 +45,8 @@ extern "C" {
#define PP_STATUSINFO ((uint64_t)1 << 22) #define PP_STATUSINFO ((uint64_t)1 << 22)
#define PP_ORIGINAL_WRITER_INFO ((uint64_t)1 << 23) #define PP_ORIGINAL_WRITER_INFO ((uint64_t)1 << 23)
#define PP_ENDPOINT_GUID ((uint64_t)1 << 24) #define PP_ENDPOINT_GUID ((uint64_t)1 << 24)
#define PP_PRISMTECH_PARTICIPANT_VERSION_INFO ((uint64_t)1 << 26) #define PP_ADLINK_PARTICIPANT_VERSION_INFO ((uint64_t)1 << 26)
#define PP_PRISMTECH_TYPE_DESCRIPTION ((uint64_t)1 << 27) #define PP_ADLINK_TYPE_DESCRIPTION ((uint64_t)1 << 27)
#define PP_COHERENT_SET ((uint64_t)1 << 28) #define PP_COHERENT_SET ((uint64_t)1 << 28)
#ifdef DDSI_INCLUDE_SSM #ifdef DDSI_INCLUDE_SSM
#define PP_READER_FAVOURS_SSM ((uint64_t)1 << 29) #define PP_READER_FAVOURS_SSM ((uint64_t)1 << 29)
@ -61,15 +61,15 @@ extern "C" {
PID_UNRECOGNIZED_INCOMPATIBLE_FLAG set (see DDSI 2.1 9.6.2.2.1) */ PID_UNRECOGNIZED_INCOMPATIBLE_FLAG set (see DDSI 2.1 9.6.2.2.1) */
#define PP_INCOMPATIBLE ((uint64_t)1 << 63) #define PP_INCOMPATIBLE ((uint64_t)1 << 63)
#define NN_PRISMTECH_PARTICIPANT_VERSION_INFO_FIXED_CDRSIZE (24) #define NN_ADLINK_PARTICIPANT_VERSION_INFO_FIXED_CDRSIZE (24)
#define NN_PRISMTECH_FL_KERNEL_SEQUENCE_NUMBER (1u << 0) #define NN_ADLINK_FL_KERNEL_SEQUENCE_NUMBER (1u << 0)
#define NN_PRISMTECH_FL_DISCOVERY_INCLUDES_GID (1u << 1) #define NN_ADLINK_FL_DISCOVERY_INCLUDES_GID (1u << 1)
#define NN_PRISMTECH_FL_PTBES_FIXED_0 (1u << 2) #define NN_ADLINK_FL_PTBES_FIXED_0 (1u << 2)
#define NN_PRISMTECH_FL_DDSI2_PARTICIPANT_FLAG (1u << 3) #define NN_ADLINK_FL_DDSI2_PARTICIPANT_FLAG (1u << 3)
#define NN_PRISMTECH_FL_PARTICIPANT_IS_DDSI2 (1u << 4) #define NN_ADLINK_FL_PARTICIPANT_IS_DDSI2 (1u << 4)
#define NN_PRISMTECH_FL_MINIMAL_BES_MODE (1u << 5) #define NN_ADLINK_FL_MINIMAL_BES_MODE (1u << 5)
#define NN_PRISMTECH_FL_SUPPORTS_STATUSINFOX (1u << 5) #define NN_ADLINK_FL_SUPPORTS_STATUSINFOX (1u << 5)
/* SUPPORTS_STATUSINFOX: when set, also means any combination of /* SUPPORTS_STATUSINFOX: when set, also means any combination of
write/unregister/dispose supported */ write/unregister/dispose supported */
@ -104,13 +104,13 @@ typedef struct nn_reader_favours_ssm {
} nn_reader_favours_ssm_t; } nn_reader_favours_ssm_t;
#endif #endif
typedef struct nn_prismtech_participant_version_info typedef struct nn_adlink_participant_version_info
{ {
uint32_t version; uint32_t version;
uint32_t flags; uint32_t flags;
uint32_t unused[3]; uint32_t unused[3];
char *internals; char *internals;
} nn_prismtech_participant_version_info_t; } nn_adlink_participant_version_info_t;
typedef struct ddsi_plist { typedef struct ddsi_plist {
uint64_t present; uint64_t present;
@ -144,7 +144,7 @@ typedef struct ddsi_plist {
char *entity_name; char *entity_name;
nn_keyhash_t keyhash; nn_keyhash_t keyhash;
uint32_t statusinfo; uint32_t statusinfo;
nn_prismtech_participant_version_info_t prismtech_participant_version_info; nn_adlink_participant_version_info_t adlink_participant_version_info;
char *type_description; char *type_description;
nn_sequence_number_t coherent_set_seqno; nn_sequence_number_t coherent_set_seqno;
#ifdef DDSI_INCLUDE_SSM #ifdef DDSI_INCLUDE_SSM

30
src/core/ddsi/include/dds/ddsi/ddsi_vendor.h
View file

@ -22,7 +22,7 @@ typedef struct {
/* All existing vendor codes have the major part equal to 1 (and this will probably be true for a long, long time) */ /* All existing vendor codes have the major part equal to 1 (and this will probably be true for a long, long time) */
#define NN_VENDORID_MINOR_RTI 0x01 #define NN_VENDORID_MINOR_RTI 0x01
#define NN_VENDORID_MINOR_PRISMTECH_OSPL 0x02 #define NN_VENDORID_MINOR_ADLINK_OSPL 0x02
#define NN_VENDORID_MINOR_OCI 0x03 #define NN_VENDORID_MINOR_OCI 0x03
#define NN_VENDORID_MINOR_MILSOFT 0x04 #define NN_VENDORID_MINOR_MILSOFT 0x04
#define NN_VENDORID_MINOR_KONGSBERG 0x05 #define NN_VENDORID_MINOR_KONGSBERG 0x05
@ -31,13 +31,13 @@ typedef struct {
#define NN_VENDORID_MINOR_ICOUP 0x08 #define NN_VENDORID_MINOR_ICOUP 0x08
#define NN_VENDORID_MINOR_ETRI 0x09 #define NN_VENDORID_MINOR_ETRI 0x09
#define NN_VENDORID_MINOR_RTI_MICRO 0x0a #define NN_VENDORID_MINOR_RTI_MICRO 0x0a
#define NN_VENDORID_MINOR_PRISMTECH_JAVA 0x0b #define NN_VENDORID_MINOR_ADLINK_JAVA 0x0b
#define NN_VENDORID_MINOR_PRISMTECH_GATEWAY 0x0c #define NN_VENDORID_MINOR_ADLINK_GATEWAY 0x0c
#define NN_VENDORID_MINOR_PRISMTECH_LITE 0x0d #define NN_VENDORID_MINOR_ADLINK_LITE 0x0d
#define NN_VENDORID_MINOR_TECHNICOLOR 0x0e #define NN_VENDORID_MINOR_TECHNICOLOR 0x0e
#define NN_VENDORID_MINOR_EPROSIMA 0x0f #define NN_VENDORID_MINOR_EPROSIMA 0x0f
#define NN_VENDORID_MINOR_ECLIPSE 0x10 #define NN_VENDORID_MINOR_ECLIPSE 0x10
#define NN_VENDORID_MINOR_PRISMTECH_CLOUD 0x20 #define NN_VENDORID_MINOR_ADLINK_CLOUD 0x20
#if defined(_WIN32) && defined(__cplusplus) #if defined(_WIN32) && defined(__cplusplus)
#define NN_VENDORID(vendor) {{ 0x01, NN_VENDORID_MINOR_##vendor }} #define NN_VENDORID(vendor) {{ 0x01, NN_VENDORID_MINOR_##vendor }}
@ -63,7 +63,7 @@ inline bool vendor_is_rti (nn_vendorid_t vendor) {
return vendor_equals (vendor, NN_VENDORID (RTI)); return vendor_equals (vendor, NN_VENDORID (RTI));
} }
inline bool vendor_is_opensplice (nn_vendorid_t vendor) { inline bool vendor_is_opensplice (nn_vendorid_t vendor) {
return vendor_equals (vendor, NN_VENDORID (PRISMTECH_OSPL)); return vendor_equals (vendor, NN_VENDORID (ADLINK_OSPL));
} }
inline bool vendor_is_twinoaks (nn_vendorid_t vendor) { inline bool vendor_is_twinoaks (nn_vendorid_t vendor) {
return vendor_equals (vendor, NN_VENDORID (TWINOAKS)); return vendor_equals (vendor, NN_VENDORID (TWINOAKS));
@ -72,20 +72,20 @@ inline bool vendor_is_eprosima (nn_vendorid_t vendor) {
return vendor_equals (vendor, NN_VENDORID (EPROSIMA)); return vendor_equals (vendor, NN_VENDORID (EPROSIMA));
} }
inline bool vendor_is_cloud (nn_vendorid_t vendor) { inline bool vendor_is_cloud (nn_vendorid_t vendor) {
return vendor_equals (vendor, NN_VENDORID (PRISMTECH_CLOUD)); return vendor_equals (vendor, NN_VENDORID (ADLINK_CLOUD));
} }
inline bool vendor_is_eclipse_or_opensplice (nn_vendorid_t vendor) { inline bool vendor_is_eclipse_or_opensplice (nn_vendorid_t vendor) {
return vendor_is_eclipse (vendor) | vendor_is_opensplice (vendor); return vendor_is_eclipse (vendor) | vendor_is_opensplice (vendor);
} }
inline bool vendor_is_prismtech (nn_vendorid_t vendor) { inline bool vendor_is_adlink (nn_vendorid_t vendor) {
return (vendor_equals (vendor, NN_VENDORID (PRISMTECH_OSPL)) || return (vendor_equals (vendor, NN_VENDORID (ADLINK_OSPL)) ||
vendor_equals (vendor, NN_VENDORID (PRISMTECH_LITE)) || vendor_equals (vendor, NN_VENDORID (ADLINK_LITE)) ||
vendor_equals (vendor, NN_VENDORID (PRISMTECH_GATEWAY)) || vendor_equals (vendor, NN_VENDORID (ADLINK_GATEWAY)) ||
vendor_equals (vendor, NN_VENDORID (PRISMTECH_JAVA)) || vendor_equals (vendor, NN_VENDORID (ADLINK_JAVA)) ||
vendor_equals (vendor, NN_VENDORID (PRISMTECH_CLOUD))); vendor_equals (vendor, NN_VENDORID (ADLINK_CLOUD)));
} }
inline bool vendor_is_eclipse_or_prismtech (nn_vendorid_t vendor) { inline bool vendor_is_eclipse_or_adlink (nn_vendorid_t vendor) {
return vendor_is_eclipse (vendor) || vendor_is_prismtech (vendor); return vendor_is_eclipse (vendor) || vendor_is_adlink (vendor);
} }
#if defined (__cplusplus) #if defined (__cplusplus)

12
src/core/ddsi/include/dds/ddsi/ddsi_xqos.h
View file

@ -241,11 +241,11 @@ typedef struct dds_ignorelocal_qospolicy {
#define QP_OWNERSHIP ((uint64_t)1 << 18) #define QP_OWNERSHIP ((uint64_t)1 << 18)
#define QP_OWNERSHIP_STRENGTH ((uint64_t)1 << 19) #define QP_OWNERSHIP_STRENGTH ((uint64_t)1 << 19)
#define QP_TIME_BASED_FILTER ((uint64_t)1 << 20) #define QP_TIME_BASED_FILTER ((uint64_t)1 << 20)
#define QP_PRISMTECH_WRITER_DATA_LIFECYCLE ((uint64_t)1 << 21) #define QP_ADLINK_WRITER_DATA_LIFECYCLE ((uint64_t)1 << 21)
#define QP_PRISMTECH_READER_DATA_LIFECYCLE ((uint64_t)1 << 22) #define QP_ADLINK_READER_DATA_LIFECYCLE ((uint64_t)1 << 22)
#define QP_PRISMTECH_READER_LIFESPAN ((uint64_t)1 << 24) #define QP_ADLINK_READER_LIFESPAN ((uint64_t)1 << 24)
#define QP_PRISMTECH_SUBSCRIPTION_KEYS ((uint64_t)1 << 25) #define QP_ADLINK_SUBSCRIPTION_KEYS ((uint64_t)1 << 25)
#define QP_PRISMTECH_ENTITY_FACTORY ((uint64_t)1 << 27) #define QP_ADLINK_ENTITY_FACTORY ((uint64_t)1 << 27)
#define QP_CYCLONE_IGNORELOCAL ((uint64_t)1 << 30) #define QP_CYCLONE_IGNORELOCAL ((uint64_t)1 << 30)
#define QP_PROPERTY_LIST ((uint64_t)1 << 31) #define QP_PROPERTY_LIST ((uint64_t)1 << 31)
@ -254,7 +254,7 @@ typedef struct dds_ignorelocal_qospolicy {
matches. Same for topic and type. Relaxed qos matching is a bit of matches. Same for topic and type. Relaxed qos matching is a bit of
a weird one, but it affects matching, so ... */ a weird one, but it affects matching, so ... */
#define QP_RXO_MASK (QP_DURABILITY | QP_PRESENTATION | QP_DEADLINE | QP_LATENCY_BUDGET | QP_OWNERSHIP | QP_LIVELINESS | QP_RELIABILITY | QP_DESTINATION_ORDER) #define QP_RXO_MASK (QP_DURABILITY | QP_PRESENTATION | QP_DEADLINE | QP_LATENCY_BUDGET | QP_OWNERSHIP | QP_LIVELINESS | QP_RELIABILITY | QP_DESTINATION_ORDER)
#define QP_CHANGEABLE_MASK (QP_USER_DATA | QP_TOPIC_DATA | QP_GROUP_DATA | QP_DEADLINE | QP_LATENCY_BUDGET | QP_OWNERSHIP_STRENGTH | QP_TIME_BASED_FILTER | QP_PARTITION | QP_TRANSPORT_PRIORITY | QP_LIFESPAN | QP_PRISMTECH_ENTITY_FACTORY | QP_PRISMTECH_WRITER_DATA_LIFECYCLE | QP_PRISMTECH_READER_DATA_LIFECYCLE) #define QP_CHANGEABLE_MASK (QP_USER_DATA | QP_TOPIC_DATA | QP_GROUP_DATA | QP_DEADLINE | QP_LATENCY_BUDGET | QP_OWNERSHIP_STRENGTH | QP_TIME_BASED_FILTER | QP_PARTITION | QP_TRANSPORT_PRIORITY | QP_LIFESPAN | QP_ADLINK_ENTITY_FACTORY | QP_ADLINK_WRITER_DATA_LIFECYCLE | QP_ADLINK_READER_DATA_LIFECYCLE)
#define QP_UNRECOGNIZED_INCOMPATIBLE_MASK ((uint64_t) 0) #define QP_UNRECOGNIZED_INCOMPATIBLE_MASK ((uint64_t) 0)
/* readers & writers have an extended qos, hence why it is a separate /* readers & writers have an extended qos, hence why it is a separate

2
src/core/ddsi/include/dds/ddsi/q_entity.h
View file

@ -638,7 +638,7 @@ int writer_set_notalive (struct writer *wr, bool notify);
XX -- XX --
*/ */
/* Set this custom flag when using nn_prismtech_writer_info_t iso nn_prismtech_writer_info_old_t */ /* Set this custom flag when using nn_adlink_writer_info_t iso nn_adlink_writer_info_old_t */
#define CF_INC_KERNEL_SEQUENCE_NUMBERS (1 << 0) #define CF_INC_KERNEL_SEQUENCE_NUMBERS (1 << 0)
/* Set when this proxy participant is created implicitly and has to be deleted upon disappearance /* Set when this proxy participant is created implicitly and has to be deleted upon disappearance
of its last endpoint. FIXME: Currently there is a potential race with adding a new endpoint of its last endpoint. FIXME: Currently there is a potential race with adding a new endpoint

55
src/core/ddsi/include/dds/ddsi/q_protocol.h
View file

@ -89,7 +89,7 @@ typedef struct {
#define NN_DISC_BUILTIN_ENDPOINT_TOPIC_ANNOUNCER (1u << 12) #define NN_DISC_BUILTIN_ENDPOINT_TOPIC_ANNOUNCER (1u << 12)
#define NN_DISC_BUILTIN_ENDPOINT_TOPIC_DETECTOR (1u << 13) #define NN_DISC_BUILTIN_ENDPOINT_TOPIC_DETECTOR (1u << 13)
/* PrismTech extensions: */ /* Adlink extensions: */
#define NN_DISC_BUILTIN_ENDPOINT_CM_PARTICIPANT_WRITER (1u << 0) #define NN_DISC_BUILTIN_ENDPOINT_CM_PARTICIPANT_WRITER (1u << 0)
#define NN_DISC_BUILTIN_ENDPOINT_CM_PARTICIPANT_READER (1u << 1) #define NN_DISC_BUILTIN_ENDPOINT_CM_PARTICIPANT_READER (1u << 1)
#define NN_DISC_BUILTIN_ENDPOINT_CM_PUBLISHER_WRITER (1u << 2) #define NN_DISC_BUILTIN_ENDPOINT_CM_PUBLISHER_WRITER (1u << 2)
@ -150,8 +150,8 @@ typedef enum SubmessageKind {
SMID_DATA = 0x15, SMID_DATA = 0x15,
SMID_DATA_FRAG = 0x16, SMID_DATA_FRAG = 0x16,
/* vendor-specific sub messages (0x80 .. 0xff) */ /* vendor-specific sub messages (0x80 .. 0xff) */
SMID_PT_MSG_LEN = 0x81, SMID_ADLINK_MSG_LEN = 0x81,
SMID_PT_ENTITY_ID = 0x82 SMID_ADLINK_ENTITY_ID = 0x82
} SubmessageKind_t; } SubmessageKind_t;
typedef struct InfoTimestamp { typedef struct InfoTimestamp {
@ -379,7 +379,7 @@ DDSRT_WARNING_MSVC_ON(4200)
#define PID_COHERENT_SET 0x56u #define PID_COHERENT_SET 0x56u
#define PID_DIRECTED_WRITE 0x57u #define PID_DIRECTED_WRITE 0x57u
#define PID_ORIGINAL_WRITER_INFO 0x61u #define PID_ORIGINAL_WRITER_INFO 0x61u
#define PID_ENDPOINT_GUID 0x5au /* !SPEC <=> PRISMTECH_ENDPOINT_GUID */ #define PID_ENDPOINT_GUID 0x5au /* !SPEC <=> ADLINK_ENDPOINT_GUID */
/* Security related PID values. */ /* Security related PID values. */
#define PID_IDENTITY_TOKEN 0x1001u #define PID_IDENTITY_TOKEN 0x1001u
@ -404,43 +404,42 @@ DDSRT_WARNING_MSVC_ON(4200)
#define PID_RECV_QUEUE_SIZE 0x18u #define PID_RECV_QUEUE_SIZE 0x18u
#define PID_RELIABILITY_OFFERED 0x19u #define PID_RELIABILITY_OFFERED 0x19u
#define PID_PRISMTECH_BUILTIN_ENDPOINT_SET (PID_VENDORSPECIFIC_FLAG | 0x0u) #define PID_ADLINK_BUILTIN_ENDPOINT_SET (PID_VENDORSPECIFIC_FLAG | 0x0u)
/* parameter ids for READER_DATA_LIFECYCLE & WRITER_DATA_LIFECYCLE are /* parameter ids for READER_DATA_LIFECYCLE & WRITER_DATA_LIFECYCLE are
undefined, but let's publish them anyway */ undefined, but let's publish them anyway */
#define PID_PRISMTECH_READER_DATA_LIFECYCLE (PID_VENDORSPECIFIC_FLAG | 0x2u) #define PID_ADLINK_READER_DATA_LIFECYCLE (PID_VENDORSPECIFIC_FLAG | 0x2u)
#define PID_PRISMTECH_WRITER_DATA_LIFECYCLE (PID_VENDORSPECIFIC_FLAG | 0x3u) #define PID_ADLINK_WRITER_DATA_LIFECYCLE (PID_VENDORSPECIFIC_FLAG | 0x3u)
/* ENDPOINT_GUID is formally undefined, so in strictly conforming /* ENDPOINT_GUID is formally undefined, so in strictly conforming
mode, we use our own */ mode, we use our own */
#define PID_PRISMTECH_ENDPOINT_GUID (PID_VENDORSPECIFIC_FLAG | 0x4u) #define PID_ADLINK_ENDPOINT_GUID (PID_VENDORSPECIFIC_FLAG | 0x4u)
#define PID_PRISMTECH_SYNCHRONOUS_ENDPOINT (PID_VENDORSPECIFIC_FLAG | 0x5u) #define PID_ADLINK_SYNCHRONOUS_ENDPOINT (PID_VENDORSPECIFIC_FLAG | 0x5u)
/* Relaxed QoS matching readers/writers are best ignored by /* Relaxed QoS matching readers/writers are best ignored by
implementations that don't understand them. This also covers "old" implementations that don't understand them. This also covers "old"
DDSI2's, although they may emit an error. */ DDSI2's, although they may emit an error. */
#define PID_PRISMTECH_RELAXED_QOS_MATCHING (PID_VENDORSPECIFIC_FLAG | PID_UNRECOGNIZED_INCOMPATIBLE_FLAG | 0x6u) #define PID_ADLINK_RELAXED_QOS_MATCHING (PID_VENDORSPECIFIC_FLAG | PID_UNRECOGNIZED_INCOMPATIBLE_FLAG | 0x6u)
#define PID_PRISMTECH_PARTICIPANT_VERSION_INFO (PID_VENDORSPECIFIC_FLAG | 0x7u) #define PID_ADLINK_PARTICIPANT_VERSION_INFO (PID_VENDORSPECIFIC_FLAG | 0x7u)
/* See CMTopics protocol.doc (2013-12-09) */ #define PID_ADLINK_NODE_NAME (PID_VENDORSPECIFIC_FLAG | 0x8u)
#define PID_PRISMTECH_NODE_NAME (PID_VENDORSPECIFIC_FLAG | 0x8u) #define PID_ADLINK_EXEC_NAME (PID_VENDORSPECIFIC_FLAG | 0x9u)
#define PID_PRISMTECH_EXEC_NAME (PID_VENDORSPECIFIC_FLAG | 0x9u) #define PID_ADLINK_PROCESS_ID (PID_VENDORSPECIFIC_FLAG | 0xau)
#define PID_PRISMTECH_PROCESS_ID (PID_VENDORSPECIFIC_FLAG | 0xau) #define PID_ADLINK_SERVICE_TYPE (PID_VENDORSPECIFIC_FLAG | 0xbu)
#define PID_PRISMTECH_SERVICE_TYPE (PID_VENDORSPECIFIC_FLAG | 0xbu) #define PID_ADLINK_ENTITY_FACTORY (PID_VENDORSPECIFIC_FLAG | 0xcu)
#define PID_PRISMTECH_ENTITY_FACTORY (PID_VENDORSPECIFIC_FLAG | 0xcu) #define PID_ADLINK_WATCHDOG_SCHEDULING (PID_VENDORSPECIFIC_FLAG | 0xdu)
#define PID_PRISMTECH_WATCHDOG_SCHEDULING (PID_VENDORSPECIFIC_FLAG | 0xdu) #define PID_ADLINK_LISTENER_SCHEDULING (PID_VENDORSPECIFIC_FLAG | 0xeu)
#define PID_PRISMTECH_LISTENER_SCHEDULING (PID_VENDORSPECIFIC_FLAG | 0xeu) #define PID_ADLINK_SUBSCRIPTION_KEYS (PID_VENDORSPECIFIC_FLAG | 0xfu)
#define PID_PRISMTECH_SUBSCRIPTION_KEYS (PID_VENDORSPECIFIC_FLAG | 0xfu) #define PID_ADLINK_READER_LIFESPAN (PID_VENDORSPECIFIC_FLAG | 0x10u)
#define PID_PRISMTECH_READER_LIFESPAN (PID_VENDORSPECIFIC_FLAG | 0x10u) #define PID_ADLINK_TYPE_DESCRIPTION (PID_VENDORSPECIFIC_FLAG | 0x12u)
#define PID_PRISMTECH_TYPE_DESCRIPTION (PID_VENDORSPECIFIC_FLAG | 0x12u) #define PID_ADLINK_LAN (PID_VENDORSPECIFIC_FLAG | 0x13u)
#define PID_PRISMTECH_LAN (PID_VENDORSPECIFIC_FLAG | 0x13u) #define PID_ADLINK_ENDPOINT_GID (PID_VENDORSPECIFIC_FLAG | 0x14u)
#define PID_PRISMTECH_ENDPOINT_GID (PID_VENDORSPECIFIC_FLAG | 0x14u) #define PID_ADLINK_GROUP_GID (PID_VENDORSPECIFIC_FLAG | 0x15u)
#define PID_PRISMTECH_GROUP_GID (PID_VENDORSPECIFIC_FLAG | 0x15u) #define PID_ADLINK_EOTINFO (PID_VENDORSPECIFIC_FLAG | 0x16u)
#define PID_PRISMTECH_EOTINFO (PID_VENDORSPECIFIC_FLAG | 0x16u) #define PID_ADLINK_PART_CERT_NAME (PID_VENDORSPECIFIC_FLAG | 0x17u);
#define PID_PRISMTECH_PART_CERT_NAME (PID_VENDORSPECIFIC_FLAG | 0x17u); #define PID_ADLINK_LAN_CERT_NAME (PID_VENDORSPECIFIC_FLAG | 0x18u);
#define PID_PRISMTECH_LAN_CERT_NAME (PID_VENDORSPECIFIC_FLAG | 0x18u);
#if defined (__cplusplus) #if defined (__cplusplus)
} }

2
src/core/ddsi/include/dds/ddsi/q_xmsg.h
View file

@ -27,7 +27,7 @@ struct addrset;
struct proxy_reader; struct proxy_reader;
struct proxy_writer; struct proxy_writer;
struct nn_prismtech_participant_version_info; struct nn_adlink_participant_version_info;
struct nn_xmsgpool; struct nn_xmsgpool;
struct nn_xmsg_data; struct nn_xmsg_data;
struct nn_xmsg; struct nn_xmsg;

58
src/core/ddsi/src/ddsi_plist.c
View file

@ -1449,28 +1449,28 @@ static const struct piddesc piddesc_omg[] = {
/* Understood parameters for Eclipse Foundation (Cyclone DDS) vendor code */ /* Understood parameters for Eclipse Foundation (Cyclone DDS) vendor code */
static const struct piddesc piddesc_eclipse[] = { static const struct piddesc piddesc_eclipse[] = {
QP (PRISMTECH_ENTITY_FACTORY, entity_factory, Xb), QP (ADLINK_ENTITY_FACTORY, entity_factory, Xb),
QP (PRISMTECH_READER_LIFESPAN, reader_lifespan, Xb, XD), QP (ADLINK_READER_LIFESPAN, reader_lifespan, Xb, XD),
QP (PRISMTECH_WRITER_DATA_LIFECYCLE, writer_data_lifecycle, Xb), QP (ADLINK_WRITER_DATA_LIFECYCLE, writer_data_lifecycle, Xb),
QP (PRISMTECH_READER_DATA_LIFECYCLE, reader_data_lifecycle, XDx2), QP (ADLINK_READER_DATA_LIFECYCLE, reader_data_lifecycle, XDx2),
QP (PRISMTECH_SUBSCRIPTION_KEYS, subscription_keys, XbCOND, XQ, XS, XSTOP), QP (ADLINK_SUBSCRIPTION_KEYS, subscription_keys, XbCOND, XQ, XS, XSTOP),
{ PID_PAD, PDF_QOS, QP_CYCLONE_IGNORELOCAL, "CYCLONE_IGNORELOCAL", { PID_PAD, PDF_QOS, QP_CYCLONE_IGNORELOCAL, "CYCLONE_IGNORELOCAL",
offsetof (struct ddsi_plist, qos.ignorelocal), membersize (struct ddsi_plist, qos.ignorelocal), offsetof (struct ddsi_plist, qos.ignorelocal), membersize (struct ddsi_plist, qos.ignorelocal),
{ .desc = { XE2, XSTOP } }, 0 }, { .desc = { XE2, XSTOP } }, 0 },
PP (PRISMTECH_PARTICIPANT_VERSION_INFO, prismtech_participant_version_info, Xux5, XS), PP (ADLINK_PARTICIPANT_VERSION_INFO, adlink_participant_version_info, Xux5, XS),
PP (PRISMTECH_TYPE_DESCRIPTION, type_description, XS), PP (ADLINK_TYPE_DESCRIPTION, type_description, XS),
{ PID_SENTINEL, 0, 0, NULL, 0, 0, { .desc = { XSTOP } }, 0 } { PID_SENTINEL, 0, 0, NULL, 0, 0, { .desc = { XSTOP } }, 0 }
}; };
/* Understood parameters for PrismTech vendor code */ /* Understood parameters for Adlink vendor code */
static const struct piddesc piddesc_prismtech[] = { static const struct piddesc piddesc_adlink[] = {
QP (PRISMTECH_ENTITY_FACTORY, entity_factory, Xb), QP (ADLINK_ENTITY_FACTORY, entity_factory, Xb),
QP (PRISMTECH_READER_LIFESPAN, reader_lifespan, Xb, XD), QP (ADLINK_READER_LIFESPAN, reader_lifespan, Xb, XD),
QP (PRISMTECH_WRITER_DATA_LIFECYCLE, writer_data_lifecycle, Xb), QP (ADLINK_WRITER_DATA_LIFECYCLE, writer_data_lifecycle, Xb),
QP (PRISMTECH_READER_DATA_LIFECYCLE, reader_data_lifecycle, XDx2), QP (ADLINK_READER_DATA_LIFECYCLE, reader_data_lifecycle, XDx2),
QP (PRISMTECH_SUBSCRIPTION_KEYS, subscription_keys, XbCOND, XQ, XS, XSTOP), QP (ADLINK_SUBSCRIPTION_KEYS, subscription_keys, XbCOND, XQ, XS, XSTOP),
PP (PRISMTECH_PARTICIPANT_VERSION_INFO, prismtech_participant_version_info, Xux5, XS), PP (ADLINK_PARTICIPANT_VERSION_INFO, adlink_participant_version_info, Xux5, XS),
PP (PRISMTECH_TYPE_DESCRIPTION, type_description, XS), PP (ADLINK_TYPE_DESCRIPTION, type_description, XS),
{ PID_SENTINEL, 0, 0, NULL, 0, 0, { .desc = { XSTOP } }, 0 } { PID_SENTINEL, 0, 0, NULL, 0, 0, { .desc = { XSTOP } }, 0 }
}; };
@ -1524,7 +1524,7 @@ static const struct piddesc *piddesc_omg_index[115];
static const struct piddesc *piddesc_omg_index[114]; static const struct piddesc *piddesc_omg_index[114];
#endif #endif
static const struct piddesc *piddesc_eclipse_index[19]; static const struct piddesc *piddesc_eclipse_index[19];
static const struct piddesc *piddesc_prismtech_index[19]; static const struct piddesc *piddesc_adlink_index[19];
#define INDEX_ANY(vendorid_, tab_) [vendorid_] = { \ #define INDEX_ANY(vendorid_, tab_) [vendorid_] = { \
.index_max = sizeof (piddesc_##tab_##_index) / sizeof (piddesc_##tab_##_index[0]) - 1, \ .index_max = sizeof (piddesc_##tab_##_index) / sizeof (piddesc_##tab_##_index[0]) - 1, \
@ -1535,11 +1535,11 @@ static const struct piddesc *piddesc_prismtech_index[19];
static const struct piddesc_index piddesc_vendor_index[] = { static const struct piddesc_index piddesc_vendor_index[] = {
INDEX_ANY (0, omg), INDEX_ANY (0, omg),
INDEX (ECLIPSE, eclipse), INDEX (ECLIPSE, eclipse),
INDEX (PRISMTECH_OSPL, prismtech), INDEX (ADLINK_OSPL, adlink),
INDEX (PRISMTECH_JAVA, prismtech), INDEX (ADLINK_JAVA, adlink),
INDEX (PRISMTECH_LITE, prismtech), INDEX (ADLINK_LITE, adlink),
INDEX (PRISMTECH_GATEWAY, prismtech), INDEX (ADLINK_GATEWAY, adlink),
INDEX (PRISMTECH_CLOUD, prismtech) INDEX (ADLINK_CLOUD, adlink)
}; };
#undef INDEX #undef INDEX
@ -2781,7 +2781,7 @@ void ddsi_plist_init_default_participant (ddsi_plist_t *plist)
{ {
ddsi_plist_init_empty (plist); ddsi_plist_init_empty (plist);
plist->qos.present |= QP_PRISMTECH_ENTITY_FACTORY; plist->qos.present |= QP_ADLINK_ENTITY_FACTORY;
plist->qos.entity_factory.autoenable_created_entities = 0; plist->qos.entity_factory.autoenable_created_entities = 0;
plist->qos.present |= QP_USER_DATA; plist->qos.present |= QP_USER_DATA;
@ -2864,15 +2864,15 @@ void ddsi_xqos_init_default_reader (dds_qos_t *xqos)
xqos->present |= QP_TIME_BASED_FILTER; xqos->present |= QP_TIME_BASED_FILTER;
xqos->time_based_filter.minimum_separation = 0; xqos->time_based_filter.minimum_separation = 0;
xqos->present |= QP_PRISMTECH_READER_DATA_LIFECYCLE; xqos->present |= QP_ADLINK_READER_DATA_LIFECYCLE;
xqos->reader_data_lifecycle.autopurge_nowriter_samples_delay = DDS_INFINITY; xqos->reader_data_lifecycle.autopurge_nowriter_samples_delay = DDS_INFINITY;
xqos->reader_data_lifecycle.autopurge_disposed_samples_delay = DDS_INFINITY; xqos->reader_data_lifecycle.autopurge_disposed_samples_delay = DDS_INFINITY;
xqos->present |= QP_PRISMTECH_READER_LIFESPAN; xqos->present |= QP_ADLINK_READER_LIFESPAN;
xqos->reader_lifespan.use_lifespan = 0; xqos->reader_lifespan.use_lifespan = 0;
xqos->reader_lifespan.duration = DDS_INFINITY; xqos->reader_lifespan.duration = DDS_INFINITY;
xqos->present |= QP_PRISMTECH_SUBSCRIPTION_KEYS; xqos->present |= QP_ADLINK_SUBSCRIPTION_KEYS;
xqos->subscription_keys.use_key_list = 0; xqos->subscription_keys.use_key_list = 0;
xqos->subscription_keys.key_list.n = 0; xqos->subscription_keys.key_list.n = 0;
xqos->subscription_keys.key_list.strs = NULL; xqos->subscription_keys.key_list.strs = NULL;
@ -2903,7 +2903,7 @@ void ddsi_xqos_init_default_writer (dds_qos_t *xqos)
xqos->present |= QP_LIFESPAN; xqos->present |= QP_LIFESPAN;
xqos->lifespan.duration = DDS_INFINITY; xqos->lifespan.duration = DDS_INFINITY;
xqos->present |= QP_PRISMTECH_WRITER_DATA_LIFECYCLE; xqos->present |= QP_ADLINK_WRITER_DATA_LIFECYCLE;
xqos->writer_data_lifecycle.autodispose_unregistered_instances = 1; xqos->writer_data_lifecycle.autodispose_unregistered_instances = 1;
} }
@ -2935,7 +2935,7 @@ void ddsi_xqos_init_default_topic (dds_qos_t *xqos)
xqos->present |= QP_LIFESPAN; xqos->present |= QP_LIFESPAN;
xqos->lifespan.duration = DDS_INFINITY; xqos->lifespan.duration = DDS_INFINITY;
xqos->present |= QP_PRISMTECH_SUBSCRIPTION_KEYS; xqos->present |= QP_ADLINK_SUBSCRIPTION_KEYS;
xqos->subscription_keys.use_key_list = 0; xqos->subscription_keys.use_key_list = 0;
xqos->subscription_keys.key_list.n = 0; xqos->subscription_keys.key_list.n = 0;
xqos->subscription_keys.key_list.strs = NULL; xqos->subscription_keys.key_list.strs = NULL;
@ -2949,7 +2949,7 @@ static void ddsi_xqos_init_default_publisher_subscriber (dds_qos_t *xqos)
xqos->group_data.length = 0; xqos->group_data.length = 0;
xqos->group_data.value = NULL; xqos->group_data.value = NULL;
xqos->present |= QP_PRISMTECH_ENTITY_FACTORY; xqos->present |= QP_ADLINK_ENTITY_FACTORY;
xqos->entity_factory.autoenable_created_entities = 1; xqos->entity_factory.autoenable_created_entities = 1;
xqos->present |= QP_PARTITION; xqos->present |= QP_PARTITION;

4
src/core/ddsi/src/ddsi_vendor.c
View file

@ -17,9 +17,9 @@ extern inline bool vendor_equals (nn_vendorid_t a, nn_vendorid_t b);
extern inline bool vendor_is_rti (nn_vendorid_t vendor); extern inline bool vendor_is_rti (nn_vendorid_t vendor);
extern inline bool vendor_is_twinoaks (nn_vendorid_t vendor); extern inline bool vendor_is_twinoaks (nn_vendorid_t vendor);
extern inline bool vendor_is_eprosima (nn_vendorid_t vendor); extern inline bool vendor_is_eprosima (nn_vendorid_t vendor);
extern inline bool vendor_is_prismtech (nn_vendorid_t vendor); extern inline bool vendor_is_adlink (nn_vendorid_t vendor);
extern inline bool vendor_is_opensplice (nn_vendorid_t vendor); extern inline bool vendor_is_opensplice (nn_vendorid_t vendor);
extern inline bool vendor_is_cloud (nn_vendorid_t vendor); extern inline bool vendor_is_cloud (nn_vendorid_t vendor);
extern inline bool vendor_is_eclipse (nn_vendorid_t vendor); extern inline bool vendor_is_eclipse (nn_vendorid_t vendor);
extern inline bool vendor_is_eclipse_or_opensplice (nn_vendorid_t vendor); extern inline bool vendor_is_eclipse_or_opensplice (nn_vendorid_t vendor);
extern inline bool vendor_is_eclipse_or_prismtech (nn_vendorid_t vendor); extern inline bool vendor_is_eclipse_or_adlink (nn_vendorid_t vendor);

54
src/core/ddsi/src/q_ddsi_discovery.c
View file

@ -296,28 +296,28 @@ int spdp_write (struct participant *pp)
} }
ps.participant_lease_duration = pp->lease_duration; ps.participant_lease_duration = pp->lease_duration;
/* Add PrismTech specific version information */ /* Add Adlink specific version information */
{ {
ps.present |= PP_PRISMTECH_PARTICIPANT_VERSION_INFO; ps.present |= PP_ADLINK_PARTICIPANT_VERSION_INFO;
memset (&ps.prismtech_participant_version_info, 0, sizeof (ps.prismtech_participant_version_info)); memset (&ps.adlink_participant_version_info, 0, sizeof (ps.adlink_participant_version_info));
ps.prismtech_participant_version_info.version = 0; ps.adlink_participant_version_info.version = 0;
ps.prismtech_participant_version_info.flags = ps.adlink_participant_version_info.flags =
NN_PRISMTECH_FL_DDSI2_PARTICIPANT_FLAG | NN_ADLINK_FL_DDSI2_PARTICIPANT_FLAG |
NN_PRISMTECH_FL_PTBES_FIXED_0 | NN_ADLINK_FL_PTBES_FIXED_0 |
NN_PRISMTECH_FL_SUPPORTS_STATUSINFOX; NN_ADLINK_FL_SUPPORTS_STATUSINFOX;
if (pp->e.gv->config.besmode == BESMODE_MINIMAL) if (pp->e.gv->config.besmode == BESMODE_MINIMAL)
ps.prismtech_participant_version_info.flags |= NN_PRISMTECH_FL_MINIMAL_BES_MODE; ps.adlink_participant_version_info.flags |= NN_ADLINK_FL_MINIMAL_BES_MODE;
ddsrt_mutex_lock (&pp->e.gv->privileged_pp_lock); ddsrt_mutex_lock (&pp->e.gv->privileged_pp_lock);
if (pp->is_ddsi2_pp) if (pp->is_ddsi2_pp)
ps.prismtech_participant_version_info.flags |= NN_PRISMTECH_FL_PARTICIPANT_IS_DDSI2; ps.adlink_participant_version_info.flags |= NN_ADLINK_FL_PARTICIPANT_IS_DDSI2;
ddsrt_mutex_unlock (&pp->e.gv->privileged_pp_lock); ddsrt_mutex_unlock (&pp->e.gv->privileged_pp_lock);
if (ddsrt_gethostname(node, sizeof(node)-1) < 0) if (ddsrt_gethostname(node, sizeof(node)-1) < 0)
(void) ddsrt_strlcpy (node, "unknown", sizeof (node)); (void) ddsrt_strlcpy (node, "unknown", sizeof (node));
size = strlen(node) + strlen(DDS_VERSION) + strlen(DDS_HOST_NAME) + strlen(DDS_TARGET_NAME) + 4; /* + ///'\0' */ size = strlen(node) + strlen(DDS_VERSION) + strlen(DDS_HOST_NAME) + strlen(DDS_TARGET_NAME) + 4; /* + ///'\0' */
ps.prismtech_participant_version_info.internals = ddsrt_malloc(size); ps.adlink_participant_version_info.internals = ddsrt_malloc(size);
(void) snprintf(ps.prismtech_participant_version_info.internals, size, "%s/%s/%s/%s", node, DDS_VERSION, DDS_HOST_NAME, DDS_TARGET_NAME); (void) snprintf(ps.adlink_participant_version_info.internals, size, "%s/%s/%s/%s", node, DDS_VERSION, DDS_HOST_NAME, DDS_TARGET_NAME);
ETRACE (pp, "spdp_write("PGUIDFMT") - internals: %s\n", PGUID (pp->e.guid), ps.prismtech_participant_version_info.internals); ETRACE (pp, "spdp_write("PGUIDFMT") - internals: %s\n", PGUID (pp->e.guid), ps.adlink_participant_version_info.internals);
} }
/* Participant QoS's insofar as they are set, different from the default. Currently, that means just USER_DATA. */ /* Participant QoS's insofar as they are set, different from the default. Currently, that means just USER_DATA. */
@ -631,21 +631,21 @@ static int handle_SPDP_alive (const struct receiver_state *rst, seqno_t seq, dds
lease_duration = DDS_SECS (100); lease_duration = DDS_SECS (100);
} }
if (datap->present & PP_PRISMTECH_PARTICIPANT_VERSION_INFO) { if (datap->present & PP_ADLINK_PARTICIPANT_VERSION_INFO) {
if (datap->prismtech_participant_version_info.flags & NN_PRISMTECH_FL_KERNEL_SEQUENCE_NUMBER) if (datap->adlink_participant_version_info.flags & NN_ADLINK_FL_KERNEL_SEQUENCE_NUMBER)
custom_flags |= CF_INC_KERNEL_SEQUENCE_NUMBERS; custom_flags |= CF_INC_KERNEL_SEQUENCE_NUMBERS;
if ((datap->prismtech_participant_version_info.flags & NN_PRISMTECH_FL_DDSI2_PARTICIPANT_FLAG) && if ((datap->adlink_participant_version_info.flags & NN_ADLINK_FL_DDSI2_PARTICIPANT_FLAG) &&
(datap->prismtech_participant_version_info.flags & NN_PRISMTECH_FL_PARTICIPANT_IS_DDSI2)) (datap->adlink_participant_version_info.flags & NN_ADLINK_FL_PARTICIPANT_IS_DDSI2))
custom_flags |= CF_PARTICIPANT_IS_DDSI2; custom_flags |= CF_PARTICIPANT_IS_DDSI2;
GVLOGDISC (" (0x%08x-0x%08x-0x%08x-0x%08x-0x%08x %s)", GVLOGDISC (" (0x%08x-0x%08x-0x%08x-0x%08x-0x%08x %s)",
datap->prismtech_participant_version_info.version, datap->adlink_participant_version_info.version,
datap->prismtech_participant_version_info.flags, datap->adlink_participant_version_info.flags,
datap->prismtech_participant_version_info.unused[0], datap->adlink_participant_version_info.unused[0],
datap->prismtech_participant_version_info.unused[1], datap->adlink_participant_version_info.unused[1],
datap->prismtech_participant_version_info.unused[2], datap->adlink_participant_version_info.unused[2],
datap->prismtech_participant_version_info.internals); datap->adlink_participant_version_info.internals);
} }
/* If any of the SEDP announcer are missing AND the guid prefix of /* If any of the SEDP announcer are missing AND the guid prefix of
@ -1114,12 +1114,12 @@ static struct proxy_participant *implicitly_create_proxypp (struct ddsi_domaingv
as_meta = ref_addrset(privpp->as_meta); as_meta = ref_addrset(privpp->as_meta);
/* copy just what we need */ /* copy just what we need */
tmp_plist = *privpp->plist; tmp_plist = *privpp->plist;
tmp_plist.present = PP_PARTICIPANT_GUID | PP_PRISMTECH_PARTICIPANT_VERSION_INFO; tmp_plist.present = PP_PARTICIPANT_GUID | PP_ADLINK_PARTICIPANT_VERSION_INFO;
tmp_plist.participant_guid = *ppguid; tmp_plist.participant_guid = *ppguid;
ddsi_plist_mergein_missing (&pp_plist, &tmp_plist, ~(uint64_t)0, ~(uint64_t)0); ddsi_plist_mergein_missing (&pp_plist, &tmp_plist, ~(uint64_t)0, ~(uint64_t)0);
ddsrt_mutex_unlock (&privpp->e.lock); ddsrt_mutex_unlock (&privpp->e.lock);
pp_plist.prismtech_participant_version_info.flags &= ~NN_PRISMTECH_FL_PARTICIPANT_IS_DDSI2; pp_plist.adlink_participant_version_info.flags &= ~NN_ADLINK_FL_PARTICIPANT_IS_DDSI2;
new_proxy_participant (gv, ppguid, 0, &privguid, as_default, as_meta, &pp_plist, DDS_INFINITY, vendorid, CF_IMPLICITLY_CREATED_PROXYPP | CF_PROXYPP_NO_SPDP, timestamp, seq); new_proxy_participant (gv, ppguid, 0, &privguid, as_default, as_meta, &pp_plist, DDS_INFINITY, vendorid, CF_IMPLICITLY_CREATED_PROXYPP | CF_PROXYPP_NO_SPDP, timestamp, seq);
} }
} }
@ -1179,7 +1179,7 @@ static void handle_SEDP_alive (const struct receiver_state *rst, seqno_t seq, dd
is_writer = is_writer_entityid (datap->endpoint_guid.entityid); is_writer = is_writer_entityid (datap->endpoint_guid.entityid);
if (!is_writer) if (!is_writer)
ddsi_xqos_mergein_missing (xqos, &gv->default_xqos_rd, ~(uint64_t)0); ddsi_xqos_mergein_missing (xqos, &gv->default_xqos_rd, ~(uint64_t)0);
else if (vendor_is_eclipse_or_prismtech(vendorid)) else if (vendor_is_eclipse_or_adlink(vendorid))
ddsi_xqos_mergein_missing (xqos, &gv->default_xqos_wr, ~(uint64_t)0); ddsi_xqos_mergein_missing (xqos, &gv->default_xqos_wr, ~(uint64_t)0);
else else
ddsi_xqos_mergein_missing (xqos, &gv->default_xqos_wr_nad, ~(uint64_t)0); ddsi_xqos_mergein_missing (xqos, &gv->default_xqos_wr_nad, ~(uint64_t)0);
@ -1273,7 +1273,7 @@ static void handle_SEDP_alive (const struct receiver_state *rst, seqno_t seq, dd
ddsi_xqos_log (DDS_LC_DISCOVERY, &gv->logconfig, xqos); ddsi_xqos_log (DDS_LC_DISCOVERY, &gv->logconfig, xqos);
GVLOGDISC ("}\n"); GVLOGDISC ("}\n");
if ((datap->endpoint_guid.entityid.u & NN_ENTITYID_SOURCE_MASK) == NN_ENTITYID_SOURCE_VENDOR && !vendor_is_eclipse_or_prismtech (vendorid)) if ((datap->endpoint_guid.entityid.u & NN_ENTITYID_SOURCE_MASK) == NN_ENTITYID_SOURCE_VENDOR && !vendor_is_eclipse_or_adlink (vendorid))
{ {
GVLOGDISC ("ignoring vendor-specific endpoint "PGUIDFMT"\n", PGUID (datap->endpoint_guid)); GVLOGDISC ("ignoring vendor-specific endpoint "PGUIDFMT"\n", PGUID (datap->endpoint_guid));
} }

12
src/core/ddsi/src/q_entity.c
View file

@ -176,7 +176,7 @@ int is_builtin_entityid (ddsi_entityid_t id, nn_vendorid_t vendorid)
return 1; return 1;
else if ((id.u & NN_ENTITYID_SOURCE_MASK) != NN_ENTITYID_SOURCE_VENDOR) else if ((id.u & NN_ENTITYID_SOURCE_MASK) != NN_ENTITYID_SOURCE_VENDOR)
return 0; return 0;
else if (!vendor_is_eclipse_or_prismtech (vendorid)) else if (!vendor_is_eclipse_or_adlink (vendorid))
return 0; return 0;
else else
{ {
@ -3981,14 +3981,14 @@ void new_proxy_participant (struct ddsi_domaingv *gv, const struct ddsi_guid *pp
memset (&proxypp->privileged_pp_guid.prefix, 0, sizeof (proxypp->privileged_pp_guid.prefix)); memset (&proxypp->privileged_pp_guid.prefix, 0, sizeof (proxypp->privileged_pp_guid.prefix));
proxypp->privileged_pp_guid.entityid.u = NN_ENTITYID_PARTICIPANT; proxypp->privileged_pp_guid.entityid.u = NN_ENTITYID_PARTICIPANT;
} }
if ((plist->present & PP_PRISMTECH_PARTICIPANT_VERSION_INFO) && if ((plist->present & PP_ADLINK_PARTICIPANT_VERSION_INFO) &&
(plist->prismtech_participant_version_info.flags & NN_PRISMTECH_FL_DDSI2_PARTICIPANT_FLAG) && (plist->adlink_participant_version_info.flags & NN_ADLINK_FL_DDSI2_PARTICIPANT_FLAG) &&
(plist->prismtech_participant_version_info.flags & NN_PRISMTECH_FL_PARTICIPANT_IS_DDSI2)) (plist->adlink_participant_version_info.flags & NN_ADLINK_FL_PARTICIPANT_IS_DDSI2))
proxypp->is_ddsi2_pp = 1; proxypp->is_ddsi2_pp = 1;
else else
proxypp->is_ddsi2_pp = 0; proxypp->is_ddsi2_pp = 0;
if ((plist->present & PP_PRISMTECH_PARTICIPANT_VERSION_INFO) && if ((plist->present & PP_ADLINK_PARTICIPANT_VERSION_INFO) &&
(plist->prismtech_participant_version_info.flags & NN_PRISMTECH_FL_MINIMAL_BES_MODE)) (plist->adlink_participant_version_info.flags & NN_ADLINK_FL_MINIMAL_BES_MODE))
proxypp->minimal_bes_mode = 1; proxypp->minimal_bes_mode = 1;
else else
proxypp->minimal_bes_mode = 0; proxypp->minimal_bes_mode = 0;

8
src/core/ddsi/src/q_receive.c
View file

@ -1775,7 +1775,7 @@ static struct ddsi_serdata *remote_make_sample (struct ddsi_tkmap_instance **tk,
else if (sampleinfo->size) else if (sampleinfo->size)
{ {
/* dispose or unregister with included serialized key or data /* dispose or unregister with included serialized key or data
(data is a PrismTech extension) -- i.e., dispose or unregister (data is a Adlink extension) -- i.e., dispose or unregister
as one would expect to receive */ as one would expect to receive */
if (data_smhdr_flags & DATA_FLAG_KEYFLAG) if (data_smhdr_flags & DATA_FLAG_KEYFLAG)
{ {
@ -2787,7 +2787,7 @@ static int handle_submsg_sequence
ts_for_latmeas = 0; ts_for_latmeas = 0;
} }
break; break;
case SMID_PT_MSG_LEN: case SMID_ADLINK_MSG_LEN:
{ {
#if 0 #if 0
state = "parse:msg_len"; state = "parse:msg_len";
@ -2795,7 +2795,7 @@ static int handle_submsg_sequence
GVTRACE ("MSG_LEN(%"PRIu32")", ((MsgLen_t*) sm)->length); GVTRACE ("MSG_LEN(%"PRIu32")", ((MsgLen_t*) sm)->length);
break; break;
} }
case SMID_PT_ENTITY_ID: case SMID_ADLINK_ENTITY_ID:
{ {
#if 0 #if 0
state = "parse:entity_id"; state = "parse:entity_id";
@ -2921,7 +2921,7 @@ static bool do_packet (struct thread_state1 * const ts1, struct ddsi_domaingv *g
ml->length = ddsrt_bswap4u (ml->length); ml->length = ddsrt_bswap4u (ml->length);
} }
if (ml->smhdr.submessageId != SMID_PT_MSG_LEN) if (ml->smhdr.submessageId != SMID_ADLINK_MSG_LEN)
{ {
malformed_packet_received_nosubmsg (gv, buff, sz, "header", hdr->vendorid); malformed_packet_received_nosubmsg (gv, buff, sz, "header", hdr->vendorid);
sz = -1; sz = -1;

12
src/core/ddsi/src/q_xmsg.c
View file

@ -377,8 +377,8 @@ static int submsg_is_compatible (const struct nn_xmsg *msg, SubmessageKind_t smk
case SMID_ACKNACK: case SMID_HEARTBEAT: case SMID_ACKNACK: case SMID_HEARTBEAT:
case SMID_GAP: case SMID_NACK_FRAG: case SMID_GAP: case SMID_NACK_FRAG:
case SMID_HEARTBEAT_FRAG: case SMID_HEARTBEAT_FRAG:
case SMID_PT_MSG_LEN: case SMID_ADLINK_MSG_LEN:
case SMID_PT_ENTITY_ID: case SMID_ADLINK_ENTITY_ID:
/* normal control stuff is ok */ /* normal control stuff is ok */
return 1; return 1;
case SMID_DATA: case SMID_DATA_FRAG: case SMID_DATA: case SMID_DATA_FRAG:
@ -410,8 +410,8 @@ static int submsg_is_compatible (const struct nn_xmsg *msg, SubmessageKind_t smk
case SMID_GAP: case SMID_GAP:
case SMID_NACK_FRAG: case SMID_NACK_FRAG:
case SMID_HEARTBEAT_FRAG: case SMID_HEARTBEAT_FRAG:
case SMID_PT_MSG_LEN: case SMID_ADLINK_MSG_LEN:
case SMID_PT_ENTITY_ID: case SMID_ADLINK_ENTITY_ID:
/* anything else is strictly verboten */ /* anything else is strictly verboten */
return 0; return 0;
} }
@ -553,7 +553,7 @@ void nn_xmsg_add_entityid (struct nn_xmsg * m)
struct nn_xmsg_marker sm; struct nn_xmsg_marker sm;
eid = (EntityId_t*) nn_xmsg_append (m, &sm, sizeof (EntityId_t)); eid = (EntityId_t*) nn_xmsg_append (m, &sm, sizeof (EntityId_t));
nn_xmsg_submsg_init (m, sm, SMID_PT_ENTITY_ID); nn_xmsg_submsg_init (m, sm, SMID_ADLINK_ENTITY_ID);
eid->entityid.u = NN_ENTITYID_PARTICIPANT; eid->entityid.u = NN_ENTITYID_PARTICIPANT;
nn_xmsg_submsg_setnext (m, sm); nn_xmsg_submsg_setnext (m, sm);
} }
@ -982,7 +982,7 @@ struct nn_xpack * nn_xpack_new (ddsi_tran_conn_t conn, uint32_t bw_limit, bool a
/* MSG_LEN first sub message for stream based connections */ /* MSG_LEN first sub message for stream based connections */
xp->msg_len.smhdr.submessageId = SMID_PT_MSG_LEN; xp->msg_len.smhdr.submessageId = SMID_ADLINK_MSG_LEN;
xp->msg_len.smhdr.flags = (DDSRT_ENDIAN == DDSRT_LITTLE_ENDIAN ? SMFLAG_ENDIANNESS : 0); xp->msg_len.smhdr.flags = (DDSRT_ENDIAN == DDSRT_LITTLE_ENDIAN ? SMFLAG_ENDIANNESS : 0);
xp->msg_len.smhdr.octetsToNextHeader = 4; xp->msg_len.smhdr.octetsToNextHeader = 4;

4
src/mpt/tests/qos/procs/rw.c
View file

@ -155,7 +155,7 @@ static bool pubsub_qos_eq_h (const dds_qos_t *a, dds_entity_t ent)
static uint64_t reader_qos_delta (const dds_qos_t *a, const dds_qos_t *b) static uint64_t reader_qos_delta (const dds_qos_t *a, const dds_qos_t *b)
{ {
return ddsi_xqos_delta (a, b, QP_USER_DATA | QP_TOPIC_DATA | QP_GROUP_DATA | QP_DURABILITY | QP_HISTORY | QP_RESOURCE_LIMITS | QP_PRESENTATION | QP_DEADLINE | QP_LATENCY_BUDGET | QP_OWNERSHIP | QP_LIVELINESS | QP_TIME_BASED_FILTER | QP_PARTITION | QP_RELIABILITY | QP_DESTINATION_ORDER | QP_PRISMTECH_READER_DATA_LIFECYCLE); return ddsi_xqos_delta (a, b, QP_USER_DATA | QP_TOPIC_DATA | QP_GROUP_DATA | QP_DURABILITY | QP_HISTORY | QP_RESOURCE_LIMITS | QP_PRESENTATION | QP_DEADLINE | QP_LATENCY_BUDGET | QP_OWNERSHIP | QP_LIVELINESS | QP_TIME_BASED_FILTER | QP_PARTITION | QP_RELIABILITY | QP_DESTINATION_ORDER | QP_ADLINK_READER_DATA_LIFECYCLE);
} }
static bool reader_qos_eq_h (const dds_qos_t *a, dds_entity_t ent) static bool reader_qos_eq_h (const dds_qos_t *a, dds_entity_t ent)
@ -177,7 +177,7 @@ static bool reader_qos_eq_h (const dds_qos_t *a, dds_entity_t ent)
static uint64_t writer_qos_delta (const dds_qos_t *a, const dds_qos_t *b) static uint64_t writer_qos_delta (const dds_qos_t *a, const dds_qos_t *b)
{ {
return ddsi_xqos_delta (a, b, QP_USER_DATA | QP_TOPIC_DATA | QP_GROUP_DATA | QP_DURABILITY | QP_HISTORY | QP_RESOURCE_LIMITS | QP_PRESENTATION | QP_LIFESPAN | QP_DEADLINE | QP_LATENCY_BUDGET | QP_OWNERSHIP | QP_OWNERSHIP_STRENGTH | QP_LIVELINESS | QP_PARTITION | QP_RELIABILITY | QP_DESTINATION_ORDER | QP_PRISMTECH_WRITER_DATA_LIFECYCLE); return ddsi_xqos_delta (a, b, QP_USER_DATA | QP_TOPIC_DATA | QP_GROUP_DATA | QP_DURABILITY | QP_HISTORY | QP_RESOURCE_LIMITS | QP_PRESENTATION | QP_LIFESPAN | QP_DEADLINE | QP_LATENCY_BUDGET | QP_OWNERSHIP | QP_OWNERSHIP_STRENGTH | QP_LIVELINESS | QP_PARTITION | QP_RELIABILITY | QP_DESTINATION_ORDER | QP_ADLINK_WRITER_DATA_LIFECYCLE);
} }
static bool writer_qos_eq_h (const dds_qos_t *a, dds_entity_t ent) static bool writer_qos_eq_h (const dds_qos_t *a, dds_entity_t ent)

2
src/tools/decode-trace
View file

@ -324,7 +324,7 @@ while(<>) {
my $userdata = $_; my $userdata = $_;
if ($userdata =~ s/.*QOS=\{.*?user_data=//) { if ($userdata =~ s/.*QOS=\{.*?user_data=//) {
$userdata =~ s/\}$//; $userdata =~ s/\}$//;
$userdata =~ s/,(?:prismtech_)?entity_factory=\d$//; $userdata =~ s/,(?:(?:prismtech|adlink)_)?entity_factory=\d$//;
$userdata = " userdata:$userdata"; $userdata = " userdata:$userdata";
} else { } else {
$userdata = ""; $userdata = "";