aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2021-12-01 09:34:21 +0100
committerMarcoFalke <falke.marco@gmail.com>2021-12-01 09:34:31 +0100
commitf2074eeb2d9cd4c42936b5ba017de04cd129d9d7 (patch)
treedb814a36df9544a38a7167ab65bec0e1701cfe9c
parent9174bcf7da3e15e61dce801ec414a6af01ba44d3 (diff)
parent6c9ee92ffe390064881ef5bf47e38e345d78a2a1 (diff)
downloadbitcoin-f2074eeb2d9cd4c42936b5ba017de04cd129d9d7.tar.xz
Merge bitcoin/bitcoin#23601: Don't check if the listening socket is valid
6c9ee92ffe390064881ef5bf47e38e345d78a2a1 net: don't check if the listening socket is valid (Vasil Dimov) Pull request description: _This is a piece of #21878, chopped off to ease review._ Listening sockets in `CConnman::vhListenSocket` are always valid (underlying file descriptor is not `INVALID_SOCKET`). ACKs for top commit: theStack: Code-review ACK 6c9ee92ffe390064881ef5bf47e38e345d78a2a1 🔌 Tree-SHA512: b2e29711c6a0c7c85467ca61cfd7fb734eb06bd83a41f88735901caf90aec095ca80707ce5bb897d39c80fdec16819dbf5a84979c9b1ab3dc3fb8b08cebe7c61
-rw-r--r--src/net.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net.cpp b/src/net.cpp
index db496c2185..e17db7e54b 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1640,7 +1640,7 @@ void CConnman::SocketHandlerListening(const std::set<SOCKET>& recv_set)
if (interruptNet) {
return;
}
- if (listen_socket.socket != INVALID_SOCKET && recv_set.count(listen_socket.socket) > 0) {
+ if (recv_set.count(listen_socket.socket) > 0) {
AcceptConnection(listen_socket);
}
}