/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#if (defined (_XOPEN_SOURCE) && !defined (_BSD_SOURCE))
#define _BSD_SOURCE
#endif
+/* This can probably be handled better, e.g. define it in config.h. */
+#define _WIN32_WINNT _WIN32_WINNT_WIN6
#include <glib.h>
#include <glib/gi18n.h>
#include <sys/time.h>
#include <sys/types.h>
#ifdef G_OS_WIN32
-# include <winsock2.h>
+# include <ws2tcpip.h>
# ifndef EINPROGRESS
# define EINPROGRESS WSAEINPROGRESS
# endif
+# include "w32lib.h"
#else
# if HAVE_SYS_WAIT_H
# include <sys/wait.h>
#include "socket.h"
#include "utils.h"
#include "log.h"
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
# include "ssl.h"
#endif
static GList *sock_connect_data_list = NULL;
-static gboolean sock_prepare (GSource *source,
+static gboolean ssl_sock_prepare (GSource *source,
gint *timeout);
-static gboolean sock_check (GSource *source);
-static gboolean sock_dispatch (GSource *source,
+static gboolean ssl_sock_check (GSource *source);
+static gboolean ssl_sock_dispatch (GSource *source,
GSourceFunc callback,
gpointer user_data);
-GSourceFuncs sock_watch_funcs = {
- sock_prepare,
- sock_check,
- sock_dispatch,
+#ifdef USE_GNUTLS
+GSourceFuncs ssl_watch_funcs = {
+ ssl_sock_prepare,
+ ssl_sock_check,
+ ssl_sock_dispatch,
NULL
};
+#endif
static gint sock_connect_with_timeout (gint sock,
const struct sockaddr *serv_addr,
gint addrlen,
guint timeout_secs);
-#ifndef INET6
-static gint sock_connect_by_hostname (gint sock,
- const gchar *hostname,
- gushort port);
-#else
static gint sock_connect_by_getaddrinfo (const gchar *hostname,
gushort port);
-#endif
static SockInfo *sockinfo_from_fd(const gchar *hostname,
gushort port,
result = WSAStartup(MAKEWORD(2, 2), &wsadata);
if (result != NO_ERROR) {
- g_warning("WSAStartup() failed\n");
+ g_warning("WSAStartup() failed");
return -1;
}
#endif
{
#ifdef G_OS_UNIX
static time_t resolv_conf_changed = (time_t)NULL;
- struct stat s;
+ GStatBuf s;
/* This makes the glibc re-read resolv.conf, if it changed
* since our startup. Maybe that should be #ifdef'ed, I don't
* know if it'd work on BSDs.
* Why doesn't the glibc do it by itself?
*/
- if (stat("/etc/resolv.conf", &s) == 0) {
+ if (g_stat("/etc/resolv.conf", &s) == 0) {
if (s.st_mtime > resolv_conf_changed) {
resolv_conf_changed = s.st_mtime;
res_init();
#endif /*G_OS_UNIX*/
}
+#ifdef G_OS_WIN32
+#define SOCKET_IS_VALID(s) ((s) != INVALID_SOCKET)
+#else
+#define SOCKET_IS_VALID(s) (s != -1)
+#endif
/* Due to the fact that socket under Windows are not represented by
standard file descriptors, we sometimes need to check whether a
#endif
}
+gint fd_connect_inet(gushort port)
+{
+ gint sock;
+ struct sockaddr_in addr;
+
+ sock = socket(AF_INET, SOCK_STREAM, 0);
+ if (!SOCKET_IS_VALID(sock)) {
+#ifdef G_OS_WIN32
+ debug_print("fd_connect_inet(): socket() failed: %d\n",
+ WSAGetLastError());
+#else
+ perror("fd_connect_inet(): socket");
+#endif
+ return -1;
+ }
+
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_port = htons(port);
+ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+
+ if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+ fd_close(sock);
+ return -1;
+ }
+
+ return sock;
+}
+gint fd_open_inet(gushort port)
+{
+ gint sock;
+ struct sockaddr_in addr;
+ gint val;
+
+ sock = socket(AF_INET, SOCK_STREAM, 0);
+ if (!SOCKET_IS_VALID(sock)) {
+#ifdef G_OS_WIN32
+ g_warning("fd_open_inet(): socket() failed: %d",
+ WSAGetLastError());
+#else
+ perror("fd_open_inet(): socket");
+#endif
+ return -1;
+ }
+
+ val = 1;
+ if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&val,
+ sizeof(val)) < 0) {
+ perror("setsockopt");
+ fd_close(sock);
+ return -1;
+ }
+
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_port = htons(port);
+ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+
+ if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+ perror("bind");
+ fd_close(sock);
+ return -1;
+ }
+
+ if (listen(sock, 1) < 0) {
+ perror("listen");
+ fd_close(sock);
+ return -1;
+ }
+
+ return sock;
+}
gint fd_connect_unix(const gchar *path)
{
gint sock_set_nonblocking_mode(SockInfo *sock, gboolean nonblock)
{
- g_return_val_if_fail(sock != NULL, -1);
+ cm_return_val_if_fail(sock != NULL, -1);
return set_nonblocking_mode(sock->sock, nonblock);
}
gboolean sock_is_nonblocking_mode(SockInfo *sock)
{
- g_return_val_if_fail(sock != NULL, FALSE);
+ cm_return_val_if_fail(sock != NULL, FALSE);
return is_nonblocking_mode(sock->sock);
}
-static gboolean sock_prepare(GSource *source, gint *timeout)
+#ifdef USE_GNUTLS
+static gboolean ssl_sock_prepare(GSource *source, gint *timeout)
{
*timeout = 1;
return FALSE;
}
-static gboolean sock_check(GSource *source)
+static gboolean ssl_sock_check(GSource *source)
{
SockInfo *sock = ((SockSource *)source)->sock;
struct timeval timeout = {0, 0};
fd_set fds;
- GIOCondition condition = sock->condition;
+ GIOCondition condition = 0;
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;
- }
+ condition = sock->condition;
- if (condition & G_IO_OUT) {
- if (SSL_want_read(sock->ssl))
- condition |= G_IO_IN;
- }
- }
-#endif
+ if ((condition & G_IO_IN) == G_IO_IN &&
+ gnutls_record_check_pending(sock->ssl) != 0)
+ return TRUE;
FD_ZERO(&fds);
FD_SET(sock->sock, &fds);
return FD_ISSET(sock->sock, &fds) != 0;
}
-static gboolean sock_dispatch(GSource *source, GSourceFunc callback,
+static gboolean ssl_sock_dispatch(GSource *source, GSourceFunc callback,
gpointer user_data)
{
SockInfo *sock = ((SockSource *)source)->sock;
return sock->callback(sock, sock->condition, sock->data);
}
+#endif
static gboolean sock_watch_cb(GIOChannel *source, GIOCondition condition,
gpointer data)
sock->condition = condition;
sock->data = data;
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
if (sock->ssl)
{
- GSource *source = g_source_new(&sock_watch_funcs,
+ GSource *source = g_source_new(&ssl_watch_funcs,
sizeof(SockSource));
((SockSource *) source)->sock = sock;
g_source_set_priority(source, G_PRIORITY_DEFAULT);
if (FD_ISSET(fd, &fds)) {
return 0;
} else {
- g_warning("Socket IO timeout\n");
+ g_warning("Socket IO timeout");
+ log_error(LOG_PROTOCOL, _("Socket IO timeout.\n"));
return -1;
}
}
alarm(0);
signal(SIGALRM, prev_handler);
errno = ETIMEDOUT;
+ log_error(LOG_PROTOCOL, _("Connection timed out.\n"));
return -1;
}
alarm(timeout_secs);
return ret;
}
-struct hostent *my_gethostbyname(const gchar *hostname)
-{
- struct hostent *hp;
-#ifdef G_OS_UNIX
- void (*prev_handler)(gint);
-
- alarm(0);
- prev_handler = signal(SIGALRM, timeout_handler);
- if (sigsetjmp(jmpenv, 1)) {
- alarm(0);
- signal(SIGALRM, prev_handler);
- g_printerr("%s: host lookup timed out.\n", hostname);
- errno = 0;
- return NULL;
- }
- alarm(io_timeout);
-#endif
-
- if ((hp = gethostbyname(hostname)) == NULL) {
-#ifdef G_OS_UNIX
- alarm(0);
- signal(SIGALRM, prev_handler);
-#endif
- g_printerr("%s: unknown host.\n", hostname);
- errno = 0;
- return NULL;
- }
-
-#ifdef G_OS_UNIX
- alarm(0);
- signal(SIGALRM, prev_handler);
-#endif
-
- return hp;
-}
-
-#ifndef INET6
-static gint my_inet_aton(const gchar *hostname, struct in_addr *inp)
-{
-#if HAVE_INET_ATON
- return inet_aton(hostname, inp);
-#else
-#if HAVE_INET_ADDR
- guint32 inaddr;
-
- inaddr = inet_addr(hostname);
- if (inaddr != -1) {
- memcpy(inp, &inaddr, sizeof(inaddr));
- return 1;
- } else
- return 0;
-#else
- return 0;
-#endif
-#endif /* HAVE_INET_ATON */
-}
-
-static gint sock_connect_by_hostname(gint sock, const gchar *hostname,
- gushort port)
-{
- struct hostent *hp;
- struct sockaddr_in ad;
-
- memset(&ad, 0, sizeof(ad));
- ad.sin_family = AF_INET;
- ad.sin_port = htons(port);
-
- refresh_resolvers();
-
- if (!my_inet_aton(hostname, &ad.sin_addr)) {
- if ((hp = my_gethostbyname(hostname)) == NULL) {
- g_printerr("%s: unknown host.\n", hostname);
- errno = 0;
- return -1;
- }
-
- if (hp->h_length != 4 && hp->h_length != 8) {
- g_printerr("illegal address length received for host %s\n", hostname);
- errno = 0;
- return -1;
- }
-
- memcpy(&ad.sin_addr, hp->h_addr, hp->h_length);
- }
-
- return sock_connect_with_timeout(sock, (struct sockaddr *)&ad,
- sizeof(ad), io_timeout);
-}
-
-#else /* INET6 */
static gint sock_connect_by_getaddrinfo(const gchar *hostname, gushort port)
{
gint sock = -1, gai_error;
refresh_resolvers();
memset(&hints, 0, sizeof(hints));
- /* hints.ai_flags = AI_CANONNAME; */
+ hints.ai_flags = AI_ADDRCONFIG;
+
+#ifdef INET6
hints.ai_family = AF_UNSPEC;
+#else
+ hints.ai_family = AF_INET;
+#endif
+
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
}
for (ai = res; ai != NULL; ai = ai->ai_next) {
+#ifndef INET6
+ if (ai->ai_family == AF_INET6)
+ continue;
+#endif
+
sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
- if (sock < 0)
+ if (sock < 0 )
+ continue;
+#ifdef G_OS_WIN32
+ if (sock == INVALID_SOCKET)
continue;
+#endif
if (sock_connect_with_timeout
(sock, ai->ai_addr, ai->ai_addrlen, io_timeout) == 0)
return sock;
}
-#endif /* !INET6 */
-
-
-/* Open a connection using an external program. May be useful when
- * you need to tunnel through a SOCKS or other firewall, or to
- * establish an IMAP-over-SSH connection. */
-/* TODO: Recreate this for sock_connect_thread() */
-SockInfo *sock_connect_cmd(const gchar *hostname, const gchar *tunnelcmd)
-{
-#ifdef G_OS_UNIX
- gint fd[2];
- int r;
-
- if ((r = socketpair(AF_UNIX, SOCK_STREAM, 0, fd)) == -1) {
- perror("socketpair");
- return NULL;
- }
- log_message(LOG_PROTOCOL, "launching tunnel command \"%s\"\n", tunnelcmd);
- if (fork() == 0) {
- close(fd[0]);
- close(0);
- close(1);
- dup(fd[1]); /* set onto stdin */
- dup(fd[1]);
- execlp("/bin/sh", "/bin/sh", "-c", tunnelcmd, NULL);
- }
-
- close(fd[1]);
- return sockinfo_from_fd(hostname, 0, fd[0]);
-#else
- /* We would need a special implementation for W32. */
- return NULL;
-#endif
-}
-
SockInfo *sock_connect(const gchar *hostname, gushort port)
{
gint sock;
#endif
-#ifdef INET6
- if ((sock = sock_connect_by_getaddrinfo(hostname, port)) < 0)
- return NULL;
-#else
-#ifdef G_OS_WIN32
- if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
- g_warning("socket() failed: %d\n", WSAGetLastError());
-#else
- if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
- perror("socket");
-#endif /* G_OS_WIN32 */
+ if ((sock = sock_connect_by_getaddrinfo(hostname, port)) < 0) {
return NULL;
}
- if (sock_connect_by_hostname(sock, hostname, port) < 0) {
- if (errno != 0) perror("connect");
- close(sock);
- return NULL;
- }
-#endif /* INET6 */
-
return sockinfo_from_fd(hostname, port, sock);
}
g_io_channel_unref(source);
len = sizeof(val);
- if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &val, &len) < 0) {
+ if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&val, &len) < 0) {
perror("getsockopt");
close(fd);
sock_connect_address_list_async(conn_data);
if (val != 0) {
close(fd);
+ log_error(LOG_PROTOCOL, _("%s:%d: connection failed (%s).\n"),
+ conn_data->hostname, conn_data->port,
+ g_strerror(val));
sock_connect_address_list_async(conn_data);
return FALSE;
}
sockinfo = g_new0(SockInfo, 1);
sockinfo->sock = fd;
+#ifndef G_OS_WIN32
sockinfo->sock_ch = g_io_channel_unix_new(fd);
+#else
+ sockinfo->sock_ch = g_io_channel_win32_new_socket(fd);
+#endif
sockinfo->hostname = g_strdup(conn_data->hostname);
sockinfo->port = conn_data->port;
sockinfo->state = CONN_ESTABLISHED;
if (conn_data->io_tag > 0)
g_source_remove(conn_data->io_tag);
if (conn_data->channel) {
- g_io_channel_close(conn_data->channel);
+ GError *err = NULL;
+ g_io_channel_shutdown(conn_data->channel, TRUE, &err);
+ if (err)
+ g_error_free(err);
g_io_channel_unref(conn_data->channel);
}
g_free(conn_data->hostname);
g_free(conn_data);
} else {
- g_warning("sock_connect_async_cancel: id %d not found.\n", id);
+ g_warning("sock_connect_async_cancel: id %d not found", id);
return -1;
}
if ((sock = socket(addr_data->family, addr_data->socktype,
addr_data->protocol)) < 0) {
perror("socket");
+
continue;
}
perror("connect");
close(sock);
}
- } else
+ } else {
break;
+ }
}
if (conn_data->cur_addr == NULL) {
- g_warning("sock_connect_address_list_async: "
- "connection to %s:%d failed\n",
- conn_data->hostname, conn_data->port);
conn_data->func(NULL, conn_data->data);
sock_connect_async_cancel(conn_data->id);
return -1;
conn_data->cur_addr = conn_data->cur_addr->next;
+#ifndef G_OS_WIN32
conn_data->channel = g_io_channel_unix_new(sock);
+#else
+ conn_data->channel = g_io_channel_win32_new_socket(sock);
+#endif
conn_data->io_tag = g_io_add_watch(conn_data->channel, G_IO_IN|G_IO_OUT,
sock_connect_async_cb, conn_data);
struct sockaddr *addr;
gchar *canonical_name = NULL;
gchar len = 0;
-
- if (g_io_channel_read(source, &len, sizeof(len),
- &bytes_read) == G_IO_ERROR_NONE) {
+ GError *err = NULL;
+
+ g_io_channel_set_encoding(source, NULL, &err);
+ if (err) {
+ g_warning("can unset encoding: %s", err->message);
+ g_error_free(err);
+ return FALSE;
+ }
+ g_io_channel_set_buffered(source, FALSE);
+ if (g_io_channel_read_chars(source, &len, sizeof(len),
+ &bytes_read, &err) == G_IO_STATUS_NORMAL) {
+ if (err != NULL) {
+ g_warning("g_io_channel_read_chars: %s", err->message);
+ g_error_free(err);
+ return FALSE;
+ }
if (bytes_read == sizeof(len) && len > 0) {
gchar *cur = NULL;
gint todo = len;
canonical_name = g_malloc0(len + 1);
cur = canonical_name;
while (todo > 0) {
- if (g_io_channel_read(source, cur, todo,
- &bytes_read) != G_IO_ERROR_NONE) {
- g_warning("canonical name not read\n");
- g_free(canonical_name);
- canonical_name = NULL;
- break;
+ if (g_io_channel_read_chars(source, cur, todo,
+ &bytes_read, &err) != G_IO_STATUS_NORMAL) {
+ if (err) {
+ g_warning("canonical name not read %s", err->message);
+ g_free(canonical_name);
+ canonical_name = NULL;
+ g_error_free(err);
+ err = NULL;
+ break;
+ }
} else {
cur += bytes_read;
todo -= bytes_read;
}
if (bytes_read == 0) {
- g_warning("canonical name not read\n");
+ g_warning("canonical name not read");
g_free(canonical_name);
canonical_name = NULL;
break;
}
}
for (;;) {
- 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 (g_io_channel_read_chars(source, (gchar *)ai_member,
+ sizeof(ai_member), &bytes_read, &err)
+ != G_IO_STATUS_NORMAL) {
+ if (err != NULL) {
+ g_warning("g_io_channel_read_chars: addr len %s", err->message);
+ g_error_free(err);
+ err = NULL;
+ break;
+ }
}
if (bytes_read == 0 || bytes_read != sizeof(ai_member))
break;
if (ai_member[0] == AF_UNSPEC) {
- g_warning("DNS lookup failed\n");
+ g_warning("DNS lookup failed");
+ log_error(LOG_PROTOCOL, _("%s:%d: unknown host.\n"),
+ lookup_data->hostname, lookup_data->port);
break;
}
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 (g_io_channel_read_chars(source, (gchar *)addr, ai_member[3],
+ &bytes_read, &err)
+ != G_IO_STATUS_NORMAL) {
+ if (err != NULL) {
+ g_warning("g_io_channel_read_chars: addr data read %s", err->message);
+ g_error_free(err);
+ err = NULL;
+ g_free(addr);
+ break;
+ }
}
if (bytes_read != ai_member[3]) {
g_warning("sock_get_address_info_async_cb: "
- "incomplete address data\n");
+ "incomplete address data");
g_free(addr);
break;
}
addr_list = g_list_append(addr_list, addr_data);
}
- g_io_channel_close(source);
+ g_io_channel_shutdown(source, TRUE, &err);
+ if (err)
+ g_error_free(err);
g_io_channel_unref(source);
#ifdef G_OS_WIN32
static void address_info_async_child(void *opaque)
{
SockLookupData *parm = opaque;
-#ifdef INET6
gint gai_err;
struct addrinfo hints, *res, *ai;
gchar port_str[6];
-#else /* !INET6 */
- struct hostent *hp;
- gchar **addr_list_p;
- struct sockaddr_in ad;
-#endif /* INET6 */
gint ai_member[4] = {AF_UNSPEC, 0, 0, 0};
#ifndef G_OS_WIN32
parm->pipe_fds[0] = -1;
#endif
-#ifdef INET6
memset(&hints, 0, sizeof(hints));
- hints.ai_flags = AI_CANONNAME;
+ hints.ai_flags = AI_CANONNAME | AI_ADDRCONFIG;
+#ifdef INET6
hints.ai_family = AF_UNSPEC;
+#else
+ hints.ai_family = AF_INET;
+#endif
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
gai_err = getaddrinfo(parm->hostname, port_str, &hints, &res);
if (gai_err != 0) {
gchar len = 0;
- g_warning("getaddrinfo for %s:%s failed: %s\n",
+ g_warning("getaddrinfo for %s:%s failed: %s",
parm->hostname, port_str, gai_strerror(gai_err));
+ log_error(LOG_PROTOCOL, _("%s:%s: host lookup failed (%s).\n"),
+ parm->hostname, port_str, gai_strerror(gai_err));
fd_write_all(parm->pipe_fds[1], &len,
sizeof(len));
fd_write_all(parm->pipe_fds[1], (gchar *)ai_member,
if (res != NULL)
freeaddrinfo(res);
-#else /* !INET6 */
- hp = my_gethostbyname(parm->hostname);
- if (hp == NULL || hp->h_addrtype != AF_INET) {
- gchar len = 0;
- fd_write_all(parm->pipe_fds[1], &len,
- sizeof(len));
- fd_write_all(parm->pipe_fds[1], (gchar *)ai_member,
- sizeof(ai_member));
- close(parm->pipe_fds[1]);
- parm->pipe_fds[1] = -1;
-#ifdef G_OS_WIN32
- _endthread();
-#else
- _exit(1);
-#endif
- }
-
- 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(parm->port);
-
- if (hp->h_name && strlen(hp->h_name) < 255) {
- gchar len = strlen(hp->h_name);
- fd_write_all(parm->pipe_fds[1], &len,
- sizeof(len));
- fd_write_all(parm->pipe_fds[1], hp->h_name,
- len);
- } else {
- gchar len = 0;
- fd_write_all(parm->pipe_fds[1], &len,
- sizeof(len));
- }
- for (addr_list_p = hp->h_addr_list; *addr_list_p != NULL;
- addr_list_p++) {
- memcpy(&ad.sin_addr, *addr_list_p, hp->h_length);
- fd_write_all(parm->pipe_fds[1], (gchar *)ai_member,
- sizeof(ai_member));
- fd_write_all(parm->pipe_fds[1], (gchar *)&ad, sizeof(ad));
- }
-#endif /* INET6 */
close(parm->pipe_fds[1]);
parm->pipe_fds[1] = -1;
lookup_data->pipe_fds[1] = -1;
#endif /*!G_OS_WIN32 */
+#ifndef G_OS_WIN32
lookup_data->channel = g_io_channel_unix_new(lookup_data->pipe_fds[0]);
+#else
+ lookup_data->channel = g_io_channel_win32_new_fd(lookup_data->pipe_fds[0]);
+#endif
lookup_data->io_tag = g_io_add_watch(lookup_data->channel, G_IO_IN,
sock_get_address_info_async_cb,
lookup_data);
if (lookup_data->io_tag > 0)
g_source_remove(lookup_data->io_tag);
if (lookup_data->channel) {
- g_io_channel_close(lookup_data->channel);
+ GError *err = NULL;
+ g_io_channel_shutdown(lookup_data->channel, TRUE, &err);
+ if (err)
+ g_error_free(err);
+
g_io_channel_unref(lookup_data->channel);
}
sockinfo = g_new0(SockInfo, 1);
sockinfo->sock = sock;
+#ifndef G_OS_WIN32
sockinfo->sock_ch = g_io_channel_unix_new(sock);
+#else
+ sockinfo->sock_ch = g_io_channel_win32_new_socket(sock);
+#endif
sockinfo->hostname = g_strdup(hostname);
sockinfo->port = port;
sockinfo->state = CONN_ESTABLISHED;
return read(fd, buf, len);
}
-#if USE_OPENSSL
-static gint ssl_read(SSL *ssl, gchar *buf, gint len)
+#if USE_GNUTLS
+static gint ssl_read(gnutls_session_t ssl, gchar *buf, gint len)
{
- gint err, ret;
+ gint r;
- if (SSL_pending(ssl) == 0) {
- if (fd_check_io(SSL_get_rfd(ssl), G_IO_IN) < 0)
+ if (gnutls_record_check_pending(ssl) == 0) {
+ if (fd_check_io(GPOINTER_TO_INT(gnutls_transport_get_ptr(ssl)), G_IO_IN) < 0)
return -1;
}
- ret = SSL_read(ssl, buf, len);
+ while (1) {
+ r = gnutls_record_recv(ssl, buf, len);
+ if (r > 0)
+ return r;
- switch ((err = 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;
- case SSL_ERROR_ZERO_RETURN:
- return 0;
- default:
- g_warning("SSL_read() returned error %d, ret = %d\n", err, ret);
- if (ret == 0)
- return 0;
- return -1;
+ switch (r) {
+ case 0: /* closed connection */
+ return -1;
+
+ case GNUTLS_E_REHANDSHAKE:
+ do {
+ r = gnutls_handshake(ssl);
+ } while (r == GNUTLS_E_AGAIN || r == GNUTLS_E_INTERRUPTED);
+ break; /* re-receive */
+ case GNUTLS_E_AGAIN:
+ case GNUTLS_E_INTERRUPTED:
+ errno = EAGAIN;
+ return -1;
+
+ default:
+ debug_print("Unexpected SSL/TLS read result %d\n", r);
+ errno = EIO;
+ return -1;
+ }
}
+
}
#endif
{
gint ret;
- g_return_val_if_fail(sock != NULL, -1);
+ cm_return_val_if_fail(sock != NULL, -1);
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
if (sock->ssl)
ret = ssl_read(sock->ssl, buf, len);
else
return write(fd, buf, len);
}
-#if USE_OPENSSL
-static gint ssl_write(SSL *ssl, const gchar *buf, gint len)
+#if USE_GNUTLS
+static gint ssl_write(gnutls_session_t ssl, const gchar *buf, gint len)
{
gint ret;
- ret = SSL_write(ssl, buf, len);
+ if (fd_check_io(GPOINTER_TO_INT(gnutls_transport_get_ptr(ssl)), G_IO_OUT) < 0)
+ return -1;
- switch (SSL_get_error(ssl, ret)) {
- case SSL_ERROR_NONE:
- return ret;
- case SSL_ERROR_WANT_READ:
- case SSL_ERROR_WANT_WRITE:
- errno = EAGAIN;
+ ret = gnutls_record_send(ssl, buf, len);
+
+ switch (ret) {
+ case 0:
return -1;
+ case GNUTLS_E_AGAIN:
+ case GNUTLS_E_INTERRUPTED:
+ return 0;
+
default:
- return -1;
+ return ret;
}
}
+
#endif
gint sock_write(SockInfo *sock, const gchar *buf, gint len)
{
gint ret;
- g_return_val_if_fail(sock != NULL, -1);
+ cm_return_val_if_fail(sock != NULL, -1);
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
if (sock->ssl)
ret = ssl_write(sock->ssl, buf, len);
else
n = write(fd, buf, len);
if (n <= 0) {
- log_error(LOG_PROTOCOL, _("write on fd%d: %s\n"), fd, strerror(errno));
+ log_error(LOG_PROTOCOL, _("write on fd%d: %s\n"), fd, g_strerror(errno));
return -1;
}
len -= n;
return wrlen;
}
-#if USE_OPENSSL
-static gint ssl_write_all(SSL *ssl, const gchar *buf, gint len)
+#ifdef USE_GNUTLS
+static gint ssl_write_all(gnutls_session_t ssl, const gchar *buf, gint len)
{
gint n, wrlen = 0;
{
gint ret;
- g_return_val_if_fail(sock != NULL, -1);
+ cm_return_val_if_fail(sock != NULL, -1);
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
if (sock->ssl)
ret = ssl_write_all(sock->ssl, buf, len);
else
gint fd_gets(gint fd, gchar *buf, gint len)
{
- gchar *newline, *bp = buf;
- gint n;
+ gchar *bp = buf;
if (--len < 1)
return -1;
#ifdef G_OS_WIN32
+ fd_check_io(fd, G_IO_IN);
do {
/*
XXX:tm try nonblock
len--;
} while (0 < len);
#else /*!G_OS_WIN32*/
+ gchar *newline;
+ gint n;
do {
if ((n = fd_recv(fd, bp, len, MSG_PEEK)) <= 0)
return -1;
return bp - buf;
}
-#if USE_OPENSSL
-static gint ssl_peek (SSL *ssl, gchar *buf, gint len);
-
-static gint ssl_gets(SSL *ssl, gchar *buf, gint len)
-{
- gchar *newline, *bp = buf;
- gint n;
-
- if (--len < 1)
- return -1;
- do {
- 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)
- return -1;
- bp += n;
- len -= n;
- } while (!newline && len);
-
- *bp = '\0';
- return bp - buf;
-}
-#endif
-
-gint sock_gets(SockInfo *sock, gchar *buf, gint len)
-{
- gint ret;
-
- g_return_val_if_fail(sock != NULL, -1);
-
-#if USE_OPENSSL
- if (sock->ssl)
- return ssl_gets(sock->ssl, buf, len);
- else
-#endif
- return fd_gets(sock->sock, buf, len);
-
- if (ret < 0)
- sock->state = CONN_DISCONNECTED;
- return ret;
-}
-
-/* peek at the socket data without actually reading it */
-#if USE_OPENSSL
-static gint ssl_peek(SSL *ssl, gchar *buf, gint len)
-{
- gint err, ret;
-
- if (SSL_pending(ssl) == 0) {
- if (fd_check_io(SSL_get_rfd(ssl), G_IO_IN) < 0)
- return -1;
- }
-
- ret = SSL_peek(ssl, buf, len);
-
- switch ((err = 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;
- case SSL_ERROR_ZERO_RETURN:
- return 0;
- case SSL_ERROR_SYSCALL:
- g_warning("SSL_peek() returned syscall error. errno=%d\n", errno);
- return -1;
- default:
- g_warning("SSL_peek() returned error %d, ret = %d\n", err, ret);
- if (ret == 0)
- return 0;
- return -1;
- }
-}
-#endif
-
gint sock_close(SockInfo *sock)
{
gint ret;
if (sock->sock_ch)
g_io_channel_unref(sock->sock_ch);
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
if (sock->ssl)
ssl_done_socket(sock);
- if (sock->g_source != 0)
+ if (sock->g_source != 0 && g_main_context_find_source_by_id(NULL, sock->g_source) != NULL)
g_source_remove(sock->g_source);
sock->g_source = 0;
#endif