diff options
author | Martin Hurton <hurtonm@gmail.com> | 2012-05-08 09:28:17 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2012-05-11 12:01:14 +0200 |
commit | b4e7f84704b0bb8ed8834d307d24a4c5487619de (patch) | |
tree | a291d4cae4317676fae2622cb52c4a8cb7e63964 /src/encoder.cpp | |
parent | bfdcb1d21fc654eeba9fd75ad5ee0c29b1d7765e (diff) |
Fix issue #268
This patch fixes a bug in the message encoder which was
responsible for computing incorrect message offset.
The bug affected PGM receiver making it unable to
decode inital messages.
Diffstat (limited to 'src/encoder.cpp')
-rw-r--r-- | src/encoder.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/encoder.cpp b/src/encoder.cpp index 1075791..f47e38e 100644 --- a/src/encoder.cpp +++ b/src/encoder.cpp @@ -51,7 +51,7 @@ bool xs::encoder_t::size_ready () { // Write message body into the buffer. next_step (in_progress.data (), in_progress.size (), - &encoder_t::message_ready, false); + &encoder_t::message_ready, !(in_progress.flags () & msg_t::more)); return true; } @@ -90,15 +90,13 @@ bool xs::encoder_t::message_ready () if (size < 255) { tmpbuf [0] = (unsigned char) size; tmpbuf [1] = (in_progress.flags () & ~msg_t::shared); - next_step (tmpbuf, 2, &encoder_t::size_ready, - !(in_progress.flags () & msg_t::more)); + next_step (tmpbuf, 2, &encoder_t::size_ready, false); } else { tmpbuf [0] = 0xff; put_uint64 (tmpbuf + 1, size); tmpbuf [9] = (in_progress.flags () & ~msg_t::shared); - next_step (tmpbuf, 10, &encoder_t::size_ready, - !(in_progress.flags () & msg_t::more)); + next_step (tmpbuf, 10, &encoder_t::size_ready, false); } return true; } |