Remove useless cruft from OpenSSL days

[claws.git] / src / common / socket.h

diff --git a/src/common/socket.h b/src/common/socket.h
index 1ad1608be45555cf5d12f0007b929b8df3ae18cf..cee9d138963eb9531a65ad3b9891a9674b0c178b 100644 (file)
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2012 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,
@@ -13,23 +13,29 @@
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifndef __SOCKET_H__
 #define __SOCKET_H__
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#include "claws-features.h"
+#endif
+
+#if (defined (_XOPEN_SOURCE) && !defined (_BSD_SOURCE))
+#define _BSD_SOURCE
 #endif
 
 #include <glib.h>
-#include <netdb.h>
+#if HAVE_NETDB_H
+#  include <netdb.h>
+#endif
 
 typedef struct _SockInfo       SockInfo;
 
-#if USE_OPENSSL
+#ifdef USE_GNUTLS
 #  include "ssl.h"
 #endif
 
@@ -40,70 +46,76 @@ typedef enum
        CONN_ESTABLISHED,
        CONN_LOOKUPFAILED,
        CONN_FAILED,
-       CONN_DISCONNECTED,
+       CONN_DISCONNECTED
 } ConnectionState;
 
+typedef gint (*SockConnectFunc)                (SockInfo       *sock,
+                                        gpointer        data);
+typedef gboolean (*SockFunc)           (SockInfo       *sock,
+                                        GIOCondition    condition,
+                                        gpointer        data);
+
 struct _SockInfo
 {
-#if USE_GIO
-       GIOChannel *channel;
-       gchar *buf;
-       gint buflen;
-#else
        gint sock;
+#if USE_GNUTLS
+       gnutls_session_t ssl;
+       gnutls_certificate_credentials_t xcred;
+       gnutls_x509_crt_t client_crt;
+       gnutls_x509_privkey_t client_key;
+       gchar *gnutls_priority;
 #endif
+       GIOChannel *sock_ch;
+
        gchar *hostname;
        gushort port;
        ConnectionState state;
        gpointer data;
-#if USE_OPENSSL
-       SSL *ssl;
-#endif
+
+       SockFunc callback;
+       GIOCondition condition;
+       gchar *canonical_name;
+       
+       const void *account;
+       gboolean is_smtp;
 };
 
+void refresh_resolvers                 (void);
+gint sock_init                         (void);
+gint sock_cleanup                      (void);
+
+gint sock_set_io_timeout               (guint sec);
+
 gint sock_set_nonblocking_mode         (SockInfo *sock, gboolean nonblock);
 gboolean sock_is_nonblocking_mode      (SockInfo *sock);
 
+guint sock_add_watch                   (SockInfo *sock, GIOCondition condition,
+                                        SockFunc func, gpointer data);
+
 struct hostent *my_gethostbyname       (const gchar *hostname);
 
 SockInfo *sock_connect                 (const gchar *hostname, gushort port);
-SockInfo *sock_connect_cmd             (const gchar *hostname, const gchar *tunnelcmd);
+gint sock_connect_async                        (const gchar *hostname, gushort port,
+                                        SockConnectFunc func, gpointer data);
+gint sock_connect_async_cancel         (gint id);
 
-gint sock_printf       (SockInfo *sock, const gchar *format, ...)
-                        G_GNUC_PRINTF(2, 3);
+/* Basic I/O functions */
 gint sock_read         (SockInfo *sock, gchar *buf, gint len);
 gint sock_write                (SockInfo *sock, const gchar *buf, gint len);
 gint sock_write_all    (SockInfo *sock, const gchar *buf, gint len);
-gint sock_gets         (SockInfo *sock, gchar *buf, gint len);
-gchar *sock_getline    (SockInfo *sock);
-gint sock_puts         (SockInfo *sock, const gchar *buf);
 gint sock_close                (SockInfo *sock);
 
-/* wrapper functions */
-gint sock_input_add      (SockInfo             *sock,
-                          GIOCondition          condition,
-                          GIOFunc               function,
-                          gpointer              data);
-
 /* Functions to directly work on FD.  They are needed for pipes */
 gint fd_connect_unix   (const gchar *path);
 gint fd_open_unix      (const gchar *path);
 gint fd_accept         (gint sock);
 
-gint fd_read           (gint sock, gchar *buf, gint len);
+gint fd_connect_inet(gushort port);
+gint fd_open_inet(gushort port);
+
 gint fd_write          (gint sock, const gchar *buf, gint len);
 gint fd_write_all      (gint sock, const gchar *buf, gint len);
 gint fd_gets           (gint sock, gchar *buf, gint len);
-gint fd_getline                (gint sock, gchar **str);
 gint fd_close          (gint sock);
 
-/* Functions for SSL */
-#if USE_OPENSSL
-gint ssl_read          (SSL *ssl, gchar *buf, gint len);
-gint ssl_write         (SSL *ssl, const gchar *buf, gint len);
-gint ssl_write_all     (SSL *ssl, const gchar *buf, gint len);
-gint ssl_gets          (SSL *ssl, gchar *buf, gint len);
-gchar *ssl_getline     (SSL *ssl);
-#endif
-
 #endif /* __SOCKET_H__ */