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

diff --git a/citadel/modules/smtp/smtp_clienthandlers.h b/citadel/modules/smtp/smtp_clienthandlers.h
index 02b84e75f..46532c032 100644
--- a/citadel/modules/smtp/smtp_clienthandlers.h
+++ b/citadel/modules/smtp/smtp_clienthandlers.h
@@ -38,6 +38,8 @@ typedef struct _stmp_out_msg {
 	long n;
 	AsyncIO IO;
 	long CXFlags;
+	int IDestructQueItem;
+	int nRemain;
 
 	eSMTP_C_States State;
 
@@ -57,11 +59,14 @@ typedef struct _stmp_out_msg {
 	ParsedURL *Relay;
 	ParsedURL *pCurrRelay;
 	StrBuf *msgtext;
+	StrBuf *QMsgData;
 	const char *envelope_from;
+
 	char user[1024];
 	char node[1024];
 	char name[1024];
 	char mailfrom[1024];
+
 	long Flags;
 } SmtpOutMsg;
 
@@ -82,26 +87,28 @@ 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, \
+	DBGLOG(LEVEL) syslog(LEVEL,		  \
 	       "IO[%ld]CC[%d]S[%ld][%ld]" FORMAT, \
 	       IO->ID, CCID, QID, N, __VA_ARGS__)
 
 #define EVSM_syslog(LEVEL, FORMAT) \
-	syslog(LEVEL, \
+	DBGLOG(LEVEL) syslog(LEVEL, \
 	       "IO[%ld]CC[%d]S[%ld][%ld]" FORMAT, \
 	       IO->ID, CCID, QID, N)
 
 #define EVNCS_syslog(LEVEL, FORMAT, ...) \
-	syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, \
+	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, \
 	       IO->ID, QID, N, __VA_ARGS__)
 
 #define EVNCSM_syslog(LEVEL, FORMAT) \
-	syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, \
+	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, \
 	       IO->ID, QID, N)