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

save work

Browse Source
This commit is contained in:
Nanosonde 2020-06-25 21:26:59 +02:00
parent eb11180858
commit 23358eb8b9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/knx/secure_application_layer.cpp
View File

@ -706,9 +706,8 @@ void SecureApplicationLayer::receivedSyncRequest(uint16_t srcAddr, uint16_t dstA
sendSyncResponse(toAddr, toIsGroupAddress, toolAccess, nextSeqNum); sendSyncResponse(toAddr, toIsGroupAddress, toolAccess, nextSeqNum);
} }
void SecureApplicationLayer::receivedSyncResponse(uint16_t remoteAddr, bool toolAccess, uint8_t* plainApdu) void SecureApplicationLayer::receivedSyncResponse(uint16_t remote, bool toolAccess, uint8_t* plainApdu)
{ {
// TODO: check if _syncReqBroadcastOutgoing is true
if (_syncReqBroadcastOutgoing) if (_syncReqBroadcastOutgoing)
{ {
if (_pendingOutgoingSyncRequests.get(GrpAddr(0)) == nullptr) if (_pendingOutgoingSyncRequests.get(GrpAddr(0)) == nullptr)
@ -719,7 +718,7 @@ void SecureApplicationLayer::receivedSyncResponse(uint16_t remoteAddr, bool tool
} }
else else
{ {
if (_pendingOutgoingSyncRequests.get(IndAddr(remoteAddr)) == nullptr) if (_pendingOutgoingSyncRequests.get(IndAddr(remote)) == nullptr)
{ {
println("Cannot handle sync.res without pending sync.req!"); println("Cannot handle sync.res without pending sync.req!");
return; return;
@ -731,11 +730,11 @@ void SecureApplicationLayer::receivedSyncResponse(uint16_t remoteAddr, bool tool
uint64_t remoteSeq = sixBytesToUInt64(plainApdu + 0); uint64_t remoteSeq = sixBytesToUInt64(plainApdu + 0);
uint64_t localSeq = sixBytesToUInt64(plainApdu + 6); uint64_t localSeq = sixBytesToUInt64(plainApdu + 6);
uint64_t last = lastValidSequenceNumber(toolAccess, remoteAddr); uint64_t last = lastValidSequenceNumber(toolAccess, remote);
if (remoteSeq - 1 > last) if (remoteSeq - 1 > last)
{ {
//logger.debug("sync.res update {} last valid {} seq -> {}", remote, toolAccess ? "tool access" : "p2p", remoteSeq -1); //logger.debug("sync.res update {} last valid {} seq -> {}", remote, toolAccess ? "tool access" : "p2p", remoteSeq -1);
updateLastValidSequence(toolAccess, remoteAddr, remoteSeq - 1); updateLastValidSequence(toolAccess, remote, remoteSeq - 1);
} }
uint64_t next = nextSequenceNumber(toolAccess); uint64_t next = nextSequenceNumber(toolAccess);
@ -744,7 +743,8 @@ void SecureApplicationLayer::receivedSyncResponse(uint16_t remoteAddr, bool tool
updateSequenceNumber(toolAccess, localSeq); updateSequenceNumber(toolAccess, localSeq);
} }
_pendingOutgoingSyncRequests.erase(IndAddr(remoteAddr)); Addr remoteAddr = _syncReqBroadcastOutgoing ? (Addr)GrpAddr(0) : (Addr)IndAddr(remote);
_pendingOutgoingSyncRequests.erase(remoteAddr);
} }
bool SecureApplicationLayer::decrypt(uint8_t* plainApdu, uint16_t plainApduLength, uint16_t srcAddr, uint16_t dstAddr, bool dstAddrIsGroupAddr, uint8_t tpci, uint8_t* secureAsdu) bool SecureApplicationLayer::decrypt(uint8_t* plainApdu, uint16_t plainApduLength, uint16_t srcAddr, uint16_t dstAddr, bool dstAddrIsGroupAddr, uint8_t tpci, uint8_t* secureAsdu)