Rename main.h and main.c to `rspamd.X`

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 494f5b6c0e88c861aa1dad7bcb69ea0b194d790e..f86c45b4057871a602b0b5f648c7a4a541da0763 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ MACRO(_AddModulesForced MLIST)
        SET(MODULES_ID ${_MODULES_ID} CACHE INTERNAL "Modules ID" FORCE)
        SET(MODULES_C "${CMAKE_CURRENT_BINARY_DIR}/modules.c")
        FILE(WRITE "${MODULES_C}"
-               "/* ${MODULES_ID} */\n#include \"main.h\"\n")
+               "/* ${MODULES_ID} */\n#include \"rspamd.h\"\n")
        
        # Handle even old cmake
        LIST(LENGTH ${MLIST} MLIST_COUNT)
@@ -28,7 +28,7 @@ ENDMACRO(_AddModulesForced MLIST)
 MACRO(_AddWorkersForced WLIST)
        SET(WORKERS_C "${CMAKE_CURRENT_BINARY_DIR}/workers.c")
        FILE(WRITE "${WORKERS_C}"
-               "#include \"main.h\"\n")
+               "#include \"rspamd.h\"\n")
        
        # Handle even old cmake
        LIST(LENGTH ${WLIST} WLIST_COUNT)
@@ -74,7 +74,7 @@ ADD_SUBDIRECTORY(client)
 SET(RSPAMDSRC  controller.c
                                fuzzy_storage.c
                                lua_worker.c
-                               main.c
+               rspamd.c
                                smtp_proxy.c
                                worker.c
                                http_proxy.c)

diff --git a/src/controller.c b/src/controller.c
index 0e729b886ea81b6e9bf8c5a319e1cf7ca7d20d6a..69132de70c869ccd76ca10b8f836b844c3c63cef 100644 (file)
--- a/src/controller.c
+++ b/src/controller.c
@@ -27,7 +27,7 @@
 #include "libutil/rrd.h"
 #include "libutil/map.h"
 #include "libstat/stat_api.h"
-#include "main.h"
+#include "rspamd.h"
 #include "libserver/worker_util.h"
 #include "utlist.h"
 

diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c
index d41b922d28c9d1a36929a29129950a37d1eb574d..ebbff3365e3de38b5bf18ef01857ea1e65aec755 100644 (file)
--- a/src/fuzzy_storage.c
+++ b/src/fuzzy_storage.c
@@ -28,7 +28,7 @@
 
 #include "config.h"
 #include "util.h"
-#include "main.h"
+#include "rspamd.h"
 #include "protocol.h"
 #include "upstream.h"
 #include "cfg_file.h"

diff --git a/src/fuzzy_storage.h b/src/fuzzy_storage.h
index b9997da8ba601bb8ad9cfb043e3bfb07c1107f5b..57d7b5cc7a304bab492a6fd93bd858dbd6e980a2 100644 (file)
--- a/src/fuzzy_storage.h
+++ b/src/fuzzy_storage.h
@@ -2,7 +2,7 @@
 #define RSPAMD_FUZZY_STORAGE_H
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "shingles.h"
 
 #define RSPAMD_FUZZY_VERSION 3

diff --git a/src/http_proxy.c b/src/http_proxy.c
index 12b2373465055b7ee32a5f1696ce5d7ea9e11154..f71adc3f6d1fc04380a4107960d9b06a9c67495e 100644 (file)
--- a/src/http_proxy.c
+++ b/src/http_proxy.c
@@ -31,7 +31,7 @@
 #include "libserver/url.h"
 #include "libserver/dns.h"
 #include "libmime/message.h"
-#include "main.h"
+#include "rspamd.h"
 #include "libserver/worker_util.h"
 #include "keypairs_cache.h"
 #include "ottery.h"

diff --git a/src/libmime/filter.c b/src/libmime/filter.c
index 7efb8f82a21ae029a96d90e282d3c91166133494..ed50efafe9ef2f04b524323b75601ac27f40c40e 100644 (file)
--- a/src/libmime/filter.c
+++ b/src/libmime/filter.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "mem_pool.h"
 #include "filter.h"
-#include "main.h"
+#include "rspamd.h"
 #include "message.h"
 #include "cfg_file.h"
 #include "util.h"

diff --git a/src/libmime/images.c b/src/libmime/images.c
index 419b6a2ca12c3255bb6b0a7e4ba962838547678e..f55e47d7a7952c1e7846fa0e01be0dfd57204732 100644 (file)
--- a/src/libmime/images.c
+++ b/src/libmime/images.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "images.h"
-#include "main.h"
+#include "rspamd.h"
 #include "message.h"
 #include "html.h"
 

