Skip to content

Fix data field slice errors in SET_NEXT_BLOCKS request. #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix data field slice errors in SET_NEXT_BLOCKS request. #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1e0076
Fix data field slice errors in SET_NEXT_BLOCKS request.
AzenkChina Sep 19, 2020
dceccd1
Fix attribute descriptor errors in SET_NEXT_BLOCKS request.
AzenkChina Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions development/src/GXDLMS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,9 @@ int CGXDLMS::GetLNPdu(
}

// Add attribute descriptor.
reply.Set(p.GetAttributeDescriptor());
if (!((p.GetCommand() == DLMS_COMMAND_SET_REQUEST) && (p.GetRequestType() == 3)))
reply.Set(p.GetAttributeDescriptor());

// If multiple blocks.
if (p.IsMultipleBlocks() && (p.GetSettings()->GetNegotiatedConformance() & DLMS_CONFORMANCE_GENERAL_BLOCK_TRANSFER) == 0)
{
Expand Down Expand Up @@ -909,7 +911,7 @@ int CGXDLMS::GetLNPdu(
len -= GXHelpers::GetObjectCountSizeInBytes(len);
}
GXHelpers::SetObjectCount(len, reply);
reply.Set(p.GetData(), 0, len);
reply.Set(p.GetData(), p.GetData()->GetPosition(), len);
}
// Add data that fits to one block.
if (len == 0)
Expand Down Expand Up @@ -4139,4 +4141,4 @@ int CGXDLMS::HandleExceptionResponse(CGXReplyData& data)
return DLMS_ERROR_TYPE_EXCEPTION_RESPONSE | value << 8 | error;
}
return 0;
}
}