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

TCP acceptor and validation fixed, logs and dot consistency

Browse Source
This commit is contained in:
Matej Sekoranja
2014-09-04 20:44:12 +02:00
parent 6bd1efa313
commit b14333f720
7 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/remote/codec.cpp
View File

@@ -557,6 +557,17 @@ namespace epics {
_socketBuffer->setPosition(newpos);
}
static const char PADDING_BYTES[] =
{
static_cast<char>(0xFF),
static_cast<char>(0xFF),
static_cast<char>(0xFF),
static_cast<char>(0xFF),
static_cast<char>(0xFF),
static_cast<char>(0xFF),
static_cast<char>(0xFF),
static_cast<char>(0xFF)
};
void AbstractCodec::alignBuffer(std::size_t alignment) {
@@ -566,9 +577,15 @@ namespace epics {
if (pos == newpos)
return;
/*
// there is always enough of space
// since sendBuffer capacity % PVA_ALIGNMENT == 0
_sendBuffer->setPosition(newpos);
*/
// for safety reasons we really pad (override previous message data)
std::size_t padCount = newpos - pos;
_sendBuffer->put(PADDING_BYTES, 0, padCount);
}
@@ -1426,7 +1443,7 @@ namespace epics {
bool BlockingTCPTransportCodec::verify(epics::pvData::int32 timeoutMs) {
return _verifiedEvent.wait(timeoutMs/1000.0);
return _verifiedEvent.wait(timeoutMs/1000.0) && _verified;
}
void BlockingTCPTransportCodec::verified(epics::pvData::Status const & status) {