Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-08-31 13:47:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

SecIfObject: save/restore required for persisting STATE. Bugfix: use correct PID for group key table

Browse Source
This commit is contained in:
Nanosonde 2020-07-05 15:15:47 +02:00
parent 108e4d7275
commit 53f6828872
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/knx/security_interface_object.cpp
View File

@ -168,6 +168,27 @@ void SecurityInterfaceObject::secureApplicationLayer(SecureApplicationLayer& sec
_secAppLayer = &secAppLayer;
}
uint8_t* SecurityInterfaceObject::save(uint8_t* buffer)
{
buffer = pushByte(_state, buffer);
return InterfaceObject::save(buffer);
}
const uint8_t* SecurityInterfaceObject::restore(const uint8_t* buffer)
{
uint8_t state = 0;
buffer = popByte(state, buffer);
_state = (LoadState)state;
return InterfaceObject::restore(buffer);
}
uint16_t SecurityInterfaceObject::saveSize()
{
return 1 + InterfaceObject::saveSize();
}
bool SecurityInterfaceObject::isLoaded()
{
return _state == LS_LOADED;
@ -354,8 +375,8 @@ const uint8_t* SecurityInterfaceObject::groupKey(uint16_t addressIndex)
uint8_t entry[elementSize]; // 2 bytes index + keysize (16 bytes) = 18 bytes
for (int i = 1; i <= numElements; i++)
{
property(PID_P2P_KEY_TABLE)->read(i, 1, entry);
uint16_t index = (entry[0] << 8) | entry[1];
property(PID_GRP_KEY_TABLE)->read(i, 1, entry);
uint16_t index = ((entry[0] << 8) | entry[1]);
if (index > addressIndex)
{
return nullptr;

5
src/knx/security_interface_object.h
View File

@ -31,6 +31,11 @@ public:
DataSecurity getGroupObjectSecurity(uint16_t index, bool isWrite);
LoadState loadState();
uint8_t* save(uint8_t* buffer) override;
const uint8_t* restore(const uint8_t* buffer) override;
uint16_t saveSize() override;
private:
SecureApplicationLayer* _secAppLayer = nullptr;