sign: fix payload/hexdump to not assume they are the last

2016-11-01 13:18:55 +05:30 · 2016-11-01 13:18:55 +05:30 · b9fd68f71d
commit b9fd68f71d
parent 3ed956eebc
2 changed files with 5 additions and 2 deletions
--- a/common/hexdump.cpp
+++ b/common/hexdump.cpp
@ -200,7 +200,10 @@ int HexDumpProtocol::protocolFrameSize(int streamIndex) const
    if (data.pad_until_end())
    {
        int pad = mpStream->frameLen(streamIndex) 
-                    - (protocolFrameOffset(streamIndex) + len + kFcsSize);
+                    - (protocolFrameOffset(streamIndex)
+                        + len
+                        + protocolFramePayloadSize(streamIndex)
+                        + kFcsSize);
        if (pad < 0)
            pad = 0;
        len += pad;
--- a/common/payload.cpp
+++ b/common/payload.cpp
@ -68,7 +68,7 @@ int PayloadProtocol::protocolFrameSize(int streamIndex) const
    int len;

    len = mpStream->frameLen(streamIndex) - protocolFrameOffset(streamIndex) 
-        - kFcsSize;
+        - protocolFramePayloadSize(streamIndex) - kFcsSize;

    if (len < 0)
        len = 0;