diff --git a/src/libmime/images.h b/src/libmime/images.h
index 5d01e6f7501812ecdf318be4da32426cd5b70509..6d64ea5d13acdcddddf2a4a67d02924066a744bc 100644 (file)
--- a/src/libmime/images.h
+++ b/src/libmime/images.h
@@ -2,7 +2,7 @@
 #define IMAGES_H_
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 
 struct html_image;
 

diff --git a/src/libmime/message.c b/src/libmime/message.c
index 54c5ab59ebaae871dbfa706167b25652330c7f09..3537f70c0aa383d2fd8559754aca8c070b306054 100644 (file)
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include "util.h"
-#include "main.h"
+#include "rspamd.h"
 #include "message.h"
 #include "cfg_file.h"
 #include "html.h"

diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c
index f5732c75ac3220346bd7d9e505dead2b24211877..6581b7362d9c72243b77925784847cd88cf1f447 100644 (file)
--- a/src/libmime/mime_expressions.c
+++ b/src/libmime/mime_expressions.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "util.h"
 #include "cfg_file.h"
-#include "main.h"
+#include "rspamd.h"
 #include "message.h"
 #include "mime_expressions.h"
 #include "html.h"

diff --git a/src/libmime/smtp_proto.c b/src/libmime/smtp_proto.c
index 713efabac739564156cfb4a9fc60083116e006c7..988bd37af925afc92a2f0824e5101c80649306e3 100644 (file)
--- a/src/libmime/smtp_proto.c
+++ b/src/libmime/smtp_proto.c
@@ -23,7 +23,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "cfg_file.h"
 #include "util.h"
 #include "smtp.h"

diff --git a/src/libmime/smtp_utils.c b/src/libmime/smtp_utils.c
index b3abe03024cf991d841dc77a4dc9f4c23b443bcf..edc7f3b1465cf49b9237ac60aa4bf30625547dad 100644 (file)
--- a/src/libmime/smtp_utils.c
+++ b/src/libmime/smtp_utils.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "filter.h"
 #include "smtp.h"
 #include "smtp_proto.h"

diff --git a/src/libserver/buffer.c b/src/libserver/buffer.c
index 4c6ee277693748a861383d3c977bb6f2a8f1e7ab..e4268863cdfe2ba2169f55752366ee6e3196bafa 100644 (file)
--- a/src/libserver/buffer.c
+++ b/src/libserver/buffer.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include "buffer.h"
-#include "main.h"
+#include "rspamd.h"
 #ifdef HAVE_SYS_SENDFILE_H
 #include <sys/sendfile.h>
 #endif

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 263ba9e409c4b2d31b3da79e397644d56a0ebb8f..efd57f715d164b2d3296376bfa682f0c3456f54e 100644 (file)
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -23,7 +23,7 @@
 
 #include <blake2.h>
 #include "cfg_rcl.h"
-#include "main.h"
+#include "rspamd.h"
 #include "uthash_strcase.h"
 #include "utlist.h"
 #include "cfg_file.h"

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 068ced265f470b48c19e9b2b85b71643889146c7..95c984b9c867adac63a8ee54a279e5a201708f9c 100644 (file)
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include "cfg_file.h"
-#include "main.h"
+#include "rspamd.h"
 #include "uthash_strcase.h"
 #include "filter.h"
 #include "lua/lua_common.h"

diff --git a/src/libserver/dkim.c b/src/libserver/dkim.c
index dd4242393bcc32281813aeacc8b11268ce4ecf59..2cfa184a38f769363739c3db3916391d0f436b6c 100644 (file)
--- a/src/libserver/dkim.c
+++ b/src/libserver/dkim.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "message.h"
 #include "dkim.h"
 #include "dns.h"

diff --git a/src/libserver/dns.c b/src/libserver/dns.c
index f808a4460da1002326808c0cbd456b4b5559f6af..0df6ddd918cbbaf494c380ae0103820aaca27d26 100644 (file)
--- a/src/libserver/dns.c
+++ b/src/libserver/dns.c
@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "dns.h"
-#include "main.h"
+#include "rspamd.h"
 #include "utlist.h"
 #include "uthash.h"
 #include "rdns_event.h"

diff --git a/src/libserver/dynamic_cfg.c b/src/libserver/dynamic_cfg.c
index 97a9d72f2f1daf000e780ac7d768c75d66b878bc..eaa658b8bb0a237c79f6cade5123521ef92767ac 100644 (file)
--- a/src/libserver/dynamic_cfg.c
+++ b/src/libserver/dynamic_cfg.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "map.h"
 #include "filter.h"
 #include "dynamic_cfg.h"

