diff --git a/src/cas/example/directoryService/directoryServer.cc b/src/cas/example/directoryService/directoryServer.cc index 9e0437398..4285d9a94 100644 --- a/src/cas/example/directoryService/directoryServer.cc +++ b/src/cas/example/directoryService/directoryServer.cc @@ -85,7 +85,7 @@ void directoryServer::installAliasName(const pvInfo &info, const char *pAliasNam // directoryServer::pvExistTest() // pvExistReturn directoryServer::pvExistTest - ( const casCtx &, const char * pPVName ) + ( const casCtx &, const caNetAddr &, const char * pPVName ) { // // lifetime of id is shorter than lifetime of pName diff --git a/src/cas/example/directoryService/directoryServer.h b/src/cas/example/directoryService/directoryServer.h index 31a7b9348..3bd43012f 100644 --- a/src/cas/example/directoryService/directoryServer.h +++ b/src/cas/example/directoryService/directoryServer.h @@ -104,7 +104,8 @@ public: directoryServer ( const char * const pvPrefix, unsigned aliasCount ); ~directoryServer(); void show ( unsigned level ) const; - pvExistReturn pvExistTest ( const casCtx&, const char *pPVName ); + pvExistReturn pvExistTest ( const casCtx&, + const caNetAddr &, const char *pPVName ); void installAliasName ( const pvInfo &info, const char *pAliasName ); inline void removeAliasName ( pvEntry &entry ); diff --git a/src/cas/generic/caServer.cc b/src/cas/generic/caServer.cc index 4b0ba9189..58d5da81b 100644 --- a/src/cas/generic/caServer.cc +++ b/src/cas/generic/caServer.cc @@ -43,12 +43,18 @@ caServer::~caServer() } } -pvExistReturn caServer::pvExistTest (const casCtx &, const char *) +pvExistReturn caServer::pvExistTest ( const casCtx & ctx, + const caNetAddr & /* clientAddress */, const char * pPVAliasName ) +{ + return this->pvExistTest ( ctx, pPVAliasName ); +} + +pvExistReturn caServer::pvExistTest ( const casCtx &, const char * ) { return pverDoesNotExistHere; } -pvCreateReturn caServer::createPV (const casCtx &, const char *) +pvCreateReturn caServer::createPV ( const casCtx &, const char * ) { return S_casApp_pvNotFound; } diff --git a/src/cas/generic/casDGClient.cc b/src/cas/generic/casDGClient.cc index 84e2b526d..51d14fecd 100644 --- a/src/cas/generic/casDGClient.cc +++ b/src/cas/generic/casDGClient.cc @@ -185,7 +185,7 @@ caStatus casDGClient::searchAction() // this->userStartedAsyncIO = false; pvExistReturn pver = - this->getCAS()->pvExistTest ( this->ctx, pChanName ); + this->getCAS()->pvExistTest ( this->ctx, this->lastRecvAddr, pChanName ); // // prevent problems when they initiate diff --git a/src/cas/generic/casdef.h b/src/cas/generic/casdef.h index 01cc9e197..96ae491cc 100644 --- a/src/cas/generic/casdef.h +++ b/src/cas/generic/casdef.h @@ -179,7 +179,7 @@ public: // in the future. // epicsShareFunc virtual pvExistReturn pvExistTest ( const casCtx & ctx, - const char * pPVAliasName ); + const caNetAddr & clientAddress, const char * pPVAliasName ); // // pvAttach() @@ -276,7 +276,9 @@ private: // deprecated interfaces (will be deleted in a future release) epicsShareFunc virtual class pvCreateReturn createPV ( const casCtx & ctx, - const char *pPVAliasName ); + const char * pPVAliasName ); + epicsShareFunc virtual pvExistReturn pvExistTest ( const casCtx & ctx, + const char * pPVAliasName ); }; // @@ -409,7 +411,7 @@ public: // (or a derived class) each time that this routine is called // epicsShareFunc virtual casChannel * createChannel ( const casCtx &ctx, - const char * const pUserName, const char * const pHostName); + const char * const pUserName, const char * const pHostName ); // // tbe best type for clients to use when accessing the diff --git a/src/makeBaseApp/top/caServerApp/exServer.cc b/src/makeBaseApp/top/caServerApp/exServer.cc index 52a82129a..a3df1a342 100644 --- a/src/makeBaseApp/top/caServerApp/exServer.cc +++ b/src/makeBaseApp/top/caServerApp/exServer.cc @@ -152,7 +152,7 @@ void exServer::installAliasName(pvInfo &info, const char *pAliasName) // exServer::pvExistTest() // pvExistReturn exServer::pvExistTest // X aCC 361 - ( const casCtx& ctxIn, const char * pPVName ) + ( const casCtx& ctxIn, const caNetAddr &, const char * pPVName ) { // // lifetime of id is shorter than lifetime of pName diff --git a/src/makeBaseApp/top/caServerApp/exServer.h b/src/makeBaseApp/top/caServerApp/exServer.h index aff5188ad..00fee3df1 100644 --- a/src/makeBaseApp/top/caServerApp/exServer.h +++ b/src/makeBaseApp/top/caServerApp/exServer.h @@ -283,7 +283,8 @@ private: bool scanOn; void installAliasName ( pvInfo & info, const char * pAliasName ); - pvExistReturn pvExistTest ( const casCtx &, const char * pPVName ); + pvExistReturn pvExistTest ( const casCtx &, + const caNetAddr &, const char * pPVName ); pvAttachReturn pvAttach ( const casCtx &, const char * pPVName ); //