From: Thomas Markwalder Date: Tue, 26 Jul 2016 12:03:11 +0000 (-0400) Subject: [master] Addes support for Host Reservations to PostgreSQL backend X-Git-Tag: trac4551_base~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac1eaa1026987c2d86d57b4aa0dc9a4d093787f0;p=thirdparty%2Fkea.git [master] Addes support for Host Reservations to PostgreSQL backend Merge branch 'trac4277' --- ac1eaa1026987c2d86d57b4aa0dc9a4d093787f0 diff --cc src/lib/dhcpsrv/Makefile.am index 70b1152954,dcfec8609e..7c4574235d mode 100644,100755..100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am @@@ -133,12 -139,9 +136,13 @@@ libkea_dhcpsrv_la_SOURCES += ncr_genera if HAVE_PGSQL libkea_dhcpsrv_la_SOURCES += pgsql_connection.cc pgsql_connection.h libkea_dhcpsrv_la_SOURCES += pgsql_exchange.cc pgsql_exchange.h + libkea_dhcpsrv_la_SOURCES += pgsql_host_data_source.cc pgsql_host_data_source.h libkea_dhcpsrv_la_SOURCES += pgsql_lease_mgr.cc pgsql_lease_mgr.h endif +if HAVE_CQL +libkea_dhcpsrv_la_SOURCES += cql_lease_mgr.cc cql_lease_mgr.h +libkea_dhcpsrv_la_SOURCES += cql_connection.cc cql_connection.h +endif libkea_dhcpsrv_la_SOURCES += pool.cc pool.h libkea_dhcpsrv_la_SOURCES += srv_config.cc srv_config.h libkea_dhcpsrv_la_SOURCES += subnet.cc subnet.h diff --cc src/lib/dhcpsrv/pgsql_connection.h index 68c1cd7bf7,92bcd4b5ed..92bcd4b5ed mode 100644,100755..100644 --- a/src/lib/dhcpsrv/pgsql_connection.h +++ b/src/lib/dhcpsrv/pgsql_connection.h diff --cc src/lib/dhcpsrv/tests/Makefile.am index 2d65439e4d,9a31ca5c50..8729de987d mode 100644,100755..100644 --- a/src/lib/dhcpsrv/tests/Makefile.am +++ b/src/lib/dhcpsrv/tests/Makefile.am @@@ -114,11 -120,9 +114,12 @@@ libdhcpsrv_unittests_SOURCES += ncr_gen if HAVE_PGSQL libdhcpsrv_unittests_SOURCES += pgsql_exchange_unittest.cc + libdhcpsrv_unittests_SOURCES += pgsql_host_data_source_unittest.cc libdhcpsrv_unittests_SOURCES += pgsql_lease_mgr_unittest.cc endif +if HAVE_CQL +libdhcpsrv_unittests_SOURCES += cql_lease_mgr_unittest.cc +endif libdhcpsrv_unittests_SOURCES += pool_unittest.cc libdhcpsrv_unittests_SOURCES += srv_config_unittest.cc libdhcpsrv_unittests_SOURCES += subnet_unittest.cc diff --cc src/lib/dhcpsrv/tests/pgsql_exchange_unittest.cc index 9cc51975ca,75547a9fac..75547a9fac mode 100644,100755..100644 --- a/src/lib/dhcpsrv/tests/pgsql_exchange_unittest.cc +++ b/src/lib/dhcpsrv/tests/pgsql_exchange_unittest.cc