diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

socket fixes

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@459 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2002-05-01 16:19:43 +00:00
parent b46d033b12
commit 83c4fab84c
3 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
C/ypsocks.c
View File

@@ -450,7 +450,42 @@ p_socket(void)
Int
CloseSocket(int fd, socket_info status, socket_domain domain)
{
if (domain == client_socket || domain == server_session_socket) {
#if _MSC_VER || defined(__MINGW32__)
/* prevent further writing
to the socket */
if (status == server_session_socket ||
status == client_socket) {
char bfr;
if (shutdown(fd, 1) != 0) {
Error(SYSTEM_ERROR, TermNil,
"socket_close/1 (close)");
return(FALSE);
}
/* read all pending characters
from the socket */
while( recv( fd, &bfr, 1, 0 ) > 0 );
/* prevent further reading
from the socket */
if (shutdown(fd, 0) < 0) {
Error(SYSTEM_ERROR, TermNil,
"socket_close/1 (close)");
return(FALSE);
}
/* close the socket */
if (closesocket(fd) != 0) {
#if HAVE_STRERROR
Error(SYSTEM_ERROR, TermNil,
"socket_close/1 (close: %s)", strerror(socket_errno));
#else
Error(SYSTEM_ERROR, TermNil,
"socket_close/1 (close)");
#endif
}
#else
if (status == server_session_socket ||
status == client_socket) {
if (shutdown(fd,2) < 0) {
#if HAVE_STRERROR
Error(SYSTEM_ERROR, TermNil,
@@ -462,17 +497,14 @@ CloseSocket(int fd, socket_info status, socket_domain domain)
return(FALSE);
}
}
#if _MSC_VER || defined(__MINGW32__)
if (closesocket(fd) != 0) {
#else
if (close(fd) < 0) {
#endif
if (close(fd) != 0) {
#if HAVE_STRERROR
Error(SYSTEM_ERROR, TermNil,
"socket_close/1 (close: %s)", strerror(socket_errno));
"socket_close/1 (close: %s)", strerror(socket_errno));
#else
Error(SYSTEM_ERROR, TermNil,
"socket_close/1 (close)");
"socket_close/1 (close)");
#endif
#endif
return(FALSE);
}