Skip to content

Commit 379ec3e

Browse files
author
Razvan Becheriu
committed
[#3536] moved from lib to hooks
1 parent d904a18 commit 379ec3e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+397
-416
lines changed

‎configure.ac‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1684,17 +1684,9 @@ AC_CONFIG_FILES([src/lib/log/tests/tempdir.h])
16841684
AC_CONFIG_FILES([src/lib/mysql/Makefile])
16851685
AC_CONFIG_FILES([src/lib/mysql/testutils/Makefile])
16861686
AC_CONFIG_FILES([src/lib/mysql/tests/Makefile])
1687-
AC_CONFIG_FILES([src/lib/mysql_lease_backend/Makefile])
1688-
AC_CONFIG_FILES([src/lib/mysql_lease_backend/tests/Makefile])
1689-
AC_CONFIG_FILES([src/lib/mysql_host_backend/Makefile])
1690-
AC_CONFIG_FILES([src/lib/mysql_host_backend/tests/Makefile])
16911687
AC_CONFIG_FILES([src/lib/pgsql/Makefile])
16921688
AC_CONFIG_FILES([src/lib/pgsql/tests/Makefile])
16931689
AC_CONFIG_FILES([src/lib/pgsql/testutils/Makefile])
1694-
AC_CONFIG_FILES([src/lib/pgsql_lease_backend/Makefile])
1695-
AC_CONFIG_FILES([src/lib/pgsql_lease_backend/tests/Makefile])
1696-
AC_CONFIG_FILES([src/lib/pgsql_host_backend/Makefile])
1697-
AC_CONFIG_FILES([src/lib/pgsql_host_backend/tests/Makefile])
16981690
AC_CONFIG_FILES([src/lib/process/Makefile])
16991691
AC_CONFIG_FILES([src/lib/process/cfgrpt/Makefile])
17001692
AC_CONFIG_FILES([src/lib/process/cfgrpt/tests/Makefile])

‎src/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SUBDIRS = share lib bin hooks
1+
SUBDIRS = share lib hooks bin
22

33
EXTRA_DIST = \
44
cppcheck-suppress.lst \

‎src/bin/dhcp4/Makefile.am‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ kea_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
5757
# to be removed
5858
if HAVE_PGSQL
5959
kea_dhcp4_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
60-
kea_dhcp4_LDADD += $(top_builddir)/src/lib/pgsql_lease_backend/libkea-pgsql-lease-backend.la
61-
kea_dhcp4_LDADD += $(top_builddir)/src/lib/pgsql_host_backend/libkea-pgsql-host-backend.la
60+
kea_dhcp4_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_lb/libpgsqllb.la
61+
kea_dhcp4_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_hb/libpgsqlhb.la
6262
endif
6363

6464
# to be removed
6565
if HAVE_MYSQL
6666
kea_dhcp4_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
67-
kea_dhcp4_LDADD += $(top_builddir)/src/lib/mysql_lease_backend/libkea-mysql-lease-backend.la
68-
kea_dhcp4_LDADD += $(top_builddir)/src/lib/mysql_host_backend/libkea-mysql-host-backend.la
67+
kea_dhcp4_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_lb/libmysqllb.la
68+
kea_dhcp4_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_hb/libmysqlhb.la
6969
endif
7070

7171
kea_dhcp4_LDADD += $(top_builddir)/src/lib/database/libkea-database.la

‎src/bin/dhcp4/dhcp4_srv.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
#include <dhcpsrv/memfile_lease_mgr.h>
6060

6161
#ifdef HAVE_MYSQL
62-
#include <mysql_lease_backend/mysql_lease_mgr.h>
62+
#include <hooks/dhcp/mysql_lb/mysql_lease_mgr.h>
6363
#endif
6464
#ifdef HAVE_PGSQL
65-
#include <pgsql_lease_backend/pgsql_lease_mgr.h>
65+
#include <hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h>
6666
#endif
6767

6868
#include <boost/algorithm/string.hpp>

‎src/bin/dhcp4/json_config_parser.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
#include <util/multi_threading_mgr.h>
4949

5050
#ifdef HAVE_MYSQL
51-
#include <mysql_lease_backend/mysql_lease_mgr.h>
52-
#include <mysql_host_backend/mysql_host_data_source.h>
51+
#include <hooks/dhcp/mysql_lb/mysql_lease_mgr.h>
52+
#include <hooks/dhcp/mysql_hb/mysql_host_data_source.h>
5353
#endif
5454

5555
#ifdef HAVE_PGSQL
56-
#include <pgsql_lease_backend/pgsql_lease_mgr.h>
57-
#include <pgsql_host_backend/pgsql_host_data_source.h>
56+
#include <hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h>
57+
#include <hooks/dhcp/pgsql_hb/pgsql_host_data_source.h>
5858
#endif
5959

6060
#include <boost/algorithm/string.hpp>

‎src/bin/dhcp4/tests/Makefile.am‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,15 @@ dhcp4_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
137137
if HAVE_PGSQL
138138
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/pgsql/testutils/libpgsqltest.la
139139
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
140-
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/pgsql_lease_backend/libkea-pgsql-lease-backend.la
141-
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/pgsql_host_backend/libkea-pgsql-host-backend.la
140+
dhcp4_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_lb/libpgsqllb.la
141+
dhcp4_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_hb/libpgsqlhb.la
142142
endif
143143

144144
if HAVE_MYSQL
145145
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/mysql/testutils/libmysqltest.la
146146
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
147-
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/mysql_lease_backend/libkea-mysql-lease-backend.la
148-
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/mysql_host_backend/libkea-mysql-host-backend.la
147+
dhcp4_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_lb/libmysqllb.la
148+
dhcp4_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_hb/libmysqlhb.la
149149
endif
150150

151151
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/database/testutils/libdatabasetest.la

‎src/bin/dhcp6/Makefile.am‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
5757
# to be removed
5858
if HAVE_PGSQL
5959
kea_dhcp6_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
60-
kea_dhcp6_LDADD += $(top_builddir)/src/lib/pgsql_lease_backend/libkea-pgsql-lease-backend.la
61-
kea_dhcp6_LDADD += $(top_builddir)/src/lib/pgsql_host_backend/libkea-pgsql-host-backend.la
60+
kea_dhcp6_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_lb/libpgsqllb.la
61+
kea_dhcp6_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_hb/libpgsqlhb.la
6262
endif
6363

6464
# to be removed
6565
if HAVE_MYSQL
6666
kea_dhcp6_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
67-
kea_dhcp6_LDADD += $(top_builddir)/src/lib/mysql_lease_backend/libkea-mysql-lease-backend.la
68-
kea_dhcp6_LDADD += $(top_builddir)/src/lib/mysql_host_backend/libkea-mysql-host-backend.la
67+
kea_dhcp6_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_lb/libmysqllb.la
68+
kea_dhcp6_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_hb/libmysqlhb.la
6969
endif
7070

7171
kea_dhcp6_LDADD += $(top_builddir)/src/lib/database/libkea-database.la

‎src/bin/dhcp6/dhcp6_srv.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
#include <dhcpsrv/memfile_lease_mgr.h>
5959

6060
#ifdef HAVE_MYSQL
61-
#include <mysql_lease_backend/mysql_lease_mgr.h>
61+
#include <hooks/dhcp/mysql_lb/mysql_lease_mgr.h>
6262
#endif
6363
#ifdef HAVE_PGSQL
64-
#include <pgsql_lease_backend/pgsql_lease_mgr.h>
64+
#include <hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h>
6565
#endif
6666

6767
#include <boost/tokenizer.hpp>

‎src/bin/dhcp6/json_config_parser.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@
5252
#include <util/triplet.h>
5353

5454
#ifdef HAVE_MYSQL
55-
#include <mysql_lease_backend/mysql_lease_mgr.h>
56-
#include <mysql_host_backend/mysql_host_data_source.h>
55+
#include <hooks/dhcp/mysql_lb/mysql_lease_mgr.h>
56+
#include <hooks/dhcp/mysql_hb/mysql_host_data_source.h>
5757
#endif
5858

5959
#ifdef HAVE_PGSQL
60-
#include <pgsql_lease_backend/pgsql_lease_mgr.h>
61-
#include <pgsql_host_backend/pgsql_host_data_source.h>
60+
#include <hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h>
61+
#include <hooks/dhcp/pgsql_hb/pgsql_host_data_source.h>
6262
#endif
6363

6464
#include <boost/algorithm/string.hpp>

‎src/bin/dhcp6/tests/Makefile.am‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,15 @@ dhcp6_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
137137
if HAVE_PGSQL
138138
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/pgsql/testutils/libpgsqltest.la
139139
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/pgsql/libkea-pgsql.la
140-
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/pgsql_lease_backend/libkea-pgsql-lease-backend.la
141-
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/pgsql_host_backend/libkea-pgsql-host-backend.la
140+
dhcp6_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_lb/libpgsqllb.la
141+
dhcp6_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/pgsql_hb/libpgsqlhb.la
142142
endif
143143

144144
if HAVE_MYSQL
145145
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/mysql/testutils/libmysqltest.la
146146
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/mysql/libkea-mysql.la
147-
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/mysql_lease_backend/libkea-mysql-lease-backend.la
148-
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/mysql_host_backend/libkea-mysql-host-backend.la
147+
dhcp6_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_lb/libmysqllb.la
148+
dhcp6_unittests_LDADD += $(top_builddir)/src/hooks/dhcp/mysql_hb/libmysqlhb.la
149149
endif
150150

151151
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/database/testutils/libdatabasetest.la

0 commit comments

Comments
 (0)