diff --git a/src/libserver/events.c b/src/libserver/events.c
index a50c122f3d7ee341adc85bb488f4d3be8d1e0752..b996f1559a46bfbb4fbab32ecba3de5b7f41cd9b 100644 (file)
--- a/src/libserver/events.c
+++ b/src/libserver/events.c
@@ -23,7 +23,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "events.h"
 #include "xxhash.h"
 

diff --git a/src/libserver/fuzzy_backend.c b/src/libserver/fuzzy_backend.c
index 3d1749aa78dd24826af9af3a69a1f61fdeb86719..ce6bd6a5acb74efa2f4b99afe56f7d3046dbd4f5 100644 (file)
--- a/src/libserver/fuzzy_backend.c
+++ b/src/libserver/fuzzy_backend.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "fuzzy_backend.h"
 
 #include <sqlite3.h>

diff --git a/src/libserver/html.c b/src/libserver/html.c
index e68c73c8ccef09b573c65f6804619c0b91b498c6..0a46cef02ffbb0b858bf31d9c51f3949e4955df4 100644 (file)
--- a/src/libserver/html.c
+++ b/src/libserver/html.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include "util.h"
-#include "main.h"
+#include "rspamd.h"
 #include "message.h"
 #include "html.h"
 #include "url.h"

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index d585f9ce632f7da784cb04e0985ce1f9b953938c..8cf6b771f84bb436a614fcb461fc35758c03d200 100644 (file)
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -23,7 +23,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "util.h"
 #include "cfg_file.h"
 #include "cfg_rcl.h"

diff --git a/src/libserver/proxy.c b/src/libserver/proxy.c
index a4076954b5ffed5352c1a1bfe0982a9a7715816e..09171eeb940a6ce6f8ea80ef51ddf06e5fca2a05 100644 (file)
--- a/src/libserver/proxy.c
+++ b/src/libserver/proxy.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "proxy.h"
 
 static void rspamd_proxy_backend_handler (gint fd, gshort what, gpointer data);

diff --git a/src/libserver/roll_history.c b/src/libserver/roll_history.c
index 52049cb5e9dee3a6b531afb191c56fc92652ecc4..74c7c8214f32e0ec311a74bb217ad0afc6d2693e 100644 (file)
--- a/src/libserver/roll_history.c
+++ b/src/libserver/roll_history.c
@@ -24,7 +24,7 @@
 
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "roll_history.h"
 
 static const gchar rspamd_history_magic[] = {'r', 's', 'h', '1'};

diff --git a/src/libserver/spf.c b/src/libserver/spf.c
index 479f22e935593e877991527761b5a19ccf66222b..d9b9a730f4b98be9ebe4d858b95b1348d246983f 100644 (file)
--- a/src/libserver/spf.c
+++ b/src/libserver/spf.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "dns.h"
 #include "spf.h"
-#include "main.h"
+#include "rspamd.h"
 #include "message.h"
 #include "filter.h"
 #include "utlist.h"

diff --git a/src/libserver/symbols_cache.c b/src/libserver/symbols_cache.c
index 52b62fac5c030c9e364ee82208ee31e7cb4ca8fa..6564d9efe8a7d5818b49430ae9206bdd799a6a9d 100644 (file)
--- a/src/libserver/symbols_cache.c
+++ b/src/libserver/symbols_cache.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include "util.h"
-#include "main.h"
+#include "rspamd.h"
 #include "message.h"
 #include "symbols_cache.h"
 #include "cfg_file.h"

diff --git a/src/libserver/task.c b/src/libserver/task.c
index ce765b8f0ac1dbf2ef3ab45a3c5fb265d81ebb8e..fc22f784f9833af86983541bf3008e0c209420ab 100644 (file)
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -22,7 +22,7 @@
  */
 
 #include "task.h"
-#include "main.h"
+#include "rspamd.h"
 #include "filter.h"
 #include "protocol.h"
 #include "message.h"

diff --git a/src/libserver/url.c b/src/libserver/url.c
index 3a99480cd55de293c16e19cdaa4ce04994c5a670..b2e5d691ce6b46834e338c6d5dbbc90e7ec4782a 100644 (file)
--- a/src/libserver/url.c
+++ b/src/libserver/url.c
@@ -29,7 +29,7 @@
 #include "url.h"
 #include "util.h"
 #include "fstring.h"
-#include "main.h"
+#include "rspamd.h"
 #include "message.h"
 #include "http.h"
 #include "acism.h"

diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index 800fa9c01ef8611cde33017841d2c1a6c3b3f711..eee200a41834a7f934af326649588e60502f5719 100644 (file)
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "message.h"
 #include "lua/lua_common.h"
 #include "worker_util.h"

diff --git a/src/libserver/worker_util.h b/src/libserver/worker_util.h
index 04109b9b009c0638ca1be3d8fb0dd0190fb2bb27..8bc0ceaee914af1637574931c15adfbfa865cf48 100644 (file)
--- a/src/libserver/worker_util.h
+++ b/src/libserver/worker_util.h
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "util.h"
 #include "http.h"
