# include <netdb.h>
# include <fcntl.h>
# include <unistd.h>
+# include <sys/types.h>
#else
#endif
}
GSocket *
-g_socket_new (gint domain, gint type, gint protocol)
+g_socket_new (GSocketDomain domain, GSocketType type, const gchar *protocol, GError **error)
{
- gint sock;
+ static GStaticMutex getprotobyname_mutex = G_STATIC_MUTEX_INIT;
+ gint fd, native_domain, native_type, native_protocol;
- sock = socket(domain, type, protocol);
+ switch (domain)
+ {
+ case G_SOCKET_DOMAIN_INET:
+ native_domain = PF_INET;
+ break;
- if (sock < 0)
- return NULL;
+ case G_SOCKET_DOMAIN_INET6:
+ native_domain = PF_INET6;
+ break;
+
+ case G_SOCKET_DOMAIN_UNIX:
+ native_domain = PF_UNIX;
+ break;
+
+ default:
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported socket domain");
+ return NULL;
+ }
+
+ switch (type)
+ {
+ case G_SOCKET_TYPE_STREAM:
+ native_type = SOCK_STREAM;
+ break;
+
+ case G_SOCKET_TYPE_DATAGRAM:
+ native_type = SOCK_DGRAM;
+ break;
+
+ case G_SOCKET_TYPE_SEQPACKET:
+ native_type = SOCK_SEQPACKET;
+ break;
- return G_SOCKET (g_object_new (G_TYPE_SOCKET, "fd", sock, NULL));
+ default:
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported socket type");
+ return NULL;
+ }
+
+ if (protocol == NULL)
+ native_protocol = 0;
+ else
+ {
+ struct protoent *ent;
+ g_static_mutex_lock (&getprotobyname_mutex);
+ if (!(ent = getprotobyname (protocol)))
+ {
+ g_static_mutex_unlock (&getprotobyname_mutex);
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported socket protocol");
+ return NULL;
+ }
+ native_protocol = ent->p_proto;
+ g_static_mutex_unlock (&getprotobyname_mutex);
+ }
+
+ fd = socket(native_domain, native_type, native_protocol);
+
+ if (fd < 0)
+ {
+ g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "unable to create socket: %s", g_strerror (errno));
+ return NULL;
+ }
+
+ return G_SOCKET (g_object_new (G_TYPE_SOCKET, "fd", fd, NULL));
}
GSocket *
if ((arg = fcntl (socket->priv->fd, F_GETFL, NULL)) < 0)
g_warning ("Error getting socket status flags: %s", g_strerror (errno));
- arg = blocking ? arg | O_NONBLOCK : arg & ~O_NONBLOCK;
+ arg = blocking ? arg & ~O_NONBLOCK : arg | O_NONBLOCK;
if (fcntl (socket->priv->fd, F_SETFL, arg) < 0)
g_warning ("Error setting socket status flags: %s", g_strerror (errno));
g_socket_get_peer_address (GSocket *socket,
GError **error)
{
- gchar buffer[128];
+ gchar buffer[256];
gsize len;
g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
if (getpeername (socket->priv->fd, (struct sockaddr *) buffer, &len) < 0)
{
- g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "could not get peer address");
+ g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "could not get peer address: %s", g_strerror (errno));
return NULL;
}
g_return_val_if_fail (G_IS_SOCKET (socket) && G_IS_SOCKET_ADDRESS (address), FALSE);
{
- gchar addr[g_socket_address_native_size (address)];
+ gchar addr[256];
if (!g_socket_address_to_native (address, addr))
return FALSE;
if (bind (socket->priv->fd, (struct sockaddr *) addr, g_socket_address_native_size (address)) < 0)
{
- // TODO: set error
+ g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "error binding to address: %s", g_strerror (errno));
return FALSE;
}
GIOCondition condition,
gint fd)
{
+ GSocket *socket;
+ GSimpleAsyncResult *result;
+ gint ret;
+
+ socket = data->socket;
+
if (condition & G_IO_IN)
{
- g_print ("WE COULD ACCEPT HERE\n");
+ if ((ret = accept (socket->priv->fd, NULL, 0)) < 0)
+ {
+ if (errno == EAGAIN)
+ return TRUE;
+
+ result = g_simple_async_result_new_error (G_OBJECT (socket), data->callback, data->user_data, G_IO_ERROR, g_io_error_from_errno (errno), "error accepting connection");
+ }
+ else
+ {
+ result = g_simple_async_result_new (G_OBJECT (socket), data->callback, data->user_data, g_socket_accept_async);
+
+ g_simple_async_result_set_op_res_gpointer (result, g_socket_new_from_fd (ret), g_object_unref);
+ }
+
+ g_simple_async_result_complete (result);
+
+ g_object_unref (result);
}
return FALSE;
{
result = g_simple_async_result_new (G_OBJECT (socket), callback, user_data, g_socket_accept_async);
+ g_simple_async_result_set_op_res_gpointer (result, g_socket_new_from_fd (ret), g_object_unref);
+
g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
GAsyncResult *result,
GError **error)
{
- return NULL;
+ GSocket *new_socket;
+ GSimpleAsyncResult *simple;
+
+ g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
+
+ simple = G_SIMPLE_ASYNC_RESULT (result);
+
+ if (g_simple_async_result_propagate_error (simple, error))
+ return NULL;
+
+ g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_socket_accept_async);
+
+ new_socket = g_object_ref (g_simple_async_result_get_op_res_gpointer (simple));
+
+ return new_socket;
}
gboolean
GCancellable *cancellable,
GError **error)
{
- g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
-/*
- if (connect () < 0)
+ gchar buffer[256];
+
+ g_return_val_if_fail (G_IS_SOCKET (socket) && G_IS_SOCKET_ADDRESS (address), FALSE);
+
+ g_socket_address_to_native (address, buffer);
+
+ if (connect (socket->priv->fd, (struct sockaddr *) buffer, g_socket_address_native_size (address)) < 0)
{
if (errno == EINPROGRESS)
g_set_error (error, G_IO_ERROR, G_IO_ERROR_PENDING, "connection in progress");
g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "error connecting: %s", g_strerror (errno));
return FALSE;
}
-*/
+
return TRUE;
}
+typedef struct {
+ GAsyncReadyCallback callback;
+ GCancellable *cancellable;
+ gpointer user_data;
+ GSocket *socket;
+ gchar address_buffer[256];
+ gsize address_length;
+} ConnectData;
+
+static gboolean
+connect_callback (ConnectData *data,
+ GIOCondition condition,
+ gint fd)
+{
+ GSocket *socket;
+ GSimpleAsyncResult *result = NULL;
+ gint sockerr = 0;
+ gsize sockerr_size = 1;
+
+ socket = data->socket;
+
+ if (condition & G_IO_OUT)
+ {
+ result = g_simple_async_result_new (G_OBJECT (socket), data->callback, data->user_data, g_socket_connect_async);
+ }
+ else if (condition & G_IO_ERR)
+ {
+ if (getsockopt (fd, SOL_SOCKET, SO_ERROR, (gpointer) &sockerr, &sockerr_size) < 0)
+ g_warning ("getsockopt: %s", g_strerror (errno));
+
+ if (sockerr != 0)
+ result = g_simple_async_result_new_error (G_OBJECT (socket), data->callback, data->user_data, G_IO_ERROR, g_io_error_from_errno (sockerr), "error connecting: %s", g_strerror (sockerr));
+ else
+ g_warning ("getsockopt SO_ERROR returned no error, with sockerr = %d", sockerr);
+ }
+
+ g_simple_async_result_complete (result);
+
+ g_object_unref (result);
+
+ return FALSE;
+}
+
void
g_socket_connect_async (GSocket *socket,
GSocketAddress *address,
GCancellable *cancellable,
- GAsyncReadyCallback *callback,
+ GAsyncReadyCallback callback,
gpointer user_data)
{
+ GSource *source;
+ GSimpleAsyncResult *result;
+ ConnectData *data;
+ gint ret;
+ gchar buffer[256];
+ gsize len;
+
+ g_return_if_fail (G_IS_SOCKET (socket) && G_IS_SOCKET_ADDRESS (address));
+
+ if (g_socket_get_blocking (socket))
+ g_socket_set_blocking (socket, FALSE);
+
+ g_socket_address_to_native (address, buffer);
+
+ len = g_socket_address_native_size (address);
+
+ if ((ret = connect (socket->priv->fd, (struct sockaddr *) buffer, len)) < 0)
+ {
+ if (errno == EINPROGRESS)
+ {
+ source = _g_fd_source_new (socket->priv->fd, G_IO_OUT | G_IO_ERR, cancellable);
+
+ data = g_new (ConnectData, 1);
+
+ data->socket = socket;
+ data->callback = callback;
+ data->cancellable = cancellable;
+ data->user_data = user_data;
+ data->address_length = len;
+ memcpy (data->address_buffer, buffer, len);
+
+ g_source_set_callback (source, (GSourceFunc) connect_callback, data, g_free);
+ g_source_attach (source, NULL);
+ }
+ else
+ {
+ g_simple_async_report_error_in_idle (G_OBJECT (socket), callback, user_data, G_IO_ERROR, g_io_error_from_errno (errno), "error connecting: %s", g_strerror (errno));
+ }
+ }
+ else
+ {
+ result = g_simple_async_result_new (G_OBJECT (socket), callback, user_data, g_socket_connect_async);
+
+ g_simple_async_result_complete_in_idle (result);
+
+ g_object_unref (result);
+ }
}
gboolean
GAsyncResult *result,
GError **error)
{
- return FALSE;
+ GSimpleAsyncResult *simple;
+
+ g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
+
+ simple = G_SIMPLE_ASYNC_RESULT (result);
+
+ if (g_simple_async_result_propagate_error (simple, error))
+ return FALSE;
+
+ g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_socket_connect_async);
+
+ return TRUE;
}