typedef struct _SockConnectData SockConnectData;
typedef struct _SockLookupData SockLookupData;
typedef struct _SockAddrData SockAddrData;
+typedef struct _SockSource SockSource;
struct _SockConnectData {
gint id;
};
struct _SockAddrData {
+ gint family;
+ gint socktype;
+ gint protocol;
gint addr_len;
- gpointer addr_data;
+ 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);
}
+
+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 (condition & G_IO_IN) {
+ if (SSL_pending(sock->ssl) > 0)
+ return TRUE;
+ if (SSL_want_write(sock->ssl))
+ condition |= G_IO_OUT;
+ }
+
+ 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,
+ (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 (!sock || !sock->callback || !sock->data)
+ return FALSE;
+
+ 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)
{
struct timeval timeout;
for (cur = addr_list; cur != NULL; cur = cur->next) {
SockAddrData *addr_data = (SockAddrData *)cur->data;
- g_free(addr_data->addr_data);
+ g_free(addr_data->addr);
g_free(addr_data);
}
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;
static gint sock_connect_address_list_async(SockConnectData *conn_data)
{
SockAddrData *addr_data;
- struct sockaddr_in ad;
-#ifdef INET6
- struct sockaddr_in6 ad6;
-#endif
- struct sockaddr *sa;
- gint sa_size;
gint sock = -1;
for (; conn_data->cur_addr != NULL;
conn_data->cur_addr = conn_data->cur_addr->next) {
addr_data = (SockAddrData *)conn_data->cur_addr->data;
-#ifdef INET6
- if (addr_data->addr_len != 4 && addr_data->addr_len != 16)
- continue;
-
- if (addr_data->addr_len == 4) {
- /* IPv4 address */
- if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
- perror("socket");
- conn_data->cur_addr = NULL;
- break;
- }
-
- memset(&ad, 0, sizeof(ad));
- ad.sin_family = AF_INET;
- ad.sin_port = htons(conn_data->port);
- memcpy(&ad.sin_addr, addr_data->addr_data,
- addr_data->addr_len);
-
- sa = (struct sockaddr *)&ad;
- sa_size = sizeof(ad);
- } else {
- /* IPv6 address */
- if ((sock = socket(AF_INET6, SOCK_STREAM, 0)) < 0) {
- perror("socket");
- conn_data->cur_addr = NULL;
- break;
- }
-
- memset(&ad6, 0, sizeof(ad6));
- ad6.sin6_family = AF_INET6;
- ad6.sin6_port = htons(conn_data->port);
- memcpy(&ad6.sin6_addr, addr_data->addr_data,
- addr_data->addr_len);
-
- sa = (struct sockaddr *)&ad6;
- sa_size = sizeof(ad6);
- }
-#else /* !INET6 */
- /* IPv4 only */
- if (addr_data->addr_len != 4)
- continue;
-
- if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
+ if ((sock = socket(addr_data->family, addr_data->socktype,
+ addr_data->protocol)) < 0) {
perror("socket");
- conn_data->cur_addr = NULL;
- break;
+ continue;
}
- memset(&ad, 0, sizeof(ad));
- ad.sin_family = AF_INET;
- ad.sin_port = htons(conn_data->port);
- memcpy(&ad.sin_addr, addr_data->addr_data, addr_data->addr_len);
-
- sa = (struct sockaddr *)&ad;
- sa_size = sizeof(ad);
-#endif
-
set_nonblocking_mode(sock, TRUE);
- if (connect(sock, sa, sa_size) < 0) {
+ if (connect(sock, addr_data->addr, addr_data->addr_len) < 0) {
if (EINPROGRESS == errno) {
break;
} else {
GList *addr_list = NULL;
SockAddrData *addr_data;
guint bytes_read;
- guint8 addr_len;
- gchar buf[16];
+ gint ai_member[4];
+ struct sockaddr *addr;
for (;;) {
- if (g_io_channel_read(source, &addr_len, 1, &bytes_read)
+ if (g_io_channel_read(source, (gchar *)ai_member,
+ sizeof(ai_member), &bytes_read)
!= G_IO_ERROR_NONE) {
g_warning("sock_get_address_info_async_cb: "
"address length read error\n");
break;
}
- if (bytes_read == 0)
+ if (bytes_read == 0 || bytes_read != sizeof(ai_member))
break;
- if (addr_len == 'e') {
+ if (ai_member[0] == AF_UNSPEC) {
g_warning("DNS lookup failed\n");
break;
- } else if (addr_len != 4 && addr_len != 16) {
- g_warning("illegal address length: %d\n", addr_len);
- break;
}
- if (g_io_channel_read(source, buf, addr_len, &bytes_read)
+ addr = g_malloc(ai_member[3]);
+ if (g_io_channel_read(source, (gchar *)addr, ai_member[3],
+ &bytes_read)
!= G_IO_ERROR_NONE) {
g_warning("sock_get_address_info_async_cb: "
"address data read error\n");
+ g_free(addr);
break;
}
- if (bytes_read != addr_len) {
+ if (bytes_read != ai_member[3]) {
g_warning("sock_get_address_info_async_cb: "
"incomplete address data\n");
+ g_free(addr);
break;
}
addr_data = g_new0(SockAddrData, 1);
- addr_data->addr_len = addr_len;
- addr_data->addr_data = g_malloc(addr_len);
- memcpy(addr_data->addr_data, buf, addr_len);
+ addr_data->family = ai_member[0];
+ addr_data->socktype = ai_member[1];
+ addr_data->protocol = ai_member[2];
+ addr_data->addr_len = ai_member[3];
+ addr_data->addr = addr;
addr_list = g_list_append(addr_list, addr_data);
}
#else /* !INET6 */
struct hostent *hp;
gchar **addr_list_p;
+ struct sockaddr_in ad;
#endif /* INET6 */
- guint8 addr_len;
+ gint ai_member[4] = {AF_UNSPEC, 0, 0, 0};
close(pipe_fds[0]);
if (gai_err != 0) {
g_warning("getaddrinfo for %s:%s failed: %s\n",
hostname, port_str, gai_strerror(gai_err));
- fd_write(pipe_fds[1], "e", 1);
+ fd_write_all(pipe_fds[1], (gchar *)ai_member,
+ sizeof(ai_member));
close(pipe_fds[1]);
_exit(1);
}
for (ai = res; ai != NULL; ai = ai->ai_next) {
- if (ai->ai_family == AF_INET) {
- struct sockaddr_in *ad;
-
- ad = (struct sockaddr_in *)ai->ai_addr;
- addr_len = sizeof(ad->sin_addr);
-
- fd_write(pipe_fds[1], &addr_len, 1);
- fd_write_all(pipe_fds[1],
- (gchar *)&ad->sin_addr,
- sizeof(ad->sin_addr));
- } else if (ai->ai_family == AF_INET6) {
- struct sockaddr_in6 *ad;
-
- ad = (struct sockaddr_in6 *)ai->ai_addr;
- addr_len = sizeof(ad->sin6_addr);
-
- fd_write(pipe_fds[1], &addr_len, 1);
- fd_write_all(pipe_fds[1],
- (gchar *)&ad->sin6_addr,
- sizeof(ad->sin6_addr));
- }
+ ai_member[0] = ai->ai_family;
+ ai_member[1] = ai->ai_socktype;
+ ai_member[2] = ai->ai_protocol;
+ ai_member[3] = ai->ai_addrlen;
+
+ fd_write_all(pipe_fds[1], (gchar *)ai_member,
+ sizeof(ai_member));
+ fd_write_all(pipe_fds[1], (gchar *)ai->ai_addr,
+ ai->ai_addrlen);
}
if (res != NULL)
freeaddrinfo(res);
#else /* !INET6 */
hp = my_gethostbyname(hostname);
- if (hp == NULL) {
- fd_write(pipe_fds[1], "e", 1);
+ if (hp == NULL || hp->h_addrtype != AF_INET) {
+ fd_write_all(pipe_fds[1], (gchar *)ai_member,
+ sizeof(ai_member));
close(pipe_fds[1]);
_exit(1);
}
- addr_len = (guint8)hp->h_length;
+ ai_member[0] = AF_INET;
+ ai_member[1] = SOCK_STREAM;
+ ai_member[2] = IPPROTO_TCP;
+ ai_member[3] = sizeof(ad);
+
+ memset(&ad, 0, sizeof(ad));
+ ad.sin_family = AF_INET;
+ ad.sin_port = htons(port);
for (addr_list_p = hp->h_addr_list; *addr_list_p != NULL;
addr_list_p++) {
- fd_write(pipe_fds[1], &addr_len, 1);
- fd_write_all(pipe_fds[1], *addr_list_p, hp->h_length);
+ memcpy(&ad.sin_addr, *addr_list_p, hp->h_length);
+ fd_write_all(pipe_fds[1], (gchar *)ai_member,
+ sizeof(ai_member));
+ fd_write_all(pipe_fds[1], (gchar *)&ad, sizeof(ad));
}
#endif /* INET6 */
g_free(lookup_data->hostname);
g_free(lookup_data);
- g_print("DNS lookup cancelled\n");
-
return 0;
}
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;
#if USE_OPENSSL
gint ssl_read(SSL *ssl, gchar *buf, gint len)
{
- return SSL_read(ssl, buf, len);
+ gint ret;
+
+ ret = SSL_read(ssl, buf, len);
+
+ switch (SSL_get_error(ssl, ret)) {
+ case SSL_ERROR_NONE:
+ return ret;
+ case SSL_ERROR_WANT_READ:
+ case SSL_ERROR_WANT_WRITE:
+ errno = EAGAIN;
+ return -1;
+ default:
+ return -1;
+ }
}
#endif
#if USE_OPENSSL
gint ssl_write(SSL *ssl, const gchar *buf, gint len)
{
- return SSL_write(ssl, buf, len);
+ gint ret;
+
+ ret = SSL_write(ssl, buf, len);
+
+ switch (SSL_get_error(ssl, ret)) {
+ case SSL_ERROR_NONE:
+ return ret;
+ case SSL_ERROR_WANT_READ:
+ case SSL_ERROR_WANT_WRITE:
+ errno = EAGAIN;
+ return -1;
+ default:
+ return -1;
+ }
}
#endif
gint n, wrlen = 0;
while (len) {
- n = SSL_write(ssl, buf, len);
+ n = ssl_write(ssl, buf, len);
if (n <= 0)
return -1;
len -= n;
if (--len < 1)
return -1;
do {
- if ((n = SSL_peek(ssl, bp, len)) <= 0)
+ if ((n = ssl_peek(ssl, bp, len)) <= 0)
return -1;
if ((newline = memchr(bp, '\n', n)) != NULL)
n = newline - bp + 1;
- if ((n = SSL_read(ssl, bp, n)) < 0)
+ if ((n = ssl_read(ssl, bp, n)) < 0)
return -1;
bp += n;
len -= n;
}
/* peek at the socket data without actually reading it */
+#if USE_OPENSSL
+gint ssl_peek(SSL *ssl, gchar *buf, gint len)
+{
+ gint ret;
+
+ ret = SSL_peek(ssl, buf, len);
+
+ switch (SSL_get_error(ssl, ret)) {
+ case SSL_ERROR_NONE:
+ return ret;
+ case SSL_ERROR_WANT_READ:
+ case SSL_ERROR_WANT_WRITE:
+ errno = EAGAIN;
+ return -1;
+ default:
+ return -1;
+ }
+}
+#endif
+
gint sock_peek(SockInfo *sock, gchar *buf, gint len)
{
g_return_val_if_fail(sock != NULL, -1);
#if USE_OPENSSL
if (sock->ssl)
- return SSL_peek(sock->ssl, buf, len);
+ return ssl_peek(sock->ssl, buf, len);
#endif
return fd_recv(sock->sock, buf, len, MSG_PEEK);
}
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);
projects / claws.git / blobdiff