From 9231d4c9b9eef206544f6ef52ed88c3c539a7a49 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 3 Feb 2004 03:04:42 +0000 Subject: [PATCH] removed repeater confirm through cac --- src/ca/cac.cpp | 7 ------- src/ca/cac.h | 1 - src/ca/udpiiu.cpp | 7 +------ src/ca/udpiiu.h | 1 - 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp index c057f1ee2..a0c38c24c 100644 --- a/src/ca/cac.cpp +++ b/src/ca/cac.cpp @@ -464,13 +464,6 @@ cacChannel & cac::createChannel ( return *pNetChan; } -void cac::repeaterSubscribeConfirmNotify () -{ - if ( this->pudpiiu ) { - this->pudpiiu->repeaterConfirmNotify (); - } -} - bool cac::transferChanToVirtCircuit ( epicsGuard < epicsMutex > & cbGuard, unsigned cid, unsigned sid, // X aCC 431 ca_uint16_t typeCode, arrayElementCount count, diff --git a/src/ca/cac.h b/src/ca/cac.h index f92d11c69..de9b1958e 100644 --- a/src/ca/cac.h +++ b/src/ca/cac.h @@ -127,7 +127,6 @@ public: // beacon management void beaconNotify ( const inetAddrID & addr, const epicsTime & currentTime, ca_uint32_t beaconNumber, unsigned protocolRevision ); - void repeaterSubscribeConfirmNotify (); unsigned beaconAnomaliesSinceProgramStart ( epicsGuard < epicsMutex > & ) const; diff --git a/src/ca/udpiiu.cpp b/src/ca/udpiiu.cpp index 4b09ed1f8..b2a9dfced 100644 --- a/src/ca/udpiiu.cpp +++ b/src/ca/udpiiu.cpp @@ -701,7 +701,7 @@ bool udpiiu::beaconAction ( bool udpiiu::repeaterAckAction ( epicsGuard < epicsMutex > &, const caHdr &, const osiSockAddr &, const epicsTime &) { - this->cacRef.repeaterSubscribeConfirmNotify (); + this->pRepeaterSubscribeTmr->confirmNotify (); return true; } @@ -1001,11 +1001,6 @@ bool udpiiu::wakeupMsg () return false; } -void udpiiu::repeaterConfirmNotify () -{ - this->pRepeaterSubscribeTmr->confirmNotify (); -} - void udpiiu::beaconAnomalyNotify ( epicsGuard < epicsMutex > & cacGuard, const epicsTime & currentTime ) { diff --git a/src/ca/udpiiu.h b/src/ca/udpiiu.h index 14a1e3eaf..886f29602 100644 --- a/src/ca/udpiiu.h +++ b/src/ca/udpiiu.h @@ -99,7 +99,6 @@ public: ca_uint32_t datagramSeqNumber ( epicsGuard < udpMutex > & ) const; void show ( unsigned level ) const; bool wakeupMsg (); - void repeaterConfirmNotify (); void beaconAnomalyNotify ( epicsGuard < epicsMutex > & guard, const epicsTime & currentTime ); void govExpireNotify ( const epicsTime & currentTime );