X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=smtp.h;h=2f3f71faf99bb99c3b910b5692146fabed86b3f6;hb=98cfcef26048bba06975e68a1aad05a8bac0d65d;hp=53b5c5c0c7a69f0bcf47e8155d3ed1646c8b0b50;hpb=267d78cd2d5eedbe4fc5ef40931d73c8927e6d8b;p=~andy%2Ffetchmail

diff --git a/smtp.h b/smtp.h
index 53b5c5c0..2f3f71fa 100644
--- a/smtp.h
+++ b/smtp.h
@@ -7,6 +7,8 @@
 #ifndef _POPSMTP_
 #define _POPSMTP_
 
+#include "config.h"
+
 #define         SMTPBUFSIZE     256
 
 /* SMTP error values */
@@ -17,16 +19,31 @@
 /* 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(FILE *sockfp,char *host);
-int SMTP_ehlo(FILE *sockfp,char *host,int *opt);
-int SMTP_from(FILE *sockfp,char *from,char *opts);
-int SMTP_rcpt(FILE *sockfp,char *to);
-int SMTP_data(FILE *sockfp);
-int SMTP_eom(FILE *sockfp);
-int SMTP_rset(FILE *sockfp);
-int SMTP_quit(FILE *sockfp);
-int SMTP_ok(FILE *sockfp);
+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];