Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2016-11-02 15:41:14 +01:00
commit 85415ce135

View file

@ -1825,7 +1825,7 @@ namespace DTSC {
dataLen += it->second.getSendLen(skipDynamic); dataLen += it->second.getSendLen(skipDynamic);
} }
} }
if (version){dataLen += 17;} if (version){dataLen += 18;}
return dataLen + 8; //add 8 bytes header return dataLen + 8; //add 8 bytes header
} }
@ -1852,7 +1852,7 @@ namespace DTSC {
writePointer(p, convertLongLong(1), 8); writePointer(p, convertLongLong(1), 8);
} }
if (version) { if (version) {
writePointer(p, "\000\006version\001", 9); writePointer(p, "\000\007version\001", 10);
writePointer(p, convertLongLong(version), 8); writePointer(p, convertLongLong(version), 8);
} }
if (bufferWindow) { if (bufferWindow) {
@ -1889,7 +1889,7 @@ namespace DTSC {
conn.SendNow(convertLongLong(1), 8); conn.SendNow(convertLongLong(1), 8);
} }
if (version) { if (version) {
conn.SendNow("\000\006version\001", 9); conn.SendNow("\000\007version\001", 10);
conn.SendNow(convertLongLong(version), 8); conn.SendNow(convertLongLong(version), 8);
} }
if (bufferWindow) { if (bufferWindow) {