#include "socket.h"
#include "utils.h"
#include "log.h"
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
# include "ssl.h"
#endif
condition |= G_IO_IN;
}
}
+#elif USE_GNUTLS
+/* ?? */
#endif
FD_ZERO(&fds);
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,
}
#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)
{
#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;
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);
}
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\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(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\n", err->message);
+ g_free(canonical_name);
+ canonical_name = NULL;
+ g_error_free(err);
+ err = NULL;
+ break;
+ }
} else {
cur += bytes_read;
todo -= bytes_read;
}
}
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
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 -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
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
return wrlen;
}
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
#if USE_OPENSSL
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 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
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
if (sock->ssl)
ssl_done_socket(sock);
if (sock->g_source != 0)