Merge branch 'legacy_63'

[~andy/fetchmail] / socket.h

diff --git a/socket.h b/socket.h
index 4473f0c08ccca99891110f1e685b9b0039b0fec9..9d9406d958c4eae21dfe3d901807dce816bcf4bf 100644 (file)
--- a/socket.h
+++ b/socket.h
@@ -1,7 +1,5 @@
-/*
- * socket.h -- declarations for socket library functions
- *
- * Design and implementation by Carl Harris <ceharris@mal.com>
+/**
+ * \file socket.h -- declarations for socket library functions
  *
  * For license terms, see the file COPYING in this directory.
  */
@@ -9,63 +7,61 @@
 #ifndef SOCKET__
 #define SOCKET__
 
-#ifndef  INADDR_NONE
-#ifdef   INADDR_BROADCAST
-#define  INADDR_NONE   INADDR_BROADCAST
-#else
-#define         INADDR_NONE    -1
-#endif
-#endif
+struct addrinfo;
 
-#if defined(HAVE_PROTOTYPES)
-/*
-Create a new client socket 
-returns < 0 on error 
-*/
-int Socket(char *host, int clientPort);
+#include <config.h>
+#include <sys/socket.h>
+#include <netdb.h>
 
-/* 
-Get a string terminated by an '\n', delete any '\r' and the '\n'.
+/** Create a new client socket; returns -1 on error */
+int SockOpen(const char *host, const char *service, const char *plugin, struct addrinfo **);
+
+/** 
+Get a string terminated by an '\n' (matches interface of fgets).
 Pass it a valid socket, a buffer for the string, and
 the length of the buffer (including the trailing \0)
-returns 0 for success. 
-*/
-int SockGets(int socket, char *buf, int len);
-
-/*
-Send a nul terminated string to the socket, followed by 
-a CR-LF.  Returns 0 for success.
+returns length of buffer on success, -1 on failure. 
 */
-int SockPuts(int socket, char *buf);
+int SockRead(int sock, char *buf, int len);
 
-/*
-Write a chunk of bytes to the socket.
-Returns 0 for success.
-*/
-int SockWrite(int socket, char *buf, int len);
+/**
+ * Peek at the next socket character without actually reading it.
+ */
+int SockPeek(int sock);
 
-/*
-Read a chunk of bytes from the socket.
-Returns 0 for success.
+/**
+Write a chunk of bytes to the socket (matches interface of fwrite).
+Returns number of bytes successfully written.
 */
-int SockRead(int socket, char *buf, int len);
+int SockWrite(int sock, const char *buf, int size);
 
-/* 
-Send formatted output to the socket, followed
-by a CR-LF.
-Returns 0 for success.
-*/
-#if defined(HAVE_STDARG_H)
-int SockPrintf(int socket, char *format, ...) ;
-#else
-int SockPrintf();
+/* from /usr/include/sys/cdefs.h */
+#if !defined __GNUC__
+# define __attribute__(xyz)    /* Ignore. */
 #endif
-/*
-Check socket for readability.  return 0 for not readable,
->0 for readable.
+
+/**
+Send formatted output to the socket (matches interface of fprintf).
+Returns number of bytes successfully written.
 */
-int SockStatus(int socket, int seconds);
+int SockPrintf(int sock, const char *format, ...)
+    __attribute__ ((format (printf, 2, 3)))
+    ;
  
-#endif /* defined(HAVE_PROTOTYPES) */
+/**
+Close a socket previously opened by SockOpen.  This allows for some
+additional clean-up if necessary.
+*/
+int SockClose(int sock);
+
+/**
+ \todo document this
+*/
+int UnixOpen(const char *path);
+
+#ifdef SSL_ENABLE
+int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck, char *cacertfile, char *cacertpath,
+    char *fingerprint, char *servercname, char *label, char **remotename);
+#endif /* SSL_ENABLE */
 
 #endif /* SOCKET__ */