X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a45068485c8fbc9db4daf77c724747992f81a90e..7f10ed6e65f6281b8d587a6382f198c8a394db97:/src/msw/gsocket.cpp diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp index 86cbb3bfef..42873e0858 100644 --- a/src/msw/gsocket.cpp +++ b/src/msw/gsocket.cpp @@ -1,16 +1,21 @@ /* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) - * Name: gsocket.c - * Author: Guillermo Rodriguez Garcia - * Purpose: GSocket main MSW file - * Licence: The wxWindows licence - * CVSID: $Id$ + * Project: GSocket (Generic Socket) + * Name: src/msw/gsocket.cpp + * Copyright: (c) Guilhem Lavaux + * Licence: wxWindows Licence + * Author: Guillermo Rodriguez Garcia + * Purpose: GSocket main MSW file + * Licence: The wxWindows licence + * CVSID: $Id$ * ------------------------------------------------------------------------- */ -/* - * PLEASE don't put C++ comments here - this is a C source file. - */ +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif #ifdef _MSC_VER /* RPCNOTIFICATION_ROUTINE in rasasync.h (included from winsock.h), @@ -40,11 +45,16 @@ #endif /* _MSC_VER */ +#if defined(__CYGWIN__) + //CYGWIN gives annoying warning about runtime stuff if we don't do this +# define USE_SYS_TYPES_FD_SET +# include +#endif + #include #ifndef __GSOCKET_STANDALONE__ # include "wx/platform.h" -# include "wx/setup.h" #endif #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) @@ -73,15 +83,15 @@ #include #include -/* if we use configure for MSW SOCKLEN_T will be already defined */ -#ifndef SOCKLEN_T -# define SOCKLEN_T int +/* if we use configure for MSW WX_SOCKLEN_T will be already defined */ +#ifndef WX_SOCKLEN_T +# define WX_SOCKLEN_T int #endif /* Table of GUI-related functions. We must call them indirectly because * of wxBase and GUI separation: */ -static class GSocketGUIFunctionsTable *gs_gui_functions; +static GSocketGUIFunctionsTable *gs_gui_functions; class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable { @@ -101,17 +111,17 @@ void GSocketGUIFunctionsTableNull::OnExit() {} bool GSocketGUIFunctionsTableNull::CanUseEventLoop() { return false; } -bool GSocketGUIFunctionsTableNull::Init_Socket(GSocket *socket) +bool GSocketGUIFunctionsTableNull::Init_Socket(GSocket *WXUNUSED(socket)) { return true; } -void GSocketGUIFunctionsTableNull::Destroy_Socket(GSocket *socket) +void GSocketGUIFunctionsTableNull::Destroy_Socket(GSocket *WXUNUSED(socket)) {} -void GSocketGUIFunctionsTableNull::Enable_Events(GSocket *socket) +void GSocketGUIFunctionsTableNull::Enable_Events(GSocket *WXUNUSED(socket)) {} -void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *socket) +void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *WXUNUSED(socket)) {} /* Global initialisers */ -void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc) +void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc) { gs_gui_functions = guifunc; } @@ -122,7 +132,7 @@ int GSocket_Init(void) if (!gs_gui_functions) { - static class GSocketGUIFunctionsTableNull table; + static GSocketGUIFunctionsTableNull table; gs_gui_functions = &table; } if ( !gs_gui_functions->OnInit() ) @@ -160,13 +170,13 @@ GSocket::GSocket() m_local = NULL; m_peer = NULL; m_error = GSOCK_NOERROR; - m_server = FALSE; - m_stream = TRUE; + m_server = false; + m_stream = true; m_non_blocking = false; m_timeout.tv_sec = 10 * 60; /* 10 minutes */ m_timeout.tv_usec = 0; - m_establishing = FALSE; - m_reusable = FALSE; + m_establishing = false; + m_reusable = false; assert(gs_gui_functions); /* Per-socket GUI-specific initialization */ @@ -288,7 +298,7 @@ GAddress *GSocket::GetLocal() { GAddress *address; struct sockaddr addr; - SOCKLEN_T size = sizeof(addr); + WX_SOCKLEN_T size = sizeof(addr); GSocketError err; assert(this); @@ -371,8 +381,8 @@ GSocketError GSocket::SetServer() } /* Initialize all fields */ - m_server = TRUE; - m_stream = TRUE; + m_server = true; + m_stream = true; /* Create the socket */ m_fd = socket(m_local->m_realfamily, SOCK_STREAM, 0); @@ -400,7 +410,7 @@ GSocketError GSocket::SetServer() if ((bind(m_fd, m_local->m_addr, m_local->m_len) != 0) || (getsockname(m_fd, m_local->m_addr, - (SOCKLEN_T *)&m_local->m_len) != 0) || + (WX_SOCKLEN_T *)&m_local->m_len) != 0) || (listen(m_fd, 5) != 0)) { Close(); @@ -427,7 +437,7 @@ GSocket *GSocket::WaitConnection() { GSocket *connection; struct sockaddr from; - SOCKLEN_T fromlen = sizeof(from); + WX_SOCKLEN_T fromlen = sizeof(from); GSocketError err; u_long arg = 1; @@ -455,7 +465,7 @@ GSocket *GSocket::WaitConnection() /* Wait for a connection (with timeout) */ if (Input_Timeout() == GSOCK_TIMEDOUT) { - GSocket_destroy(connection); + delete connection; /* m_error set by _GSocket_Input_Timeout */ return NULL; } @@ -469,19 +479,19 @@ GSocket *GSocket::WaitConnection() else m_error = GSOCK_IOERR; - GSocket_destroy(connection); + delete connection; return NULL; } /* Initialize all fields */ - connection->m_server = FALSE; - connection->m_stream = TRUE; + connection->m_server = false; + connection->m_stream = true; /* Setup the peer address field */ connection->m_peer = GAddress_new(); if (!connection->m_peer) { - GSocket_destroy(connection); + delete connection; m_error = GSOCK_MEMERR; return NULL; } @@ -489,7 +499,7 @@ GSocket *GSocket::WaitConnection() if (err != GSOCK_NOERROR) { GAddress_destroy(connection->m_peer); - GSocket_destroy(connection); + delete connection; m_error = err; return NULL; } @@ -505,17 +515,17 @@ GSocket *GSocket::WaitConnection() * make the appropriate setsockopt() call. * Implemented as a GSocket function because clients (ie, wxSocketServer) * don't have access to the GSocket struct information. -* Returns TRUE if the flag was set correctly, FALSE if an error occured +* Returns true if the flag was set correctly, false if an error occurred * (ie, if the parameter was NULL) */ -int GSocket::SetReusable() +bool GSocket::SetReusable() { /* socket must not be null, and must not be in use/already bound */ if (this && m_fd == INVALID_SOCKET) { - m_reusable = TRUE; - return TRUE; + m_reusable = true; + return true; } - return FALSE; + return false; } /* Client specific parts */ @@ -524,7 +534,7 @@ int GSocket::SetReusable() * For stream (connection oriented) sockets, GSocket_Connect() tries * to establish a client connection to a server using the peer address * as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the - * connection has been succesfully established, or one of the error + * connection has been successfully established, or one of the error * codes listed below. Note that for nonblocking sockets, a return * value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection * request can be completed later; you should use GSocket_Select() @@ -567,8 +577,8 @@ GSocketError GSocket::Connect(GSocketStream stream) /* Streamed or dgram socket? */ m_stream = (stream == GSOCK_STREAMED); - m_server = FALSE; - m_establishing = FALSE; + m_server = false; + m_establishing = false; /* Create the socket */ m_fd = socket(m_peer->m_realfamily, @@ -616,7 +626,7 @@ GSocketError GSocket::Connect(GSocketStream stream) */ if ((err == WSAEWOULDBLOCK) && (m_non_blocking)) { - m_establishing = TRUE; + m_establishing = true; m_error = GSOCK_WOULDBLOCK; return GSOCK_WOULDBLOCK; } @@ -664,8 +674,8 @@ GSocketError GSocket::SetNonOriented() } /* Initialize all fields */ - m_stream = FALSE; - m_server = FALSE; + m_stream = false; + m_server = false; /* Create the socket */ m_fd = socket(m_local->m_realfamily, SOCK_DGRAM, 0); @@ -685,7 +695,7 @@ GSocketError GSocket::SetNonOriented() if ((bind(m_fd, m_local->m_addr, m_local->m_len) != 0) || (getsockname(m_fd, m_local->m_addr, - (SOCKLEN_T *)&m_local->m_len) != 0)) + (WX_SOCKLEN_T *)&m_local->m_len) != 0)) { Close(); m_error = GSOCK_IOERR; @@ -715,7 +725,10 @@ int GSocket::Read(char *buffer, int size) /* If the socket is blocking, wait for data (with a timeout) */ if (Input_Timeout() == GSOCK_TIMEDOUT) + { + m_error = GSOCK_TIMEDOUT; return -1; + } /* Read the data */ if (m_stream) @@ -810,7 +823,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags) */ if ((m_detected & GSOCK_LOST_FLAG) != 0) { - m_establishing = FALSE; + m_establishing = false; return (GSOCK_LOST_FLAG & flags); } @@ -842,7 +855,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags) else { m_detected = GSOCK_LOST_FLAG; - m_establishing = FALSE; + m_establishing = false; /* LOST event: Abort any further processing */ return (GSOCK_LOST_FLAG & flags); @@ -856,9 +869,9 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags) if (m_establishing && !m_server) { int error; - SOCKLEN_T len = sizeof(error); + WX_SOCKLEN_T len = sizeof(error); - m_establishing = FALSE; + m_establishing = false; getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len); @@ -884,7 +897,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags) /* Check for exceptions and errors (is this useful in Unices?) */ if (FD_ISSET(m_fd, &exceptfds)) { - m_establishing = FALSE; + m_establishing = false; m_detected = GSOCK_LOST_FLAG; /* LOST event: Abort any further processing */ @@ -926,7 +939,7 @@ void GSocket::SetTimeout(unsigned long millis) } /* GSocket_GetError: - * Returns the last error occured for this socket. Note that successful + * Returns the last error occurred for this socket. Note that successful * operations do not clear this back to GSOCK_NOERROR, so use it only * after an error. */ @@ -951,7 +964,7 @@ GSocketError WXDLLIMPEXP_NET GSocket::GetError() * assume that it can write since the first OUTPUT event, and no more * OUTPUT events will be generated unless an error occurs. * GSOCK_CONNECTION: - * Connection succesfully established, for client sockets, or incoming + * Connection successfully established, for client sockets, or incoming * client connection, for server sockets. Wait for this event (also watch * out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call. * GSOCK_LOST: @@ -1103,7 +1116,7 @@ int GSocket::Recv_Stream(char *buffer, int size) int GSocket::Recv_Dgram(char *buffer, int size) { struct sockaddr from; - SOCKLEN_T fromlen = sizeof(from); + WX_SOCKLEN_T fromlen = sizeof(from); int ret; GSocketError err; @@ -1409,7 +1422,7 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address, CHECK_ADDRESS(address, INET); addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr); - addr->s_addr = htonl(hostaddr);; + addr->s_addr = htonl(hostaddr); return GSOCK_NOERROR; } @@ -1525,24 +1538,15 @@ GSocketError _GAddress_Init_UNIX(GAddress *address) return GSOCK_INVADDR; } -GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path) +GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *WXUNUSED(path)) { -#if defined(__BORLANDC__) - /* prevents unused variable message in Borland */ - (void)path; -#endif assert (address != NULL); address->m_error = GSOCK_INVADDR; return GSOCK_INVADDR; } -GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) +GSocketError GAddress_UNIX_GetPath(GAddress *address, char *WXUNUSED(path), size_t WXUNUSED(sbuf)) { -#if defined(__BORLANDC__) - /* prevents unused variable message in Borland */ - (void)path; - (void)sbuf; -#endif assert (address != NULL); address->m_error = GSOCK_INVADDR; return GSOCK_INVADDR; @@ -1557,4 +1561,3 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) typedef void (*wxDummy)(); #endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ -