From 583838e2c285ab09ee1569bdfd44127e1a0fe7bc Mon Sep 17 00:00:00 2001 From: orignal Date: Tue, 30 Dec 2014 15:33:11 -0500 Subject: [PATCH] fixed misalignment --- Garlic.cpp | 3 +-- TunnelPool.cpp | 10 +++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Garlic.cpp b/Garlic.cpp index 1948806b..d312b467 100644 --- a/Garlic.cpp +++ b/Garlic.cpp @@ -526,8 +526,7 @@ namespace garlic void GarlicDestination::HandleDeliveryStatusMessage (I2NPMessage * msg) { - I2NPDeliveryStatusMsg * deliveryStatus = (I2NPDeliveryStatusMsg *)msg->GetPayload (); - uint32_t msgID = be32toh (deliveryStatus->msgID); + uint32_t msgID = bufbe32toh (msg->GetPayload ()); { auto it = m_CreatedSessions.find (msgID); if (it != m_CreatedSessions.end ()) diff --git a/TunnelPool.cpp b/TunnelPool.cpp index 30441cbc..fd176841 100644 --- a/TunnelPool.cpp +++ b/TunnelPool.cpp @@ -232,8 +232,12 @@ namespace tunnel void TunnelPool::ProcessDeliveryStatus (I2NPMessage * msg) { - I2NPDeliveryStatusMsg * deliveryStatus = (I2NPDeliveryStatusMsg *)msg->GetPayload (); - auto it = m_Tests.find (be32toh (deliveryStatus->msgID)); + const uint8_t * buf = msg->GetPayload (); + uint32_t msgID = bufbe32toh (buf); + buf += 4; + uint64_t timestamp = bufbe64toh (buf); + + auto it = m_Tests.find (msgID); if (it != m_Tests.end ()) { // restore from test failed state if any @@ -241,7 +245,7 @@ namespace tunnel it->second.first->SetState (eTunnelStateEstablished); if (it->second.second->GetState () == eTunnelStateTestFailed) it->second.second->SetState (eTunnelStateEstablished); - LogPrint ("Tunnel test ", it->first, " successive. ", i2p::util::GetMillisecondsSinceEpoch () - be64toh (deliveryStatus->timestamp), " milliseconds"); + LogPrint ("Tunnel test ", it->first, " successive. ", i2p::util::GetMillisecondsSinceEpoch () - timestamp, " milliseconds"); m_Tests.erase (it); DeleteI2NPMessage (msg); }