git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32697
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
signal(SIGPIPE, old_handler); \
}
signal(SIGPIPE, old_handler); \
}
+#ifdef MSG_NOSIGNAL
+# define GSOCKET_MSG_NOSIGNAL MSG_NOSIGNAL
+#else /* MSG_NOSIGNAL not available (FreeBSD including OS X) */
+# define GSOCKET_MSG_NOSIGNAL 0
+#endif /* MSG_NOSIGNAL */
#ifndef __GSOCKET_STANDALONE__
# include "wx/unix/gsockunx.h"
#ifndef __GSOCKET_STANDALONE__
# include "wx/unix/gsockunx.h"
m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
+
+ /* FreeBSD variants can't use MSG_NOSIGNAL, and instead use a socket option */
+#ifdef SO_NOSIGPIPE
+ setsockopt(m_fd, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&arg, sizeof(u_long));
+#endif
+
ioctl(m_fd, FIONBIO, &arg);
gs_gui_functions->Enable_Events(this);
ioctl(m_fd, FIONBIO, &arg);
gs_gui_functions->Enable_Events(this);
/* Reenable CONNECTION events */
Enable(GSOCK_CONNECTION);
/* Reenable CONNECTION events */
Enable(GSOCK_CONNECTION);
/* If the socket has already been created, we exit immediately */
if (m_fd == INVALID_SOCKET || !m_server)
/* If the socket has already been created, we exit immediately */
if (m_fd == INVALID_SOCKET || !m_server)
connection->m_fd = accept(m_fd, &from, (SOCKLEN_T *) &fromlen);
connection->m_fd = accept(m_fd, &from, (SOCKLEN_T *) &fromlen);
+#ifdef __DARWIN__
+ /* Reenable CONNECTION events */
+ Enable(GSOCK_CONNECTION);
+#endif
+
if (connection->m_fd == INVALID_SOCKET)
{
if (errno == EWOULDBLOCK)
if (connection->m_fd == INVALID_SOCKET)
{
if (errno == EWOULDBLOCK)
m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
+
+ /* FreeBSD variants can't use MSG_NOSIGNAL, and instead use a socket option */
+#ifdef SO_NOSIGPIPE
+ setsockopt(m_fd, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&arg, sizeof(u_long));
+#endif
+
#if defined(__EMX__) || defined(__VISAGECPP__)
ioctl(m_fd, FIONBIO, (char*)&arg, sizeof(arg));
#else
ioctl(m_fd, FIONBIO, &arg);
#endif
#if defined(__EMX__) || defined(__VISAGECPP__)
ioctl(m_fd, FIONBIO, (char*)&arg, sizeof(arg));
#else
ioctl(m_fd, FIONBIO, &arg);
#endif
- gs_gui_functions->Enable_Events(this);
/* Connect it to the peer address, with a timeout (see below) */
ret = connect(m_fd, m_peer->m_addr, m_peer->m_len);
/* Connect it to the peer address, with a timeout (see below) */
ret = connect(m_fd, m_peer->m_addr, m_peer->m_len);
+ if (m_non_blocking)
+ {
+ gs_gui_functions->Enable_Events(this);
+ }
+
if (ret == -1)
{
err = errno;
if (ret == -1)
{
err = errno;
getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*) &error, &len);
getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*) &error, &len);
+ gs_gui_functions->Enable_Events(this);
+
if (!error)
return GSOCK_NOERROR;
}
if (!error)
return GSOCK_NOERROR;
}
- if (errno == EWOULDBLOCK)
+ if ((errno == EWOULDBLOCK) || (errno == EAGAIN))
m_error = GSOCK_WOULDBLOCK;
else
m_error = GSOCK_IOERR;
m_error = GSOCK_WOULDBLOCK;
else
m_error = GSOCK_IOERR;
- if (errno == EWOULDBLOCK)
+ if ((errno == EWOULDBLOCK) || (errno == EAGAIN))
{
m_error = GSOCK_WOULDBLOCK;
GSocket_Debug(( "GSocket_Write error WOULDBLOCK\n" ));
{
m_error = GSOCK_WOULDBLOCK;
GSocket_Debug(( "GSocket_Write error WOULDBLOCK\n" ));
- if (recv(m_fd, &c, 1, MSG_PEEK) > 0)
+ int num = recv(m_fd, &c, 1, MSG_PEEK | GSOCKET_MSG_NOSIGNAL);
+
+ if (num > 0)
{
result |= GSOCK_INPUT_FLAG;
}
{
result |= GSOCK_INPUT_FLAG;
}
result |= GSOCK_CONNECTION_FLAG;
m_detected |= GSOCK_CONNECTION_FLAG;
}
result |= GSOCK_CONNECTION_FLAG;
m_detected |= GSOCK_CONNECTION_FLAG;
}
+ else if ((errno != EWOULDBLOCK) && (errno != EAGAIN) && (errno != EINTR))
{
m_detected = GSOCK_LOST_FLAG;
m_establishing = false;
{
m_detected = GSOCK_LOST_FLAG;
m_establishing = false;
int GSocket::Recv_Stream(char *buffer, int size)
{
int GSocket::Recv_Stream(char *buffer, int size)
{
- return recv(m_fd, buffer, size, 0);
+ int ret;
+ do
+ {
+ ret = recv(m_fd, buffer, size, GSOCKET_MSG_NOSIGNAL);
+ } while (ret == -1 && errno == EINTR);
+ return ret;
}
int GSocket::Recv_Dgram(char *buffer, int size)
}
int GSocket::Recv_Dgram(char *buffer, int size)
- ret = recvfrom(m_fd, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen);
+ do
+ {
+ ret = recvfrom(m_fd, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen);
+ } while (ret == -1 && errno == EINTR);
if (ret == -1)
return -1;
if (ret == -1)
return -1;
int ret;
#ifndef __VISAGECPP__
int ret;
#ifndef __VISAGECPP__
- MASK_SIGNAL();
- ret = send(m_fd, buffer, size, 0);
+ MASK_SIGNAL();
+#endif
+ do
+ {
+ ret = send(m_fd, (char *)buffer, size, GSOCKET_MSG_NOSIGNAL);
+ } while (ret == -1 && errno == EINTR);
+#ifndef __VISAGECPP__
-#else
- ret = send(m_fd, (char *)buffer, size, 0);
#ifndef __VISAGECPP__
MASK_SIGNAL();
#ifndef __VISAGECPP__
MASK_SIGNAL();
- ret = sendto(m_fd, buffer, size, 0, addr, len);
+#endif
+ do
+ {
+ ret = sendto(m_fd, (char *)buffer, size, 0, addr, len);
+ } while (ret == -1 && errno == EINTR);
+#ifndef __VISAGECPP__
-#else
- ret = sendto(m_fd, (char *)buffer, size, 0, addr, len);
#endif
/* Frees memory allocated from _GAddress_translate_to */
#endif
/* Frees memory allocated from _GAddress_translate_to */
+ /* Safeguard against straggling call to Detected_Read */
+ if (m_fd == INVALID_SOCKET)
+ {
+ return;
+ }
+
/* If we have already detected a LOST event, then don't try
* to do any further processing.
*/
/* If we have already detected a LOST event, then don't try
* to do any further processing.
*/
- if (recv(m_fd, &c, 1, MSG_PEEK) > 0)
+ int num = recv(m_fd, &c, 1, MSG_PEEK | GSOCKET_MSG_NOSIGNAL);
+
+ if (num > 0)
{
CALL_CALLBACK(this, GSOCK_INPUT);
}
{
CALL_CALLBACK(this, GSOCK_INPUT);
}
- CALL_CALLBACK(this, GSOCK_LOST);
- Shutdown();
+ if ((errno == EWOULDBLOCK) || (errno == EAGAIN) || (errno == EINTR))
+ {
+ CALL_CALLBACK(this, GSOCK_INPUT);
+ }
+ else
+ {
+ CALL_CALLBACK(this, GSOCK_LOST);
+ Shutdown();
+ }