From aa5c7a9e8bced2039bc6435595dd8045ff606b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 13 Apr 2021 21:00:27 -0400
Subject: [PATCH] sockaddr: cleanup
---
include/opendht/sockaddr.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/opendht/sockaddr.h b/include/opendht/sockaddr.h
index 790204de..e371bb90 100644
--- a/include/opendht/sockaddr.h
+++ b/include/opendht/sockaddr.h
@@ -144,7 +144,7 @@ public:
if (len) addr.reset((sockaddr*)::calloc(len, 1));
else addr.reset();
}
- if (len > sizeof(sa_family_t))
+ if (len)
addr->sa_family = af;
}
@@ -223,16 +223,16 @@ public:
*/
sockaddr* get() { return addr.get(); }
- const sockaddr_in& getIPv4() const {
+ inline const sockaddr_in& getIPv4() const {
return *reinterpret_cast<const sockaddr_in*>(get());
}
- const sockaddr_in6& getIPv6() const {
+ inline const sockaddr_in6& getIPv6() const {
return *reinterpret_cast<const sockaddr_in6*>(get());
}
- sockaddr_in& getIPv4() {
+ inline sockaddr_in& getIPv4() {
return *reinterpret_cast<sockaddr_in*>(get());
}
- sockaddr_in6& getIPv6() {
+ inline sockaddr_in6& getIPv6() {
return *reinterpret_cast<sockaddr_in6*>(get());
}
--
GitLab