aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2014-06-16 15:55:39 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2014-08-08 07:40:45 +0200
commitefd6b87811351cde592ac48247190e682ad02aea (patch)
tree0e362f3f4b8cc1bd13764a05433ee84a0bbe4b49
parent8833acc4c979877993f87c8fdc8a6d14cd072ba2 (diff)
small net cleanup
- add comment for disabling sigpipe - add closing comment in compat.h - remove redundant check in net.h
-rw-r--r--src/compat.h4
-rw-r--r--src/net.h7
-rw-r--r--src/netbase.cpp1
3 files changed, 6 insertions, 6 deletions
diff --git a/src/compat.h b/src/compat.h
index 1b3a60d11b..52c7817130 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -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
diff --git a/src/net.h b/src/net.h
index 2d9325abf9..a8795a4760 100644
--- a/src/net.h
+++ b/src/net.h
@@ -356,12 +356,11 @@ public:
~CNode()
{
- if (hSocket != INVALID_SOCKET)
- {
- CloseSocket(hSocket);
- }
+ CloseSocket(hSocket);
+
if (pfilter)
delete pfilter;
+
GetNodeSignals().FinalizeNode(GetId());
}
diff --git a/src/netbase.cpp b/src/netbase.cpp
index af6d11f0e2..1031e7e38a 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -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