From 4ec65c6231df9fcb38210f9b885cdf73b72cc176 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Sun, 9 Feb 2014 17:17:04 +0100 Subject: Call DelFd() and SetFd(-1) from SocketEngine::Close(EventHandler*) --- src/socketengine.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/socketengine.cpp') diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 698b9061f..86608f0a3 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -147,13 +147,12 @@ int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen) return accept(fd->GetFd(), addr, addrlen); } -int SocketEngine::Close(EventHandler* fd) +int SocketEngine::Close(EventHandler* eh) { -#ifdef _WIN32 - return closesocket(fd->GetFd()); -#else - return close(fd->GetFd()); -#endif + DelFd(eh); + int ret = Close(eh->GetFd()); + eh->SetFd(-1); + return ret; } int SocketEngine::Close(int fd) -- cgit v1.3.1-10-gc9f91