From 0e7dda680a9e34e98c12bfd974f5616b35e71e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 19 May 2016 23:14:05 -0400
Subject: [PATCH] header cleanup
---
include/opendht/node.h | 22 ++++++++++------------
src/dht.cpp | 2 +-
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/include/opendht/node.h b/include/opendht/node.h
index cd2813bc..e2b84bb4 100644
--- a/include/opendht/node.h
+++ b/include/opendht/node.h
@@ -18,11 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
#pragma once
+#include "infohash.h" // includes socket structures
#include "utils.h"
-#include "infohash.h"
#include <list>
@@ -33,21 +32,20 @@ class Request;
struct Node {
friend class NetworkEngine;
- InfoHash id {};
- sockaddr_storage ss;
+ InfoHash id;
+
socklen_t sslen {0};
+ sockaddr_storage ss;
+
time_point time {time_point::min()}; /* last time eared about */
time_point reply_time {time_point::min()}; /* time of last correct reply received */
- Node() : ss() {
- std::fill_n((uint8_t*)&ss, sizeof(ss), 0);
- }
Node(const InfoHash& id, const sockaddr* sa, socklen_t salen)
- : id(id), ss(), sslen(salen) {
- std::copy_n((const uint8_t*)sa, salen, (uint8_t*)&ss);
- if ((unsigned)salen < sizeof(ss))
- std::fill_n((uint8_t*)&ss+salen, sizeof(ss)-salen, 0);
- }
+ : id(id), sslen(salen), ss() {
+ std::copy_n((const uint8_t*)sa, salen, (uint8_t*)&ss);
+ if ((unsigned)salen < sizeof(ss))
+ std::fill_n((uint8_t*)&ss+salen, sizeof(ss)-salen, 0);
+ }
InfoHash getId() const {
return id;
}
diff --git a/src/dht.cpp b/src/dht.cpp
index 2a2f7db6..333747b7 100644
--- a/src/dht.cpp
+++ b/src/dht.cpp
@@ -619,7 +619,7 @@ Dht::Search::insertNode(std::shared_ptr<Node> node, time_point now, const Blob&
num_bad_nodes--;
auto to_remove = std::find_if(nodes.rbegin(), nodes.rend(),
- [&](const SearchNode& n) { return not n.isBad(); }
+ [](const SearchNode& n) { return not n.isBad(); }
);
if (to_remove != nodes.rend()) {
nodes.erase(std::prev(to_remove.base()));
--
GitLab