X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/de76e9b07d0b6e463f0d6c24b3695966218809dd..3857519629ca8fbcf3466c3fc761a5bb6ed32d53:/src/src/functions.h diff --git a/src/src/functions.h b/src/src/functions.h index 3c8104d25..8f85165e7 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -2,9 +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-or-later */ /* Prototypes for functions that appear in various modules. Gathered together @@ -53,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); @@ -100,11 +103,15 @@ extern acl_block *acl_read(uschar *(*)(void), uschar **); extern int acl_check(int, uschar *, uschar *, uschar **, uschar **); extern uschar *acl_current_verb(void); extern int acl_eval(int, uschar *, uschar **, uschar **); +extern uschar *acl_standalone_setvar(const uschar *); extern tree_node *acl_var_create(uschar *); extern void acl_var_write(uschar *, uschar *, void *); #ifdef EXPERIMENTAL_ARC +# ifdef SUPPORT_DMARC +extern gstring *arc_dmarc_hist_append(gstring *); +# endif extern void *arc_ams_setup_sign_bodyhash(void); extern const uschar *arc_header_feed(gstring *, BOOL); extern gstring *arc_sign(const uschar *, gstring *, uschar **); @@ -150,7 +157,7 @@ extern gstring *authres_spf(gstring *); extern uschar *b64encode(const uschar *, int); extern uschar *b64encode_taint(const uschar *, int, const void *); -extern int b64decode(const uschar *, uschar **); +extern int b64decode(const uschar *, uschar **, const void *); extern int bdat_getc(unsigned); extern uschar *bdat_getbuf(unsigned *); extern BOOL bdat_hasc(void); @@ -182,6 +189,10 @@ extern BOOL cutthrough_predata(void); extern void release_cutthrough_connection(const uschar *); extern void daemon_go(void); +#ifndef COMPILE_UTILITY +extern ssize_t daemon_client_sockname(struct sockaddr_un *, uschar **); +extern ssize_t daemon_notifier_sockname(struct sockaddr_un *); +#endif #ifdef EXPERIMENTAL_DCC extern int dcc_process(uschar **); @@ -260,6 +271,7 @@ extern int exp_bool(address_item *addr, extern BOOL expand_check_condition(uschar *, uschar *, uschar *); extern uschar *expand_file_big_buffer(const uschar *); extern uschar *expand_string(uschar *); /* public, cannot make const */ +extern const uschar *expand_string_2(const uschar *, BOOL *); extern const uschar *expand_cstring(const uschar *); /* ... so use this one */ extern uschar *expand_getkeyed(const uschar *, const uschar *); @@ -332,7 +344,7 @@ extern BOOL macro_read_assignment(uschar *); extern uschar *macros_expand(int, int *, BOOL *); extern void mainlog_close(void); #ifdef WITH_CONTENT_SCAN -extern int malware(const uschar *, int); +extern int malware(const uschar *, BOOL, int); extern int malware_in_file(uschar *); extern void malware_init(void); extern gstring * malware_show_supported(gstring *); @@ -345,7 +357,7 @@ extern int match_check_list(const uschar **, int, tree_node **, unsigned int const uschar *, const uschar **); extern int match_isinlist(const uschar *, const uschar **, int, tree_node **, unsigned int *, int, BOOL, const uschar **); -extern int match_check_string(const uschar *, const uschar *, int, BOOL, BOOL, BOOL, +extern int match_check_string(const uschar *, const uschar *, int, mcs_flags, const uschar **); extern void message_start(void); @@ -360,7 +372,7 @@ extern int mime_acl_check(uschar *acl, FILE *f, struct mime_boundary_context *, uschar **, uschar **); extern int mime_decode(const uschar **); extern ssize_t mime_decode_base64(FILE *, FILE *, uschar *); -extern int mime_regex(const uschar **); +extern int mime_regex(const uschar **, BOOL); extern void mime_set_anomaly(int); #endif extern uschar *moan_check_errorcopy(uschar *); @@ -391,9 +403,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); @@ -404,7 +416,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); @@ -420,7 +432,7 @@ extern void readconf_main(BOOL); extern void readconf_options_from_list(optionlist *, unsigned, const uschar *, uschar *); extern BOOL readconf_print(const uschar *, uschar *, BOOL); extern uschar *readconf_printtime(int); -extern uschar *readconf_readname(uschar *, int, uschar *); +extern const uschar *readconf_readname(uschar *, int, const uschar *); extern int readconf_readtime(const uschar *, int, BOOL); extern void readconf_rest(void); extern uschar *readconf_retry_error(const uschar *, const uschar *, int *, int *); @@ -433,11 +445,15 @@ extern BOOL receive_msg(BOOL); extern int_eximarith_t receive_statvfs(BOOL, int *); extern void receive_swallow_smtp(void); #ifdef WITH_CONTENT_SCAN -extern int regex(const uschar **); +extern int regex(const uschar **, BOOL); +extern void regex_vars_clear(void); #endif +extern void regex_at_daemon(const uschar *); extern BOOL regex_match(const pcre2_code *, const uschar *, int, uschar **); extern BOOL regex_match_and_setup(const pcre2_code *, const uschar *, int, int); -extern const pcre2_code *regex_must_compile(const uschar *, BOOL, BOOL); +extern const pcre2_code *regex_compile(const uschar *, mcs_flags, uschar **, + pcre2_compile_context *); +extern const pcre2_code *regex_must_compile(const uschar *, mcs_flags, BOOL); extern void retry_add_item(address_item *, uschar *, int); extern BOOL retry_check_address(const uschar *, host_item *, uschar *, BOOL, uschar **, uschar **); @@ -478,6 +494,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 *); @@ -486,6 +503,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; @@ -538,6 +556,7 @@ extern int stdin_ferror(void); extern BOOL stdin_hasc(void); extern int stdin_ungetc(int); +extern void stackdump(void); extern void store_exit(void); extern void store_init(void); extern void store_writeprotect(int); @@ -546,7 +565,8 @@ extern gstring *string_append(gstring *, int, ...) WARN_UNUSED_RESULT; extern gstring *string_append_listele(gstring *, uschar, const uschar *) WARN_UNUSED_RESULT; extern gstring *string_append_listele_n(gstring *, uschar, const uschar *, unsigned) WARN_UNUSED_RESULT; extern gstring *string_append2_listele_n(gstring *, const uschar *, const uschar *, unsigned) WARN_UNUSED_RESULT; -extern uschar *string_base62(unsigned long int); +extern uschar *string_base62_32(unsigned long int); +extern uschar *string_base62_64(unsigned long int); extern gstring *string_cat (gstring *, const uschar * ) WARN_UNUSED_RESULT; extern gstring *string_catn(gstring *, const uschar *, int) WARN_UNUSED_RESULT; extern int string_compare_by_pointer(const void *, const void *); @@ -618,7 +638,7 @@ extern BOOL transport_pass_socket(const uschar *, const uschar *, const uscha ); extern uschar *transport_rcpt_address(address_item *, BOOL); extern BOOL transport_set_up_command(const uschar ***, const uschar *, - BOOL, int, address_item *, BOOL, const uschar *, uschar **); + unsigned, int, address_item *, const uschar *, uschar **); extern void transport_update_waiting(host_item *, uschar *); extern BOOL transport_write_block(transport_ctx *, uschar *, int, BOOL); extern void transport_write_reset(int); @@ -643,6 +663,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 **); @@ -665,6 +689,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 /******************************************************************************/ @@ -951,12 +981,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__) @@ -1002,6 +1078,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 /******************************************************************************/ @@ -1088,10 +1171,32 @@ set_subdir_str(uschar * subdir_str, const uschar * name, int search_sequence) { subdir_str[0] = split_spool_directory == (search_sequence == 0) - ? name[5] : '\0'; + ? name[MESSAGE_ID_TIME_LEN-1] : '\0'; subdir_str[1] = '\0'; } +/******************************************************************************/ +/* Message-ID format transition knowlege */ + +static inline BOOL +is_new_message_id(const uschar * id) +{ +return id[MESSAGE_ID_TIME_LEN + 1 + MESSAGE_ID_PID_LEN] == '-'; +} + +static inline BOOL +is_old_message_id(const uschar * id) +{ +return id[MESSAGE_ID_TIME_LEN + 1 + MESSAGE_ID_PID_LEN_OLD] == '-'; +} + +static inline unsigned +spool_data_start_offset(const uschar * id) +{ +if (is_old_message_id(id)) return SPOOL_DATA_START_OFFSET_OLD; +return SPOOL_DATA_START_OFFSET; +} + /******************************************************************************/ /* Time calculations */ @@ -1222,6 +1327,7 @@ pid_t pid; DEBUG(D_any) debug_printf("%s forking for %s\n", process_purpose, purpose); if ((pid = fork()) == 0) { + f.daemon_listen = FALSE; process_purpose = purpose; DEBUG(D_any) debug_printf("postfork: %s\n", purpose); } @@ -1294,6 +1400,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 */ /******************************************************************************/ @@ -1301,6 +1431,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 */