From 3bada02d8972a2f7967020ac0f9a8949fb228a6f Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 29 Mar 2019 01:02:41 +0000 Subject: [PATCH] Fixup one ASAN warning --- libutp/utp_packedsockaddr.cpp | 3 +-- llarp/messages/relay_commit.hpp | 8 ++++---- llarp/service/endpoint.hpp | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/libutp/utp_packedsockaddr.cpp b/libutp/utp_packedsockaddr.cpp index b4570137f..04aad3157 100644 --- a/libutp/utp_packedsockaddr.cpp +++ b/libutp/utp_packedsockaddr.cpp @@ -71,8 +71,7 @@ void PackedSockAddr::set(const SOCKADDR_STORAGE *sa, socklen_t len) { // on unix, the cast does nothing, socklen_t is _already_ unsigned - sockaddr_storage ssa = *sa; // stops member access with misaligned address - if( ssa.ss_family == AF_INET) + if(sa->ss_family == AF_INET) { assert((unsigned)len >= sizeof(sockaddr_in)); const sockaddr_in *sin = (sockaddr_in *)sa; diff --git a/llarp/messages/relay_commit.hpp b/llarp/messages/relay_commit.hpp index 72180b1b1..4012b894d 100644 --- a/llarp/messages/relay_commit.hpp +++ b/llarp/messages/relay_commit.hpp @@ -55,16 +55,16 @@ namespace llarp ~LR_CommitMessage(); void - Clear(); + Clear() override; bool - DecodeKey(const llarp_buffer_t &key, llarp_buffer_t *buf); + DecodeKey(const llarp_buffer_t &key, llarp_buffer_t *buf) override; bool - BEncode(llarp_buffer_t *buf) const; + BEncode(llarp_buffer_t *buf) const override; bool - HandleMessage(AbstractRouter *router) const; + HandleMessage(AbstractRouter *router) const override; bool AsyncDecrypt(llarp::path::PathContext *context) const; diff --git a/llarp/service/endpoint.hpp b/llarp/service/endpoint.hpp index 47fa42a08..196f74260 100644 --- a/llarp/service/endpoint.hpp +++ b/llarp/service/endpoint.hpp @@ -11,7 +11,7 @@ #include #include -// minimum time between interoset shifts +// minimum time between introset shifts #ifndef MIN_SHIFT_INTERVAL #define MIN_SHIFT_INTERVAL (5 * 1000) #endif @@ -336,7 +336,7 @@ namespace llarp HandleHiddenServiceFrame(path::Path* p, const ProtocolFrame* frame); std::string - Name() const; + Name() const override; private: /// swap remoteIntro with next intro @@ -357,7 +357,7 @@ namespace llarp m_BadIntros; llarp_time_t lastShift = 0; uint16_t m_LookupFails = 0; - uint16_t m_BuildFails = 0; + uint16_t m_BuildFails = 0; }; // passed a sendto context when we have a path established otherwise