*/
#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
-#define BSD_SELECT // use Berkley Sockets select
+#define BSD_SELECT /* use Berkley Sockets select */
#include <assert.h>
#include <sys\types.h>
+#ifdef __EMX__
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <errno.h>
+#define HAVE_INET_ADDR
+#else
#include <utils.h>
#include <sys\time.h>
+#include <types.h>
#include <in.h>
#include <netdb.h>
#include <nerrno.h>
+#endif
#if defined(__VISAGECPP__) && __IBMCPP__ < 400
+#include <machine\endian.h>
#include <socket.h>
#include <ioctl.h>
#include <select.h>
+#include <unistd.h>
#else
#include <sys\socket.h>
#include <sys\ioctl.h>
#include <sys\select.h>
+#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 *,
+ struct fd_set *,
+ struct fd_set *,
+ struct timeval *);
+int _System soclose(int);
+#endif
#endif
#include <string.h>
#include <stdio.h>
-#include <stdlib.h>
+#if defined(__VISAGECPP__) && __IBMCPP__ < 400
+# ifdef min
+# undef min
+# endif
+# include <stdlib.h>
+#endif
#include <stddef.h>
#include <ctype.h>
/* Global initialisers */
-bool GSocket_Init()
+int GSocket_Init()
{
- return TRUE;
+ return 1;
}
void GSocket_Cleanup()
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;
}
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);
socket->m_cbacks[evt] = NULL;
socket->m_detected = 0;
- _GSocket_Disable_Events(socket);
+ (socket);
}
/* Address handling */
}
/* 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);
}
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) {
}
/* 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;
}
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);
}
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) {
/* 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;
}
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);
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;
* 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);
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:
{
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);
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)
{
port_int = atoi(port);
addr = (struct sockaddr_in *)address->m_addr;
- addr->sin_port = htons(port_int);
+// addr->sin_port = htons(port_int);
return GSOCK_NOERROR;
}
CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
addr = (struct sockaddr_in *)address->m_addr;
- addr->sin_port = htons(port);
+// addr->sin_port = htons(port);
return GSOCK_NOERROR;
}
CHECK_ADDRESS(address, INET, 0);
addr = (struct sockaddr_in *)address->m_addr;
- return ntohs(addr->sin_port);
+ 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
projects / wxWidgets.git / blobdiff