X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/c4ceed07f17f67af7d96e7fd27c92eb374e62e19..456d70ec89d9ba122871f1f035bb308f4771016f:/src/exim_monitor/em_globals.c?ds=sidebyside diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c index 816d42d05..925e88e05 100644 --- a/src/exim_monitor/em_globals.c +++ b/src/exim_monitor/em_globals.c @@ -2,7 +2,7 @@ * Exim Monitor * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2012 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -130,7 +130,7 @@ int body_zerocount = 0; BOOL deliver_firsttime = FALSE; BOOL deliver_freeze = FALSE; -int deliver_frozen_at = 0; +time_t deliver_frozen_at = 0; BOOL deliver_manual_thaw = FALSE; #ifndef DISABLE_DKIM @@ -139,12 +139,19 @@ uschar *dkim_signers = NULL; uschar *dkim_signing_domain = NULL; uschar *dkim_signing_selector = NULL; uschar *dkim_verify_signers = US"$dkim_signers"; -BOOL dkim_collect_input = FALSE; +unsigned dkim_collect_input = 0; BOOL dkim_disable_verify = FALSE; #endif BOOL dont_deliver = FALSE; +int dsn_ret = 0; +uschar *dsn_envid = NULL; + +struct global_flags f = { + .sender_local = FALSE, +}; + #ifdef WITH_CONTENT_SCAN int fake_response = OK; #endif @@ -184,13 +191,15 @@ uid_t originator_uid; uschar *primary_hostname = NULL; +uschar *queue_name = US""; + int received_count = 0; uschar *received_protocol = NULL; -int received_time = 0; +struct timeval received_time = { 0, 0 }; int recipients_count = 0; recipient_item *recipients_list = NULL; int recipients_list_max = 0; -int running_in_test_harness=FALSE; +BOOL running_in_test_harness=FALSE; uschar *sender_address = NULL; uschar *sender_fullhost = NULL; @@ -200,7 +209,6 @@ uschar *sender_host_authenticated = NULL; uschar *sender_host_name = NULL; int sender_host_port = 0; uschar *sender_ident = NULL; -BOOL sender_local = FALSE; BOOL sender_set_untrusted = FALSE; uschar *smtp_active_hostname = NULL; @@ -211,12 +219,10 @@ int string_datestamp_length= 0; int string_datestamp_type = -1; BOOL timestamps_utc = FALSE; -BOOL tls_certificate_verified = FALSE; -uschar *tls_cipher = NULL; -uschar *tls_peerdn = NULL; -#ifdef SUPPORT_TLS -uschar *tls_sni = NULL; -#endif +tls_support tls_in = { + .active = { .sock = -1 } + /* remainder zero/null/false */ +}; tree_node *tree_duplicates = NULL; tree_node *tree_nonrecipients = NULL;