version check and port numbers aligned with Java

This commit is contained in:
Matej Sekoranja
2012-06-27 08:25:15 +02:00
parent 4b5bc38835
commit 998fd9e44e
8 changed files with 23 additions and 31 deletions

View File

@@ -580,7 +580,7 @@ namespace pvAccess {
// second byte version - major/minor nibble
int8 magic = _socketBuffer->getByte();
_version = _socketBuffer->getByte();
if(unlikely((magic != CA_MAGIC) || (((uint8_t)_version) >> 4)!=CA_MAJOR_PROTOCOL_REVISION))
if(unlikely(magic != CA_MAGIC))
{
// error... disconnect
LOG(