-#include "main.h"
+#include "rspamd.h"
 
 #ifndef HAVE_SA_SIGINFO
 typedef void (*rspamd_sig_handler_t) (gint);

diff --git a/src/libstat/backends/mmaped_file.c b/src/libstat/backends/mmaped_file.c
index 6bb5e0feb5954d7bee5b8de6c83b9b651eb4a874..41d6900cec90e0327ea3674f379e7c8800789d17 100644 (file)
--- a/src/libstat/backends/mmaped_file.c
+++ b/src/libstat/backends/mmaped_file.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include "stat_internal.h"
-#include "main.h"
+#include "rspamd.h"
 
 #define CHAIN_LENGTH 128
 

diff --git a/src/libstat/backends/redis.c b/src/libstat/backends/redis.c
index 38d6c7a3a13f501e5aa1e3f05bb9e8cdad7a8193..39d7dc21a19b456326cfa6b47714c93ef2be5400 100644 (file)
--- a/src/libstat/backends/redis.c
+++ b/src/libstat/backends/redis.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "stat_internal.h"
 #include "upstream.h"
 

diff --git a/src/libstat/backends/sqlite3_backend.c b/src/libstat/backends/sqlite3_backend.c
index 96eddea3e5f869799de607409dc63144de326afc..33aac049456048beca97c3025998e647b1b7b5f6 100644 (file)
--- a/src/libstat/backends/sqlite3_backend.c
+++ b/src/libstat/backends/sqlite3_backend.c
@@ -23,7 +23,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "sqlite3.h"
 #include "libutil/sqlite_utils.h"
 #include "libstat/stat_internal.h"

diff --git a/src/libstat/classifiers/bayes.c b/src/libstat/classifiers/bayes.c
index e248fd6e606e1a52f4515fb45a3fe9b27b72eaa6..67c2e31162b6e32fea8995adacfff0e6326b0f5b 100644 (file)
--- a/src/libstat/classifiers/bayes.c
+++ b/src/libstat/classifiers/bayes.c
@@ -26,7 +26,7 @@
  * Bayesian classifier
  */
 #include "classifiers.h"
-#include "main.h"
+#include "rspamd.h"
 #include "filter.h"
 #include "cfg_file.h"
 #include "stat_internal.h"

diff --git a/src/libstat/learn_cache/sqlite3_cache.c b/src/libstat/learn_cache/sqlite3_cache.c
index 745b8839cb2faf8f8a9a23f7d7a3ec79ef73b011..6eabaefda446fe5218d0693f2df86c98aa47d96b 100644 (file)
--- a/src/libstat/learn_cache/sqlite3_cache.c
+++ b/src/libstat/learn_cache/sqlite3_cache.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "learn_cache.h"
-#include "main.h"
+#include "rspamd.h"
 #include "stat_api.h"
 #include "stat_internal.h"
 #include "blake2.h"

diff --git a/src/libstat/stat_config.c b/src/libstat/stat_config.c
index 00baaa059d506122036d9df6e914b05fe8e82be7..dbfe16c27323d932c74d5438860c1eef6e6c34dc 100644 (file)
--- a/src/libstat/stat_config.c
+++ b/src/libstat/stat_config.c
@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "stat_api.h"
-#include "main.h"
+#include "rspamd.h"
 #include "cfg_rcl.h"
 #include "stat_internal.h"
 

diff --git a/src/libstat/stat_process.c b/src/libstat/stat_process.c
index d1e23baf2cfc94355d1c9b8905292fd1a7b5ba91..a6f5d31aec7650114013f0820a72f8550308fe11 100644 (file)
--- a/src/libstat/stat_process.c
+++ b/src/libstat/stat_process.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "stat_api.h"
-#include "main.h"
+#include "rspamd.h"
 #include "stat_internal.h"
 #include "libmime/message.h"
 #include "libmime/images.h"

diff --git a/src/libstat/tokenizers/tokenizers.c b/src/libstat/tokenizers/tokenizers.c
index b54c890234397d1f93699978583baaf0d5371d49..07e7a1f45e06a238b4b2ce2747e3f223eb4b1892 100644 (file)
--- a/src/libstat/tokenizers/tokenizers.c
+++ b/src/libstat/tokenizers/tokenizers.c
@@ -26,7 +26,7 @@
  * Common tokenization functions
  */
 
-#include "main.h"
+#include "rspamd.h"
 #include "tokenizers.h"
 #include "stat_internal.h"
 

