Browse Source

* try to fix dlopen() load path : 2nd try

master
Alex 'AdUser' Z 8 years ago
parent
commit
a132610965
  1. 2
      configs/conf-available/05-source-files.conf
  2. 2
      configs/conf-available/05-source-mcast.conf
  3. 2
      configs/conf-available/05-source-portknock.conf
  4. 2
      configs/conf-available/05-source-redis.conf
  5. 2
      configs/conf-available/10-backend-exec-ipfw.conf
  6. 2
      configs/conf-available/10-backend-exec-ipset.conf
  7. 2
      configs/conf-available/10-backend-ipset.conf
  8. 2
      configs/conf-available/10-backend-mcast.conf
  9. 2
      configs/conf-available/10-backend-redis.conf
  10. 2
      configs/conf-available/15-filter-pcre.conf
  11. 2
      configs/conf-available/15-filter-preg.conf
  12. 1
      src/CMakeLists.txt
  13. 5
      src/backends/CMakeLists.txt
  14. 5
      src/filters/CMakeLists.txt
  15. 5
      src/sources/CMakeLists.txt

2
configs/conf-available/05-source-files.conf

@ -1,2 +1,2 @@
[source:files] [source:files]
load = sources/files.so load = source_files.so

2
configs/conf-available/05-source-mcast.conf

@ -1,5 +1,5 @@
[source:mcast] [source:mcast]
load = sources/mcast.so load = source_mcast.so
; group = 239.255.186.1 ; group = 239.255.186.1
; port = 3370 ; port = 3370
; bind = 0.0.0.0 ; bind = 0.0.0.0

2
configs/conf-available/05-source-portknock.conf

@ -1,5 +1,5 @@
[source:portknock] [source:portknock]
load = sources/portknock.so load = source_portknock.so
; listen = 0.0.0.0:23 # telnet ; listen = 0.0.0.0:23 # telnet
; listen = 0.0.0.0:5060 # sip ; listen = 0.0.0.0:5060 # sip
; listen = 0.0.0.0:6667 # irc ; listen = 0.0.0.0:6667 # irc

2
configs/conf-available/05-source-redis.conf

@ -1,5 +1,5 @@
[source:redis] [source:redis]
load = sources/redis.so load = source_redis.so
timeout = 2 timeout = 2
host = 127.0.0.1 host = 127.0.0.1
port = 6379 port = 6379

2
configs/conf-available/10-backend-exec-ipfw.conf

@ -1,5 +1,5 @@
[backend:exec-ipfw] [backend:exec-ipfw]
load = backends/exec.so load = backend_exec.so
ban = /sbin/ipfw table <ID> add <IP> ban = /sbin/ipfw table <ID> add <IP>
unban = /sbin/ipfw table <ID> delete <IP> unban = /sbin/ipfw table <ID> delete <IP>
timeout = 2 timeout = 2

2
configs/conf-available/10-backend-exec-ipset.conf

@ -1,5 +1,5 @@
[backend:exec-ipset] [backend:exec-ipset]
load = backends/exec.so load = backend_exec.so
start = /sbin/ipset -! create <ID> hash:ip start = /sbin/ipset -! create <ID> hash:ip
start = /sbin/iptables -I INPUT -m set --match-set <ID> src -j DROP start = /sbin/iptables -I INPUT -m set --match-set <ID> src -j DROP
stop = /sbin/iptables -D INPUT -m set --match-set <ID> src -j DROP stop = /sbin/iptables -D INPUT -m set --match-set <ID> src -j DROP

2
configs/conf-available/10-backend-ipset.conf

@ -1,2 +1,2 @@
[backend:ipset] [backend:ipset]
load = backends/ipset.so load = backend_ipset.so

2
configs/conf-available/10-backend-mcast.conf

@ -1,4 +1,4 @@
[backend:mcast] [backend:mcast]
load = backends/mcast.so load = backend_mcast.so
; group = 239.255.186.1 ; group = 239.255.186.1
; port = 3370 ; port = 3370

2
configs/conf-available/10-backend-redis.conf

@ -1,5 +1,5 @@
[backend:redis] [backend:redis]
load = backends/redis.so load = backend_redis.so
shared = yes shared = yes
timeout = 2 timeout = 2
ping = 5 ping = 5

