git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Logging: Receive duration on <= lines. Bug 353
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index b9cdb88d44f29c4844a954126ff59adccc292de5..8ec62466fdf76b61066be03848b8f6438c42d353 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-378,7
+378,7
@@
address_item address_defaults = {
.dsn_aware = 0,
.uid = (uid_t)(-1),
.gid = (gid_t)(-1),
.dsn_aware = 0,
.uid = (uid_t)(-1),
.gid = (gid_t)(-1),
- .flags =
0
,
+ .flags =
{ 0 }
,
.domain_cache = { 0 }, /* domain_cache - any larger array should be zeroed */
.localpart_cache = { 0 }, /* localpart_cache - ditto */
.mode = -1,
.domain_cache = { 0 }, /* domain_cache - any larger array should be zeroed */
.localpart_cache = { 0 }, /* localpart_cache - ditto */
.mode = -1,
@@
-399,6
+399,7
@@
address_item address_defaults = {
#ifdef EXPERIMENTAL_SRS
.srs_sender = NULL,
#endif
#ifdef EXPERIMENTAL_SRS
.srs_sender = NULL,
#endif
+ .ignore_error = FALSE,
#ifdef SUPPORT_I18N
.utf8_msg = FALSE,
.utf8_downcvt = FALSE,
#ifdef SUPPORT_I18N
.utf8_msg = FALSE,
.utf8_downcvt = FALSE,
@@
-666,7
+667,10
@@
int dkim_key_length = 0;
uschar *dkim_signers = NULL;
uschar *dkim_signing_domain = NULL;
uschar *dkim_signing_selector = NULL;
uschar *dkim_signers = NULL;
uschar *dkim_signing_domain = NULL;
uschar *dkim_signing_selector = NULL;
+uschar *dkim_verify_overall = NULL;
uschar *dkim_verify_signers = US"$dkim_signers";
uschar *dkim_verify_signers = US"$dkim_signers";
+uschar *dkim_verify_status = NULL;
+uschar *dkim_verify_reason = NULL;
#endif
#ifdef EXPERIMENTAL_DMARC
BOOL dmarc_has_been_checked = FALSE;
#endif
#ifdef EXPERIMENTAL_DMARC
BOOL dmarc_has_been_checked = FALSE;
@@
-855,6
+859,7
@@
int log_default[] = { /* for initializing log_selector */
Li_acl_warn_skipped,
Li_connection_reject,
Li_delay_delivery,
Li_acl_warn_skipped,
Li_connection_reject,
Li_delay_delivery,
+ Li_dkim,
Li_dnslist_defer,
Li_etrn,
Li_host_lookup_failed,
Li_dnslist_defer,
Li_etrn,
Li_host_lookup_failed,
@@
-889,6
+894,10
@@
bit_table log_options[] = { /* must be in alphabetical order */
BIT_TABLE(L, delay_delivery),
BIT_TABLE(L, deliver_time),
BIT_TABLE(L, delivery_size),
BIT_TABLE(L, delay_delivery),
BIT_TABLE(L, deliver_time),
BIT_TABLE(L, delivery_size),
+#ifndef DISABLE_DKIM
+ BIT_TABLE(L, dkim),
+ BIT_TABLE(L, dkim_verbose),
+#endif
BIT_TABLE(L, dnslist_defer),
BIT_TABLE(L, dnssec),
BIT_TABLE(L, etrn),
BIT_TABLE(L, dnslist_defer),
BIT_TABLE(L, dnssec),
BIT_TABLE(L, etrn),
@@
-901,12
+910,13
@@
bit_table log_options[] = { /* must be in alphabetical order */
BIT_TABLE(L, outgoing_interface),
BIT_TABLE(L, outgoing_port),
BIT_TABLE(L, pid),
BIT_TABLE(L, outgoing_interface),
BIT_TABLE(L, outgoing_port),
BIT_TABLE(L, pid),
-#if defined(SUPPORT_PROXY) || defined
(SUPPORT_SOCKS)
+#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS)
BIT_TABLE(L, proxy),
#endif
BIT_TABLE(L, queue_run),
BIT_TABLE(L, queue_time),
BIT_TABLE(L, queue_time_overall),
BIT_TABLE(L, proxy),
#endif
BIT_TABLE(L, queue_run),
BIT_TABLE(L, queue_time),
BIT_TABLE(L, queue_time_overall),
+ BIT_TABLE(L, receive_time),
BIT_TABLE(L, received_recipients),
BIT_TABLE(L, received_sender),
BIT_TABLE(L, rejected_header),
BIT_TABLE(L, received_recipients),
BIT_TABLE(L, received_sender),
BIT_TABLE(L, rejected_header),
@@
-1112,6
+1122,7
@@
uschar *received_header_text = US
int received_headers_max = 30;
uschar *received_protocol = NULL;
struct timeval received_time = { 0, 0 };
int received_headers_max = 30;
uschar *received_protocol = NULL;
struct timeval received_time = { 0, 0 };
+struct timeval received_time_taken = { 0, 0 };
uschar *recipient_data = NULL;
uschar *recipient_unqualified_hosts = NULL;
uschar *recipient_verify_failure = NULL;
uschar *recipient_data = NULL;
uschar *recipient_unqualified_hosts = NULL;
uschar *recipient_verify_failure = NULL;
@@
-1357,7
+1368,7
@@
uschar *spam_action = NULL;
uschar *spam_score = NULL;
uschar *spam_score_int = NULL;
#endif
uschar *spam_score = NULL;
uschar *spam_score_int = NULL;
#endif
-#ifdef
EXPERIMENTAL
_SPF
+#ifdef
SUPPORT
_SPF
uschar *spf_guess = US"v=spf1 a/24 mx/24 ptr ?all";
uschar *spf_header_comment = NULL;
uschar *spf_received = NULL;
uschar *spf_guess = US"v=spf1 a/24 mx/24 ptr ?all";
uschar *spf_header_comment = NULL;
uschar *spf_received = NULL;
@@
-1416,7
+1427,12
@@
BOOL system_filter_uid_set = FALSE;
BOOL system_filtering = FALSE;
BOOL tcp_fastopen_ok = FALSE;
BOOL system_filtering = FALSE;
BOOL tcp_fastopen_ok = FALSE;
+blob tcp_fastopen_nodata = { .data = NULL, .len = 0 };
+BOOL tcp_in_fastopen = FALSE;
+BOOL tcp_in_fastopen_logged = FALSE;
BOOL tcp_nodelay = TRUE;
BOOL tcp_nodelay = TRUE;
+int tcp_out_fastopen = 0;
+BOOL tcp_out_fastopen_logged= FALSE;
#ifdef USE_TCP_WRAPPERS
uschar *tcp_wrappers_daemon_name = US TCP_WRAPPERS_DAEMON_NAME;
#endif
#ifdef USE_TCP_WRAPPERS
uschar *tcp_wrappers_daemon_name = US TCP_WRAPPERS_DAEMON_NAME;
#endif