Remove attempts to quieten compiler static-checking (more)

[users/heiko/exim.git] / src / src / spam.h

diff --git a/src/src/spam.h b/src/src/spam.h
index b2a12e3475b45da40fc8668c7df9cfae2efe0555..2fe73809ef5703f9ee78dfd03b673091827a8991 100644 (file)
--- a/src/src/spam.h
+++ b/src/src/spam.h
@@ -1,30 +1,38 @@
-/* $Cambridge: exim/src/src/spam.h,v 1.2 2004/12/16 15:11:47 tom Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-???? */
+/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015 */
 /* License: GPL */
 
 /* spam defines */
 
 #ifdef WITH_CONTENT_SCAN
 
-/* timeout for reading from spamd */
-#define SPAMD_READ_TIMEOUT 3600
+/* timeout for reading and writing spamd */
+#define SPAMD_TIMEOUT 120
 
-/* maximum length of the spam bar */
+/* maximum length of the spam bar, please update the
+ * spec, the max length is mentioned there */
 #define MAX_SPAM_BAR_CHARS 50
 
 /* SHUT_WR seems to be undefined on Unixware ? */
 #ifndef SHUT_WR
-#define SHUT_WR 1
+# define SHUT_WR 1
 #endif
 
-typedef struct spamd_address_container {
-  uschar tcp_addr[24];
-  unsigned int tcp_port;
+/* default weight */
+#define SPAMD_WEIGHT 1
+
+typedef struct spamd_address_container
+{
+  uschar * hostspec;
+  int is_rspamd:1;
+  int is_failed:1;
+  unsigned int weight;
+  unsigned int timeout;
+  unsigned int retry;
+  unsigned int priority;
 } spamd_address_container;
 
 #endif