Remove unused PrismTech/Adlink-specials

Signed-off-by: Erik Boasson <eb@ilities.com>

src/core/ddsi/include/dds/ddsi/ddsi_plist.h

@@ -112,11 +112,6 @@ typedef struct nn_prismtech_participant_version_info
   char *internals;
 } nn_prismtech_participant_version_info_t;
 
-typedef struct nn_prismtech_eotgroup_tid {
-  ddsi_entityid_t writer_entityid;
-  uint32_t transactionId;
-} nn_prismtech_eotgroup_tid_t;
-
 typedef struct ddsi_plist {
   uint64_t present;
   uint64_t aliased;

src/core/ddsi/include/dds/ddsi/q_entity.h

@@ -332,7 +332,6 @@ struct proxy_participant
   uint32_t refc; /* number of proxy endpoints (both user & built-in; not groups, they don't have a life of their own) */
   nn_vendorid_t vendor; /* vendor code from discovery */
   unsigned bes; /* built-in endpoint set */
-  unsigned prismtech_bes; /* prismtech-specific extension of built-in endpoints set */
   ddsi_guid_t privileged_pp_guid; /* if this PP depends on another PP for its SEDP writing */
   struct ddsi_plist *plist; /* settings/QoS for this participant */
   ddsrt_atomic_voidp_t minl_auto; /* lease object for shortest automatic liveliness pwr's lease (includes this proxypp's lease) */

src/core/ddsi/include/dds/ddsi/q_protocol.h

@@ -150,7 +150,6 @@ typedef enum SubmessageKind {
   SMID_DATA = 0x15,
   SMID_DATA_FRAG = 0x16,
   /* vendor-specific sub messages (0x80 .. 0xff) */
-  SMID_PT_INFO_CONTAINER = 0x80,
   SMID_PT_MSG_LEN = 0x81,
   SMID_PT_ENTITY_ID = 0x82
 } SubmessageKind_t;
@@ -291,12 +290,6 @@ DDSRT_WARNING_MSVC_ON(4200)
 #define NACKFRAG_SIZE(numbits) (offsetof (NackFrag_t, bits) + NN_FRAGMENT_NUMBER_SET_BITS_SIZE (numbits) + 4)
 #define NACKFRAG_SIZE_MAX NACKFRAG_SIZE (256u)
 
-typedef struct PT_InfoContainer {
-  SubmessageHeader_t smhdr;
-  uint32_t id;
-} PT_InfoContainer_t;
-#define PTINFO_ID_ENCRYPT (0x01u)
-
 typedef union Submessage {
   SubmessageHeader_t smhdr;
   AckNack_t acknack;
@@ -309,7 +302,6 @@ typedef union Submessage {
   HeartbeatFrag_t heartbeatfrag;
   Gap_t gap;
   NackFrag_t nackfrag;
-  PT_InfoContainer_t pt_infocontainer;
 } Submessage_t;
 
 DDSRT_WARNING_MSVC_OFF(4200)

src/core/ddsi/include/dds/ddsi/q_radmin.h

@@ -123,7 +123,6 @@ struct nn_rsample_info {
   ddsrt_wctime_t timestamp;
   ddsrt_wctime_t reception_timestamp; /* OpenSplice extension -- but we get it essentially for free, so why not? */
   unsigned statusinfo: 2;       /* just the two defined bits from the status info */
-  unsigned pt_wr_info_zoff: 16; /* PrismTech writer info offset */
   unsigned bswap: 1;            /* so we can extract well formatted writer info quicker */
   unsigned complex_qos: 1;      /* includes QoS other than keyhash, 2-bit statusinfo, PT writer info */
 };
@@ -156,8 +155,6 @@ struct nn_rdata {
 #define NN_ZOFF_TO_OFF(zoff) ((unsigned) (zoff))
 #define NN_OFF_TO_ZOFF(off) ((unsigned short) (off))
 #endif
-#define NN_SAMPLEINFO_HAS_WRINFO(rsi) ((rsi)->pt_wr_info_zoff != NN_OFF_TO_ZOFF (0))
-#define NN_SAMPLEINFO_WRINFO_OFF(rsi) NN_ZOFF_TO_OFF ((rsi)->pt_wr_info_zoff)
 #define NN_RDATA_PAYLOAD_OFF(rdata) NN_ZOFF_TO_OFF ((rdata)->payload_zoff)
 #define NN_RDATA_SUBMSG_OFF(rdata) NN_ZOFF_TO_OFF ((rdata)->submsg_zoff)
 

src/core/ddsi/include/dds/ddsi/q_rtps.h

@@ -54,8 +54,6 @@ typedef int64_t seqno_t;
 #define NN_ENTITYID_KIND_WRITER_NO_KEY 0x03
 #define NN_ENTITYID_KIND_READER_NO_KEY 0x04
 #define NN_ENTITYID_KIND_READER_WITH_KEY 0x07
-#define NN_ENTITYID_KIND_PRISMTECH_SUBSCRIBER 0x0a /* source = VENDOR */
-#define NN_ENTITYID_KIND_PRISMTECH_PUBLISHER 0x0b /* source = VENDOR */
 #define NN_ENTITYID_ALLOCSTEP 0x100
 
 struct cfgst;

src/core/ddsi/src/ddsi_plist.c

@@ -2686,7 +2686,6 @@ unsigned char *ddsi_plist_quickscan (struct nn_rsample_info *dest, const struct
   const unsigned char *pl;
   (void)rmsg;
   dest->statusinfo = 0;
-  dest->pt_wr_info_zoff = NN_OFF_TO_ZOFF (0);
   dest->complex_qos = 0;
   switch (src->encoding)
   {

src/core/ddsi/src/q_ddsi_discovery.c

@@ -320,7 +320,7 @@ int spdp_write (struct participant *pp)
     ETRACE (pp, "spdp_write("PGUIDFMT") - internals: %s\n", PGUID (pp->e.guid), ps.prismtech_participant_version_info.internals);
   }
 
-  /* Participant QoS's insofar as they are set, different from the default, and mapped to the SPDP data, rather than to the PrismTech-specific CMParticipant endpoint.  Currently, that means just USER_DATA. */
+  /* Participant QoS's insofar as they are set, different from the default.  Currently, that means just USER_DATA. */
   qosdiff = ddsi_xqos_delta (&pp->plist->qos, &pp->e.gv->default_plist_pp.qos, QP_USER_DATA);
   if (pp->e.gv->config.explicitly_publish_qos_set_to_default)
     qosdiff |= ~QP_UNRECOGNIZED_INCOMPATIBLE_MASK;

src/core/ddsi/src/q_entity.c

@@ -4063,12 +4063,10 @@ void new_proxy_participant (struct ddsi_domaingv *gv, const struct ddsi_guid *pp
   /* Add proxy endpoints based on the advertised (& possibly augmented
      ...) built-in endpoint set. */
   {
-#define PT_TE(ap_, a_, bp_, b_) { 0, NN_##ap_##BUILTIN_ENDPOINT_##a_, NN_ENTITYID_##bp_##_BUILTIN_##b_ }
+#define TE(ap_, a_, bp_, b_) { NN_##ap_##BUILTIN_ENDPOINT_##a_, NN_ENTITYID_##bp_##_BUILTIN_##b_ }
-#define TE(ap_, a_, bp_, b_) { NN_##ap_##BUILTIN_ENDPOINT_##a_, 0, NN_ENTITYID_##bp_##_BUILTIN_##b_ }
+#define LTE(a_, bp_, b_) { NN_##BUILTIN_ENDPOINT_##a_, NN_ENTITYID_##bp_##_BUILTIN_##b_ }
-#define LTE(a_, bp_, b_) { NN_##BUILTIN_ENDPOINT_##a_, 0, NN_ENTITYID_##bp_##_BUILTIN_##b_ }
     static const struct bestab {
       unsigned besflag;
-      unsigned prismtech_besflag;
       unsigned entityid;
     } bestab[] = {
 #if 0
@@ -4086,7 +4084,6 @@ void new_proxy_participant (struct ddsi_domaingv *gv, const struct ddsi_guid *pp
       TE (DISC_, TOPIC_ANNOUNCER, SEDP, TOPIC_WRITER),
       TE (DISC_, TOPIC_DETECTOR, SEDP, TOPIC_READER)
     };
-#undef PT_TE
 #undef TE
 #undef LTE
     ddsi_plist_t plist_rd, plist_wr;
@@ -4101,7 +4098,7 @@ void new_proxy_participant (struct ddsi_domaingv *gv, const struct ddsi_guid *pp
     for (i = 0; i < (int) (sizeof (bestab) / sizeof (*bestab)); i++)
     {
       const struct bestab *te = &bestab[i];
-      if ((proxypp->bes & te->besflag) || (proxypp->prismtech_bes & te->prismtech_besflag))
+      if (proxypp->bes & te->besflag)
       {
         ddsi_guid_t guid1;
         guid1.prefix = proxypp->e.guid.prefix;

src/core/ddsi/src/q_receive.c

@@ -283,7 +283,7 @@ static void set_sampleinfo_proxy_writer (struct nn_rsample_info *sampleinfo, dds
 
 static int valid_Data (const struct receiver_state *rst, struct nn_rmsg *rmsg, Data_t *msg, size_t size, int byteswap, struct nn_rsample_info *sampleinfo, unsigned char **payloadp)
 {
-  /* on success: sampleinfo->{seq,rst,statusinfo,pt_wr_info_zoff,bswap,complex_qos} all set */
+  /* on success: sampleinfo->{seq,rst,statusinfo,bswap,complex_qos} all set */
   ddsi_guid_t pwr_guid;
   unsigned char *ptr;
 
@@ -320,7 +320,6 @@ static int valid_Data (const struct receiver_state *rst, struct nn_rmsg *rmsg, D
     *payloadp = NULL;
     sampleinfo->size = 0; /* size is full payload size, no payload & unfragmented => size = 0 */
     sampleinfo->statusinfo = 0;
-    sampleinfo->pt_wr_info_zoff = NN_OFF_TO_ZOFF (0);
     sampleinfo->complex_qos = 0;
     return 1;
   }
@@ -349,7 +348,6 @@ static int valid_Data (const struct receiver_state *rst, struct nn_rmsg *rmsg, D
   else
   {
     sampleinfo->statusinfo = 0;
-    sampleinfo->pt_wr_info_zoff = NN_OFF_TO_ZOFF (0);
     sampleinfo->complex_qos = 0;
   }
 
@@ -393,7 +391,7 @@ static int valid_Data (const struct receiver_state *rst, struct nn_rmsg *rmsg, D
 
 static int valid_DataFrag (const struct receiver_state *rst, struct nn_rmsg *rmsg, DataFrag_t *msg, size_t size, int byteswap, struct nn_rsample_info *sampleinfo, unsigned char **payloadp)
 {
-  /* on success: sampleinfo->{rst,statusinfo,pt_wr_info_zoff,bswap,complex_qos} all set */
+  /* on success: sampleinfo->{rst,statusinfo,bswap,complex_qos} all set */
   uint32_t payloadsz;
   ddsi_guid_t pwr_guid;
   unsigned char *ptr;
@@ -471,7 +469,6 @@ static int valid_DataFrag (const struct receiver_state *rst, struct nn_rmsg *rms
   else
   {
     sampleinfo->statusinfo = 0;
-    sampleinfo->pt_wr_info_zoff = NN_OFF_TO_ZOFF (0);
     sampleinfo->complex_qos = 0;
   }
 

src/core/ddsi/src/q_xmsg.c

@@ -377,7 +377,6 @@ static int submsg_is_compatible (const struct nn_xmsg *msg, SubmessageKind_t smk
         case SMID_ACKNACK: case SMID_HEARTBEAT:
         case SMID_GAP: case SMID_NACK_FRAG:
         case SMID_HEARTBEAT_FRAG:
-        case SMID_PT_INFO_CONTAINER:
         case SMID_PT_MSG_LEN:
         case SMID_PT_ENTITY_ID:
           /* normal control stuff is ok */
@@ -411,7 +410,6 @@ static int submsg_is_compatible (const struct nn_xmsg *msg, SubmessageKind_t smk
         case SMID_GAP:
         case SMID_NACK_FRAG:
         case SMID_HEARTBEAT_FRAG:
-        case SMID_PT_INFO_CONTAINER:
         case SMID_PT_MSG_LEN:
         case SMID_PT_ENTITY_ID:
           /* anything else is strictly verboten */