X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9dea36ef6d117e0562f0079345a77ff1696d3a49..d1dea842a06344bef9500b372463c0d1f94f7701:/src/os2/gsocket.c diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c index 0ea14036b8..1eef6eb14c 100644 --- a/src/os2/gsocket.c +++ b/src/os2/gsocket.c @@ -7,7 +7,12 @@ */ #include "wx/setup.h" +#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. */ #include "wx/defs.h" +#endif #if wxUSE_SOCKETS @@ -15,11 +20,20 @@ #include #include +#ifdef __EMX__ +#include +#include +#include +#include +#include +#define HAVE_INET_ADDR +#else #include #include #include #include #include +#endif #if defined(__VISAGECPP__) && __IBMCPP__ < 400 #include #include @@ -28,6 +42,9 @@ #include #include #include +#ifdef __EMX__ +#define soclose(a) close(a) +#else #define select(a,b,c,d,e) bsdselect(a,b,c,d,e) int _System bsdselect(int, struct fd_set *, @@ -36,10 +53,16 @@ int _System bsdselect(int, struct timeval *); int _System soclose(int); #endif +#endif #include #include -#include +#if defined(__VISAGECPP__) && __IBMCPP__ < 400 +# ifdef min +# undef min +# endif +# include +#endif #include #include @@ -62,9 +85,9 @@ int _System soclose(int); /* Global initialisers */ -bool GSocket_Init() +int GSocket_Init() { - return TRUE; + return 1; } void GSocket_Cleanup() @@ -92,16 +115,13 @@ GSocket *GSocket_new() socket->m_local = NULL; socket->m_peer = NULL; socket->m_error = GSOCK_NOERROR; - socket->m_server = FALSE; - socket->m_stream = TRUE; + socket->m_server = 0; + socket->m_stream = 1; socket->m_gui_dependent = NULL; - socket->m_non_blocking = FALSE; + socket->m_non_blocking = 0; socket->m_timeout = 10*60*1000; /* 10 minutes * 60 sec * 1000 millisec */ - socket->m_establishing = FALSE; - - /* We initialize the GUI specific entries here */ - _GSocket_GUI_Init(socket); + socket->m_establishing = 0; return socket; } @@ -114,9 +134,6 @@ void GSocket_destroy(GSocket *socket) if (socket->m_fd != -1) GSocket_Shutdown(socket); - /* We destroy GUI specific variables */ - _GSocket_GUI_Destroy(socket); - /* We destroy private addresses */ if (socket->m_local) GAddress_destroy(socket->m_local); @@ -147,7 +164,7 @@ void GSocket_Shutdown(GSocket *socket) socket->m_cbacks[evt] = NULL; socket->m_detected = 0; - _GSocket_Disable_Events(socket); + (socket); } /* Address handling */ @@ -266,8 +283,8 @@ GSocketError GSocket_SetServer(GSocket *sck) } /* We always have a stream here */ - sck->m_stream = TRUE; - sck->m_server = TRUE; + sck->m_stream = 1; + sck->m_server = 1; /* Create the socket */ sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0); @@ -278,7 +295,6 @@ GSocketError GSocket_SetServer(GSocket *sck) } ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(int)); - _GSocket_Enable_Events(sck); /* Bind the socket to the LOCAL address */ if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) { @@ -349,13 +365,11 @@ GSocket *GSocket_WaitConnection(GSocket *socket) } /* Initialize all fields */ - connection->m_server = FALSE; - connection->m_stream = TRUE; - connection->m_oriented = TRUE; + connection->m_server = 0; + connection->m_stream = 1; + connection->m_oriented = 1; ioctl(connection->m_fd, FIONBIO, (char*)&arg, sizeof(int)); - _GSocket_Enable_Events(connection); - return connection; } @@ -377,9 +391,9 @@ GSocketError GSocket_SetNonOriented(GSocket *sck) return GSOCK_INVADDR; } - sck->m_stream = FALSE; - sck->m_server = FALSE; - sck->m_oriented = FALSE; + sck->m_stream = 0; + sck->m_server = 0; + sck->m_oriented = 0; /* Create the socket */ sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_DGRAM, 0); @@ -390,7 +404,6 @@ GSocketError GSocket_SetNonOriented(GSocket *sck) } ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(int)); - _GSocket_Enable_Events(sck); /* Bind it to the LOCAL address */ if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) { @@ -438,9 +451,9 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) /* Test whether we want the socket to be a stream (e.g. TCP) */ sck->m_stream = (stream == GSOCK_STREAMED); - sck->m_oriented = TRUE; - sck->m_server = FALSE; - sck->m_establishing = FALSE; + sck->m_oriented = 1; + sck->m_server = 0; + sck->m_establishing = 0; if (sck->m_stream) type = SOCK_STREAM; @@ -456,7 +469,6 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) } ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(int)); - _GSocket_Enable_Events(sck); /* Connect it to the PEER address */ ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len); @@ -496,7 +508,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) if ((err == EINPROGRESS) && (sck->m_non_blocking)) { sck->m_error = GSOCK_WOULDBLOCK; - sck->m_establishing = TRUE; + sck->m_establishing = 1; fprintf(stderr, "Nonblocking connect in progress\n"); return GSOCK_WOULDBLOCK; @@ -613,7 +625,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags) * Sets the socket to non-blocking mode. This is useful if * we don't want to wait. */ -void GSocket_SetNonBlocking(GSocket *socket, bool non_block) +void GSocket_SetNonBlocking(GSocket *socket, int non_block) { assert(socket != NULL); @@ -714,13 +726,12 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags) void _GSocket_Enable(GSocket *socket, GSocketEvent event) { socket->m_detected &= ~(1 << event); - _GSocket_Install_Callback(socket, event); + (socket, event); } void _GSocket_Disable(GSocket *socket, GSocketEvent event) { socket->m_detected |= (1 << event); - _GSocket_Uninstall_Callback(socket, event); } /* _GSocket_Input_Timeout: @@ -885,7 +896,7 @@ void _GSocket_Detected_Write(GSocket *socket) { int error, len; - socket->m_establishing = FALSE; + socket->m_establishing = 0; len = sizeof(error); getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len); @@ -1108,6 +1119,11 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) return GSOCK_NOERROR; } +GSocketError GAddress_INET_SetAnyAddress(GAddress *address) +{ + return GAddress_INET_SetHostAddress(address, INADDR_ANY); +} + GSocketError GAddress_INET_SetHostAddress(GAddress *address, unsigned long hostaddr) { @@ -1217,5 +1233,32 @@ unsigned short GAddress_INET_GetPort(GAddress *address) return ntohs(addr->sin_port); } +/* + * ------------------------------------------------------------------------- + * Unix address family + * ------------------------------------------------------------------------- + */ + +GSocketError _GAddress_Init_UNIX(GAddress *address) +{ + assert (address != NULL); + address->m_error = GSOCK_INVADDR; + return GSOCK_INVADDR; +} + +GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path) +{ + assert (address != NULL); + address->m_error = GSOCK_INVADDR; + return GSOCK_INVADDR; +} + +GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) +{ + assert (address != NULL); + address->m_error = GSOCK_INVADDR; + return GSOCK_INVADDR; +} + #endif /* wxUSE_SOCKETS */