diff --git a/src/libstat/tokenizers/tokenizers.h b/src/libstat/tokenizers/tokenizers.h
index 050f6d7b1bbc006b44e20c94bf472a2b136acfd3..7b01d9fe8b8da5359bacd5f0bd800542a4bc2818 100644 (file)
--- a/src/libstat/tokenizers/tokenizers.h
+++ b/src/libstat/tokenizers/tokenizers.h
@@ -4,7 +4,7 @@
 #include "config.h"
 #include "mem_pool.h"
 #include "fstring.h"
-#include "main.h"
+#include "rspamd.h"
 #include "stat_api.h"
 
 #define RSPAMD_DEFAULT_TOKENIZER "osb"

diff --git a/src/libutil/aio_event.c b/src/libutil/aio_event.c
index ed257bab0139832644e1d5f62371f06587d1e706..0686bbd0db23c4207a1d3f95c7efbe33f04a36b3 100644 (file)
--- a/src/libutil/aio_event.c
+++ b/src/libutil/aio_event.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "aio_event.h"
-#include "main.h"
+#include "rspamd.h"
 
 #ifdef HAVE_SYS_EVENTFD_H
 #include <sys/eventfd.h>

diff --git a/src/libutil/keypairs_cache.c b/src/libutil/keypairs_cache.c
index 532eaa37302d83ad59cfb5aca20de8d9d88e22a2..1bedb704d3280b9643acb91ce2e1fb76bc983974 100644 (file)
--- a/src/libutil/keypairs_cache.c
+++ b/src/libutil/keypairs_cache.c
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "keypairs_cache.h"
 #include "keypair_private.h"
 #include "hash.h"

diff --git a/src/libutil/logger.c b/src/libutil/logger.c
index 57410ad96f66a187223e813650543da14d0156bb..65cb67cdcb092c8330cb5df6241df1309f4da7c7 100644 (file)
--- a/src/libutil/logger.c
+++ b/src/libutil/logger.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "logger.h"
 #include "util.h"
-#include "main.h"
+#include "rspamd.h"
 #include "map.h"
 #include "xxhash.h"
 

diff --git a/src/libutil/map.c b/src/libutil/map.c
index 2ef68302e7e8bdd4166eb4a1f2ff4f8bafedf4af..cba82ba418ccba75358a77349cf6c3ee53275ee8 100644 (file)
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "map.h"
 #include "http.h"
-#include "main.h"
+#include "rspamd.h"
 #include "util.h"
 #include "mem_pool.h"
 #include "blake2.h"

diff --git a/src/libutil/mem_pool.c b/src/libutil/mem_pool.c
index 8070e1c2bd5c687e9d17a9c354100a5a5296bf24..ea5fa0bd83c61a3d6f223a496b4feed0dc02055c 100644 (file)
--- a/src/libutil/mem_pool.c
+++ b/src/libutil/mem_pool.c
@@ -27,7 +27,7 @@
 #include "fstring.h"
 #include "logger.h"
 #include "util.h"
-#include "main.h"
+#include "rspamd.h"
 #include "utlist.h"
 #include "ottery.h"
 

diff --git a/src/libutil/printf.c b/src/libutil/printf.c
index 03b801041c11883b21dbd5acb0199b61df98b0b4..328173bd06d1f6edd6e7ce42940a9f5ffa920020 100644 (file)
--- a/src/libutil/printf.c
+++ b/src/libutil/printf.c
@@ -25,7 +25,7 @@
 
 #include "printf.h"
 #include "fstring.h"
