socket->m_fd = -1;
for (i=0;i<GSOCK_MAX_EVENT;i++) {
- socket->m_fbacks[i] = NULL;
+ socket->m_cbacks[i] = NULL;
socket->m_iocalls[i] = FALSE;
}
socket->m_local = NULL;
socket->m_server = FALSE;
socket->m_stream = TRUE;
socket->m_gui_dependent = NULL;
- socket->m_blocking = FALSE;
+ socket->m_non_blocking = FALSE;
socket->m_timeout = 10*60*1000;
/* 10 minutes * 60 sec * 1000 millisec */
/* If socket has been created, we shutdown it */
if (socket->m_fd != -1) {
- shutdown(socket->m_fd, 2);
+ /* Only oriented connection should be shutdowned */
+ if (socket->m_oriented)
+ shutdown(socket->m_fd, 2);
close(socket->m_fd);
socket->m_fd = -1;
}
/* We always have a stream here */
sck->m_stream = TRUE;
+ sck->m_server = TRUE;
/* Create the socket */
sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0);
return GSOCK_IOERR;
}
- GSocket_SetNonBlocking(sck, sck->m_blocking);
+ GSocket_SetNonBlocking(sck, sck->m_non_blocking);
GSocket_SetTimeout(sck, sck->m_timeout);
return GSOCK_NOERROR;
return GSOCK_IOERR;
}
- GSocket_SetNonBlocking(sck, sck->m_blocking);
+ GSocket_SetNonBlocking(sck, sck->m_non_blocking);
GSocket_SetTimeout(sck, sck->m_timeout);
return GSOCK_NOERROR;
/* It is not a server */
sck->m_server = FALSE;
- GSocket_SetNonBlocking(sck, sck->m_blocking);
+ GSocket_SetNonBlocking(sck, sck->m_non_blocking);
GSocket_SetTimeout(sck, sck->m_timeout);
return GSOCK_NOERROR;
{
assert(socket != NULL);
- socket->m_blocking = non_block;
+ socket->m_non_blocking = non_block;
if (socket->m_fd != -1)
ioctl(socket->m_fd, FIONBIO, &non_block);
SO_RCVTIMEO. The man pages, that these flags should exist but
are read only. RR. */
/* OK, restrict this to GLIBC 2.1. GL. */
+ /* Anyway, they seem to pose problems: I need to know the socket level and
+ it varies (may be SOL_TCP, SOL_UDP, ...). I disables this and use the
+ other solution. GL. */
+#if 0
#ifdef CAN_USE_TIMEOUT
if (socket->m_fd != -1) {
struct timeval tval;
setsockopt(socket->m_fd, SOL_SOCKET, SO_RCVTIMEO, &tval, sizeof(tval));
}
#endif
+#endif
}
/*
/* Callbacks */
/*
- Only one fallback is possible for each event (INPUT, OUTPUT, CONNECTION)
+ Only one callback is possible for each event (INPUT, OUTPUT, CONNECTION)
INPUT: The function is called when there is at least a byte in the
input buffer
OUTPUT: The function is called when the system is sure the next write call
CONNECTION -> GSocket_Accept()
*/
void GSocket_SetCallback(GSocket *socket, GSocketEventFlags event,
- GSocketCallback fallback, char *cdata)
+ GSocketCallback callback, char *cdata)
{
int count;
/* We test each flag and, if it is enabled, we enable the corresponding
event */
if ((event & (1 << count)) != 0) {
- socket->m_fbacks[count] = fallback;
+ socket->m_cbacks[count] = callback;
socket->m_data[count] = cdata;
_GSocket_Enable(socket, count);
}
}
/*
- UnsetCallback will disables all fallbacks specified by "event".
+ UnsetCallback will disables all callbacks specified by "event".
NOTE: event may be a combination of flags
*/
void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags event)
for (count=0;count<GSOCK_MAX_EVENT;count++) {
if ((event & (1 << count)) != 0) {
_GSocket_Disable(socket, count);
- socket->m_fbacks[count] = NULL;
+ socket->m_cbacks[count] = NULL;
}
}
}
#define CALL_FALLBACK(socket, event) \
if (socket->m_iocalls[event] && \
- socket->m_fbacks[event]) {\
+ socket->m_cbacks[event]) {\
_GSocket_Disable(socket, event); \
- socket->m_fbacks[event](socket, event, \
+ socket->m_cbacks[event](socket, event, \
socket->m_data[event]); \
}
signal(SIGPIPE, old_handler); \
}
-#if 0
-#ifndef CAN_USE_TIMEOUT
-
#define ENABLE_TIMEOUT(socket) \
{ \
struct itimerval old_ival, new_ival; \
void (*old_timer_sig)(int); \
\
- new_ival.it_interval.tv_sec = socket->m_timeout / 1000; \
- new_ival.it_interval.tv_usec = (socket->m_timeout % 1000) * 1000; \
- setitimer(ITIMER_REAL, &new_ival, &old_ival); \
- old_timer_sig = signal(SIGALRM, SIG_DFL);
+ old_timer_sig = signal(SIGALRM, SIG_DFL); \
+ siginterrupt(SIGALRM, 1); \
+ new_ival.it_value.tv_sec = socket->m_timeout / 1000; \
+ new_ival.it_value.tv_usec = (socket->m_timeout % 1000) * 1000; \
+ new_ival.it_interval.tv_sec = 0; \
+ new_ival.it_interval.tv_usec = 0; \
+ setitimer(ITIMER_REAL, &new_ival, &old_ival);
#define DISABLE_TIMEOUT(socket) \
signal(SIGALRM, old_timer_sig); \
+ siginterrupt(SIGALRM, 0); \
setitimer(ITIMER_REAL, &old_ival, NULL); \
}
-#else
-
-#define ENABLE_TIMEOUT(s)
-#define DISABLE_TIMEOUT(s)
-
-#endif
-
-#endif
-
-/* Temporary */
-#define ENABLE_TIMEOUT(s)
-#define DISABLE_TIMEOUT(s)
-
void _GSocket_Enable(GSocket *socket, GSocketEvent event)
{
socket->m_iocalls[event] = TRUE;
- if (socket->m_fbacks[event])
+ if (socket->m_cbacks[event])
_GSocket_Install_Callback(socket, event);
}
void _GSocket_Disable(GSocket *socket, GSocketEvent event)
{
socket->m_iocalls[event] = FALSE;
- if (socket->m_fbacks[event])
+ if (socket->m_cbacks[event])
_GSocket_Uninstall_Callback(socket, event);
}
DISABLE_TIMEOUT(socket);
UNMASK_SIGNAL();
- if (ret == -1 && errno != EAGAIN) {
+ if (ret == -1 && errno != EWOULDBLOCK) {
socket->m_error = GSOCK_IOERR;
return -1;
}
- if (errno == EAGAIN) {
- socket->m_error = GSOCK_TRYAGAIN;
+ if (errno == EWOULDBLOCK) {
+ socket->m_error = GSOCK_WOULDBLOCK;
return -1;
}
return ret;
ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen);
DISABLE_TIMEOUT(socket);
UNMASK_SIGNAL();
- if (ret == -1 && errno != EAGAIN) {
+ if (ret == -1 && errno != EWOULDBLOCK) {
socket->m_error = GSOCK_IOERR;
return -1;
}
- if (errno == EAGAIN) {
- socket->m_error = GSOCK_TRYAGAIN;
+ if (errno == EWOULDBLOCK) {
+ socket->m_error = GSOCK_WOULDBLOCK;
return -1;
}
ret = send(socket->m_fd, buffer, size, 0);
DISABLE_TIMEOUT(socket);
UNMASK_SIGNAL();
- if (ret == -1 && errno != EAGAIN) {
+ if (ret == -1 && errno != EWOULDBLOCK) {
socket->m_error = GSOCK_IOERR;
return -1;
}
- if (errno == EAGAIN) {
- socket->m_error = GSOCK_TRYAGAIN;
+ if (errno == EWOULDBLOCK) {
+ socket->m_error = GSOCK_WOULDBLOCK;
return -1;
}
return ret;
/* Frees memory allocated from _GAddress_translate_to */
free(addr);
- if (ret == -1 && errno != EAGAIN) {
+ if (ret == -1 && errno != EWOULDBLOCK) {
socket->m_error = GSOCK_IOERR;
return -1;
}
- if (errno == EAGAIN) {
- socket->m_error = GSOCK_TRYAGAIN;
+ if (errno == EWOULDBLOCK) {
+ socket->m_error = GSOCK_WOULDBLOCK;
return -1;
}
((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET;
((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_ANY;
- return TRUE;
+ return GSOCK_NOERROR;
}
GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
/* If it is a numeric host name, convert it now */
+#if defined(HAVE_INET_ATON)
if (inet_aton(hostname, addr) == 0) {
+#elif defined(HAVE_INET_ADDR)
+ /* Fix from Guillermo Rodriguez Garcia <guille@iies.es> */
+ if ( (addr->s_addr = inet_addr(hostname)) == -1 ) {
+#else
+ /* Use gethostbyname by default */
+ if (1) {
+#endif
struct in_addr *array_addr;
/* It is a real name, we solve it */
projects / wxWidgets.git / blobdiff