From a13261096520806c0599a067008262bab2d6c9db Mon Sep 17 00:00:00 2001 From: Alex 'AdUser' Z Date: Wed, 26 Apr 2017 21:18:38 +1000 Subject: [PATCH] * try to fix dlopen() load path : 2nd try --- configs/conf-available/05-source-files.conf | 2 +- configs/conf-available/05-source-mcast.conf | 2 +- configs/conf-available/05-source-portknock.conf | 2 +- configs/conf-available/05-source-redis.conf | 2 +- configs/conf-available/10-backend-exec-ipfw.conf | 2 +- configs/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/CMakeLists.txt | 1 + src/backends/CMakeLists.txt | 5 ++--- src/filters/CMakeLists.txt | 5 ++--- src/sources/CMakeLists.txt | 5 ++--- 15 files changed, 18 insertions(+), 20 deletions(-) diff --git a/configs/conf-available/05-source-files.conf b/configs/conf-available/05-source-files.conf index 86dc042..ca31120 100644 --- a/configs/conf-available/05-source-files.conf +++ b/configs/conf-available/05-source-files.conf @@ -1,2 +1,2 @@ [source:files] -load = sources/files.so +load = source_files.so diff --git a/configs/conf-available/05-source-mcast.conf b/configs/conf-available/05-source-mcast.conf index 69b2f07..83aba27 100644 --- a/configs/conf-available/05-source-mcast.conf +++ b/configs/conf-available/05-source-mcast.conf @@ -1,5 +1,5 @@ [source:mcast] -load = sources/mcast.so +load = source_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 e15e80c..39b8c5f 100644 --- a/configs/conf-available/05-source-portknock.conf +++ b/configs/conf-available/05-source-portknock.conf @@ -1,5 +1,5 @@ [source:portknock] -load = sources/portknock.so +load = source_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 cebfb4a..2d7a7b5 100644 --- a/configs/conf-available/05-source-redis.conf +++ b/configs/conf-available/05-source-redis.conf @@ -1,5 +1,5 @@ [source:redis] -load = sources/redis.so +load = source_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 4e26861..0f8c74c 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 = backends/exec.so +load = backend_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 13d7fca..7f4a384 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 = backends/exec.so +load = backend_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 920bcbe..e6b4f53 100644 --- a/configs/conf-available/10-backend-ipset.conf +++ b/configs/conf-available/10-backend-ipset.conf @@ -1,2 +1,2 @@ [backend:ipset] -load = backends/ipset.so +load = backend_ipset.so diff --git a/configs/conf-available/10-backend-mcast.conf b/configs/conf-available/10-backend-mcast.conf index 46f4c3d..6accae1 100644 --- a/configs/conf-available/10-backend-mcast.conf +++ b/configs/conf-available/10-backend-mcast.conf @@ -1,4 +1,4 @@ [backend:mcast] -load = backends/mcast.so +load = backend_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 95c4ec2..b8053be 100644 --- a/configs/conf-available/10-backend-redis.conf +++ b/configs/conf-available/10-backend-redis.conf @@ -1,5 +1,5 @@ [backend:redis] -load = backends/redis.so +load = backend_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 0314155..ba4d65d 100644 --- a/configs/conf-available/15-filter-pcre.conf +++ b/configs/conf-available/15-filter-pcre.conf @@ -1,5 +1,5 @@ [filter:pcre] -load = filters/pcre.so +load = filter_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 dde607b..3539b22 100644 --- a/configs/conf-available/15-filter-preg.conf +++ b/configs/conf-available/15-filter-preg.conf @@ -1,3 +1,3 @@ [filter:preg] -load = filters/preg.so +load = filter_preg.so icase = yes diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b655a56..0f6c990 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,6 +38,7 @@ endif () install(TARGETS "f2b-source-test" "f2b-filter-test" "f2b-backend-test" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +set(PLUGINS_PATH "${CMAKE_INSTALL_LIBDIR}/${CNAME}") add_subdirectory("backends") add_subdirectory("filters") add_subdirectory("sources") diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt index 3a6e7ea..2f9e87f 100644 --- a/src/backends/CMakeLists.txt +++ b/src/backends/CMakeLists.txt @@ -25,10 +25,9 @@ if (WITH_IPSET AND IPSET_FOUND) list(APPEND BACKENDS "ipset") endif () -set(LIB_PATH "${CMAKE_INSTALL_LIBDIR}/${CNAME}/backends") foreach (BACKEND IN LISTS BACKENDS) - set_target_properties("b_${BACKEND}" PROPERTIES OUTPUT_NAME ${BACKEND}) - install(TARGETS "b_${BACKEND}" LIBRARY DESTINATION ${LIB_PATH}) + set_target_properties("b_${BACKEND}" PROPERTIES OUTPUT_NAME "backend_${BACKEND}") + install(TARGETS "b_${BACKEND}" LIBRARY DESTINATION ${PLUGINS_PATH}) endforeach () message(STATUS "- Backends : ${BACKENDS}") diff --git a/src/filters/CMakeLists.txt b/src/filters/CMakeLists.txt index 457d45a..120b8be 100644 --- a/src/filters/CMakeLists.txt +++ b/src/filters/CMakeLists.txt @@ -12,10 +12,9 @@ if (WITH_PCRE AND PCRE_FOUND) list(APPEND FILTERS "pcre") endif () -set(LIB_PATH "${CMAKE_INSTALL_LIBDIR}/${CNAME}/filters") foreach (FILTER IN LISTS FILTERS) - set_target_properties("f_${FILTER}" PROPERTIES OUTPUT_NAME ${FILTER}) - install(TARGETS "f_${FILTER}" LIBRARY DESTINATION ${LIB_PATH}) + set_target_properties("f_${FILTER}" PROPERTIES OUTPUT_NAME "filter_${FILTER}") + install(TARGETS "f_${FILTER}" LIBRARY DESTINATION ${PLUGINS_PATH}) endforeach () message(STATUS "- Filters : ${FILTERS}") diff --git a/src/sources/CMakeLists.txt b/src/sources/CMakeLists.txt index f45b065..a6003d6 100644 --- a/src/sources/CMakeLists.txt +++ b/src/sources/CMakeLists.txt @@ -21,10 +21,9 @@ if (WITH_REDIS AND REDIS_FOUND) list(APPEND SOURCES "redis") endif () -set(LIB_PATH "${CMAKE_INSTALL_LIBDIR}/${CNAME}/sources") foreach (SOURCE IN LISTS SOURCES) - set_target_properties("s_${SOURCE}" PROPERTIES OUTPUT_NAME ${SOURCE}) - install(TARGETS "s_${SOURCE}" LIBRARY DESTINATION ${LIB_PATH}) + set_target_properties("s_${SOURCE}" PROPERTIES OUTPUT_NAME "source_${SOURCE}") + install(TARGETS "s_${SOURCE}" LIBRARY DESTINATION ${PLUGINS_PATH}) endforeach () message(STATUS "- Sources : ${SOURCES}")