-#include "main.h"
+#include "rspamd.h"
 
 /**
  * From FreeBSD libutil code

diff --git a/src/libutil/radix.c b/src/libutil/radix.c
index a919691da016c42b0a4c4f9b6b69920a60e4adf1..bea96b14278ebf0573d181e6ea8bf2935e8ca011 100644 (file)
--- a/src/libutil/radix.c
+++ b/src/libutil/radix.c
@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "radix.h"
-#include "main.h"
+#include "rspamd.h"
 #include "mem_pool.h"
 
 #define msg_err_radix(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \

diff --git a/src/libutil/regexp.c b/src/libutil/regexp.c
index da9884ec11264f1b960c3690926ffa6d53f9ccd9..f713ca2f740e793e85923c6e22abe202b3a40ef9 100644 (file)
--- a/src/libutil/regexp.c
+++ b/src/libutil/regexp.c
@@ -28,7 +28,7 @@
 #include "blake2.h"
 #include "ref.h"
 #include "util.h"
-#include "main.h"
+#include "rspamd.h"
 #include <pcre.h>
 
 typedef guchar regexp_id_t[BLAKE2B_OUTBYTES];

diff --git a/src/libutil/util.c b/src/libutil/util.c
index 983accf62b96d5cb58eb1d9aa0791379dec0bf71..496bd0298b857e3b9e4fc096a13e2e8b16f2a2b6 100644 (file)
--- a/src/libutil/util.c
+++ b/src/libutil/util.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "util.h"
 #include "cfg_file.h"
-#include "main.h"
+#include "rspamd.h"
 #include "filter.h"
 #include "message.h"
 

diff --git a/src/lua/lua_common.h b/src/lua/lua_common.h
index b2b2750b585d1e0e0cb859c9fa2d6cc500cb3332..3aee6ea52565806b9be4f5552b650c86b2fe4c20 100644 (file)
--- a/src/lua/lua_common.h
+++ b/src/lua/lua_common.h
@@ -8,7 +8,7 @@
 #include <lauxlib.h>
 #include <lualib.h>
 
-#include "main.h"
+#include "rspamd.h"
 #include "ucl.h"
 #include "lua_ucl.h"
 

diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
index f533434ce1ce0abca39d4a3323cf6a85f0343560..f9f71c532c73e812ec645507fd3ca255d3595d0d 100644 (file)
--- a/src/lua/lua_util.c
+++ b/src/lua/lua_util.c
@@ -23,7 +23,7 @@
 
 #include "lua_common.h"
 #include "task.h"
-#include "main.h"
+#include "rspamd.h"
 #include "html.h"
 #include "cfg_rcl.h"
 #include "tokenizers/tokenizers.h"

diff --git a/src/lua_worker.c b/src/lua_worker.c
index 8e6aaa8fc5c2cdcc0ed53df66caceedebc0f5f48..c378ffc0b63789d4c3efe3bf4de116e4254d6f31 100644 (file)
--- a/src/lua_worker.c
+++ b/src/lua_worker.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include "util.h"
-#include "main.h"
+#include "rspamd.h"
 #include "libserver/worker_util.h"
 #include "protocol.h"
 #include "upstream.h"

diff --git a/src/plugins/chartable.c b/src/plugins/chartable.c
index 9c7362b35e20d14beb88238c1e039ae0eaf975bc..b704e9238da5a947be482614bad7ac6e7f7e83a4 100644 (file)
--- a/src/plugins/chartable.c
+++ b/src/plugins/chartable.c
@@ -33,7 +33,7 @@
 
 #include "config.h"
 #include "libmime/message.h"
-#include "main.h"
+#include "rspamd.h"
 
 #define DEFAULT_SYMBOL "R_CHARSET_MIXED"
 #define DEFAULT_THRESHOLD 0.1

diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c
index e6c88da52b9c5fb6d03841346f74ac963e35b222..7cf65f2a3d0f865d65ef04feb53ba1792289acc0 100644 (file)
--- a/src/plugins/dkim_check.c
+++ b/src/plugins/dkim_check.c
@@ -42,7 +42,7 @@
 #include "libserver/dkim.h"
 #include "libutil/hash.h"
 #include "libutil/map.h"
-#include "main.h"
+#include "rspamd.h"
 #include "utlist.h"
 
 #define DEFAULT_SYMBOL_REJECT "R_DKIM_REJECT"

diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index 0b5cd97ed89c982d8a2570a570082848ba7f787b..37d5f261e46764f7246e236b683b01c7de1ef700 100644 (file)
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -46,7 +46,7 @@
 #include "libserver/worker_util.h"
 #include "fuzzy_storage.h"
 #include "utlist.h"
-#include "main.h"
+#include "rspamd.h"
 #include "blake2.h"
 #include "ottery.h"
 

diff --git a/src/plugins/regexp.c b/src/plugins/regexp.c
index 16f941364c530f8674e4de4e9e53e14db71e2720..2fd267aa0d510fd566d62e75090580bb6b1ab2f0 100644 (file)
--- a/src/plugins/regexp.c
+++ b/src/plugins/regexp.c
@@ -33,7 +33,7 @@
 #include "mime_expressions.h"
 #include "libutil/map.h"
 #include "lua/lua_common.h"
-#include "main.h"
+#include "rspamd.h"
 
 struct regexp_module_item {
        struct rspamd_expression *expr;

diff --git a/src/plugins/spf.c b/src/plugins/spf.c
index 70c298a7da032d1d3c4138cf3d6fe4901c26f4f3..f19d2b50fbef084d084f103e9b6a1f8205122633 100644 (file)
--- a/src/plugins/spf.c
+++ b/src/plugins/spf.c
@@ -37,7 +37,7 @@
 #include "libserver/spf.h"
 #include "libutil/hash.h"
 #include "libutil/map.h"
-#include "main.h"
+#include "rspamd.h"
 
 #define DEFAULT_SYMBOL_FAIL "R_SPF_FAIL"
 #define DEFAULT_SYMBOL_SOFTFAIL "R_SPF_SOFTFAIL"

diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index 8538e57a19e9aa172a0f385fcf1d715bfb94c558..882eed2d4bf1b42eeb5d52098df6f9a65a4ccf93 100644 (file)
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -45,7 +45,7 @@
 #include "libmime/message.h"
 #include "libutil/hash.h"
 #include "libutil/map.h"
-#include "main.h"
+#include "rspamd.h"
 #include "surbl.h"
 #include "regexp.h"
 #include "acism.h"

diff --git a/src/plugins/surbl.h b/src/plugins/surbl.h
index 76f2bafb9d49879b074853a5dc05bd0fec6865d1..9eab930002966ef5119c98fb5f0620afc227308f 100644 (file)
--- a/src/plugins/surbl.h
+++ b/src/plugins/surbl.h
@@ -3,7 +3,7 @@
 
 #include "config.h"
 #include "acism.h"
-#include "main.h"
+#include "rspamd.h"
 
 #define DEFAULT_REDIRECTOR_PORT 8080
 #define DEFAULT_SURBL_WEIGHT 10

diff --git a/src/main.c b/src/rspamd.c
similarity index 99%
rename from src/main.c
rename to src/rspamd.c
index 87de76bee78b171552561a1c7f368f252839a483..48874cffec521baf2aa7687a80698528f7eb24ba 100644 (file)
--- a/src/main.c
+++ b/src/rspamd.c
@@ -23,9 +23,7 @@
  */
 
 #include "config.h"
