diff --git a/src/cas/generic/casClient.cc b/src/cas/generic/casClient.cc index d502016df..45680b984 100644 --- a/src/cas/generic/casClient.cc +++ b/src/cas/generic/casClient.cc @@ -474,7 +474,7 @@ const char *pformat, */ reply[1].m_postsize = htons (curp->m_postsize); reply[1].m_cmmd = htons (curp->m_cmmd); - reply[1].m_type = htons (curp->m_type); + reply[1].m_dataType = htons (curp->m_dataType); reply[1].m_count = htons (curp->m_count); reply[1].m_cid = curp->m_cid; reply[1].m_available = curp->m_available; @@ -582,12 +582,12 @@ void casClient::dumpMsg(const caHdr *mp, const void *dp) pName, mp->m_cmmd, pPVName, - mp->m_type, + mp->m_dataType, mp->m_count, mp->m_postsize, mp->m_available); - if (mp->m_cmmd==CA_PROTO_WRITE && mp->m_type==DBR_STRING && dp) { + if (mp->m_cmmd==CA_PROTO_WRITE && mp->m_dataType==DBR_STRING && dp) { ca_printf("CAS: The string written: %s \n", (char *)dp); } } diff --git a/src/cas/generic/casClientMon.cc b/src/cas/generic/casClientMon.cc index 0a2c60ae1..059957137 100644 --- a/src/cas/generic/casClientMon.cc +++ b/src/cas/generic/casClientMon.cc @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.4 1998/07/08 15:38:04 jhill + * fixed lost monitors during flow control problem + * * Revision 1.3 1997/08/05 00:47:05 jhill * fixed warnings * @@ -80,7 +83,7 @@ caStatus casClientMon::callBack(gdd &value) // msg.m_cmmd = CA_PROTO_EVENT_ADD; msg.m_postsize = 0u; - msg.m_type = this->getType(); + msg.m_dataType = this->getType(); msg.m_count = (ca_uint16_t) this->getCount(); msg.m_cid = this->getChannel().getSID(); msg.m_available = this->getClientId(); diff --git a/src/cas/generic/casCtxIL.h b/src/cas/generic/casCtxIL.h index 99b61259c..a292e960f 100644 --- a/src/cas/generic/casCtxIL.h +++ b/src/cas/generic/casCtxIL.h @@ -73,7 +73,7 @@ inline void casCtx::setMsg(const char *pBuf) memcpy (&this->msg, pBuf, sizeof(this->msg)); this->msg.m_cmmd = ntohs (this->msg.m_cmmd); this->msg.m_postsize = ntohs (this->msg.m_postsize); - this->msg.m_type = ntohs (this->msg.m_type); + this->msg.m_dataType = ntohs (this->msg.m_dataType); this->msg.m_count = ntohs (this->msg.m_count); this->msg.m_cid = ntohl (this->msg.m_cid); this->msg.m_available = ntohl (this->msg.m_available);