From f7551113d8066786211ce8c47d2dd1e944a83154 Mon Sep 17 00:00:00 2001 From: Alex 'AdUser' Z Date: Fri, 20 Jan 2017 12:56:36 +1000 Subject: [PATCH] * change modules naming & location --- configs/conf-available/05-source-files.conf | 2 +- configs/conf-available/05-source-mcast.conf | 2 +- .../conf-available/05-source-portknock.conf | 2 +- configs/conf-available/05-source-redis.conf | 2 +- .../conf-available/10-backend-exec-ipfw.conf | 2 +- .../conf-available/10-backend-exec-ipset.conf | 2 +- configs/conf-available/10-backend-ipset.conf | 2 +- configs/conf-available/10-backend-mcast.conf | 2 +- configs/conf-available/10-backend-redis.conf | 2 +- configs/conf-available/15-filter-pcre.conf | 2 +- configs/conf-available/15-filter-preg.conf | 2 +- src/backends/CMakeLists.txt | 30 +++++++++++-------- src/filters/CMakeLists.txt | 20 ++++++++----- src/sources/CMakeLists.txt | 28 +++++++++-------- 14 files changed, 56 insertions(+), 44 deletions(-) diff --git a/configs/conf-available/05-source-files.conf b/configs/conf-available/05-source-files.conf index 4df3717..cede06a 100644 --- a/configs/conf-available/05-source-files.conf +++ b/configs/conf-available/05-source-files.conf @@ -1,2 +1,2 @@ [source:files] -load = libf2b_source_files.so +load = f2b/sources/files.so diff --git a/configs/conf-available/05-source-mcast.conf b/configs/conf-available/05-source-mcast.conf index cc5ace6..6f5b2d1 100644 --- a/configs/conf-available/05-source-mcast.conf +++ b/configs/conf-available/05-source-mcast.conf @@ -1,5 +1,5 @@ [source:mcast] -load = libf2b_source_mcast.so +load = f2b/sources/mcast.so ; group = 239.255.186.1 ; port = 3370 ; bind = 0.0.0.0 diff --git a/configs/conf-available/05-source-portknock.conf b/configs/conf-available/05-source-portknock.conf index 159b437..ced992b 100644 --- a/configs/conf-available/05-source-portknock.conf +++ b/configs/conf-available/05-source-portknock.conf @@ -1,5 +1,5 @@ [source:portknock] -load = libf2b_source_portknock.so +load = f2b/sources/portknock.so ; listen = 0.0.0.0:23 # telnet ; listen = 0.0.0.0:5060 # sip ; listen = 0.0.0.0:6667 # irc diff --git a/configs/conf-available/05-source-redis.conf b/configs/conf-available/05-source-redis.conf index f11ae02..f20cf4b 100644 --- a/configs/conf-available/05-source-redis.conf +++ b/configs/conf-available/05-source-redis.conf @@ -1,5 +1,5 @@ [source:redis] -load = libf2b_source_redis.so +load = f2b/sources/redis.so timeout = 2 host = 127.0.0.1 port = 6379 diff --git a/configs/conf-available/10-backend-exec-ipfw.conf b/configs/conf-available/10-backend-exec-ipfw.conf index 6efe0a5..4929527 100644 --- a/configs/conf-available/10-backend-exec-ipfw.conf +++ b/configs/conf-available/10-backend-exec-ipfw.conf @@ -1,5 +1,5 @@ [backend:exec-ipfw] -load = libf2b_backend_exec.so +load = f2b/backends/exec.so ban = /sbin/ipfw table add unban = /sbin/ipfw table delete timeout = 2 diff --git a/configs/conf-available/10-backend-exec-ipset.conf b/configs/conf-available/10-backend-exec-ipset.conf index a9d57f1..018527e 100644 --- a/configs/conf-available/10-backend-exec-ipset.conf +++ b/configs/conf-available/10-backend-exec-ipset.conf @@ -1,5 +1,5 @@ [backend:exec-ipset] -load = libf2b_backend_exec.so +load = f2b/backends/exec.so start = /sbin/ipset -! create hash:ip start = /sbin/iptables -I INPUT -m set --match-set src -j DROP stop = /sbin/iptables -D INPUT -m set --match-set src -j DROP diff --git a/configs/conf-available/10-backend-ipset.conf b/configs/conf-available/10-backend-ipset.conf index 5d28d3c..22d4508 100644 --- a/configs/conf-available/10-backend-ipset.conf +++ b/configs/conf-available/10-backend-ipset.conf @@ -1,2 +1,2 @@ [backend:ipset] -load = libf2b_backend_ipset.so +load = f2b/backends/ipset.so diff --git a/configs/conf-available/10-backend-mcast.conf b/configs/conf-available/10-backend-mcast.conf index 25226fc..e889165 100644 --- a/configs/conf-available/10-backend-mcast.conf +++ b/configs/conf-available/10-backend-mcast.conf @@ -1,4 +1,4 @@ [backend:mcast] -load = libf2b_backend_mcast.so +load = f2b/backends/mcast.so ; group = 239.255.186.1 ; port = 3370 diff --git a/configs/conf-available/10-backend-redis.conf b/configs/conf-available/10-backend-redis.conf index 47c3fca..3d389c3 100644 --- a/configs/conf-available/10-backend-redis.conf +++ b/configs/conf-available/10-backend-redis.conf @@ -1,5 +1,5 @@ [backend:redis] -load = libf2b_backend_redis.so +load = f2b/backends/redis.so shared = yes timeout = 2 ping = 5 diff --git a/configs/conf-available/15-filter-pcre.conf b/configs/conf-available/15-filter-pcre.conf index ad702e5..7d1c281 100644 --- a/configs/conf-available/15-filter-pcre.conf +++ b/configs/conf-available/15-filter-pcre.conf @@ -1,5 +1,5 @@ [filter:pcre] -load = libf2b_filter_pcre.so +load = f2b/filters/pcre.so icase = yes study = yes usejit = no diff --git a/configs/conf-available/15-filter-preg.conf b/configs/conf-available/15-filter-preg.conf index 03d878d..a868aa3 100644 --- a/configs/conf-available/15-filter-preg.conf +++ b/configs/conf-available/15-filter-preg.conf @@ -1,3 +1,3 @@ [filter:preg] -load = libf2b_filter_preg.so +load = f2b/filters/preg.so icase = yes diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt index a6724ea..ef5708e 100644 --- a/src/backends/CMakeLists.txt +++ b/src/backends/CMakeLists.txt @@ -1,30 +1,34 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) +unset(CMAKE_SHARED_MODULE_PREFIX) set(BACKENDS "") -add_library("f2b_backend_exec" MODULE "exec.c" "../strlcpy.c") -list(APPEND BACKENDS "f2b_backend_exec") +add_library("b_exec" MODULE "exec.c" "../strlcpy.c") +list(APPEND BACKENDS "exec") if (WITH_MCAST) - add_library("f2b_backend_mcast" MODULE "mcast.c" "../strlcpy.c" + add_library("b_mcast" MODULE "mcast.c" "../strlcpy.c" "../commands.c" "../cmsg.c" "../csocket.c") - list(APPEND BACKENDS "f2b_backend_mcast") + list(APPEND BACKENDS "mcast") endif () find_library(REDIS_FOUND "hiredis") if (WITH_REDIS AND REDIS_FOUND) - add_library("f2b_backend_redis" MODULE "redis.c" "../strlcpy.c") - target_link_libraries("f2b_backend_redis" "hiredis") - list(APPEND BACKENDS "f2b_backend_redis") + add_library("b_redis" MODULE "redis.c" "../strlcpy.c") + target_link_libraries("b_redis" "hiredis") + list(APPEND BACKENDS "redis") endif () find_library(IPSET_FOUND "ipset") if (WITH_IPSET AND IPSET_FOUND) - add_library("f2b_backend_ipset" MODULE "ipset.c" "../strlcpy.c") - target_link_libraries("f2b_backend_ipset" "ipset") - list(APPEND BACKENDS "f2b_backend_ipset") + add_library("b_ipset" MODULE "ipset.c" "../strlcpy.c") + target_link_libraries("b_ipset" "ipset") + list(APPEND BACKENDS "ipset") endif () -message(STATUS "- Backends : ${BACKENDS}") +set(LIB_PATH "${CMAKE_INSTALL_LIBDIR}/f2b/backends") +foreach (BACKEND IN LISTS BACKENDS) + set_target_properties("b_${BACKEND}" PROPERTIES OUTPUT_NAME ${BACKEND}) + install(TARGETS "b_${BACKEND}" LIBRARY DESTINATION ${LIB_PATH}) +endforeach () -install(TARGETS ${BACKENDS} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +message(STATUS "- Backends : ${BACKENDS}") diff --git a/src/filters/CMakeLists.txt b/src/filters/CMakeLists.txt index 6e66da8..126003a 100644 --- a/src/filters/CMakeLists.txt +++ b/src/filters/CMakeLists.txt @@ -1,17 +1,21 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) +unset(CMAKE_SHARED_MODULE_PREFIX) set(FILTERS "") -add_library("f2b_filter_preg" MODULE "preg.c" "../strlcpy.c") -list(APPEND FILTERS "f2b_filter_preg") +add_library("f_preg" MODULE "preg.c" "../strlcpy.c") +list(APPEND FILTERS "preg") find_library(PCRE_FOUND "pcre") if (WITH_PCRE AND PCRE_FOUND) - add_library("f2b_filter_pcre" MODULE "pcre.c" "../strlcpy.c") - target_link_libraries("f2b_filter_pcre" "pcre") - list(APPEND FILTERS "f2b_filter_pcre") + add_library("f_pcre" MODULE "pcre.c" "../strlcpy.c") + target_link_libraries("f_pcre" "pcre") + list(APPEND FILTERS "pcre") endif () -message(STATUS "- Filters : ${FILTERS}") +set(LIB_PATH "${CMAKE_INSTALL_LIBDIR}/f2b/filters") +foreach (FILTER IN LISTS FILTERS) + set_target_properties("f_${FILTER}" PROPERTIES OUTPUT_NAME ${FILTER}) + install(TARGETS "f_${FILTER}" LIBRARY DESTINATION ${LIB_PATH}) +endforeach () -install(TARGETS ${FILTERS} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +message(STATUS "- Filters : ${FILTERS}") diff --git a/src/sources/CMakeLists.txt b/src/sources/CMakeLists.txt index c36d303..1921012 100644 --- a/src/sources/CMakeLists.txt +++ b/src/sources/CMakeLists.txt @@ -1,26 +1,30 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) +unset(CMAKE_SHARED_MODULE_PREFIX) set(SOURCES "") -add_library("f2b_source_files" MODULE "files.c" "../strlcpy.c") -list(APPEND SOURCES "f2b_source_files") +add_library("s_files" MODULE "files.c" "../strlcpy.c") +list(APPEND SOURCES "files") -add_library("f2b_source_portknock" MODULE "portknock.c" "../strlcpy.c") -list(APPEND SOURCES "f2b_source_portknock") +add_library("s_portknock" MODULE "portknock.c" "../strlcpy.c") +list(APPEND SOURCES "portknock") if (WITH_MCAST) - add_library("f2b_source_mcast" MODULE "mcast.c" "../strlcpy.c" + add_library("s_mcast" MODULE "mcast.c" "../strlcpy.c" "../commands.c" "../cmsg.c" "../csocket.c") - list(APPEND SOURCES "f2b_source_mcast") + list(APPEND SOURCES "mcast") endif () find_library(REDIS_FOUND "hiredis") if (WITH_REDIS AND REDIS_FOUND) - add_library("f2b_source_redis" MODULE "redis.c" "../strlcpy.c") - target_link_libraries("f2b_source_redis" "hiredis") - list(APPEND SOURCES "f2b_source_redis") + add_library("s_redis" MODULE "redis.c" "../strlcpy.c") + target_link_libraries("s_redis" "hiredis") + list(APPEND SOURCES "redis") endif () -message(STATUS "- Sources : ${SOURCES}") +set(LIB_PATH "${CMAKE_INSTALL_LIBDIR}/f2b/sources") +foreach (SOURCE IN LISTS SOURCES) + set_target_properties("s_${SOURCE}" PROPERTIES OUTPUT_NAME ${SOURCE}) + install(TARGETS "s_${SOURCE}" LIBRARY DESTINATION ${LIB_PATH}) +endforeach () -install(TARGETS ${SOURCES} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +message(STATUS "- Sources : ${SOURCES}")