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
Compiler quietening
[exim.git]
/
src
/
src
/
structs.h
diff --git
a/src/src/structs.h
b/src/src/structs.h
index c16899a0c7a3ace69082250938c8afb5183f363f..98c95010d2cf238ec51dc69fe4e292a132436ae5 100644
(file)
--- a/
src/src/structs.h
+++ b/
src/src/structs.h
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
5
*/
+/* Copyright (c) University of Cambridge 1995 - 201
8
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-25,6
+25,13
@@
struct smtp_outblock;
struct transport_info;
struct router_info;
struct transport_info;
struct router_info;
+/* Growable-string */
+typedef struct gstring {
+ int size; /* Current capacity of string memory */
+ int ptr; /* Offset at which to append further chars */
+ uschar * s; /* The string memory */
+} gstring;
+
/* Structure for remembering macros for the configuration file */
typedef struct macro_item {
/* Structure for remembering macros for the configuration file */
typedef struct macro_item {
@@
-238,7
+245,7
@@
typedef int (*tpt_chunk_cmd_cb)(struct transport_context *, unsigned, unsigned);
typedef struct transport_context {
union { /* discriminated by option topt_output_string */
int fd; /* file descriptor to write message to */
typedef struct transport_context {
union { /* discriminated by option topt_output_string */
int fd; /* file descriptor to write message to */
-
uschar *
msg; /* allocated string with written message */
+
gstring *
msg; /* allocated string with written message */
} u;
transport_instance * tblock; /* transport */
struct address_item * addr;
} u;
transport_instance * tblock; /* transport */
struct address_item * addr;
@@
-249,10
+256,6
@@
typedef struct transport_context {
/* items below only used with option topt_use_bdat */
tpt_chunk_cmd_cb chunk_cb; /* per-datachunk callback */
void * smtp_context;
/* items below only used with option topt_use_bdat */
tpt_chunk_cmd_cb chunk_cb; /* per-datachunk callback */
void * smtp_context;
-
- /* items below only used with option topt_output_string */
- int msg_size;
- int msg_ptr;
} transport_ctx;
} transport_ctx;
@@
-617,7
+620,7
@@
typedef struct address_item {
#endif
BOOL af_chunking_used:1; /* delivery used SMTP CHUNKING */
BOOL af_force_command:1; /* force_command in pipe transport */
#endif
BOOL af_chunking_used:1; /* delivery used SMTP CHUNKING */
BOOL af_force_command:1; /* force_command in pipe transport */
-#ifdef
EXPERIMENTAL
_DANE
+#ifdef
SUPPORT
_DANE
BOOL af_dane_verified:1; /* TLS cert verify done with DANE */
#endif
#ifdef SUPPORT_I18N
BOOL af_dane_verified:1; /* TLS cert verify done with DANE */
#endif
#ifdef SUPPORT_I18N
@@
-876,6
+879,10
@@
struct ob_dkim {
uschar *dkim_strict;
uschar *dkim_hash;
BOOL dot_stuffed;
uschar *dkim_strict;
uschar *dkim_hash;
BOOL dot_stuffed;
+ BOOL force_bodyhash;
+#ifdef EXPERIMENTAL_ARC
+ uschar *arc_signspec;
+#endif
};
/* End of structs.h */
};
/* End of structs.h */