Skip to content

Commit dbbb7fb

Browse files
committed
Merge bitcoin/bitcoin#23130: doc: Revert "Remove outdated comments" and place comment correctly
8ff3743 Revert "doc: Remove outdated comments" (Hennadii Stepanov) Pull request description: Unfortunately, in #23094 the assumption that #14336 makes comments outdated is wrong. As pointed in bitcoin/bitcoin#23094 (comment), the #14336 just moved the relevant code a few lines down. This PR reverts commit ee7891a, and moves the comments into the right place. I apologize about that. ACKs for top commit: MarcoFalke: cr ACK 8ff3743 laanwj: ACK 8ff3743 Tree-SHA512: 84aca627bb5b49c06fc172778f9b9407482c5a873ccbc3dc40167e6a8ad0bc60475d6a469c843b7b42712e35cf3fc2d3518923e791d5e0c59628e042acc72747
2 parents 80b4e8f + 8ff3743 commit dbbb7fb

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/init.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -878,6 +878,8 @@ bool AppInitParameterInteraction(const ArgsManager& args)
878878
#else
879879
int fd_max = FD_SETSIZE;
880880
#endif
881+
// Trim requested connection counts, to fit into system limitations
882+
// <int> in std::min<int>(...) to work around FreeBSD compilation issue described in #2695
881883
nMaxConnections = std::max(std::min<int>(nMaxConnections, fd_max - nBind - MIN_CORE_FILEDESCRIPTORS - MAX_ADDNODE_CONNECTIONS - NUM_FDS_MESSAGE_CAPTURE), 0);
882884
if (nFD < MIN_CORE_FILEDESCRIPTORS)
883885
return InitError(_("Not enough file descriptors available."));

0 commit comments

Comments
 (0)