2
configs/conf-available/15-filter-pcre.conf

@ -1,5 +1,5 @@
[filter:pcre] [filter:pcre]
load = filters/pcre.so load = filter_pcre.so
icase = yes icase = yes
study = yes study = yes
usejit = no usejit = no

2
configs/conf-available/15-filter-preg.conf

@ -1,3 +1,3 @@
[filter:preg] [filter:preg]
load = filters/preg.so load = filter_preg.so
icase = yes icase = yes

1
src/CMakeLists.txt

@ -38,6 +38,7 @@ endif ()
install(TARGETS "f2b-source-test" "f2b-filter-test" "f2b-backend-test" install(TARGETS "f2b-source-test" "f2b-filter-test" "f2b-backend-test"
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
set(PLUGINS_PATH "${CMAKE_INSTALL_LIBDIR}/${CNAME}")
add_subdirectory("backends") add_subdirectory("backends")
add_subdirectory("filters") add_subdirectory("filters")
add_subdirectory("sources") add_subdirectory("sources")

5
src/backends/CMakeLists.txt

@ -25,10 +25,9 @@ if (WITH_IPSET AND IPSET_FOUND)
list(APPEND BACKENDS "ipset") list(APPEND BACKENDS "ipset")
endif () endif ()
set(LIB_PATH "${CMAKE_INSTALL_LIBDIR}/${CNAME}/backends")
foreach (BACKEND IN LISTS BACKENDS) foreach (BACKEND IN LISTS BACKENDS)
set_target_properties("b_${BACKEND}" PROPERTIES OUTPUT_NAME ${BACKEND}) set_target_properties("b_${BACKEND}" PROPERTIES OUTPUT_NAME "backend_${BACKEND}")
install(TARGETS "b_${BACKEND}" LIBRARY DESTINATION ${LIB_PATH}) install(TARGETS "b_${BACKEND}" LIBRARY DESTINATION ${PLUGINS_PATH})
endforeach () endforeach ()
message(STATUS "- Backends : ${BACKENDS}") message(STATUS "- Backends : ${BACKENDS}")

5
src/filters/CMakeLists.txt

@ -12,10 +12,9 @@ if (WITH_PCRE AND PCRE_FOUND)
list(APPEND FILTERS "pcre") list(APPEND FILTERS "pcre")
endif () endif ()
set(LIB_PATH "${CMAKE_INSTALL_LIBDIR}/${CNAME}/filters")
foreach (FILTER IN LISTS FILTERS) foreach (FILTER IN LISTS FILTERS)
set_target_properties("f_${FILTER}" PROPERTIES OUTPUT_NAME ${FILTER}) set_target_properties("f_${FILTER}" PROPERTIES OUTPUT_NAME "filter_${FILTER}")
install(TARGETS "f_${FILTER}" LIBRARY DESTINATION ${LIB_PATH}) install(TARGETS "f_${FILTER}" LIBRARY DESTINATION ${PLUGINS_PATH})
endforeach () endforeach ()
message(STATUS "- Filters : ${FILTERS}") message(STATUS "- Filters : ${FILTERS}")

5
src/sources/CMakeLists.txt

@ -21,10 +21,9 @@ if (WITH_REDIS AND REDIS_FOUND)
list(APPEND SOURCES "redis") list(APPEND SOURCES "redis")
endif () endif ()
set(LIB_PATH "${CMAKE_INSTALL_LIBDIR}/${CNAME}/sources")
foreach (SOURCE IN LISTS SOURCES) foreach (SOURCE IN LISTS SOURCES)
set_target_properties("s_${SOURCE}" PROPERTIES OUTPUT_NAME ${SOURCE}) set_target_properties("s_${SOURCE}" PROPERTIES OUTPUT_NAME "source_${SOURCE}")
install(TARGETS "s_${SOURCE}" LIBRARY DESTINATION ${LIB_PATH}) install(TARGETS "s_${SOURCE}" LIBRARY DESTINATION ${PLUGINS_PATH})
endforeach () endforeach ()
message(STATUS "- Sources : ${SOURCES}") message(STATUS "- Sources : ${SOURCES}")

Loading…
Cancel
Save