X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/a85c067ba6c6940512cf57ec213277a370d87e70..24cda181fb88542cf38db2beae5d0ddb37f59c5c:/src/src/functions.h diff --git a/src/src/functions.h b/src/src/functions.h index be1fae00d..aa5057a83 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -2,10 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) The Exim Maintainers 2020 - 2022 */ +/* Copyright (c) The Exim Maintainers 2020 - 2023 */ /* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Prototypes for functions that appear in various modules. Gathered together @@ -54,6 +54,8 @@ extern uschar * tls_cert_fprt_sha256(void *); extern void tls_clean_env(void); extern BOOL tls_client_start(client_conn_ctx *, smtp_connect_args *, void *, tls_support *, uschar **); +extern BOOL tls_client_adjunct_start(host_item *, client_conn_ctx *, + const uschar *, uschar **); extern void tls_client_creds_reload(BOOL); extern void tls_close(void *, int); @@ -398,9 +400,9 @@ extern const uschar *parse_quote_2047(const uschar *, int, const uschar *, extern const uschar *parse_date_time(const uschar *str, time_t *t); extern void priv_drop_temp(const uid_t, const gid_t); extern void priv_restore(void); -extern int vaguely_random_number(int); -#ifndef DISABLE_TLS -extern int vaguely_random_number_fallback(int); +#ifdef SUPPORT_PROXY +extern BOOL proxy_protocol_host(void); +extern void proxy_protocol_setup(void); #endif extern BOOL queue_action(uschar *, int, uschar **, int, int); @@ -411,7 +413,7 @@ extern void queue_list(int, uschar **, int); #ifndef DISABLE_QUEUE_RAMP extern void queue_notify_daemon(const uschar * hostname); #endif -extern void queue_run(uschar *, uschar *, BOOL); +extern void queue_run(qrunner *, uschar *, uschar *, BOOL); extern int random_number(int); extern const uschar *rc_to_string(int); @@ -489,6 +491,7 @@ extern int search_findtype_partial(const uschar *, int *, const uschar **, i int *, const uschar **); extern void *search_open(const uschar *, int, int, uid_t *, gid_t *); extern void search_tidyup(void); +extern uschar *sender_helo_verified_boolstr(void); extern void set_process_info(const char *, ...) PRINTF_FUNCTION(1,2); extern void sha1_end(hctx *, const uschar *, int, uschar *); extern void sha1_mid(hctx *, const uschar *); @@ -497,6 +500,7 @@ extern int sieve_interpret(const uschar *, int, const uschar *, const uschar *, const uschar *, const uschar *, address_item **, uschar **); extern void sigalrm_handler(int); +extern void single_queue_run(qrunner *, uschar *, uschar *); extern int smtp_boundsock(smtp_connect_args *); extern void smtp_closedown(uschar *); extern void smtp_command_timeout_exit(void) NORETURN; @@ -654,6 +658,10 @@ extern void unspool_mbox(void); extern gstring *utf8_version_report(gstring *); #endif +extern int vaguely_random_number(int); +#ifndef DISABLE_TLS +extern int vaguely_random_number_fallback(int); +#endif extern int verify_address(address_item *, FILE *, int, int, int, int, uschar *, uschar *, BOOL *); extern int verify_check_dnsbl(int, const uschar **, uschar **); @@ -676,6 +684,12 @@ extern void version_init(void); extern BOOL write_chunk(transport_ctx *, uschar *, int); extern ssize_t write_to_fd_buf(int, const uschar *, size_t); +extern uschar *wrap_header(const uschar *, unsigned, unsigned, const uschar *, unsigned); + +#ifdef EXPERIMENTAL_XCLIENT +extern uschar * xclient_smtp_command(uschar *, int *, BOOL *); +extern gstring * xclient_smtp_advertise_str(gstring *); +#endif /******************************************************************************/ @@ -962,12 +976,58 @@ g->s[g->ptr] = '\0'; return g->s; } +static inline int +len_string_from_gstring(gstring * g, uschar ** sp) +{ +if (g) + { + *sp = g->s; + g->s[g->ptr] = '\0'; + return g->ptr; + } +else + { + *sp = NULL; + return 0; + } +} + +static inline uschar * +string_copy_from_gstring(gstring * g) +{ +return g ? string_copyn(g->s, g->ptr) : NULL; +} + static inline unsigned gstring_length(const gstring * g) { return g ? (unsigned)g->ptr : 0; } +static inline uschar +gstring_last_char(gstring * g) +{ +return g->s[g->ptr-1]; +} + +static inline void +gstring_trim(gstring * g, unsigned amount) +{ +g->ptr -= amount; +} + +static inline void +gstring_trim_trailing(gstring * g, uschar c) +{ +if (gstring_last_char(g) == c) gstring_trim(g, 1); +} + +static inline void +gstring_reset(gstring * g) +{ +g->ptr = 0; +} + #define gstring_release_unused(g) \ gstring_release_unused_trc(g, __FUNCTION__, __LINE__) @@ -1013,6 +1073,13 @@ memcpy(s, g->s, g->ptr); g->s = s; } +/* Append one gstring to another */ +static inline gstring * +gstring_append(gstring * dest, gstring * item) +{ +return string_catn(dest, item->s, item->ptr); +} + # ifndef COMPILE_UTILITY /******************************************************************************/ @@ -1306,6 +1373,30 @@ debug_printf("cmdlog: '%s'\n", client_cmd_log ? client_cmd_log->s : US"(unset)") +static inline int +expand_max_rcpt(const uschar * str_max_rcpt) +{ +const uschar * s = expand_cstring(str_max_rcpt); +int res; +return !s || !*s || (res = Uatoi(s)) == 0 ? UNLIMITED_ADDRS : res; +} + +/******************************************************************************/ +/* Queue-runner operations */ + +static inline BOOL +is_onetime_qrun(void) +{ +return qrunners && !qrunners->next && qrunners->interval == 0; +} + +static inline BOOL +is_multiple_qrun(void) +{ +return qrunners && (qrunners->interval > 0 || qrunners->next); +} + + # endif /* !COMPILE_UTILITY */ /******************************************************************************/ @@ -1313,6 +1404,6 @@ debug_printf("cmdlog: '%s'\n", client_cmd_log ? client_cmd_log->s : US"(unset)") #endif /* _FUNCTIONS_H_ */ -/* vi: aw +/* vi: aw ai sw=2 */ /* End of functions.h */