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

pv API tests pass

Browse Source
This commit is contained in:
Matej Sekoranja
2014-06-01 23:54:40 +02:00
parent 1df336c6e2
commit 1442c6cd41
5 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pvAccessApp/remote/codec.cpp
View File

@@ -153,7 +153,13 @@ namespace epics {
if (!readToBuffer(PVA_MESSAGE_HEADER_SIZE, false)) {
return;
}
/*
hexDump("Header", (const int8*)_socketBuffer->getArray(),
_socketBuffer->getPosition(), PVA_MESSAGE_HEADER_SIZE);
*/
// read header fields
processHeader();
bool isControl = ((_flags & 0x01) == 0x01);
@@ -166,8 +172,13 @@ namespace epics {
bool notFirstSegment = (_flags & 0x20) != 0;
if (notFirstSegment)
{
// not-first segmented message with zero payload is "kind of" valid
// TODO this should check if previous message was first- or middle-segmented message
if (_payloadSize == 0)
continue;
LOG(logLevelWarn,
"Not-a-frst segmented message received in normal mode"
"Not-a-first segmented message received in normal mode"
" from the client at %s:%d: %s, disconnecting...",
__FILE__, __LINE__, inetAddressToString(*getLastReadBufferSocketAddress()).c_str());
invalidDataStreamHandler();