summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2018-09-12 12:40:28 +0200
committerKarsten Heimrich <karsten.heimrich@qt.io>2018-09-13 08:19:17 +0000
commitd5cb428bfc9fa1d19cf4771c5b5fe22cd0832f23 (patch)
tree504bcb4aba5f2f1c97bbf8189c6df7433e793cfb
parentda4d566fe7fecb41fd933dc1d713a3c80c79f6ba (diff)
Fix fetching values from the secure wrapper class
Change-Id: Ic48a3a6a3a46320d83d6c9480168bc7fde10d07b Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
-rw-r--r--src/knx/netip/qknxnetipsecurewrapper.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/knx/netip/qknxnetipsecurewrapper.cpp b/src/knx/netip/qknxnetipsecurewrapper.cpp
index 831989e..8aa2f18 100644
--- a/src/knx/netip/qknxnetipsecurewrapper.cpp
+++ b/src/knx/netip/qknxnetipsecurewrapper.cpp
@@ -147,7 +147,7 @@ QKnxByteArray QKnxNetIpSecureWrapperProxy::serialNumber() const
*/
quint16 QKnxNetIpSecureWrapperProxy::messageTag() const
{
- return QKnxUtils::QUint16::fromBytes(m_frame.constData().mid(16));
+ return QKnxUtils::QUint16::fromBytes(m_frame.constData().mid(14));
}
/*!
@@ -156,7 +156,8 @@ quint16 QKnxNetIpSecureWrapperProxy::messageTag() const
*/
QKnxByteArray QKnxNetIpSecureWrapperProxy::encapsulatedFrame() const
{
- return m_frame.constData().mid(18, m_frame.dataSize() - 16);
+ auto data = m_frame.constData().mid(16);
+ return data.mid(0, data.size() - 16); // remove the MAC
}
/*!