updated email address - petr@smoliku.cz

[orte.git] / orte / liborte / RTPSCSTReader.c

diff --git a/orte/liborte/RTPSCSTReader.c b/orte/liborte/RTPSCSTReader.c
index fa4dd6bb9c908b9db966154c99fd04c220ca8f8f..1745cf40dd4d09f4eb6749f03a94d1e76c13a180 100644 (file)
--- a/orte/liborte/RTPSCSTReader.c
+++ b/orte/liborte/RTPSCSTReader.c
@@ -2,9 +2,19 @@
  *  $Id: RTPSCSTReader.c,v 0.0.0.1      2003/09/13 
  *
  *  DEBUG:  section 53                  CSTReader
- *  AUTHOR: Petr Smolik                 petr.smolik@wo.cz
  *
- *  ORTE - OCERA Real-Time Ethernet     http://www.ocera.org/
+ *  -------------------------------------------------------------------  
+ *                                ORTE                                 
+ *                      Open Real-Time Ethernet                       
+ *                                                                    
+ *                      Copyright (C) 2001-2006                       
+ *  Department of Control Engineering FEE CTU Prague, Czech Republic  
+ *                      http://dce.felk.cvut.cz                       
+ *                      http://www.ocera.org                          
+ *                                                                    
+ *  Author:             Petr Smolik    petr@smoliku.cz             
+ *  Advisor:            Pavel Pisa                                   
+ *  Project Responsible: Zdenek Hanzalek                              
  *  --------------------------------------------------------------------
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,7 +29,7 @@
  *  
  */ 
 
