add whether we're in which eventloop / a worker thread to the log output.

[citadel.git] / citadel / modules / smtp / smtp_clienthandlers.h

diff --git a/citadel/modules/smtp/smtp_clienthandlers.h b/citadel/modules/smtp/smtp_clienthandlers.h
index 02b84e75fb213fa8e864885c2f457205e2f39fc8..aa8db2834985b014ffa349c5a4a182947607af0d 100644 (file)
--- 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,
@@ -38,6 +40,8 @@ typedef struct _stmp_out_msg {
        long n;
        AsyncIO IO;
        long CXFlags;
+       int IDestructQueItem;
+       int nRemain;
 
        eSMTP_C_States State;
 
@@ -57,12 +61,17 @@ typedef struct _stmp_out_msg {
        ParsedURL *Relay;
        ParsedURL *pCurrRelay;
        StrBuf *msgtext;
+       StrBuf *QMsgData;
+       StrBuf *MultiLineBuf;
        const char *envelope_from;
+
        char user[1024];
        char node[1024];
        char name[1024];
        char mailfrom[1024];
+       long SendLogin;
        long Flags;
+       long IsRelay;
 } SmtpOutMsg;
 
 
@@ -82,26 +91,56 @@ const double SMTP_C_ConnTimeout;
 #define F_HAVE_MX        (1<<3) /* we have a list of mx records to go through.*/
 #define F_DIRECT         (1<<4) /* no mx record found, trying direct connect. */
 
+extern int SMTPClientDebugEnabled;
 
 int smtp_resolve_recipients(SmtpOutMsg *SendMsg);
 
 #define QID ((SmtpOutMsg*)IO->Data)->MyQItem->MessageID
 #define N ((SmtpOutMsg*)IO->Data)->n
+#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (SMTPClientDebugEnabled != 0))
 
 #define EVS_syslog(LEVEL, FORMAT, ...) \
-       syslog(LEVEL, \
-              "IO[%ld]CC[%d]S[%ld][%ld]" FORMAT, \
-              IO->ID, CCID, QID, N, __VA_ARGS__)
+       DBGLOG(LEVEL) syslog(LEVEL,               \
+              "SMTPC:%s[%ld]CC[%d]S[%ld][%ld] " FORMAT, \
+              IOSTR, IO->ID, CCID, QID, N, __VA_ARGS__)
 
 #define EVSM_syslog(LEVEL, FORMAT) \
-       syslog(LEVEL, \
-              "IO[%ld]CC[%d]S[%ld][%ld]" FORMAT, \
-              IO->ID, CCID, QID, N)
+       DBGLOG(LEVEL) syslog(LEVEL, \
+              "SMTPC:%s[%ld]CC[%d]S[%ld][%ld] " FORMAT, \
+              IOSTR, IO->ID, CCID, QID, N)
 
 #define EVNCS_syslog(LEVEL, FORMAT, ...) \
-       syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, \
-              IO->ID, QID, N, __VA_ARGS__)
+       DBGLOG(LEVEL) syslog(LEVEL, "SMTPC:%s[%ld]S[%ld][%ld] " FORMAT, \
+              IOSTR, IO->ID, QID, N, __VA_ARGS__)
 
 #define EVNCSM_syslog(LEVEL, FORMAT) \
-       syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, \
-              IO->ID, QID, N)
+       DBGLOG(LEVEL) syslog(LEVEL, "SMTPC:%s[%ld]S[%ld][%ld] " FORMAT, \
+              IOSTR, 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);