highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-17 13:22:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

net: separate the listening socket from the permissions

Browse Source 
They were coupled in `struct ListenSocket`, but the socket belongs to
the lower level transport protocol, whereas the permissions are specific
to the higher Bitcoin P2P protocol.
This commit is contained in:
Vasil Dimov 2025-01-14 17:24:22 +01:00
parent db36a92c02
commit 7745ea523c
No known key found for this signature in database
GPG Key ID: 54DF06F64B55CBBF
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/net.cpp
View File

@ -1755,7 +1755,10 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
const CService addr_bind{MaybeFlipIPv6toCJDNS(GetBindAddress(*sock))};
NetPermissionFlags permission_flags = NetPermissionFlags::None;
hListenSocket.AddSocketPermissionFlags(permission_flags);
auto it{m_listen_permissions.find(addr_bind)};
if (it != m_listen_permissions.end()) {
NetPermissions::AddFlag(permission_flags, it->second);
}
CreateNodeFromAcceptedSocket(std::move(sock), permission_flags, addr_bind, addr);
}
@ -3111,7 +3114,7 @@ void CConnman::ThreadI2PAcceptIncoming()
}
}
bool CConnman::BindListenPort(const CService& addrBind, bilingual_str& strError, NetPermissionFlags permissions)
bool CConnman::BindListenPort(const CService& addrBind, bilingual_str& strError)
{
int nOne = 1;
@ -3176,7 +3179,7 @@ bool CConnman::BindListenPort(const CService& addrBind, bilingual_str& strError,
return false;
}
vhListenSocket.emplace_back(std::move(sock), permissions);
vhListenSocket.emplace_back(std::move(sock));
return true;
}
@ -3242,13 +3245,15 @@ bool CConnman::Bind(const CService& addr_, unsigned int flags, NetPermissionFlag
const CService addr{MaybeFlipIPv6toCJDNS(addr_)};
bilingual_str strError;
if (!BindListenPort(addr, strError, permissions)) {
if (!BindListenPort(addr, strError)) {
if ((flags & BF_REPORT_ERROR) && m_client_interface) {
m_client_interface->ThreadSafeMessageBox(strError, "", CClientUIInterface::MSG_ERROR);
}
return false;
}
m_listen_permissions.emplace(addr, permissions);
if (addr.IsRoutable() && fDiscover && !(flags & BF_DONT_ADVERTISE) && !NetPermissions::HasFlag(permissions, NetPermissionFlags::NoBan)) {
AddLocal(addr, LOCAL_BIND);
}
@ -3482,6 +3487,7 @@ void CConnman::StopNodes()
DeleteNode(pnode);
}
m_nodes_disconnected.clear();
m_listen_permissions.clear();
vhListenSocket.clear();
semOutbound.reset();
semAddnode.reset();

16
src/net.h
View File

@ -1276,21 +1276,17 @@ private:
struct ListenSocket {
public:
std::shared_ptr<Sock> sock;
inline void AddSocketPermissionFlags(NetPermissionFlags& flags) const { NetPermissions::AddFlag(flags, m_permissions); }
ListenSocket(std::shared_ptr<Sock> sock_, NetPermissionFlags permissions_)
: sock{sock_}, m_permissions{permissions_}
ListenSocket(std::shared_ptr<Sock> sock_)
: sock{sock_}
{
}
private:
NetPermissionFlags m_permissions;
};
//! returns the time left in the current max outbound cycle
//! in case of no limit, it will always return 0
std::chrono::seconds GetMaxOutboundTimeLeftInCycle_() const EXCLUSIVE_LOCKS_REQUIRED(m_total_bytes_sent_mutex);
bool BindListenPort(const CService& bindAddr, bilingual_str& strError, NetPermissionFlags permissions);
bool BindListenPort(const CService& bindAddr, bilingual_str& strError);
bool Bind(const CService& addr, unsigned int flags, NetPermissionFlags permissions);
bool InitBinds(const Options& options);
@ -1431,6 +1427,12 @@ private:
unsigned int nReceiveFloodSize{0};
std::vector<ListenSocket> vhListenSocket;
/**
* Permissions that incoming peers get based on our listening address they connected to.
*/
std::unordered_map<CService, NetPermissionFlags, CServiceHash> m_listen_permissions;
std::atomic<bool> fNetworkActive{true};
bool fAddressesInitialized{false};
AddrMan& addrman;