Attempt merging from 6.3.24.

[~andy/fetchmail] / smtp.h

diff --git a/smtp.h b/smtp.h
index b65196a7e01e86d9846e1233063ae72646c38263..2f3f71faf99bb99c3b910b5692146fabed86b3f6 100644 (file)
--- a/smtp.h
+++ b/smtp.h
@@ -23,6 +23,16 @@
 #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);
@@ -33,7 +43,7 @@ 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 SMTP_ok(int socket, char smtp_mode, int mintimeout);
 
 extern char smtp_response[MSGBUFSIZE];