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
Fix non-WITH_CONTENT_SCAN build (2)
[exim.git]
/
src
/
src
/
structs.h
diff --git
a/src/src/structs.h
b/src/src/structs.h
index 9bfc8826b1c00931a3bfa6c87c0c99b174f7304c..06cd06084cdbf45b4f64aa9ce4a97138c876f134 100644
(file)
--- a/
src/src/structs.h
+++ b/
src/src/structs.h
@@
-2,8
+2,8
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-133,11
+133,15
@@
typedef struct driver_instance {
uschar *name; /* Instance name */
struct driver_info *info; /* Points to info for this driver */
void *options_block; /* Pointer to private options */
uschar *name; /* Instance name */
struct driver_info *info; /* Points to info for this driver */
void *options_block; /* Pointer to private options */
+
uschar *driver_name; /* All start with this generic option */
uschar *driver_name; /* All start with this generic option */
+ const uschar *srcfile; /* and config source info for errors */
+ int srcline;
} driver_instance;
typedef struct driver_info {
uschar *driver_name; /* Name of driver */
} driver_instance;
typedef struct driver_info {
uschar *driver_name; /* Name of driver */
+
optionlist *options; /* Table of private options names */
int *options_count; /* -> Number of entries in table */
void *options_block; /* Points to default private block */
optionlist *options; /* Table of private options names */
int *options_count; /* -> Number of entries in table */
void *options_block; /* Points to default private block */
@@
-159,6
+163,9
@@
typedef struct transport_instance {
struct transport_info *info; /* Info for this driver */
void *options_block; /* Pointer to private options */
uschar *driver_name; /* Must be first */
struct transport_info *info; /* Info for this driver */
void *options_block; /* Pointer to private options */
uschar *driver_name; /* Must be first */
+ const uschar *srcfile;
+ int srcline;
+
int (*setup)( /* Setup entry point */
struct transport_instance *,
struct address_item *,
int (*setup)( /* Setup entry point */
struct transport_instance *,
struct address_item *,
@@
-283,6
+290,8
@@
typedef struct router_instance {
struct router_info *info;
void *options_block; /* Pointer to private options */
uschar *driver_name; /* Must be first */
struct router_info *info;
void *options_block; /* Pointer to private options */
uschar *driver_name; /* Must be first */
+ const uschar *srcfile;
+ int srcline;
uschar *address_data; /* Arbitrary data */
#ifdef EXPERIMENTAL_BRIGHTMAIL
uschar *address_data; /* Arbitrary data */
#ifdef EXPERIMENTAL_BRIGHTMAIL
@@
-400,6
+409,9
@@
typedef struct auth_instance {
struct auth_info *info; /* Pointer to driver info block */
void *options_block; /* Pointer to private options */
uschar *driver_name; /* Must be first */
struct auth_info *info; /* Pointer to driver info block */
void *options_block; /* Pointer to private options */
uschar *driver_name; /* Must be first */
+ const uschar *srcfile;
+ int srcline;
+
uschar *advertise_condition; /* Are we going to advertise this?*/
uschar *client_condition; /* Should the client try this? */
uschar *public_name; /* Advertised name */
uschar *advertise_condition; /* Are we going to advertise this?*/
uschar *client_condition; /* Should the client try this? */
uschar *public_name; /* Advertised name */
@@
-435,8
+447,8
@@
typedef struct auth_info {
int, /* command timeout */
uschar *, /* buffer for reading response */
int); /* sizeof buffer */
int, /* command timeout */
uschar *, /* buffer for reading response */
int); /* sizeof buffer */
-
void (*version_report)(
/* diagnostic version reporting */
-
FILE *); /* I/O stream to print
to */
+
gstring * (*version_report)(
/* diagnostic version reporting */
+
gstring *); /* string to append
to */
void (*macros_create)(void); /* feature-macro creation */
} auth_info;
void (*macros_create)(void); /* feature-macro creation */
} auth_info;
@@
-518,9
+530,6
@@
typedef struct address_item_propagated {
uschar *remove_headers; /* list of those to remove */
void *variables; /* router-vasriables */
uschar *remove_headers; /* list of those to remove */
void *variables; /* router-vasriables */
-#ifdef EXPERIMENTAL_SRS_ALT
- uschar *srs_sender; /* Change return path when delivering */
-#endif
BOOL ignore_error:1; /* ignore delivery error */
#ifdef SUPPORT_I18N
BOOL utf8_msg:1; /* requires SMTPUTF8 processing */
BOOL ignore_error:1; /* ignore delivery error */
#ifdef SUPPORT_I18N
BOOL utf8_msg:1; /* requires SMTPUTF8 processing */
@@
-822,6
+831,11
@@
typedef struct {
int host_af;
uschar * interface;
int host_af;
uschar * interface;
+ int sock; /* used for a bound but not connected socket */
+ uschar * sending_ip_address; /* used for TLS resumption */
+ const uschar * host_lbserver; /* ditto, for server-behind LB */
+ BOOL have_lbserver:1; /* host_lbserver is valid */
+
#ifdef SUPPORT_DANE
BOOL dane:1; /* connection must do dane */
dns_answer tlsa_dnsa; /* strictly, this should use tainted mem */
#ifdef SUPPORT_DANE
BOOL dane:1; /* connection must do dane */
dns_answer tlsa_dnsa; /* strictly, this should use tainted mem */
@@
-881,7
+895,7
@@
typedef struct check_host_block {
const uschar *host_name;
const uschar *host_address;
const uschar *host_ipv4;
const uschar *host_name;
const uschar *host_address;
const uschar *host_ipv4;
-
BOOL negative
;
+
mcs_flags flags
;
} check_host_block;
/* Structure for remembering lookup data when caching the result of
} check_host_block;
/* Structure for remembering lookup data when caching the result of