diff --git a/src/ca/tcpRecvWatchdog.cpp b/src/ca/tcpRecvWatchdog.cpp index 57a20cfa7..86d4ea48b 100644 --- a/src/ca/tcpRecvWatchdog.cpp +++ b/src/ca/tcpRecvWatchdog.cpp @@ -13,15 +13,16 @@ #define epicsAssertAuthor "Jeff Hill johill@lanl.gov" #include "iocinf.h" +#include "cac.h" #include "virtualCircuit.h" // // the recv watchdog timer is active when this object is created // tcpRecvWatchdog::tcpRecvWatchdog - ( tcpiiu & iiuIn, double periodIn, epicsTimerQueue & queueIn ) : + ( cac & cacIn, tcpiiu & iiuIn, double periodIn, epicsTimerQueue & queueIn ) : period ( periodIn ), timer ( queueIn.createTimer () ), - iiu ( iiuIn ), responsePending ( false ), + cacRef ( cacIn ), iiu ( iiuIn ), responsePending ( false ), beaconAnomaly ( true ) { } @@ -43,7 +44,7 @@ tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ ) // X aCC 361 "- disconnecting.\n", hostName, this->period ) ); # endif - this->iiu.forcedShutdown (); + this->cacRef.initiateAbortShutdown ( this->iiu ); return noRestart; } else { diff --git a/src/ca/tcpSendWatchdog.cpp b/src/ca/tcpSendWatchdog.cpp index e9a598bea..33320f109 100644 --- a/src/ca/tcpSendWatchdog.cpp +++ b/src/ca/tcpSendWatchdog.cpp @@ -13,12 +13,13 @@ #define epicsAssertAuthor "Jeff Hill johill@lanl.gov" #include "iocinf.h" +#include "cac.h" #include "virtualCircuit.h" tcpSendWatchdog::tcpSendWatchdog - ( tcpiiu &iiuIn, double periodIn, epicsTimerQueue & queueIn ) : + ( cac & cacIn, tcpiiu & iiuIn, double periodIn, epicsTimerQueue & queueIn ) : period ( periodIn ), timer ( queueIn.createTimer () ), - iiu ( iiuIn ) + cacRef ( cacIn ), iiu ( iiuIn ) { } @@ -36,7 +37,7 @@ epicsTimerNotify::expireStatus tcpSendWatchdog::expire ( debugPrintf ( ( "Request not accepted by CA server %s for %g sec. Disconnecting.\n", hostName, this->period ) ); # endif - this->iiu.forcedShutdown (); + this->cacRef.initiateAbortShutdown ( this->iiu ); return noRestart; }