X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9b230009225d688ca002152c8747c96e83951397..1d28cc061677bd07d9bed48dd84bd5c590247043:/src/src/local_scan.h diff --git a/src/src/local_scan.h b/src/src/local_scan.h index 23da01b2b..69b3c6cdb 100644 --- a/src/src/local_scan.h +++ b/src/src/local_scan.h @@ -2,14 +2,20 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2019 */ +/* Copyright (c) The Exim Maintainers 2020 - 2022 */ +/* Copyright (c) University of Cambridge 1995 - 2020 */ /* See the file NOTICE for conditions of use and distribution. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* This file is the header that is the only Exim header to be included in the source for the local_scan.c() function. It contains definitions that are made available for use in that function, and which are documented. That source should first #define LOCAL_SCAN +Not every definition that becomes available to the compiler by the inclusion +of this file is part of the local_scan API. The "Adding a local scan function +to Exim" chapter in the documentation is definitive. + This API is also used for functions called by the ${dlfunc expansion item. Source for those should first #define DLFUNC_IMPL and then include this file. Coders of dlfunc routines should read the notes on tainting at the start of @@ -27,6 +33,21 @@ settings, and the store functions. */ #include "store.h" +/* Some people (Marc Merlin et al) are maintaining a patch that allows for +dynamic local_scan() libraries. This code is not yet in Exim proper, but it +helps the maintainers if we keep their ABI version numbers here. This may +mutate into more general support later. The major number is increased when the +ABI is changed in a non backward compatible way. The minor number is increased +each time a new feature is added (in a way that doesn't break backward +compatibility). */ + +#define LOCAL_SCAN_ABI_VERSION_MAJOR 6 +#define LOCAL_SCAN_ABI_VERSION_MINOR 0 +#define LOCAL_SCAN_ABI_VERSION \ + LOCAL_SCAN_ABI_VERSION_MAJOR.LOCAL_SCAN_ABI_VERSION_MINOR + + + /* The function and its return codes. */ extern int local_scan(int, uschar **); @@ -95,19 +116,6 @@ the name of the data file to be present in the first line. */ #define SPOOL_DATA_START_OFFSET (MESSAGE_ID_LENGTH+3) -/* Some people (Marc Merlin et al) are maintaining a patch that allows for -dynamic local_scan() libraries. This code is not yet in Exim proper, but it -helps the maintainers if we keep their ABI version numbers here. This may -mutate into more general support later. The major number is increased when the -ABI is changed in a non backward compatible way. The minor number is increased -each time a new feature is added (in a way that doesn't break backward -compatibility). */ - -#define LOCAL_SCAN_ABI_VERSION_MAJOR 3 -#define LOCAL_SCAN_ABI_VERSION_MINOR 1 -#define LOCAL_SCAN_ABI_VERSION \ - LOCAL_SCAN_ABI_VERSION_MAJOR.LOCAL_SCAN_ABI_VERSION_MINOR - /* Structure definitions that are documented as visible in the function. */ typedef struct header_line { @@ -120,10 +128,15 @@ typedef struct header_line { /* Entries in lists options are in this form. */ typedef struct { - const char *name; /* should have been uschar but too late now */ - int type; - void *value; + const char * name; /* should have been uschar but too late now */ + int type; + union { + void * value; + long offset; + void (* fn)(); + } v; } optionlist; +#define OPT_OFF(s, field) {.offset = offsetof(s, field)} /* Structure for holding information about an envelope address. The errors_to field is always NULL except for one_time aliases that had errors_to on the @@ -148,7 +161,7 @@ extern unsigned int debug_selector; /* Debugging bits */ extern int body_linecount; /* Line count in body */ extern int body_zerocount; /* Binary zero count in body */ extern uschar *expand_string_message; /* Error info for failing expansion */ -extern uschar *headers_charset; /* Charset for RFC 2047 decoding */ +extern const uschar *headers_charset; /* Charset for RFC 2047 decoding */ extern header_line *header_last; /* Final header */ extern header_line *header_list; /* First header */ extern BOOL host_checking; /* Set when checking a host */ @@ -170,9 +183,6 @@ extern BOOL smtp_input; /* TRUE if input is via SMTP */ /* Functions that are documented as visible in local_scan(). */ extern int child_close(pid_t, int); -extern pid_t child_open(uschar **, uschar **, int, int *, int *, BOOL); -extern pid_t child_open_exim(int *); -extern pid_t child_open_exim2(int *, uschar *, uschar *); extern void debug_printf(const char *, ...) PRINTF_FUNCTION(1,2); extern uschar *expand_string(uschar *); extern void header_add(int, const char *, ...); @@ -189,7 +199,8 @@ extern int lss_match_address(uschar *, uschar *, BOOL); extern int lss_match_host(uschar *, uschar *, uschar *); extern void receive_add_recipient(uschar *, int); extern BOOL receive_remove_recipient(uschar *); -extern uschar *rfc2047_decode(uschar *, BOOL, uschar *, int, int *, uschar **); +extern uschar *rfc2047_decode(uschar *, BOOL, const uschar *, int, int *, + uschar **); extern int smtp_fflush(void); extern void smtp_printf(const char *, BOOL, ...) PRINTF_FUNCTION(1,3); extern void smtp_vprintf(const char *, BOOL, va_list); @@ -198,12 +209,12 @@ extern void smtp_vprintf(const char *, BOOL, va_list); string_sprintf_trc(fmt, US __FUNCTION__, __LINE__, __VA_ARGS__) extern uschar *string_sprintf_trc(const char *, const uschar *, unsigned, ...) ALMOST_PRINTF(1,4); -#define store_get(size, tainted) \ - store_get_3(size, tainted, __FUNCTION__, __LINE__) -extern void *store_get_3(int, BOOL, const char *, int) ALLOC ALLOC_SIZE(1) WARN_UNUSED_RESULT; -#define store_get_perm(size, tainted) \ - store_get_perm_3(size, tainted, __FUNCTION__, __LINE__) -extern void *store_get_perm_3(int, BOOL, const char *, int) ALLOC ALLOC_SIZE(1) WARN_UNUSED_RESULT; +#define store_get(size, proto_mem) \ + store_get_3((size), (proto_mem), __FUNCTION__, __LINE__) +extern void *store_get_3(int, const void *, const char *, int) ALLOC ALLOC_SIZE(1) WARN_UNUSED_RESULT; +#define store_get_perm(size, proto_mem) \ + store_get_perm_3((size), (proto_mem), __FUNCTION__, __LINE__) +extern void *store_get_perm_3(int, const void *, const char *, int) ALLOC ALLOC_SIZE(1) WARN_UNUSED_RESULT; #if defined(LOCAL_SCAN) || defined(DLFUNC_IMPL) @@ -214,10 +225,16 @@ with the original name. */ # define string_copy(s) string_copy_function(s) # define string_copyn(s, n) string_copyn_function((s), (n)) # define string_copy_taint(s, t) string_copy_taint_function((s), (t)) +# define child_open_exim(p) child_open_exim_function((p), US"from local_scan") +# define child_open_exim2(p, s, a) child_open_exim2_function((p), (s), (a), US"from local_scan") +# define child_open(a,e,u,i,o,l) child_open_function((a),(e),(u),(i),(o),(l),US"from local_scan") extern uschar * string_copy_function(const uschar *); extern uschar * string_copyn_function(const uschar *, int n); -extern uschar * string_copy_taint_function(const uschar *, BOOL tainted); +extern uschar * string_copy_taint_function(const uschar *, const void * proto_mem); +extern pid_t child_open_exim_function(int *, const uschar *); +extern pid_t child_open_exim2_function(int *, uschar *, uschar *, const uschar *); +extern pid_t child_open_function(uschar **, uschar **, int, int *, int *, BOOL, const uschar *); #endif /* End of local_scan.h */