Merge branch 'legacy_63'

[~andy/fetchmail] / smtp.h

diff --git a/smtp.h b/smtp.h
index dfc96c66f6bbaa88b4add5d483bf6912cae15ef6..2f3f71faf99bb99c3b910b5692146fabed86b3f6 100644 (file)
--- a/smtp.h
+++ b/smtp.h
@@ -7,6 +7,8 @@
 #ifndef _POPSMTP_
 #define _POPSMTP_
 
+#include "config.h"
+
 #define         SMTPBUFSIZE     256
 
 /* SMTP error values */
@@ -14,15 +16,35 @@
 #define         SM_ERROR           128
 #define         SM_UNRECOVERABLE   129
 
-#ifdef HAVE_PROTOTYPES
-int SMTP_helo(FILE *sockfp,char *host);
-int SMTP_from(FILE *sockfp,char *from);
-int SMTP_rcpt(FILE *sockfp,char *to);
-int SMTP_data(FILE *sockfp);
-int SMTP_eom(FILE *sockfp);
-int SMTP_quit(FILE *sockfp);
-int SMTP_ok(FILE *sockfp,char *argbuf);
-void SMTP_rset(FILE *sockfp);
-#endif /* HAVE_PROTOTYPES */
+/* ESMTP extension option masks (not all options are listed here) */
+#define ESMTP_8BITMIME 0x01
+#define ESMTP_SIZE     0x02
+#define ESMTP_ETRN     0x04
+#define ESMTP_ATRN     0x08            /* used with ODMR, RFC 2645 */
+#define ESMTP_AUTH     0x10
+
+/* SMTP timeouts (seconds) - SHOULD clauses from RFC-5321 sec. 4.5.3.2. */
+#define TIMEOUT_STARTSMTP      300
+#define TIMEOUT_HELO           300 /* not in RFC-5321, also for EHLO/LHLO */
+#define TIMEOUT_MAIL           300
+#define TIMEOUT_RCPT           300
+#define TIMEOUT_DATA           120
+#define TIMEOUT_DATALINE       180
+#define TIMEOUT_EOM            600
+#define TIMEOUT_DEFAULT                300 /* not in RFC-5321, all other client timeouts */
+
+extern time_t last_smtp_ok;
+
+int SMTP_helo(int socket, char smtp_mode, const char *host);
+int SMTP_ehlo(int socket, char smtp_mode, const char *host, char *name, char *passwd, int *opt);
+int SMTP_from(int socket, char smtp_mode, const char *from,const char *opts);
+int SMTP_rcpt(int socket, char smtp_mode, const char *to);
+int SMTP_data(int socket, char smtp_mode);
+int SMTP_eom(int socket, char smtp_mode);
+int SMTP_rset(int socket, char smtp_mode);
+int SMTP_quit(int socket, char smtp_mode);
+int SMTP_ok(int socket, char smtp_mode, int mintimeout);
+
+extern char smtp_response[MSGBUFSIZE];
 
 #endif