diff --git a/CSFML/build/VC2005/csfml-network-d.def b/CSFML/build/VC2005/csfml-network-d.def index 3235bbf34..216476292 100644 --- a/CSFML/build/VC2005/csfml-network-d.def +++ b/CSFML/build/VC2005/csfml-network-d.def @@ -68,6 +68,7 @@ EXPORTS sfSocketTCP_Receive sfSocketTCP_SendPacket sfSocketTCP_ReceivePacket + sfSocketTCP_Close sfSocketTCP_IsValid sfSocketUDP_Create sfSocketUDP_Destroy @@ -78,6 +79,7 @@ EXPORTS sfSocketUDP_Receive sfSocketUDP_SendPacket sfSocketUDP_ReceivePacket + sfSocketUDP_Close sfSocketUDP_IsValid sfPacket_Create sfPacket_Destroy diff --git a/CSFML/build/VC2005/csfml-network.def b/CSFML/build/VC2005/csfml-network.def index cdd067d7a..2a27d528f 100644 --- a/CSFML/build/VC2005/csfml-network.def +++ b/CSFML/build/VC2005/csfml-network.def @@ -68,6 +68,7 @@ EXPORTS sfSocketTCP_Receive sfSocketTCP_SendPacket sfSocketTCP_ReceivePacket + sfSocketTCP_Close sfSocketTCP_IsValid sfSocketUDP_Create sfSocketUDP_Destroy @@ -78,6 +79,7 @@ EXPORTS sfSocketUDP_Receive sfSocketUDP_SendPacket sfSocketUDP_ReceivePacket + sfSocketUDP_Close sfSocketUDP_IsValid sfPacket_Create sfPacket_Destroy diff --git a/CSFML/build/VC2008/csfml-network-d.def b/CSFML/build/VC2008/csfml-network-d.def index 3235bbf34..216476292 100644 --- a/CSFML/build/VC2008/csfml-network-d.def +++ b/CSFML/build/VC2008/csfml-network-d.def @@ -68,6 +68,7 @@ EXPORTS sfSocketTCP_Receive sfSocketTCP_SendPacket sfSocketTCP_ReceivePacket + sfSocketTCP_Close sfSocketTCP_IsValid sfSocketUDP_Create sfSocketUDP_Destroy @@ -78,6 +79,7 @@ EXPORTS sfSocketUDP_Receive sfSocketUDP_SendPacket sfSocketUDP_ReceivePacket + sfSocketUDP_Close sfSocketUDP_IsValid sfPacket_Create sfPacket_Destroy diff --git a/CSFML/build/VC2008/csfml-network.def b/CSFML/build/VC2008/csfml-network.def index cdd067d7a..2a27d528f 100644 --- a/CSFML/build/VC2008/csfml-network.def +++ b/CSFML/build/VC2008/csfml-network.def @@ -68,6 +68,7 @@ EXPORTS sfSocketTCP_Receive sfSocketTCP_SendPacket sfSocketTCP_ReceivePacket + sfSocketTCP_Close sfSocketTCP_IsValid sfSocketUDP_Create sfSocketUDP_Destroy @@ -78,6 +79,7 @@ EXPORTS sfSocketUDP_Receive sfSocketUDP_SendPacket sfSocketUDP_ReceivePacket + sfSocketUDP_Close sfSocketUDP_IsValid sfPacket_Create sfPacket_Destroy diff --git a/CSFML/include/SFML/Network/SocketTCP.h b/CSFML/include/SFML/Network/SocketTCP.h index 4aed9a450..18c85f55c 100644 --- a/CSFML/include/SFML/Network/SocketTCP.h +++ b/CSFML/include/SFML/Network/SocketTCP.h @@ -145,6 +145,16 @@ CSFML_API sfSocketStatus sfSocketTCP_SendPacket(sfSocketTCP* socket, sfPacket* p //////////////////////////////////////////////////////////// CSFML_API sfSocketStatus sfSocketTCP_ReceivePacket(sfSocketTCP* socket, sfPacket* packet); +//////////////////////////////////////////////////////////// +/// Close the socket +/// +/// \param socket : Socket to close +/// +/// \return True if the socket was successfully closed +/// +//////////////////////////////////////////////////////////// +CSFML_API sfBool sfSocketTCP_Close(sfSocketTCP* socket); + //////////////////////////////////////////////////////////// /// Check if a socket is in a valid state ; this function /// can be called any time to check if the socket is OK diff --git a/CSFML/include/SFML/Network/SocketUDP.h b/CSFML/include/SFML/Network/SocketUDP.h index 3c00ae509..18e68b5ad 100644 --- a/CSFML/include/SFML/Network/SocketUDP.h +++ b/CSFML/include/SFML/Network/SocketUDP.h @@ -140,6 +140,16 @@ CSFML_API sfSocketStatus sfSocketUDP_SendPacket(sfSocketUDP* socket, sfPacket* p //////////////////////////////////////////////////////////// CSFML_API sfSocketStatus sfSocketUDP_ReceivePacket(sfSocketUDP* socket, sfPacket* packet, sfIPAddress* address, unsigned short* port); +//////////////////////////////////////////////////////////// +/// Close the socket +/// +/// \param socket : Socket to close +/// +/// \return True if the socket was successfully closed +/// +//////////////////////////////////////////////////////////// +CSFML_API sfBool sfSocketUDP_Close(sfSocketUDP* socket); + //////////////////////////////////////////////////////////// /// Check if a socket is in a valid state ; this function /// can be called any time to check if the socket is OK diff --git a/CSFML/src/SFML/Network/SocketTCP.cpp b/CSFML/src/SFML/Network/SocketTCP.cpp index d1d860e46..a65d031da 100644 --- a/CSFML/src/SFML/Network/SocketTCP.cpp +++ b/CSFML/src/SFML/Network/SocketTCP.cpp @@ -170,6 +170,15 @@ sfSocketStatus sfSocketTCP_ReceivePacket(sfSocketTCP* socket, sfPacket* packet) } +//////////////////////////////////////////////////////////// +/// Close the socket +//////////////////////////////////////////////////////////// +sfBool sfSocketTCP_Close(sfSocketTCP* socket) +{ + CSFML_CALL_RETURN(socket, Close(), sfFalse); +} + + //////////////////////////////////////////////////////////// /// Check if a socket is in a valid state ; this function /// can be called any time to check if the socket is OK diff --git a/CSFML/src/SFML/Network/SocketUDP.cpp b/CSFML/src/SFML/Network/SocketUDP.cpp index 030408431..e2e497a8a 100644 --- a/CSFML/src/SFML/Network/SocketUDP.cpp +++ b/CSFML/src/SFML/Network/SocketUDP.cpp @@ -165,6 +165,15 @@ sfSocketStatus sfSocketUDP_ReceivePacket(sfSocketUDP* socket, sfPacket* packet, } +//////////////////////////////////////////////////////////// +/// Close the socket +//////////////////////////////////////////////////////////// +sfBool sfSocketUDP_Close(sfSocketUDP* socket) +{ + CSFML_CALL_RETURN(socket, Close(), sfFalse); +} + + //////////////////////////////////////////////////////////// /// Check if a socket is in a valid state ; this function /// can be called any time to check if the socket is OK diff --git a/dotnet/extlibs/csfml-audio.dll b/dotnet/extlibs/csfml-audio.dll index 64dadbf25..2f22cbe3a 100644 Binary files a/dotnet/extlibs/csfml-audio.dll and b/dotnet/extlibs/csfml-audio.dll differ diff --git a/dotnet/extlibs/csfml-graphics.dll b/dotnet/extlibs/csfml-graphics.dll index 7754a788b..0aee4cfc9 100644 Binary files a/dotnet/extlibs/csfml-graphics.dll and b/dotnet/extlibs/csfml-graphics.dll differ diff --git a/dotnet/extlibs/csfml-window.dll b/dotnet/extlibs/csfml-window.dll index 5f763d174..32d434200 100644 Binary files a/dotnet/extlibs/csfml-window.dll and b/dotnet/extlibs/csfml-window.dll differ