/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#if (defined (_XOPEN_SOURCE) && !defined (_BSD_SOURCE))
+#define _BSD_SOURCE
+#endif
+
#include <glib.h>
+#include <glib/gi18n.h>
+
#include <sys/time.h>
#include <sys/types.h>
#ifdef G_OS_WIN32
#include "socket.h"
#include "utils.h"
#include "log.h"
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
# include "ssl.h"
#endif
guint io_tag;
SockConnectFunc func;
gpointer data;
+ gchar *canonical_name;
};
struct _SockLookupData {
gpointer data;
gushort port;
gint pipe_fds[2];
+ gchar *canonical_name;
};
struct _SockAddrData {
strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);
if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- perror("bind");
+ gchar *buf = g_strdup_printf("can't bind to %s", path);
+ perror(buf);
+ g_free(buf);
close(sock);
return -1;
}
if (listen(sock, 1) < 0) {
- perror("listen");
+ gchar *buf = g_strdup_printf("can't listen on %s", path);
+ perror(buf);
+ g_free(buf);
close(sock);
return -1;
}
condition |= G_IO_IN;
}
}
+#elif USE_GNUTLS
+/* ?? */
#endif
FD_ZERO(&fds);
guint sock_add_watch(SockInfo *sock, GIOCondition condition, SockFunc func,
gpointer data)
{
+ if (!sock)
+ return FALSE;
+
sock->callback = func;
sock->condition = condition;
sock->data = data;
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
if (sock->ssl)
{
GSource *source = g_source_new(&sock_watch_funcs,
if (sigsetjmp(jmpenv, 1)) {
alarm(0);
signal(SIGALRM, prev_handler);
- fprintf(stderr, "%s: host lookup timed out.\n", hostname);
+ g_printerr("%s: host lookup timed out.\n", hostname);
errno = 0;
return NULL;
}
alarm(0);
signal(SIGALRM, prev_handler);
#endif
- fprintf(stderr, "%s: unknown host.\n", hostname);
+ g_printerr("%s: unknown host.\n", hostname);
errno = 0;
return NULL;
}
if (!my_inet_aton(hostname, &ad.sin_addr)) {
if ((hp = my_gethostbyname(hostname)) == NULL) {
- fprintf(stderr, "%s: unknown host.\n", hostname);
+ g_printerr("%s: unknown host.\n", hostname);
errno = 0;
return -1;
}
if (hp->h_length != 4 && hp->h_length != 8) {
- fprintf(stderr, "illegal address length received for host %s\n", hostname);
+ g_printerr("illegal address length received for host %s\n", hostname);
errno = 0;
return -1;
}
g_snprintf(port_str, sizeof(port_str), "%d", port);
if ((gai_error = getaddrinfo(hostname, port_str, &hints, &res)) != 0) {
- fprintf(stderr, "getaddrinfo for %s:%s failed: %s\n",
+ g_printerr("getaddrinfo for %s:%s failed: %s\n",
hostname, port_str, gai_strerror(gai_error));
return -1;
}
}
#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("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)
{
#ifdef G_OS_WIN32
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;
+ sockinfo->canonical_name = g_strdup(conn_data->canonical_name);
conn_data->func(sockinfo, conn_data->data);
conn_data->addr_list = addr_list;
conn_data->cur_addr = addr_list;
- conn_data->lookup_data = NULL;
-
+ if (conn_data->lookup_data) {
+ conn_data->canonical_name = conn_data->lookup_data->canonical_name;
+ conn_data->lookup_data->canonical_name = NULL;
+ conn_data->lookup_data = NULL;
+ }
return sock_connect_address_list_async(conn_data);
}
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);
}
sock_address_list_free(conn_data->addr_list);
+ g_free(conn_data->canonical_name);
g_free(conn_data->hostname);
g_free(conn_data);
} else {
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);
gsize bytes_read;
gint ai_member[4];
struct sockaddr *addr;
-
+ gchar *canonical_name = NULL;
+ gchar len = 0;
+ GError *err = NULL;
+
+ g_io_channel_set_encoding(source, NULL, &err);
+ if (err) {
+ g_warning("can unset encoding: %s\n", 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\n", 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_chars(source, cur, todo,
+ &bytes_read, &err) != G_IO_STATUS_NORMAL) {
+ if (err) {
+ g_warning("canonical name not read %s\n", 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_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\n", err->message);
+ g_error_free(err);
+ err = NULL;
+ break;
+ }
}
if (bytes_read == 0 || bytes_read != sizeof(ai_member))
}
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\n", err->message);
+ g_error_free(err);
+ err = NULL;
+ g_free(addr);
+ break;
+ }
}
if (bytes_read != ai_member[3]) {
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
kill(lookup_data->child_pid, SIGKILL);
waitpid(lookup_data->child_pid, NULL, 0);
#endif
+ lookup_data->canonical_name = canonical_name;
lookup_data->func(addr_list, lookup_data->data);
+ g_free(lookup_data->canonical_name);
g_free(lookup_data->hostname);
g_free(lookup_data);
#ifdef INET6
memset(&hints, 0, sizeof(hints));
- /* hints.ai_flags = AI_CANONNAME; */
+ hints.ai_flags = AI_CANONNAME;
hints.ai_family = AF_UNSPEC;
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",
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,
sizeof(ai_member));
close(parm->pipe_fds[1]);
#endif
}
+ if (res != NULL) {
+ if (res->ai_canonname && strlen(res->ai_canonname) < 255) {
+ gchar len = strlen(res->ai_canonname);
+ fd_write_all(parm->pipe_fds[1], &len,
+ sizeof(len));
+ fd_write_all(parm->pipe_fds[1], res->ai_canonname,
+ len);
+ } else {
+ gchar len = 0;
+ fd_write_all(parm->pipe_fds[1], &len,
+ sizeof(len));
+ }
+ } else {
+ gchar len = 0;
+ fd_write_all(parm->pipe_fds[1], &len,
+ sizeof(len));
+ }
+
for (ai = res; ai != NULL; ai = ai->ai_next) {
ai_member[0] = ai->ai_family;
ai_member[1] = ai->ai_socktype;
#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]);
+ close(parm->pipe_fds[1]);
parm->pipe_fds[1] = -1;
#ifdef G_OS_WIN32
_endthread();
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);
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);
}
#endif
}
+ g_free(lookup_data->canonical_name);
g_free(lookup_data->hostname);
g_free(lookup_data);
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 sockinfo;
}
-gint sock_printf(SockInfo *sock, const gchar *format, ...)
-{
- va_list args;
- gchar buf[BUFFSIZE];
-
- va_start(args, format);
- g_vsnprintf(buf, sizeof(buf), format, args);
- va_end(args);
-
- return sock_write_all(sock, buf, strlen(buf));
-}
-
-gint fd_read(gint fd, gchar *buf, gint len)
+static gint fd_read(gint fd, gchar *buf, gint len)
{
if (fd_check_io(fd, G_IO_IN) < 0)
return -1;
}
#if USE_OPENSSL
-gint ssl_read(SSL *ssl, gchar *buf, gint len)
+static gint ssl_read(SSL *ssl, gchar *buf, gint len)
{
gint err, ret;
return -1;
}
}
+#elif USE_GNUTLS
+static gint ssl_read(gnutls_session ssl, gchar *buf, gint len)
+{
+ gint r;
+
+ 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;
+ }
+
+ while (1) {
+ r = gnutls_record_recv(ssl, buf, len);
+ if (r > 0)
+ return r;
+
+ switch (r) {
+ case 0: /* closed connection */
+ return -1;
+
+ case GNUTLS_E_AGAIN:
+ case GNUTLS_E_INTERRUPTED:
+ errno = EAGAIN;
+ return -1;
+ break;
+
+ default:
+ return -1;
+ }
+ }
+
+}
#endif
gint sock_read(SockInfo *sock, gchar *buf, gint len)
g_return_val_if_fail(sock != NULL, -1);
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
if (sock->ssl)
ret = ssl_read(sock->ssl, buf, len);
else
}
#if USE_OPENSSL
-gint ssl_write(SSL *ssl, const gchar *buf, gint len)
+static gint ssl_write(SSL *ssl, const gchar *buf, gint len)
{
gint ret;
return -1;
}
}
+#elif USE_GNUTLS
+static gint ssl_write(gnutls_session ssl, const gchar *buf, gint len)
+{
+ gint ret;
+
+ if (fd_check_io(GPOINTER_TO_INT(gnutls_transport_get_ptr(ssl)), G_IO_OUT) < 0)
+ return -1;
+
+ 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 ret;
+ }
+}
+
#endif
gint sock_write(SockInfo *sock, const gchar *buf, gint len)
g_return_val_if_fail(sock != NULL, -1);
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
if (sock->ssl)
ret = ssl_write(sock->ssl, buf, len);
else
n = write(fd, buf, len);
if (n <= 0) {
- log_error("write on fd%d: %s\n", fd, strerror(errno));
+ log_error(LOG_PROTOCOL, _("write on fd%d: %s\n"), fd, strerror(errno));
return -1;
}
len -= n;
return wrlen;
}
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
#if USE_OPENSSL
-gint ssl_write_all(SSL *ssl, const gchar *buf, gint len)
+static gint ssl_write_all(SSL *ssl, const gchar *buf, gint len)
+#else
+static gint ssl_write_all(gnutls_session ssl, const gchar *buf, gint len)
+#endif
{
gint n, wrlen = 0;
g_return_val_if_fail(sock != NULL, -1);
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
if (sock->ssl)
ret = ssl_write_all(sock->ssl, buf, len);
else
return ret;
}
-gint fd_recv(gint fd, gchar *buf, gint len, gint flags)
+static gint fd_recv(gint fd, gchar *buf, gint len, gint flags)
{
if (fd_check_io(fd, G_IO_IN) < 0)
return -1;
return bp - buf;
}
-#if USE_OPENSSL
-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;
-}
-
-gint fd_getline(gint fd, gchar **str)
-{
- gchar buf[BUFFSIZE];
- gint len;
- gulong size = 1;
-
- while ((len = fd_gets(fd, buf, sizeof(buf))) > 0) {
- size += len;
- if (!*str)
- *str = g_strdup(buf);
- else {
- *str = g_realloc(*str, size);
- strcat(*str, buf);
- }
- if (buf[len - 1] == '\n'
-#ifdef G_OS_WIN32 /* FIXME This does not seem to be correct. */
- || buf[len - 1] == '\r'
-#endif
- )
- break;
- }
- if (len == -1 && *str)
- g_free(*str);
-
- return len;
-}
-
-#if USE_OPENSSL
-gint ssl_getline(SSL *ssl, gchar **str)
-{
- gchar buf[BUFFSIZE];
- gint len;
- gulong size = 1;
-
- while ((len = ssl_gets(ssl, buf, sizeof(buf))) > 0) {
- size += len;
- if (!*str)
- *str = g_strdup(buf);
- else {
- *str = g_realloc(*str, size);
- strcat(*str, buf);
- }
- if (buf[len - 1] == '\n')
- break;
- }
- if (len == -1 && *str)
- g_free(*str);
-
- return len;
-}
-#endif
-
-gchar *sock_getline(SockInfo *sock)
-{
- gint ret;
- gchar *str = NULL;
-
- g_return_val_if_fail(sock != NULL, NULL);
-
-#if USE_OPENSSL
- if (sock->ssl)
- ret = ssl_getline(sock->ssl, &str);
- else
-#endif
- ret = fd_getline(sock->sock, &str);
-
- if (ret < 0)
- sock->state = CONN_DISCONNECTED;
- return str;
-}
-
-gint sock_puts(SockInfo *sock, const gchar *buf)
-{
- gint ret;
-
- if ((ret = sock_write_all(sock, buf, strlen(buf))) < 0)
- return ret;
- return sock_write_all(sock, "\r\n", 2);
-}
-
-/* peek at the socket data without actually reading it */
-#if USE_OPENSSL
-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_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);
-#endif
- return fd_recv(sock->sock, buf, len, MSG_PEEK);
-}
-
gint sock_close(SockInfo *sock)
{
gint ret;
if (sock->sock_ch)
g_io_channel_unref(sock->sock_ch);
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
if (sock->ssl)
ssl_done_socket(sock);
if (sock->g_source != 0)
ret = fd_close(sock->sock);
#endif
+ g_free(sock->canonical_name);
g_free(sock->hostname);
g_free(sock);
projects / claws.git / blobdiff