-#include "main.h"
-#include "lmtp.h"
-#include "smtp.h"
+#include "rspamd.h"
 #include "libutil/map.h"
 #include "fuzzy_storage.h"
 #include "libserver/symbols_cache.h"

diff --git a/src/main.h b/src/rspamd.h
similarity index 100%
rename from src/main.h
rename to src/rspamd.h

diff --git a/src/smtp.h b/src/smtp.h
index d6713eeb209b79816a263b5d37a9f9638f297a31..798e87a30b589bc8ebd433377e44820db97108f1 100644 (file)
--- a/src/smtp.h
+++ b/src/smtp.h
@@ -5,7 +5,7 @@
 #include "libutil/upstream.h"
 #include "libmime/smtp_utils.h"
 #include "libmime/smtp_proto.h"
-#include "main.h"
+#include "rspamd.h"
 
 struct rspamd_dns_resolver;
 

diff --git a/src/smtp_proxy.c b/src/smtp_proxy.c
index de9854a34f1861cf53b4be65bc6885613b614f49..b931a78909918fee41b1e462afd7c8134133e5fe 100644 (file)
--- a/src/smtp_proxy.c
+++ b/src/smtp_proxy.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #include "utlist.h"
 #include "libserver/proxy.h"
-#include "main.h"
+#include "rspamd.h"
 #include "smtp.h"
 #include "libserver/worker_util.h"
 

diff --git a/src/worker.c b/src/worker.c
index 2d37c8b5f0098d7637d90a23847f64159dc99dc9..a127d14d882ba34632c413428301b37a38b9871a 100644 (file)
--- a/src/worker.c
+++ b/src/worker.c
@@ -35,7 +35,7 @@
 #include "libserver/url.h"
 #include "libserver/dns.h"
 #include "libmime/message.h"
-#include "main.h"
+#include "rspamd.h"
 #include "keypairs_cache.h"
 #include "libstat/stat_api.h"
 #include "libserver/worker_util.h"

diff --git a/test/rspamd_async_test.c b/test/rspamd_async_test.c
index 2308acc671000eaaad8a31a7016c38c38e8b0cb3..71eec712a078e5ad50ee78805fe6cec61d695966 100644 (file)
--- a/test/rspamd_async_test.c
+++ b/test/rspamd_async_test.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "tests.h"
-#include "main.h"
+#include "rspamd.h"
 #include "aio_event.h"
 #include "mem_pool.h"
 

diff --git a/test/rspamd_cryptobox_test.c b/test/rspamd_cryptobox_test.c
index 47eab183889e2a452ef25a8b158c6ded360cd62d..c7ad2921cea59637ddb976561ccd1f7145b9d806 100644 (file)
--- a/test/rspamd_cryptobox_test.c
+++ b/test/rspamd_cryptobox_test.c
@@ -24,7 +24,7 @@
 
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "shingles.h"
 #include "fstring.h"
 #include "ottery.h"

diff --git a/test/rspamd_dkim_test.c b/test/rspamd_dkim_test.c
index c0fca4ce5df1eaaf576c05e98a2bee199976ddb2..50dfae7daf8324b87587112633b5f81d33d3425c 100644 (file)
--- a/test/rspamd_dkim_test.c
+++ b/test/rspamd_dkim_test.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "tests.h"
-#include "main.h"
+#include "rspamd.h"
 #include "dkim.h"
 
 static const gchar test_dkim_sig[] = "v=1; a=rsa-sha256; c=relaxed/relaxed; "

