X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fsmtp_clienthandlers.h;h=dedab4ba49b5c8af79e9ed30bdf40b7e21f8e664;hb=32529f8b8c0e1d3044d28f6694a99e30a214db5d;hp=46532c03286a698c14b1239438e4a4a4f9234b19;hpb=1f492ac650c71a515d36571d5c0a5effd05779dd;p=citadel.git

diff --git a/citadel/modules/smtp/smtp_clienthandlers.h b/citadel/modules/smtp/smtp_clienthandlers.h
index 46532c032..dedab4ba4 100644
--- a/citadel/modules/smtp/smtp_clienthandlers.h
+++ b/citadel/modules/smtp/smtp_clienthandlers.h
@@ -22,6 +22,8 @@ typedef enum _eSMTP_C_States {
 	eEHLO,
 	eHELO,
 	eSMTPAuth,
+	eSMTPAuthPlain1,
+	eSMTPAuthPlain2,
 	eFROM,
 	eRCPT,
 	eDATA,
@@ -66,7 +68,7 @@ typedef struct _stmp_out_msg {
 	char node[1024];
 	char name[1024];
 	char mailfrom[1024];
-
+	long SendLogin;
 	long Flags;
 } SmtpOutMsg;
 
@@ -97,18 +99,46 @@ int smtp_resolve_recipients(SmtpOutMsg *SendMsg);
 
 #define EVS_syslog(LEVEL, FORMAT, ...) \
 	DBGLOG(LEVEL) syslog(LEVEL,		  \
-	       "IO[%ld]CC[%d]S[%ld][%ld]" FORMAT, \
+	       "SMTPC:IO[%ld]CC[%d]S[%ld][%ld] " FORMAT, \
 	       IO->ID, CCID, QID, N, __VA_ARGS__)
 
 #define EVSM_syslog(LEVEL, FORMAT) \
 	DBGLOG(LEVEL) syslog(LEVEL, \
-	       "IO[%ld]CC[%d]S[%ld][%ld]" FORMAT, \
+	       "SMTPC:IO[%ld]CC[%d]S[%ld][%ld] " FORMAT, \
 	       IO->ID, CCID, QID, N)
 
 #define EVNCS_syslog(LEVEL, FORMAT, ...) \
-	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, \
+	DBGLOG(LEVEL) syslog(LEVEL, "SMTPC:IO[%ld]S[%ld][%ld] " FORMAT, \
 	       IO->ID, QID, N, __VA_ARGS__)
 
 #define EVNCSM_syslog(LEVEL, FORMAT) \
-	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, \
+	DBGLOG(LEVEL) syslog(LEVEL, "SMTPC:IO[%ld]S[%ld][%ld] " FORMAT, \
 	       IO->ID, QID, N)
+
+#define SMTPC_syslog(LEVEL, FORMAT, ...)	  \
+	DBGLOG(LEVEL) syslog(LEVEL,		  \
+			     "SMTPCQ: " FORMAT,	  \
+			     __VA_ARGS__)
+
+#define SMTPCM_syslog(LEVEL, FORMAT)		\
+	DBGLOG(LEVEL) syslog(LEVEL,		\
+			     "SMTPCQ: " FORMAT)
+
+
+
+typedef enum __smtpstate {
+	eSTMPmxlookup,
+	eSTMPevaluatenext,
+	eSTMPalookup,
+	eSTMPaaaalookup,
+	eSTMPconnecting,
+	eSTMPsmtp,
+	eSTMPsmtpdata,
+	eSTMPsmtpdone,
+	eSTMPfinished,
+	eSTMPfailOne,
+	eSMTPFailTemporary,
+	eSMTPFailTotal
+} smtpstate;
+
+void SetSMTPState(AsyncIO *IO, smtpstate State);