cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Converted some SetBlocking to SetNonBlocking

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux 1999-07-31 13:33:01 +00:00
parent 97979ddfbe
commit 9592b68708
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/unix/gsocket.c
View File

@ -23,6 +23,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
@ -343,7 +344,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
return GSOCK_IOERR;
}
GSocket_SetBlocking(sck, sck->m_blocking);
GSocket_SetNonBlocking(sck, sck->m_blocking);
GSocket_SetTimeout(sck, sck->m_timeout);
return GSOCK_NOERROR;
@ -401,7 +402,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
/* It is not a server */
sck->m_server = FALSE;
GSocket_SetBlocking(sck, sck->m_blocking);
GSocket_SetNonBlocking(sck, sck->m_blocking);
GSocket_SetTimeout(sck, sck->m_timeout);
return GSOCK_NOERROR;
@ -613,10 +614,14 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
MASK_SIGNAL();
ret = recv(socket->m_fd, buffer, size, 0);
UNMASK_SIGNAL();
if (ret == -1) {
if (ret == -1 && errno != EAGAIN) {
socket->m_error = GSOCK_IOERR;
return -1;
}
if (errno == EAGAIN) {
socket->m_error = GSOCK_TRYAGAIN;
return -1;
}
return ret;
}
@ -631,10 +636,14 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
MASK_SIGNAL();
ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen);
UNMASK_SIGNAL();
if (ret == -1) {
if (ret == -1 && errno != EAGAIN) {
socket->m_error = GSOCK_IOERR;
return -1;
}
if (errno == EAGAIN) {
socket->m_error = GSOCK_TRYAGAIN;
return -1;
}
/* Translate a system address into a GSocket address */
if (!socket->m_peer)
@ -651,10 +660,14 @@ int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size)
MASK_SIGNAL();
ret = send(socket->m_fd, buffer, size, 0);
UNMASK_SIGNAL();
if (ret == -1) {
if (ret == -1 && errno != EAGAIN) {
socket->m_error = GSOCK_IOERR;
return -1;
}
if (errno == EAGAIN) {
socket->m_error = GSOCK_TRYAGAIN;
return -1;
}
return ret;
}
@ -673,14 +686,19 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
MASK_SIGNAL();
ret = sendto(socket->m_fd, buffer, size, 0, addr, len);
UNMASK_SIGNAL();
if (ret == -1) {
socket->m_error = GSOCK_IOERR;
return -1;
}
/* Frees memory allocated from _GAddress_translate_to */
free(addr);
if (ret == -1 && errno != EAGAIN) {
socket->m_error = GSOCK_IOERR;
return -1;
}
if (errno == EAGAIN) {
socket->m_error = GSOCK_TRYAGAIN;
return -1;
}
return ret;
}