diff --git a/test/rspamd_dns_test.c b/test/rspamd_dns_test.c
index 31efdc827ab4f4200fb0441ee729f5037fa32a6d..c2383b61abd871a4191a90a193b920e603c60ea4 100644 (file)
--- a/test/rspamd_dns_test.c
+++ b/test/rspamd_dns_test.c
@@ -3,7 +3,7 @@
 #include "tests.h"
 #include "dns.h"
 #include "logger.h"
-#include "main.h"
+#include "rspamd.h"
 #include "events.h"
 #include "cfg_file.h"
 

diff --git a/test/rspamd_http_test.c b/test/rspamd_http_test.c
index ee6c49b2338614ea5787fe839afe7b58f63ebeb4..f4712b22436cbc7daca92dc10c1e677e504d4713 100644 (file)
--- a/test/rspamd_http_test.c
+++ b/test/rspamd_http_test.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "util.h"
 #include "http.h"
 #include "tests.h"

diff --git a/test/rspamd_lua_test.c b/test/rspamd_lua_test.c
index b129f1b518216958cba06092269ebf46cf525073..caeb9814ef8bb862ba632bf49b5f5fc93fcde3d7 100644 (file)
--- a/test/rspamd_lua_test.c
+++ b/test/rspamd_lua_test.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "util.h"
 #include "lua/lua_common.h"
 

diff --git a/test/rspamd_radix_test.c b/test/rspamd_radix_test.c
index 388f95a9a4c96b41d6e22c77b73d831c93af88e5..a46f4a3b11d2234249bced2b12f27a9ff9018a68 100644 (file)
--- a/test/rspamd_radix_test.c
+++ b/test/rspamd_radix_test.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "radix.h"
 #include "ottery.h"
 

diff --git a/test/rspamd_rrd_test.c b/test/rspamd_rrd_test.c
index 4700be8b48c59e018c0be707307d7e82116d4505..7b3cd7a68a9dc94ce807322c43c9fe1b274161c4 100644 (file)
--- a/test/rspamd_rrd_test.c
+++ b/test/rspamd_rrd_test.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #include "tests.h"
 #include "rrd.h"
-#include "main.h"
+#include "rspamd.h"
 #include "ottery.h"
 
 const int rows_cnt = 20;

diff --git a/test/rspamd_shingles_test.c b/test/rspamd_shingles_test.c
index 1a96b64bcd03cbe607bb69a027e82691d1ec476c..433fe8c679b1fddd8b16ff8cb4e6f91d946f8a9b 100644 (file)
--- a/test/rspamd_shingles_test.c
+++ b/test/rspamd_shingles_test.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "shingles.h"
 #include "fstring.h"
 #include "ottery.h"

diff --git a/test/rspamd_statfile_test.c b/test/rspamd_statfile_test.c
index af18faa5e539a0436a328c498713d27048c9c5dd..2ee32ea48b12941a9026cebfb2aa085ffe765d7e 100644 (file)
--- a/test/rspamd_statfile_test.c
+++ b/test/rspamd_statfile_test.c
@@ -1,5 +1,5 @@
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "tests.h"
 #include "ottery.h"
 

diff --git a/test/rspamd_test_suite.c b/test/rspamd_test_suite.c
index 8e092fd8423e04f308315d6e8ce217b22b4f89bf..e10ebd88925831fc9cf79f1733317ef0207af018 100644 (file)
--- a/test/rspamd_test_suite.c
+++ b/test/rspamd_test_suite.c
@@ -1,5 +1,5 @@
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "cfg_file.h"
 #include "regexp.h"
 #include "libstat/stat_api.h"

diff --git a/test/rspamd_upstream_test.c b/test/rspamd_upstream_test.c
index 28c4bb7576896934c59606e2bfeea830a4e3eac3..9e04c4ddaab2e5400dfcda2d0555e168524e91f4 100644 (file)
--- a/test/rspamd_upstream_test.c
+++ b/test/rspamd_upstream_test.c
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "upstream.h"
 #include "ottery.h"
 

diff --git a/test/rspamd_url_test.c b/test/rspamd_url_test.c
index 8acc6b3247144f98497e7a983774800ee86766d7..aadc18409f329d509ed205cdcb97a3f242fce78a 100644 (file)
--- a/test/rspamd_url_test.c
+++ b/test/rspamd_url_test.c
@@ -1,5 +1,5 @@
 #include "config.h"
-#include "main.h"
+#include "rspamd.h"
 #include "cfg_file.h"
 #include "url.h"
 #include "tests.h"