drop account-hooks for now.

[apps/madmutt.git] / lib-sys / mutt_socket.c

diff --git a/lib-sys/mutt_socket.c b/lib-sys/mutt_socket.c
index 78a609f..f71b789 100644 (file)
--- a/lib-sys/mutt_socket.c
+++ b/lib-sys/mutt_socket.c
@@ -9,23 +9,13 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <unistd.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <string.h>
-#include <errno.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "globals.h"
@@ -34,8 +24,10 @@
 #include "mutt_socket.h"
 #include "mutt_tunnel.h"
 #include "mutt_signal.h"
-#include "mutt_ssl.h"
 
+#ifdef HAVE_LIBIDN
+#include <idna.h>
+#endif
 #include "mutt_idna.h"
 
 /* support for multiple socket connections */
@@ -88,7 +80,7 @@ int mutt_socket_read (CONNECTION * conn, char *buf, ssize_t len)
   return rc;
 }
 
-int mutt_socket_write_d (CONNECTION * conn, const char *buf, int dbg)
+int mutt_socket_write(CONNECTION * conn, const char *buf)
 {
   int rc;
   int len;
@@ -132,8 +124,7 @@ int mutt_socket_readchar (CONNECTION * conn, char *c)
   return 1;
 }
 
-int mutt_socket_readln_d (char *buf, ssize_t buflen, CONNECTION * conn,
-                          int dbg)
+int mutt_socket_readln(char *buf, ssize_t buflen, CONNECTION * conn)
 {
   char ch;
   ssize_t i;
@@ -159,6 +150,23 @@ int mutt_socket_readln_d (char *buf, ssize_t buflen, CONNECTION * conn,
   return i + 1;
 }
 
+int mutt_socket_readln2(buffer_t *buf, CONNECTION *conn)
+{
+    char ch;
+
+    while (mutt_socket_readchar(conn, &ch) == 1) {
+        if (ch == '\n') {
+            if (buf->len && buf->data[buf->len - 1] == '\r') {
+                buf->data[--buf->len] = '\0';
+            }
+            return 0;
+        }
+        buffer_addch(buf, ch);
+    }
+
+    return -1;
+}
+
 CONNECTION *mutt_socket_head (void)
 {
   return Connections;
@@ -198,14 +206,6 @@ void mutt_socket_free (CONNECTION * conn)
 CONNECTION *mutt_conn_find (const CONNECTION * start, const ACCOUNT * account)
 {
   CONNECTION *conn;
-  ciss_url_t url;
-  char hook[LONG_STRING];
-
-  /* account isn't actually modified, since url isn't either */
-  mutt_account_tourl ((ACCOUNT *) account, &url);
-  url.path = NULL;
-  url_ciss_tostring (&url, hook, sizeof (hook), 0);
-  mutt_account_hook (hook);
 
   conn = start ? start->next : Connections;
   while (conn) {
@@ -222,22 +222,12 @@ CONNECTION *mutt_conn_find (const CONNECTION * start, const ACCOUNT * account)
 
   if (Tunnel && *Tunnel)
     mutt_tunnel_socket_setup (conn);
-  else if (account->flags & M_ACCT_SSL) {
-#if defined (USE_SSL) || defined (USE_GNUTLS)
+  else if (account->has_ssl) {
     if (mutt_ssl_socket_setup (conn) < 0) {
       mutt_socket_free (conn);
       return NULL;
     }
-#else
-    mutt_error _("SSL is unavailable.");
-
-    mutt_sleep (2);
-    mutt_socket_free (conn);
-
-    return NULL;
-#endif
-  }
-  else {
+  } else {
     conn->conn_read = raw_socket_read;
     conn->conn_write = raw_socket_write;
     conn->conn_open = raw_socket_open;
@@ -274,10 +264,8 @@ static int socket_connect (int fd, struct sockaddr *sa)
 
   if (sa->sa_family == AF_INET)
     sa_size = sizeof (struct sockaddr_in);
-#ifdef HAVE_GETADDRINFO
   else if (sa->sa_family == AF_INET6)
     sa_size = sizeof (struct sockaddr_in6);
-#endif
   else {
     return -1;
   }
@@ -350,9 +338,6 @@ int raw_socket_open (CONNECTION * conn)
 
   char *host_idna = NULL;
 
-#ifdef HAVE_GETADDRINFO
-/* --- IPv4/6 --- */
-
   /* "65536\0" */
   char port[6];
   struct addrinfo hints;
@@ -382,7 +367,6 @@ int raw_socket_open (CONNECTION * conn)
 
   mutt_message (_("Looking up %s..."), conn->account.host);
 
-
   rc = getaddrinfo (host_idna, port, &hints, &res);
 
 # ifdef HAVE_LIBIDN
@@ -413,60 +397,6 @@ int raw_socket_open (CONNECTION * conn)
 
   freeaddrinfo (res);
 
-#else
-  /* --- IPv4 only --- */
-
-  struct sockaddr_in sin;
-  struct hostent *he;
-  int i;
-
-  p_clear(&sin, 1);
-  sin.sin_port = htons (conn->account.port);
-  sin.sin_family = AF_INET;
-
-# ifdef HAVE_LIBIDN
-  if (idna_to_ascii_lz (conn->account.host, &host_idna, 1) != IDNA_SUCCESS) {
-    mutt_error (_("Bad IDN \"%s\"."), conn->account.host);
-    return -1;
-  }
-# else
-  host_idna = conn->account.host;
-# endif
-
-  mutt_message (_("Looking up %s..."), conn->account.host);
-
-  if ((he = gethostbyname (host_idna)) == NULL) {
-# ifdef HAVE_LIBIDN
-    p_delete(&host_idna);
-# endif
-    mutt_error (_("Could not find the host \"%s\""), conn->account.host);
-
-    return -1;
-  }
-
-# ifdef HAVE_LIBIDN
-  p_delete(&host_idna);
-# endif
-
-  mutt_message (_("Connecting to %s..."), conn->account.host);
-
-  rc = -1;
-  for (i = 0; he->h_addr_list[i] != NULL; i++) {
-    memcpy (&sin.sin_addr, he->h_addr_list[i], he->h_length);
-    fd = socket (PF_INET, SOCK_STREAM, IPPROTO_IP);
-
-    if (fd >= 0) {
-      if ((rc = socket_connect (fd, (struct sockaddr *) &sin)) == 0) {
-        fcntl (fd, F_SETFD, FD_CLOEXEC);
-        conn->fd = fd;
-        break;
-      }
-      else
-        close (fd);
-    }
-  }
-
-#endif
   if (rc) {
     mutt_error (_("Could not connect to %s (%s)."), conn->account.host,
                 (rc > 0) ? strerror (rc) : _("unknown error"));