Vutils

Author: vic4key

include/Vutils.h

@@ -1280,7 +1280,7 @@ class Socket : public LastError
   VUResult vuapi accept(Handle& socket);
 
   VUResult vuapi connect(const Endpoint& endpoint);
-  VUResult vuapi disconnect(const shutdowns_t flags = SD_BOTH);
+  VUResult vuapi disconnect(const shutdowns_t flags = SD_BOTH, const bool cleanup = true);
 
   IResult vuapi send(const char* ptr_data, int size, const flags_t flags = MSG_NONE);
   IResult vuapi send(const Buffer& data, const flags_t flags = MSG_NONE);
@@ -1382,7 +1382,7 @@ class AsyncSocket : public LastError
   IResult  vuapi close();
 
   std::set<SOCKET> vuapi get_connections();
-  VUResult vuapi disconnect_connections(const Socket::shutdowns_t flags = SD_BOTH);
+  VUResult vuapi disconnect_connections(const Socket::shutdowns_t flags = SD_BOTH, const bool cleanup = true);
 
   IResult vuapi send(const SOCKET& connection, const char* ptr_data, int size, const Socket::flags_t flags = MSG_NONE);
   IResult vuapi send(const SOCKET& connection, const Buffer& data, const Socket::flags_t flags = MSG_NONE);

src/details/asyncsocket.cpp

@@ -194,14 +194,14 @@ std::set<SOCKET> vuapi AsyncSocket::get_connections()
   return result;
 }
 
-VUResult vuapi AsyncSocket::disconnect_connections(const Socket::shutdowns_t flags)
+VUResult vuapi AsyncSocket::disconnect_connections(const Socket::shutdowns_t flags, const bool cleanup)
 {
   auto connections = this->get_connections();
   for (const auto& e : connections)
   {
     vu::Socket socket;
     socket.attach(e);
-    socket.disconnect(flags);
+    socket.disconnect(flags, cleanup);
   }
 
   return VU_OK;

src/details/socket.cpp

@@ -623,19 +623,31 @@ VUResult vuapi Socket::close()
   return VU_OK;
 }
 
-VUResult vuapi Socket::disconnect(const shutdowns_t flags)
+VUResult vuapi Socket::disconnect(const shutdowns_t flags, const bool cleanup)
 {
   if (!this->available())
   {
     return 1;
   }
 
+  if (cleanup) // clean-up all remaining data in the socket
+  {
+    vu::Buffer temp;
+    this->recv_all(temp);
+  }
+
   if (::shutdown(m_socket, flags) == SOCKET_ERROR)
   {
     m_last_error_code = GetLastError();
     return 2;
   }
 
+  if (closesocket(m_socket) == SOCKET_ERROR)
+  {
+    m_last_error_code = GetLastError();
+    return 3;
+  }
+
   return VU_OK;
 }