X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-sys%2Fmutt_socket.h;h=02494a4e8558b544a428582ccce49cdc0425ac65;hp=9369b2acd375e312d3aee14a40620287c55bb60e;hb=bb8c11821cc88fef9da474587cc42e0f7554cf28;hpb=ccf2b75a9ed50a79c4d8e5d6235c7313fcd3719a

diff --git a/lib-sys/mutt_socket.h b/lib-sys/mutt_socket.h
index 9369b2a..02494a4 100644
--- a/lib-sys/mutt_socket.h
+++ b/lib-sys/mutt_socket.h
@@ -11,8 +11,9 @@
 #ifndef _MUTT_SOCKET_H_
 #define _MUTT_SOCKET_H_ 1
 
+#include <lib-lua/lib-lua.h>
 #include "account.h"
-#include "lib.h"
+#include "mutt_ssl.li"
 
 /* logging levels */
 #define M_SOCK_LOG_CMD  2
@@ -34,23 +35,25 @@ typedef struct _connection {
   struct _connection *next;
 
   void *sockdata;
-  int (*conn_read) (struct _connection * conn, char *buf, size_t len);
+  int (*conn_read) (struct _connection * conn, char *buf, ssize_t len);
   int (*conn_write) (struct _connection * conn, const char *buf,
-                     size_t count);
+                     ssize_t count);
   int (*conn_open) (struct _connection * conn);
   int (*conn_close) (struct _connection * conn);
 } CONNECTION;
 
 int mutt_socket_open (CONNECTION * conn);
 int mutt_socket_close (CONNECTION * conn);
-int mutt_socket_read (CONNECTION * conn, char *buf, size_t len);
+int mutt_socket_read (CONNECTION * conn, char *buf, ssize_t len);
 int mutt_socket_readchar (CONNECTION * conn, char *c);
 
-#define mutt_socket_readln(A,B,C) mutt_socket_readln_d(A,B,C,M_SOCK_LOG_CMD)
-int mutt_socket_readln_d (char *buf, ssize_t buflen, CONNECTION * conn,
-                          int dbg);
-#define mutt_socket_write(A,B) mutt_socket_write_d(A,B,M_SOCK_LOG_CMD);
-int mutt_socket_write_d (CONNECTION * conn, const char *buf, int dbg);
+int mutt_socket_readln(char *buf, ssize_t buflen, CONNECTION * conn);
+int mutt_socket_write(CONNECTION * conn, const char *buf);
+
+int mutt_socket_readln2(buffer_t *buf, CONNECTION *conn);
+
+int mutt_ssl_starttls (CONNECTION * conn);
+int mutt_ssl_socket_setup (CONNECTION * conn);
 
 /* stupid hack for imap_logout_all */
 CONNECTION *mutt_socket_head (void);
@@ -58,8 +61,8 @@ void mutt_socket_free (CONNECTION * conn);
 CONNECTION *mutt_conn_find (const CONNECTION * start,
                             const ACCOUNT * account);
 
-int raw_socket_read (CONNECTION * conn, char *buf, size_t len);
-int raw_socket_write (CONNECTION * conn, const char *buf, size_t count);
+int raw_socket_read (CONNECTION * conn, char *buf, ssize_t len);
+int raw_socket_write (CONNECTION * conn, const char *buf, ssize_t count);
 int raw_socket_open (CONNECTION * conn);
 int raw_socket_close (CONNECTION * conn);