epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

test for channel connected outside the clear channel request stub

Browse Source
This commit is contained in:
Jeff Hill
2001-10-02 01:11:06 +00:00
parent deb6813aee
commit c54518d555
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ca/netiiu.cpp
+8 -3
View File
@@ -47,7 +47,12 @@ void netiiu::show ( unsigned level ) const
void netiiu::uninstallAllChan ( tsDLList < nciu > & dstList )
{
while ( nciu *pChan = this->channelList.get () ) {
this->clearChannelRequest ( *pChan );
// if the claim reply has not returned yet then we will issue
// the clear chhannel request to the server when the claim reply
// arrives and there is no matching nciu in the client
if ( pChan->connected() ) {
this->clearChannelRequest ( pChan->getSID(), pChan->getCID() );
}
dstList.add ( *pChan );
}
}
@@ -128,7 +133,7 @@ void netiiu::createChannelRequest ( nciu & )
{
}
void netiiu::clearChannelRequest ( nciu & )
void netiiu::clearChannelRequest ( ca_uint32_t sid, ca_uint32_t cid )
{
}
@@ -136,7 +141,7 @@ void netiiu::subscriptionRequest ( nciu &, netSubscription & )
{
}
void netiiu::subscriptionCancelRequest ( nciu &, netSubscription & )
void netiiu::subscriptionCancelRequest ( nciu & chan, netSubscription & subscr )
{
}
src/ca/tcpiiu.cpp
+12 -14
View File
@@ -1192,18 +1192,16 @@ void tcpiiu::createChannelRequest ( nciu &chan )
this->sendQue.commitMsg ();
}
void tcpiiu::clearChannelRequest ( nciu &chan )
void tcpiiu::clearChannelRequest ( ca_uint32_t sid, ca_uint32_t cid )
{
if ( chan.connected () ) {
this->sendQue.beginMsg ();
this->sendQue.pushUInt16 ( CA_PROTO_CLEAR_CHANNEL ); // cmd
this->sendQue.pushUInt16 ( 0u ); // postsize
this->sendQue.pushUInt16 ( 0u ); // dataType
this->sendQue.pushUInt16 ( 0u ); // count
this->sendQue.pushUInt32 ( chan.getSID () ); // cid
this->sendQue.pushUInt32 ( chan.getCID () ); // available
this->sendQue.commitMsg ();
}
this->sendQue.beginMsg ();
this->sendQue.pushUInt16 ( CA_PROTO_CLEAR_CHANNEL ); // cmd
this->sendQue.pushUInt16 ( 0u ); // postsize
this->sendQue.pushUInt16 ( 0u ); // dataType
this->sendQue.pushUInt16 ( 0u ); // count
this->sendQue.pushUInt32 ( sid ); // cid
this->sendQue.pushUInt32 ( cid ); // available
this->sendQue.commitMsg ();
}
//
@@ -1248,12 +1246,12 @@ void tcpiiu::subscriptionRequest ( nciu &chan, netSubscription & subscr )
this->sendQue.commitMsg ();
}
void tcpiiu::subscriptionCancelRequest ( nciu &chan, netSubscription &subscr )
void tcpiiu::subscriptionCancelRequest ( nciu & chan, netSubscription & subscr )
{
insertRequestHeader ( this->sendQue,
CA_PROTO_EVENT_CANCEL, 0u,
static_cast < ca_uint16_t > ( subscr.getType () ),
static_cast < ca_uint16_t > ( subscr.getCount () ),
static_cast < ca_uint16_t > ( subscr.getType() ),
static_cast < ca_uint16_t > ( subscr.getCount() ),
chan.getSID(), subscr.getID(),
CA_V49 ( this->minorProtocolVersion ) );
this->sendQue.commitMsg ();