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 3cbcb6d4a39881083aaf5d503c1480e880171826..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,
@@ -60,14 +62,16 @@ typedef struct _stmp_out_msg {
        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;
 
 
@@ -97,21 +101,21 @@ int smtp_resolve_recipients(SmtpOutMsg *SendMsg);
 
 #define EVS_syslog(LEVEL, FORMAT, ...) \
        DBGLOG(LEVEL) syslog(LEVEL,               \
-              "SMTPC:IO[%ld]CC[%d]S[%ld][%ld] " FORMAT, \
-              IO->ID, CCID, QID, N, __VA_ARGS__)
+              "SMTPC:%s[%ld]CC[%d]S[%ld][%ld] " FORMAT, \
+              IOSTR, IO->ID, CCID, QID, N, __VA_ARGS__)
 
 #define EVSM_syslog(LEVEL, FORMAT) \
        DBGLOG(LEVEL) syslog(LEVEL, \
-              "SMTPC:IO[%ld]CC[%d]S[%ld][%ld] " FORMAT, \
-              IO->ID, CCID, QID, N)
+              "SMTPC:%s[%ld]CC[%d]S[%ld][%ld] " FORMAT, \
+              IOSTR, IO->ID, CCID, QID, N)
 
 #define EVNCS_syslog(LEVEL, FORMAT, ...) \
-       DBGLOG(LEVEL) syslog(LEVEL, "SMTPC: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) \
-       DBGLOG(LEVEL) syslog(LEVEL, "SMTPC: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,               \