merge v25 upstream changes

jlopp · Jun 4, 2023 · 54c3ffd · 54c3ffd
1 parent f5f782c
commit 54c3ffd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/net.cpp b/src/net.cpp
@@ -2578,7 +2578,7 @@ CConnman::~CConnman()
 
 size_t CConnman::GetAddressCount() const
 {
-    return addrman.size();
+    return addrman.Size();
 }
 
 std::vector<CAddress> CConnman::GetAddresses(size_t max_addresses, size_t max_pct, std::optional<Network> network) const

diff --git a/src/net.h b/src/net.h
@@ -387,6 +387,8 @@ class CNode
     Mutex cs_vRecv;
 
     uint64_t nRecvBytes GUARDED_BY(cs_vRecv){0};
+    mapMsgTypeSize mapSendBytesPerMsgType GUARDED_BY(cs_vSend);
+    mapMsgTypeSize mapRecvBytesPerMsgType GUARDED_BY(cs_vRecv);
 
     std::atomic<std::chrono::seconds> m_last_send{0s};
     std::atomic<std::chrono::seconds> m_last_recv{0s};
@@ -637,9 +639,6 @@ class CNode
     CService addrLocal GUARDED_BY(m_addr_local_mutex);
     mutable Mutex m_addr_local_mutex;
 
-    mapMsgTypeSize mapSendBytesPerMsgType GUARDED_BY(cs_vSend);
-    mapMsgTypeSize mapRecvBytesPerMsgType GUARDED_BY(cs_vRecv);
-
     /**
      * If an I2P session is created per connection (for outbound transient I2P
      * connections) then it is stored here so that it can be destroyed when the

diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
@@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stdio.h>
 #include <sys/types.h>
 #include <netinet/in.h>
-#include <util/system.h>
+#include <common/args.h>
 #include "statsd_client.h"
 #include <fcntl.h>