LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #12326: net: initialize socket to avoid closing random fd's

Browse source 
96dbd38 net: initialize socket to avoid closing random fd's (Cory Fields)

Pull request description:

  An excellent spot by @david60.

  Even if it isn't causing the fd issue we're looking for, this should be fixed.

Tree-SHA512: 062a8f2cdd39d895213e1263dbd7b8391473ddaea2f93c82c211a9bb6ea6744d48a6c84c8ff804b16b865d14145492635c500a9fd138d0988fee5e4f719ebb91
This commit is contained in:
Wladimir J. van der Laan 2018-02-01 19:21:05 +01:00
commit 84291d18dd
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/net.cpp
View file

@ -410,7 +410,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
// Connect // Connect
bool connected = false; bool connected = false;
SOCKET hSocket; SOCKET hSocket = INVALID_SOCKET;
proxyType proxy; proxyType proxy;
if (addrConnect.IsValid()) { if (addrConnect.IsValid()) {
bool proxyConnectionFailed = false; bool proxyConnectionFailed = false;

3
src/netbase.cpp
View file

@ -682,6 +682,9 @@ bool CloseSocket(SOCKET& hSocket)
#else #else
int ret = close(hSocket); int ret = close(hSocket);
#endif #endif
if (ret) {
LogPrintf("Socket close failed: %d. Error: %s\n", hSocket, NetworkErrorString(WSAGetLastError()));
}
hSocket = INVALID_SOCKET; hSocket = INVALID_SOCKET;
return ret != SOCKET_ERROR; return ret != SOCKET_ERROR;
} }