#ifndef __GSOCKET_STANDALONE__
#include "wx/defs.h"
+#include "wx/private/gsocketiohandler.h"
#endif
#if defined(__VISAGECPP__)
#include <netdb.h>
#include <sys/ioctl.h>
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+
#ifdef __VMS__
#include <socket.h>
struct sockaddr_un
const struct hostent *he,
char *buffer, int size, int *err)
{
+ /* copy old structure */
memcpy(h, he, sizeof(struct hostent));
+
+ /* copy name */
int len = strlen(h->h_name);
if (len > size)
- len = size - 1;
+ {
+ *err = ENOMEM;
+ return NULL;
+ }
memcpy(buffer, h->h_name, len);
buffer[len] = '\0';
h->h_name = buffer;
- buffer += len + 1;
- size -= len + 1;
+
+ /* track position in the buffer */
+ int pos = len + 1;
+
+ /* reuse len to store address length */
len = h->h_length;
- for (char **p = h->h_addr_list; *p != 0; p++) {
- if (size < len){
+
+ /* ensure pointer alignment */
+ unsigned int misalign = sizeof(char *) - pos%sizeof(char *);
+ if(misalign < sizeof(char *))
+ pos += misalign;
+
+ /* leave space for pointer list */
+ char **p = h->h_addr_list, **q;
+ char **h_addr_list = (char **)(buffer + pos);
+ while(*(p++) != 0)
+ pos += sizeof(char *);
+
+ /* copy addresses and fill new pointer list */
+ for (p = h->h_addr_list, q = h_addr_list; *p != 0; p++, q++)
+ {
+ if (size < pos + len)
+ {
*err = ENOMEM;
return NULL;
}
- memcpy(buffer, *p, len);
- *p = buffer;
- buffer += len;
- size -= len;
- }
- for (char **q = h->h_aliases; size > 0 && *q != 0; q++){
- len = strlen(*q);
- if (len > size)
- len = size - 1;
- memcpy(buffer, *q, len);
- buffer[len] = '\0';
- *q = buffer;
- buffer += len + 1;
- size -= len + 1;
+ memcpy(buffer + pos, *p, len); /* copy content */
+ *q = buffer + pos; /* set copied pointer to copied content */
+ pos += len;
}
+ *++q = 0; /* null terminate the pointer list */
+ h->h_addr_list = h_addr_list; /* copy pointer to pointers */
+
+ /* ensure word alignment of pointers */
+ misalign = sizeof(char *) - pos%sizeof(char *);
+ if(misalign < sizeof(char *))
+ pos += misalign;
+
+ /* leave space for pointer list */
+ p = h->h_aliases;
+ char **h_aliases = (char **)(buffer + pos);
+ while(*(p++) != 0)
+ pos += sizeof(char *);
+
+ /* copy aliases and fill new pointer list */
+ for (p = h->h_aliases, q = h_aliases; *p != 0; p++, q++)
+ {
+ len = strlen(*p);
+ if (size <= pos + len)
+ {
+ *err = ENOMEM;
+ return NULL;
+ }
+ memcpy(buffer + pos, *p, len); /* copy content */
+ buffer[pos + len] = '\0';
+ *q = buffer + pos; /* set copied pointer to copied content */
+ pos += len + 1;
+ }
+ *++q = 0; /* null terminate the pointer list */
+ h->h_aliases = h_aliases; /* copy pointer to pointers */
+
return h;
}
#endif
+#if defined(HAVE_GETHOSTBYNAME) && wxUSE_THREADS
+static wxMutex nameLock;
+#endif
struct hostent * wxGethostbyname_r(const char *hostname, struct hostent *h,
void *buffer, int size, int *err)
{
- struct hostent *he;
+ struct hostent *he = NULL;
*err = 0;
#if defined(HAVE_FUNC_GETHOSTBYNAME_R_6)
if (gethostbyname_r(hostname, h, (char*)buffer, size, &he, err))
he = h;
#elif defined(HAVE_GETHOSTBYNAME)
#if wxUSE_THREADS
- static wxMutex nameLock;
wxMutexLocker locker(nameLock);
#endif
he = gethostbyname(hostname);
return he;
}
+#if defined(HAVE_GETHOSTBYNAME) && wxUSE_THREADS
+static wxMutex addrLock;
+#endif
struct hostent * wxGethostbyaddr_r(const char *addr_buf, int buf_size,
int proto, struct hostent *h,
void *buffer, int size, int *err)
{
- struct hostent *he;
+ struct hostent *he = NULL;
*err = 0;
#if defined(HAVE_FUNC_GETHOSTBYNAME_R_6)
if (gethostbyaddr_r(addr_buf, buf_size, proto, h,
he = h;
#elif defined(HAVE_GETHOSTBYNAME)
#if wxUSE_THREADS
- static wxMutex addrLock;
wxMutexLocker locker(addrLock);
#endif
he = gethostbyaddr(addr_buf, buf_size, proto);
return he;
}
-#if defined(HAVE_GETHOSTBYNAME)
+#if defined(HAVE_GETSERVBYNAME)
static struct servent * deepCopyServent(struct servent *s,
const struct servent *se,
char *buffer, int size)
{
+ /* copy plain old structure */
memcpy(s, se, sizeof(struct servent));
+
+ /* copy name */
int len = strlen(s->s_name);
- if (len > size)
- len = size - 1;
+ if (len >= size)
+ {
+ return NULL;
+ }
memcpy(buffer, s->s_name, len);
buffer[len] = '\0';
s->s_name = buffer;
- buffer += len + 1;
- size -= len + 1;
+
+ /* track position in the buffer */
+ int pos = len + 1;
+
+ /* copy protocol */
len = strlen(s->s_proto);
- if (len > size)
- len = size - 1;
- memcpy(buffer, s->s_proto, len);
- buffer[len] = '\0';
- s->s_proto = buffer;
- buffer += len + 1;
- size -= len + 1;
- for (char **q = s->s_aliases; size > 0 && *q != 0; q++){
- len = strlen(*q);
- if (len > size)
- len = size - 1;
- memcpy(buffer, *q, len);
- buffer[len] = '\0';
- *q = buffer;
- buffer += len + 1;
- size -= len + 1;
+ if (pos + len >= size)
+ {
+ return NULL;
+ }
+ memcpy(buffer + pos, s->s_proto, len);
+ buffer[pos + len] = '\0';
+ s->s_proto = buffer + pos;
+
+ /* track position in the buffer */
+ pos += len + 1;
+
+ /* ensure pointer alignment */
+ unsigned int misalign = sizeof(char *) - pos%sizeof(char *);
+ if(misalign < sizeof(char *))
+ pos += misalign;
+
+ /* leave space for pointer list */
+ char **p = s->s_aliases, **q;
+ char **s_aliases = (char **)(buffer + pos);
+ while(*(p++) != 0)
+ pos += sizeof(char *);
+
+ /* copy addresses and fill new pointer list */
+ for (p = s->s_aliases, q = s_aliases; *p != 0; p++, q++){
+ len = strlen(*p);
+ if (size <= pos + len)
+ {
+ return NULL;
+ }
+ memcpy(buffer + pos, *p, len); /* copy content */
+ buffer[pos + len] = '\0';
+ *q = buffer + pos; /* set copied pointer to copied content */
+ pos += len + 1;
}
+ *++q = 0; /* null terminate the pointer list */
+ s->s_aliases = s_aliases; /* copy pointer to pointers */
return s;
}
#endif
+#if defined(HAVE_GETSERVBYNAME) && wxUSE_THREADS
+static wxMutex servLock;
+#endif
struct servent *wxGetservbyname_r(const char *port, const char *protocol,
struct servent *serv, void *buffer, int size)
{
- struct servent *se;
+ struct servent *se = NULL;
#if defined(HAVE_FUNC_GETSERVBYNAME_R_6)
if (getservbyname_r(port, protocol, serv, (char*)buffer, size, &se))
se = NULL;
se = serv;
#elif defined(HAVE_GETSERVBYNAME)
#if wxUSE_THREADS
- static wxMutex servLock;
wxMutexLocker locker(servLock);
#endif
se = getservbyname(port, protocol);
int i;
m_fd = INVALID_SOCKET;
+ m_handler = NULL;
+
for (i=0;i<GSOCK_MAX_EVENT;i++)
{
m_cbacks[i] = NULL;
m_gui_dependent = NULL;
m_non_blocking = false;
m_reusable = false;
+ m_broadcast = false;
+ m_dobind = true;
m_timeout = 10*60*1000;
/* 10 minutes * 60 sec * 1000 millisec */
m_establishing = false;
+ m_initialRecvBufferSize = -1;
+ m_initialSendBufferSize = -1;
assert(gs_gui_functions);
/* Per-socket GUI-specific initialization */
void GSocket::Close()
{
gs_gui_functions->Disable_Events(this);
- /* gsockosx.c calls CFSocketInvalidate which closes the socket for us */
-#if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)))
- close(m_fd);
-#endif
+
+ /* When running on OS X, the gsockosx implementation of GSocketGUIFunctionsTable
+ will close the socket during Disable_Events. However, it will only do this
+ if it is being used. That is, it won't do it in a console program. To
+ ensure we get the right behavior, we have gsockosx set m_fd = INVALID_SOCKET
+ if it has closed the socket which indicates to us (at runtime, instead of
+ at compile time as this had been before) that the socket has already
+ been closed.
+ */
+ if(m_fd != INVALID_SOCKET)
+ close(m_fd);
m_fd = INVALID_SOCKET;
}
/* Per-socket GUI-specific cleanup */
gs_gui_functions->Destroy_Socket(this);
+ delete m_handler;
+
/* Destroy private addresses */
if (m_local)
GAddress_destroy(m_local);
/* If socket has been created, shutdown it */
if (m_fd != INVALID_SOCKET)
{
- shutdown(m_fd, 2);
+ shutdown(m_fd, 1);
Close();
}
/* 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));
+ setsockopt(m_fd, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&arg, sizeof(arg));
#endif
ioctl(m_fd, FIONBIO, &arg);
state after being previously closed.
*/
if (m_reusable)
- setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
+ {
+ setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(arg));
+#ifdef SO_REUSEPORT
+ setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (const char*)&arg, sizeof(arg));
+#endif
+ }
/* Bind to the local address,
* retrieve the actual address bound,
return false;
}
+bool GSocket::SetBroadcast()
+{
+ /* socket must not be in use/already bound */
+ if (m_fd == INVALID_SOCKET) {
+ m_broadcast = true;
+ return true;
+ }
+ return false;
+}
+
+bool GSocket::DontDoBind()
+{
+ /* socket must not be in use/already bound */
+ if (m_fd == INVALID_SOCKET) {
+ m_dobind = false;
+ return true;
+ }
+ return false;
+}
+
/* Client specific parts */
/* GSocket_Connect:
/* 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));
+ setsockopt(m_fd, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&arg, sizeof(arg));
#endif
#if defined(__EMX__) || defined(__VISAGECPP__)
ioctl(m_fd, FIONBIO, &arg);
#endif
+ // If the reuse flag is set, use the applicable socket reuse flags(s)
+ if (m_reusable)
+ {
+ setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(arg));
+#ifdef SO_REUSEPORT
+ setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (const char*)&arg, sizeof(arg));
+#endif
+ }
+
+ if (m_initialRecvBufferSize >= 0)
+ setsockopt(m_fd, SOL_SOCKET, SO_RCVBUF, (const char*)&m_initialRecvBufferSize, sizeof(m_initialRecvBufferSize));
+ if (m_initialSendBufferSize >= 0)
+ setsockopt(m_fd, SOL_SOCKET, SO_SNDBUF, (const char*)&m_initialSendBufferSize, sizeof(m_initialSendBufferSize));
+
+ // If a local address has been set, then we need to bind to it before calling connect
+ if (m_local && m_local->m_addr)
+ {
+ bind(m_fd, m_local->m_addr, m_local->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);
#endif
gs_gui_functions->Enable_Events(this);
- /* Bind to the local address,
- * and retrieve the actual address bound.
- */
- if ((bind(m_fd, m_local->m_addr, m_local->m_len) != 0) ||
- (getsockname(m_fd,
- m_local->m_addr,
- (WX_SOCKLEN_T *) &m_local->m_len) != 0))
+ if (m_reusable)
{
- Close();
- m_error = GSOCK_IOERR;
- return GSOCK_IOERR;
+ setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(arg));
+#ifdef SO_REUSEPORT
+ setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (const char*)&arg, sizeof(arg));
+#endif
}
+ if (m_broadcast)
+ {
+ setsockopt(m_fd, SOL_SOCKET, SO_BROADCAST, (const char*)&arg, sizeof(arg));
+ }
+ if (m_dobind)
+ {
+ /* Bind to the local address,
+ * and retrieve the actual address bound.
+ */
+ if ((bind(m_fd, m_local->m_addr, m_local->m_len) != 0) ||
+ (getsockname(m_fd,
+ m_local->m_addr,
+ (WX_SOCKLEN_T *) &m_local->m_len) != 0))
+ {
+ Close();
+ m_error = GSOCK_IOERR;
+ return GSOCK_IOERR;
+ }
+ }
return GSOCK_NOERROR;
}
else
ret = Recv_Dgram(buffer, size);
- /* If recv returned zero, then the connection is lost, and errno is not set.
+ /* If recv returned zero, then the connection has been gracefully closed.
* Otherwise, recv has returned an error (-1), in which case we have lost the
* socket only if errno does _not_ indicate that there may be more data to read.
*/
if (ret == 0)
- m_error = GSOCK_IOERR;
+ {
+ /* Make sure wxSOCKET_LOST event gets sent and shut down the socket */
+ m_detected = GSOCK_LOST_FLAG;
+ Detected_Read();
+ return 0;
+ }
else if (ret == -1)
{
if ((errno == EWOULDBLOCK) || (errno == EAGAIN))
return (result & flags);
}
+ /* Check for exceptions and errors */
+ if (wxFD_ISSET(m_fd, &exceptfds))
+ {
+ m_establishing = false;
+ m_detected = GSOCK_LOST_FLAG;
+
+ /* LOST event: Abort any further processing */
+ return (GSOCK_LOST_FLAG & flags);
+ }
+
/* Check for readability */
if (wxFD_ISSET(m_fd, &readfds))
{
- char c;
+ result |= GSOCK_INPUT_FLAG;
- int num = recv(m_fd, &c, 1, MSG_PEEK | GSOCKET_MSG_NOSIGNAL);
-
- if (num > 0)
+ if (m_server && m_stream)
{
- result |= GSOCK_INPUT_FLAG;
- }
- else
- {
- if (m_server && m_stream)
- {
- result |= GSOCK_CONNECTION_FLAG;
- m_detected |= GSOCK_CONNECTION_FLAG;
- }
- /* If recv returned zero, then the connection is lost, and errno is not set.
- * Otherwise, recv has returned an error (-1), in which case we have lost the
- * socket only if errno does _not_ indicate that there may be more data to read.
- */
- else if (num == 0 ||
- (errno != EWOULDBLOCK) && (errno != EAGAIN) && (errno != EINTR))
- {
- m_detected = GSOCK_LOST_FLAG;
- m_establishing = false;
-
- /* LOST event: Abort any further processing */
- return (GSOCK_LOST_FLAG & flags);
- }
+ /* This is a TCP server socket that detected a connection.
+ While the INPUT_FLAG is also set, it doesn't matter on
+ this kind of sockets, as we can only Accept() from them. */
+ result |= GSOCK_CONNECTION_FLAG;
+ m_detected |= GSOCK_CONNECTION_FLAG;
}
}
}
}
- /* Check for exceptions and errors (is this useful in Unices?) */
- if (wxFD_ISSET(m_fd, &exceptfds))
- {
- m_establishing = false;
- m_detected = GSOCK_LOST_FLAG;
-
- /* LOST event: Abort any further processing */
- return (GSOCK_LOST_FLAG & flags);
- }
-
return (result & flags);
}
{
CALL_CALLBACK(this, GSOCK_CONNECTION);
}
+ else if (num == 0)
+ {
+ /* graceful shutdown */
+ CALL_CALLBACK(this, GSOCK_LOST);
+ Shutdown();
+ }
else
{
/* Do not throw a lost event in cases where the socket isn't really lost */
struct in_addr *array_addr;
/* It is a real name, we solve it */
- if ((he = gethostbyname(hostname)) == NULL)
+ struct hostent h;
+#if defined(HAVE_FUNC_GETHOSTBYNAME_R_3)
+ struct hostent_data buffer;
+#else
+ char buffer[1024];
+#endif
+ int err;
+ he = wxGethostbyname_r(hostname, &h, (void*)&buffer, sizeof(buffer), &err);
+ if (he == NULL)
{
/* Reset to invalid address */
addr->s_addr = INADDR_NONE;
return GSOCK_NOERROR;
}
+
+GSocketError GAddress_INET_SetBroadcastAddress(GAddress *address)
+{
+ return GAddress_INET_SetHostAddress(address, INADDR_BROADCAST);
+}
+
GSocketError GAddress_INET_SetAnyAddress(GAddress *address)
{
return GAddress_INET_SetHostAddress(address, INADDR_ANY);
return GSOCK_INVPORT;
}
-#if defined(__WXPM__) && defined(__EMX__)
- se = getservbyname(port, (char*)protocol);
+#if defined(HAVE_FUNC_GETSERVBYNAME_R_4)
+ struct servent_data buffer;
#else
- se = getservbyname(port, protocol);
+ char buffer[1024];
#endif
+ struct servent serv;
+ se = wxGetservbyname_r(port, protocol, &serv,
+ (void*)&buffer, sizeof(buffer));
if (!se)
{
/* the cast to int suppresses compiler warnings about subscript having the
addr = (struct sockaddr_in *)address->m_addr;
addr_buf = (char *)&(addr->sin_addr);
- he = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET);
+ struct hostent temphost;
+#if defined(HAVE_FUNC_GETHOSTBYNAME_R_3)
+ struct hostent_data buffer;
+#else
+ char buffer[1024];
+#endif
+ int err;
+ he = wxGethostbyaddr_r(addr_buf, sizeof(addr->sin_addr), AF_INET, &temphost,
+ (void*)&buffer, sizeof(buffer), &err);
if (he == NULL)
{
address->m_error = GSOCK_NOHOST;
projects / wxWidgets.git / blobdiff