From: Vsevolod Stakhov Date: Tue, 22 Sep 2015 17:17:24 +0000 (+0100) Subject: Rename main.h and main.c to `rspamd.X` X-Git-Tag: 1.0.2~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3afc4aba24dd996950c3947b9cb6475271aec884;p=thirdparty%2Frspamd.git Rename main.h and main.c to `rspamd.X` --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 494f5b6c0e..f86c45b405 100644 --- 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 0e729b886e..69132de70c 100644 --- 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 d41b922d28..ebbff3365e 100644 --- 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 b9997da8ba..57d7b5cc7a 100644 --- 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 12b2373465..f71adc3f6d 100644 --- 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 7efb8f82a2..ed50efafe9 100644 --- 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 419b6a2ca1..f55e47d7a7 100644 --- 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 5d01e6f750..6d64ea5d13 100644 --- 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 54c5ab59eb..3537f70c0a 100644 --- 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 f5732c75ac..6581b7362d 100644 --- 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 713efabac7..988bd37af9 100644 --- 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 b3abe03024..edc7f3b146 100644 --- 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 4c6ee27769..e4268863cd 100644 --- 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 #endif diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c index 263ba9e409..efd57f715d 100644 --- a/src/libserver/cfg_rcl.c +++ b/src/libserver/cfg_rcl.c @@ -23,7 +23,7 @@ #include #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 068ced265f..95c984b9c8 100644 --- 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 dd4242393b..2cfa184a38 100644 --- 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 f808a4460d..0df6ddd918 100644 --- 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 97a9d72f2f..eaa658b8bb 100644 --- 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 a50c122f3d..b996f1559a 100644 --- 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 3d1749aa78..ce6bd6a5ac 100644 --- 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 diff --git a/src/libserver/html.c b/src/libserver/html.c index e68c73c8cc..0a46cef02f 100644 --- 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 d585f9ce63..8cf6b771f8 100644 --- 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 a4076954b5..09171eeb94 100644 --- 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 52049cb5e9..74c7c8214f 100644 --- 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 479f22e935..d9b9a730f4 100644 --- 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 52b62fac5c..6564d9efe8 100644 --- 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 ce765b8f0a..fc22f784f9 100644 --- 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 3a99480cd5..b2e5d691ce 100644 --- 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 800fa9c01e..eee200a418 100644 --- 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 04109b9b00..8bc0ceaee9 100644 --- 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 6bb5e0feb5..41d6900cec 100644 --- 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 38d6c7a3a1..39d7dc21a1 100644 --- 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 96eddea3e5..33aac04945 100644 --- 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 e248fd6e60..67c2e31162 100644 --- 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 745b8839cb..6eabaefda4 100644 --- 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 00baaa059d..dbfe16c273 100644 --- 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 d1e23baf2c..a6f5d31aec 100644 --- 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 b54c890234..07e7a1f45e 100644 --- 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 050f6d7b1b..7b01d9fe8b 100644 --- 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 ed257bab01..0686bbd0db 100644 --- 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 diff --git a/src/libutil/keypairs_cache.c b/src/libutil/keypairs_cache.c index 532eaa3730..1bedb704d3 100644 --- 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 57410ad96f..65cb67cdcb 100644 --- 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 2ef68302e7..cba82ba418 100644 --- 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 8070e1c2bd..ea5fa0bd83 100644 --- 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 03b801041c..328173bd06 100644 --- 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 a919691da0..bea96b1427 100644 --- 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 da9884ec11..f713ca2f74 100644 --- 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 typedef guchar regexp_id_t[BLAKE2B_OUTBYTES]; diff --git a/src/libutil/util.c b/src/libutil/util.c index 983accf62b..496bd0298b 100644 --- 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 b2b2750b58..3aee6ea525 100644 --- a/src/lua/lua_common.h +++ b/src/lua/lua_common.h @@ -8,7 +8,7 @@ #include #include -#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 f533434ce1..f9f71c532c 100644 --- 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 8e6aaa8fc5..c378ffc0b6 100644 --- 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 9c7362b35e..b704e9238d 100644 --- 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 e6c88da52b..7cf65f2a3d 100644 --- 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 0b5cd97ed8..37d5f261e4 100644 --- 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 16f941364c..2fd267aa0d 100644 --- 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 70c298a7da..f19d2b50fb 100644 --- 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 8538e57a19..882eed2d4b 100644 --- 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 76f2bafb9d..9eab930002 100644 --- 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 87de76bee7..48874cffec 100644 --- 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 d6713eeb20..798e87a30b 100644 --- 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 de9854a34f..b931a78909 100644 --- 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 2d37c8b5f0..a127d14d88 100644 --- 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 2308acc671..71eec712a0 100644 --- 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 47eab18388..c7ad2921ce 100644 --- 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 c0fca4ce5d..50dfae7daf 100644 --- 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 31efdc827a..c2383b61ab 100644 --- 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 ee6c49b233..f4712b2243 100644 --- 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 b129f1b518..caeb9814ef 100644 --- 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 388f95a9a4..a46f4a3b11 100644 --- 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 4700be8b48..7b3cd7a68a 100644 --- 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 1a96b64bcd..433fe8c679 100644 --- 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 af18faa5e5..2ee32ea48b 100644 --- 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 8e092fd842..e10ebd8892 100644 --- 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 28c4bb7576..9e04c4ddaa 100644 --- 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 8acc6b3247..aadc18409f 100644 --- 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"