typedef struct _SockConnectData SockConnectData;
typedef struct _SockLookupData SockLookupData;
typedef struct _SockAddrData SockAddrData;
+typedef struct _SockSource SockSource;
struct _SockConnectData {
gint id;
struct sockaddr *addr;
};
+struct _SockSource {
+ GSource parent;
+ SockInfo *sock;
+};
+
static guint io_timeout = 60;
static GList *sock_connect_data_list = NULL;
+static gboolean sock_prepare (GSource *source,
+ gint *timeout);
+static gboolean sock_check (GSource *source);
+static gboolean sock_dispatch (GSource *source,
+ GSourceFunc callback,
+ gpointer user_data);
+
+GSourceFuncs sock_watch_funcs = {
+ sock_prepare,
+ sock_check,
+ sock_dispatch,
+ NULL
+};
+
static gint sock_connect_with_timeout (gint sock,
const struct sockaddr *serv_addr,
gint addrlen,
return set_nonblocking_mode(sock->sock, nonblock);
}
-
static gboolean is_nonblocking_mode(gint fd)
{
gint flags;
return is_nonblocking_mode(sock->sock);
}
-gboolean sock_has_pending_data(SockInfo *sock)
+
+static gboolean sock_prepare(GSource *source, gint *timeout)
{
+ *timeout = 1;
+ return FALSE;
+}
+
+static gboolean sock_check(GSource *source)
+{
+ SockInfo *sock = ((SockSource *)source)->sock;
struct timeval timeout = {0, 0};
fd_set fds;
+ GIOCondition condition = sock->condition;
+
+ if (!sock || !sock->sock)
+ return FALSE;
#if USE_OPENSSL
if (sock->ssl) {
- if (SSL_pending(sock->ssl) > 0)
- g_print("socket has pending data\n");
+ if (condition & G_IO_IN) {
+ if (SSL_pending(sock->ssl) > 0)
+ return TRUE;
+ if (SSL_want_write(sock->ssl))
+ condition |= G_IO_OUT;
+ }
- return SSL_pending(sock->ssl) > 0;
+ if (condition & G_IO_OUT) {
+ if (SSL_want_read(sock->ssl))
+ condition |= G_IO_IN;
+ }
}
#endif
FD_ZERO(&fds);
FD_SET(sock->sock, &fds);
- select(sock->sock + 1, &fds, NULL, NULL, &timeout);
+ select(sock->sock + 1,
+ (condition & G_IO_IN) ? &fds : NULL,
+ (condition & G_IO_OUT) ? &fds : NULL,
+ NULL, &timeout);
+
+ return FD_ISSET(sock->sock, &fds) != 0;
+}
+
+static gboolean sock_dispatch(GSource *source, GSourceFunc callback,
+ gpointer user_data)
+{
+ SockInfo *sock = ((SockSource *)source)->sock;
- if (FD_ISSET(sock->sock, &fds))
- g_print("socket has pending data\n");
+ if (!sock || !sock->callback || !sock->data)
+ return FALSE;
- return FD_ISSET(sock->sock, &fds);
+ return sock->callback(sock, sock->condition, sock->data);
+}
+
+static gboolean sock_watch_cb(GIOChannel *source, GIOCondition condition,
+ gpointer data)
+{
+ SockInfo *sock = (SockInfo *)data;
+
+ if (!sock || !sock->callback || !sock->data) {
+ return FALSE;
+ }
+ return sock->callback(sock, condition, sock->data);
+}
+
+guint sock_add_watch(SockInfo *sock, GIOCondition condition, SockFunc func,
+ gpointer data)
+{
+ sock->callback = func;
+ sock->condition = condition;
+ sock->data = data;
+
+#if USE_OPENSSL
+ if (sock->ssl)
+ {
+ GSource *source = g_source_new(&sock_watch_funcs,
+ sizeof(SockSource));
+ ((SockSource *) source)->sock = sock;
+ g_source_set_priority(source, G_PRIORITY_DEFAULT);
+ g_source_set_can_recurse(source, FALSE);
+ sock->g_source = g_source_attach(source, NULL);
+ return g_source_attach(source, NULL);
+ }
+#endif
+
+ return g_io_add_watch(sock->sock_ch, condition, sock_watch_cb, sock);
}
static gint fd_check_io(gint fd, GIOCondition cond)
sockinfo = g_new0(SockInfo, 1);
sockinfo->sock = fd;
+ sockinfo->sock_ch = g_io_channel_unix_new(fd);
sockinfo->hostname = g_strdup(conn_data->hostname);
sockinfo->port = conn_data->port;
sockinfo->state = CONN_ESTABLISHED;
sockinfo = g_new0(SockInfo, 1);
sockinfo->sock = sock;
+ sockinfo->sock_ch = g_io_channel_unix_new(sock);
sockinfo->hostname = g_strdup(hostname);
sockinfo->port = port;
sockinfo->state = CONN_ESTABLISHED;
case SSL_ERROR_NONE:
return ret;
case SSL_ERROR_WANT_READ:
- g_print("ssl_read(): SSL_ERROR_WANT_READ\n");
- errno = EAGAIN;
- return -1;
case SSL_ERROR_WANT_WRITE:
- g_print("ssl_read(): SSL_ERROR_WANT_WRITE\n");
errno = EAGAIN;
return -1;
default:
case SSL_ERROR_NONE:
return ret;
case SSL_ERROR_WANT_READ:
- g_print("ssl_write(): SSL_ERROR_WANT_READ\n");
- errno = EAGAIN;
- return -1;
case SSL_ERROR_WANT_WRITE:
- g_print("ssl_write(): SSL_ERROR_WANT_WRITE\n");
errno = EAGAIN;
return -1;
default:
case SSL_ERROR_NONE:
return ret;
case SSL_ERROR_WANT_READ:
- g_print("ssl_peek(): SSL_ERROR_WANT_READ\n");
- errno = EAGAIN;
- return -1;
case SSL_ERROR_WANT_WRITE:
- g_print("ssl_peek(): SSL_ERROR_WANT_WRITE\n");
errno = EAGAIN;
return -1;
default:
if (!sock)
return 0;
+ if (sock->sock_ch)
+ g_io_channel_unref(sock->sock_ch);
+
#if USE_OPENSSL
if (sock->ssl)
ssl_done_socket(sock);
+ if (sock->g_source != 0)
+ g_source_remove(sock->g_source);
+ sock->g_source = 0;
#endif
ret = fd_close(sock->sock);
g_free(sock->hostname);