-#include "orte.h"
+#include "orte_all.h"
 
 GAVL_CUST_NODE_INT_IMP(CSTReader, 
                        CSTSubscriptions, CSTReader, GUID_RTPS,
@@ -123,7 +133,7 @@ CSTReaderAddRemoteWriter(ORTEDomain *d,CSTReader *cstReader,ObjectEntryOID *obje
   cstRemoteWriter->guid.hid=object->objectEntryHID->hid;
   cstRemoteWriter->guid.aid=object->objectEntryAID->aid;
   cstRemoteWriter->guid.oid=oid;
-  cstRemoteWriter->objectEntryOID=object;
+  cstRemoteWriter->spobject=object;
   cstRemoteWriter->cstReader=cstReader;
   cstRemoteWriter->csChangesCounter=0;
   cstRemoteWriter->ACKRetriesCounter=0;
@@ -138,7 +148,7 @@ CSTReaderAddRemoteWriter(ORTEDomain *d,CSTReader *cstReader,ObjectEntryOID *obje
   //add event for repeatActiveTime
   if (NtpTimeCmp(cstReader->params.repeatActiveQueryTime,iNtpTime)!=0) {
     eventAdd(d,
-        cstRemoteWriter->objectEntryOID->objectEntryAID,
+        cstRemoteWriter->spobject->objectEntryAID,
         &cstRemoteWriter->repeatActiveQueryTimer,
         1,   //metatraffic timer
         "CSTReaderQueryTimer",
@@ -176,7 +186,7 @@ CSTReaderDestroyRemoteWriter(ORTEDomain *d,CSTRemoteWriter *cstRemoteWriter) {
                 cstRemoteWriter->guid.oid);
   if ((cstRemoteWriter->cstReader->guid.oid & 0x07)==OID_SUBSCRIPTION) {
     ORTEPublProp *pp;
-    pp=(ORTEPublProp*)cstRemoteWriter->objectEntryOID->attributes;
+    pp=(ORTEPublProp*)cstRemoteWriter->spobject->attributes;
     if ((pp->reliabilityOffered & PID_VALUE_RELIABILITY_STRICT)!=0)
       cstRemoteWriter->cstReader->strictReliableCounter++;
     else {
@@ -191,11 +201,11 @@ CSTReaderDestroyRemoteWriter(ORTEDomain *d,CSTRemoteWriter *cstRemoteWriter) {
         csChangeFromWriter,ORTE_FALSE);
   }
   eventDetach(d,
-      cstRemoteWriter->objectEntryOID->objectEntryAID,
+      cstRemoteWriter->spobject->objectEntryAID,
       &cstRemoteWriter->delayResponceTimer,
       1);   //metatraffic timer
   eventDetach(d,
-      cstRemoteWriter->objectEntryOID->objectEntryAID,
+      cstRemoteWriter->spobject->objectEntryAID,
       &cstRemoteWriter->repeatActiveQueryTimer,
       1);   //metatraffic timer
   CSTRemoteWriter_delete(cstRemoteWriter->cstReader,cstRemoteWriter);
@@ -225,8 +235,8 @@ CSTReaderDestroyCSChangeFromWriter(CSTRemoteWriter *cstRemoteWriter,
   CSTReaderCSChange_delete(cstRemoteWriter->cstReader,
                            csChangeFromWriter->csChange);
   if (!keepCSChange) {
-    if (csChangeFromWriter->csChange->cdrStream.buffer)
-      FREE(csChangeFromWriter->csChange->cdrStream.buffer);
+    if (csChangeFromWriter->csChange->cdrCodec.buffer)
+      FREE(csChangeFromWriter->csChange->cdrCodec.buffer);
     parameterDelete(csChangeFromWriter->csChange);
     FREE(csChangeFromWriter->csChange);
   }
@@ -258,15 +268,15 @@ CSTReaderSetupState(CSTRemoteWriter *cstRemoteWriter) {
         cstRemoteWriter->commStateACK=PULLING;
         cstRemoteWriter->ACKRetriesCounter=0;
         eventDetach(cstRemoteWriter->cstReader->domain,
-            cstRemoteWriter->objectEntryOID->objectEntryAID,
+            cstRemoteWriter->spobject->objectEntryAID,
             &cstRemoteWriter->repeatActiveQueryTimer,
             1);  //metatraffic timer
         eventDetach(cstRemoteWriter->cstReader->domain,
-            cstRemoteWriter->objectEntryOID->objectEntryAID,
+            cstRemoteWriter->spobject->objectEntryAID,
             &cstRemoteWriter->delayResponceTimer,
             1);   //metatraffic timer
         eventAdd(cstRemoteWriter->cstReader->domain,
-            cstRemoteWriter->objectEntryOID->objectEntryAID,
+            cstRemoteWriter->spobject->objectEntryAID,
             &cstRemoteWriter->delayResponceTimer,
             1,   //metatraffic timer
             "CSTReaderResponceTimer",
@@ -280,17 +290,17 @@ CSTReaderSetupState(CSTRemoteWriter *cstRemoteWriter) {
         cstRemoteWriter->commStateACK=WAITING;
         cstRemoteWriter->ACKRetriesCounter=0;
         eventDetach(cstRemoteWriter->cstReader->domain,
-            cstRemoteWriter->objectEntryOID->objectEntryAID,
+            cstRemoteWriter->spobject->objectEntryAID,
             &cstRemoteWriter->delayResponceTimer,
             1);   //metatraffic timer
         if (NtpTimeCmp(cstRemoteWriter->cstReader->params.repeatActiveQueryTime,
                        iNtpTime)!=0) {
           eventDetach(cstRemoteWriter->cstReader->domain,
-              cstRemoteWriter->objectEntryOID->objectEntryAID,
+              cstRemoteWriter->spobject->objectEntryAID,
               &cstRemoteWriter->repeatActiveQueryTimer,
               1);   //metatraffic timer
           eventAdd(cstRemoteWriter->cstReader->domain,
-              cstRemoteWriter->objectEntryOID->objectEntryAID,
+              cstRemoteWriter->spobject->objectEntryAID,
               &cstRemoteWriter->repeatActiveQueryTimer,
               1,   //metatraffic timer
               "CSTReaderQueryTimer",
@@ -306,15 +316,15 @@ CSTReaderSetupState(CSTRemoteWriter *cstRemoteWriter) {
       cstRemoteWriter->commStateACK=PULLING;
       cstRemoteWriter->ACKRetriesCounter=0;
       eventDetach(cstRemoteWriter->cstReader->domain,
-          cstRemoteWriter->objectEntryOID->objectEntryAID,
+          cstRemoteWriter->spobject->objectEntryAID,
           &cstRemoteWriter->repeatActiveQueryTimer,
           1);   //metatraffic timer
       eventDetach(cstRemoteWriter->cstReader->domain,
-          cstRemoteWriter->objectEntryOID->objectEntryAID,
+          cstRemoteWriter->spobject->objectEntryAID,
           &cstRemoteWriter->delayResponceTimer,
           1);   //metatraffic timer
       eventAdd(cstRemoteWriter->cstReader->domain,
-          cstRemoteWriter->objectEntryOID->objectEntryAID,
+          cstRemoteWriter->spobject->objectEntryAID,
           &cstRemoteWriter->delayResponceTimer,
           1,   //metatraffic timer
           "CSTReaderResponceTimer",