* Name: gsocket.c
* Authors: Guilhem Lavaux,
* Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
- * Purpose: GSocket main Unix-style file
+ * Purpose: GSocket main Unix and OS/2 file
* Licence: The wxWindows licence
* CVSID: $Id$
* -------------------------------------------------------------------------
#include "wx/setup.h"
#endif
-#ifndef __EMX__
-/* I don't see, why this include is needed, but it seems to be necessary
- sometimes. For EMX, including C++ headers into plain C source breaks
- compilation, so don't do it there. */
+#if defined(__VISAGECPP__)
+/* Seems to be needed by Visual Age C++, though I don't see how it manages
+ to not break on including a C++ header into a plain C source file */
#include "wx/defs.h"
+#define BSD_SELECT /* use Berkley Sockets select */
#endif
#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
-#define BSD_SELECT /* use Berkley Sockets select */
-
#include <assert.h>
#include <sys/types.h>
-
-#ifdef __EMX__
+#ifdef __VISAGECPP__
+#include <string.h>
#include <sys/time.h>
+#include <types.h>
#include <netinet/in.h>
-#include <arpa/inet.h>
+#endif
#include <netdb.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/un.h>
-#define HAVE_INET_ADDR
+#include <sys/ioctl.h>
+#ifdef __VMS__
+#include <socket.h>
+struct sockaddr_un
+{
+ u_char sun_len; /* sockaddr len including null */
+ u_char sun_family; /* AF_UNIX */
+ char sun_path[108]; /* path name (gag) */
+};
#else
+#include <sys/socket.h>
+#include <sys/un.h>
+#endif
-#include <string.h>
-
+#ifndef __VISAGECPP__
#include <sys/time.h>
-#include <types.h>
#include <netinet/in.h>
-#include <netdb.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#else
#include <nerrno.h>
-
-#endif
-
-#if defined(__VISAGECPP__) && __IBMCPP__ < 400
-
+# if __IBMCPP__ < 400
#include <machine/endian.h>
#include <socket.h>
#include <ioctl.h>
#define EBADF SOCEBADF
-#else
-
+# ifdef min
+# undef min
+# endif
+# else
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/select.h>
-#ifdef __EMX__
-#define soclose(a) close(a)
-#else
+#define close(a) soclose(a)
#define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
int _System bsdselect(int,
struct fd_set *,
struct fd_set *,
struct timeval *);
int _System soclose(int);
-#endif
-#endif
-
-#include <stdio.h>
-#if (defined(__VISAGECPP__) && __IBMCPP__ < 400) || defined(__EMX__)
-# ifdef min
-# undef min
# endif
-# include <stdlib.h>
#endif
+#include <stdio.h>
+#include <stdlib.h>
#include <stddef.h>
#include <ctype.h>
-#include <stdlib.h>
-
+#ifdef sun
+# include <sys/filio.h>
+#endif
+#ifdef sgi
+# include <bstring.h>
+#endif
#include <signal.h>
#ifndef SOCKLEN_T
-#ifdef __GLIBC__
-# if __GLIBC__ == 2
-# define SOCKLEN_T socklen_t
-# endif
+#ifdef VMS
+# define SOCKLEN_T unsigned int
#else
-# define SOCKLEN_T int
+# ifdef __GLIBC__
+# if __GLIBC__ == 2
+# define SOCKLEN_T socklen_t
+# endif
+# else
+# define SOCKLEN_T int
+# endif
#endif
-#endif
+#endif /* SOCKLEN_T */
/*
* MSW defines this, Unices don't.
#define INVALID_SOCKET -1
#endif
+/* UnixWare reportedly needs this for FIONBIO definition */
+#ifdef __UNIXWARE__
+#include <sys/filio.h>
+#endif
+
/*
* INADDR_BROADCAST is identical to INADDR_NONE which is not defined
* on all systems. INADDR_BROADCAST should be fine to indicate an error.
void GSocket_close(GSocket *socket)
{
_GSocket_Disable_Events(socket);
- soclose(socket->m_fd);
+ close(socket->m_fd);
socket->m_fd = INVALID_SOCKET;
}
socket->m_cbacks[evt] = NULL;
socket->m_detected = GSOCK_LOST_FLAG;
- _GSocket_Disable_Events(socket);
}
/* Address handling */
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
-
+#if defined(__EMX__) || defined(__VISAGECPP__)
ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else
+ ioctl(sck->m_fd, FIONBIO, &arg);
+#endif
_GSocket_Enable_Events(sck);
/* Bind to the local address,
socket->m_error = err;
return NULL;
}
-
+#if defined(__EMX__) || defined(__VISAGECPP__)
ioctl(connection->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else
+ ioctl(connection->m_fd, FIONBIO, &arg);
+#endif
_GSocket_Enable_Events(connection);
return connection;
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
-
+#if defined(__EMX__) || defined(__VISAGECPP__)
ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else
+ ioctl(sck->m_fd, FIONBIO, &arg);
+#endif
_GSocket_Enable_Events(sck);
/* Connect it to the peer address, with a timeout (see below) */
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
-
+#if defined(__EMX__) || defined(__VISAGECPP__)
ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else
+ ioctl(sck->m_fd, FIONBIO, &arg);
+#endif
_GSocket_Enable_Events(sck);
/* Bind to the local address,
if (ret == -1)
{
GSocket_Debug(( "GSocket_Input_Timeout, select returned -1\n" ));
- if (errno == EBADF) GSocket_Debug(( "Invalid file descriptor\n" ));
- if (errno == EINTR) GSocket_Debug(( "A non blocked signal was caught\n" ));
- if (errno == EINVAL) GSocket_Debug(( "The highest number descriptor is negative\n" ));
- if (errno == ENOMEM) GSocket_Debug(( "Not enough memory\n" ));
+ if (errno == EBADF) { GSocket_Debug(( "Invalid file descriptor\n" )); }
+ if (errno == EINTR) { GSocket_Debug(( "A non blocked signal was caught\n" )); }
+ if (errno == EINVAL) { GSocket_Debug(( "The highest number descriptor is negative\n" )); }
+ if (errno == ENOMEM) { GSocket_Debug(( "Not enough memory\n" )); }
socket->m_error = GSOCK_TIMEDOUT;
return GSOCK_TIMEDOUT;
}
if (ret == -1)
{
GSocket_Debug(( "GSocket_Output_Timeout, select returned -1\n" ));
- if (errno == EBADF) GSocket_Debug(( "Invalid file descriptor\n" ));
- if (errno == EINTR) GSocket_Debug(( "A non blocked signal was caught\n" ));
- if (errno == EINVAL) GSocket_Debug(( "The highest number descriptor is negative\n" ));
- if (errno == ENOMEM) GSocket_Debug(( "Not enough memory\n" ));
+ if (errno == EBADF) { GSocket_Debug(( "Invalid file descriptor\n" )); }
+ if (errno == EINTR) { GSocket_Debug(( "A non blocked signal was caught\n" )); }
+ if (errno == EINVAL) { GSocket_Debug(( "The highest number descriptor is negative\n" )); }
+ if (errno == ENOMEM) { GSocket_Debug(( "Not enough memory\n" )); }
socket->m_error = GSOCK_TIMEDOUT;
return GSOCK_TIMEDOUT;
}
- if ( ! FD_ISSET(socket->m_fd, &writefds) )
- GSocket_Debug(( "GSocket_Output_Timeout is buggy!\n" ));
- else
- GSocket_Debug(( "GSocket_Output_Timeout seems correct\n" ));
+ if ( ! FD_ISSET(socket->m_fd, &writefds) ) {
+ GSocket_Debug(( "GSocket_Output_Timeout is buggy!\n" ));
+ }
+ else {
+ GSocket_Debug(( "GSocket_Output_Timeout seems correct\n" ));
+ }
}
else
{
{
int ret;
-#ifdef __EMX__
+#ifndef __VISAGECPP__
MASK_SIGNAL();
ret = send(socket->m_fd, buffer, size, 0);
UNMASK_SIGNAL();
#else
ret = send(socket->m_fd, (char *)buffer, size, 0);
#endif
+
return ret;
}
return -1;
}
-#ifdef __EMX__
+#ifndef __VISAGECPP__
MASK_SIGNAL();
ret = sendto(socket->m_fd, buffer, size, 0, addr, len);
UNMASK_SIGNAL();
if (address->m_addr)
free(address->m_addr);
-/* free(address); */
+ free(address);
}
void GAddress_SetFamily(GAddress *address, GAddressType type)
if (inet_aton(hostname, addr) == 0)
{
#elif defined(HAVE_INET_ADDR)
- addr->s_addr = inet_addr(hostname);
- if ( addr->s_addr == -1 )
+ if ( (addr->s_addr = inet_addr(hostname)) == -1 )
{
#else
/* Use gethostbyname by default */
* -------------------------------------------------------------------------
*/
-#ifdef __EMX__
+#ifndef __VISAGECPP__
GSocketError _GAddress_Init_UNIX(GAddress *address)
{
address->m_len = sizeof(struct sockaddr_un);
return GSOCK_NOERROR;
}
-#endif
- /* __EMX__ */
-#endif
- /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+#endif /* !defined(__VISAGECPP__) */
+#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
projects / wxWidgets.git / blobdiff