diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-19 10:47:43 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-19 10:47:43 +0200 |
| commit | 03b65211260ff757b35a367f8936fd5e882ce56c (patch) | |
| tree | 014155ca365a93687f99ea6492dd2c9d3e80593e /nxcomp/Split.cpp | |
| parent | 2ffe52c5ecb7cf6af111c685eee7f8fcfd1139a9 (diff) | |
| parent | 5c495241069708e9b1bbf6e57fd49599be540b63 (diff) | |
| download | nx-libs-03b65211260ff757b35a367f8936fd5e882ce56c.tar.gz nx-libs-03b65211260ff757b35a367f8936fd5e882ce56c.tar.bz2 nx-libs-03b65211260ff757b35a367f8936fd5e882ce56c.zip | |
Merge branch 'fcarvajaldev-3.6.x-remove-old-proto-compat' into 3.6.x
Diffstat (limited to 'nxcomp/Split.cpp')
| -rw-r--r-- | nxcomp/Split.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/nxcomp/Split.cpp b/nxcomp/Split.cpp index 35a4ed4a2..607544312 100644 --- a/nxcomp/Split.cpp +++ b/nxcomp/Split.cpp @@ -748,27 +748,8 @@ int SplitStore::start(DecodeBuffer &decodeBuffer) // Get the compressed size. // - if (control -> isProtoStep7() == 1) - { - decodeBuffer.decodeValue(compressedSize, 32, 14); - } - else - { - // - // As we can't refuse to handle the decoding - // of the split message when connected to an - // old proxy version, we need to decode this - // in a way that is compatible. - // - - unsigned int diffSize; - - decodeBuffer.decodeValue(diffSize, 32, 14); - - split -> store_ -> lastResize += diffSize; - - compressedSize = split -> store_ -> lastResize; - } + // Since ProtoStep7 (#issue 108) + decodeBuffer.decodeValue(compressedSize, 32, 14); split -> store_ -> validateSize(split -> d_size_, compressedSize); |