diff options
| author | Fernando Carvajal <fcarvajal@qindel.com> | 2016-04-12 11:52:22 +0200 |
|---|---|---|
| committer | Fernando Carvajal <fcarvajal@qindel.com> | 2016-04-12 12:07:53 +0200 |
| commit | a9be6f59105b7cf29bb799556274dc2c3b3d2af8 (patch) | |
| tree | 555bfeba04b21dc26df16ee5c26a3ec798d02584 /nxcomp/FillPoly.h | |
| parent | 2ffe52c5ecb7cf6af111c685eee7f8fcfd1139a9 (diff) | |
| download | nx-libs-a9be6f59105b7cf29bb799556274dc2c3b3d2af8.tar.gz nx-libs-a9be6f59105b7cf29bb799556274dc2c3b3d2af8.tar.bz2 nx-libs-a9be6f59105b7cf29bb799556274dc2c3b3d2af8.zip | |
Remove compatibility code for nxcomp before 3.5.0
As a part of nxcomp's clean-up process, compatibility with old protocol
versions has been set now at 3.5.0.
This commit removes compatibility code from nxcomp so the minimum supported
version changes from 1.5.0 (protocol step 6) to 3.5.0 (protocol step 10).
At this moment the removal is not complete and it will be followed by some
other commits, in order to get rid of several components and files that are
no longer used as they were only needed to work with old protocol versions.
Refs: ArcticaProject/nx-libs#108
Diffstat (limited to 'nxcomp/FillPoly.h')
| -rw-r--r-- | nxcomp/FillPoly.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/nxcomp/FillPoly.h b/nxcomp/FillPoly.h index f33968494..d926b6dee 100644 --- a/nxcomp/FillPoly.h +++ b/nxcomp/FillPoly.h @@ -40,7 +40,6 @@ #define FILLPOLY_ENABLE_COMPRESS 0 #define FILLPOLY_DATA_LIMIT 512 -#define FILLPOLY_DATA_OFFSET 16 #define FILLPOLY_CACHE_SLOTS 2000 #define FILLPOLY_CACHE_THRESHOLD 3 @@ -98,12 +97,9 @@ class FillPolyStore : public MessageStore enableCompress = FILLPOLY_ENABLE_COMPRESS; dataLimit = FILLPOLY_DATA_LIMIT; - dataOffset = FILLPOLY_DATA_OFFSET; - if (control -> isProtoStep8() == 1) - { - dataOffset = FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8; - } + // Since ProtoStep8 (#issue 108) + dataOffset = FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8; cacheSlots = FILLPOLY_CACHE_SLOTS; cacheThreshold = FILLPOLY_CACHE_THRESHOLD; @@ -169,11 +165,9 @@ class FillPolyStore : public MessageStore virtual int identitySize(const unsigned char *buffer, unsigned int size) { - unsigned int offset = (control -> isProtoStep8() == 1 ? - FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8 : - FILLPOLY_DATA_OFFSET); - - return (size >= offset ? offset : size); + // Since ProtoStep8 (#issue 108) + return (size >= FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8 ? + FILLPOLY_DATA_OFFSET_IF_PROTO_STEP_8 : size); } virtual int parseIdentity(Message *message, const unsigned char *buffer, |