Merge pull request #4636

efd6b87 small net cleanup (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-08-08 09:30:03 +02:00
commit 3181986d7e
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
3 changed files with 6 additions and 6 deletions

View file

@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2013 The Bitcoin developers
// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -59,4 +59,4 @@ typedef u_int SOCKET;
#define SOCKET_ERROR -1
#endif
#endif
#endif // _BITCOIN_COMPAT_H

View file

@ -356,12 +356,11 @@ public:
~CNode()
{
if (hSocket != INVALID_SOCKET)
{
CloseSocket(hSocket);
}
CloseSocket(hSocket);
if (pfilter)
delete pfilter;
GetNodeSignals().FinalizeNode(GetId());
}

View file

@ -334,6 +334,7 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe
#ifdef SO_NOSIGPIPE
int set = 1;
// Different way of disabling SIGPIPE on BSD
setsockopt(hSocket, SOL_SOCKET, SO_NOSIGPIPE, (void*)&set, sizeof(int));
#endif