]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Addes support for Host Reservations to PostgreSQL backend
authorThomas Markwalder <tmark@isc.org>
Tue, 26 Jul 2016 12:03:11 +0000 (08:03 -0400)
committerThomas Markwalder <tmark@isc.org>
Tue, 26 Jul 2016 12:03:11 +0000 (08:03 -0400)
    Merge branch 'trac4277'

1  2 
src/lib/dhcpsrv/Makefile.am
src/lib/dhcpsrv/dhcpsrv_messages.mes
src/lib/dhcpsrv/host_data_source_factory.cc
src/lib/dhcpsrv/libdhcpsrv.dox
src/lib/dhcpsrv/pgsql_connection.h
src/lib/dhcpsrv/pgsql_lease_mgr.cc
src/lib/dhcpsrv/tests/Makefile.am
src/lib/dhcpsrv/tests/pgsql_exchange_unittest.cc

index 70b1152954ddf21475277deb4f3cb7a17567affa,dcfec8609efcf684b5098a8e7fe2c8e525888f17..7c4574235d7d5eaa56ba5f03333d0f78026a8ea4
mode 100644,100755..100644
@@@ -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
Simple merge
Simple merge
index 68c1cd7bf7a7f4fb438e95c06aee2a894946f74c,92bcd4b5edd87eda9238c533af45d2102c71b6df..92bcd4b5edd87eda9238c533af45d2102c71b6df
mode 100644,100755..100644
Simple merge
index 2d65439e4dd2c9de538444008339fc9dbdb571f2,9a31ca5c50defe611445b955f2d70bbaae792827..8729de987d38668a598d8d44766320df6fe232c6
mode 100644,100755..100644
@@@ -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
index 9cc51975caff61526d0b49a2082fa415775a7397,75547a9fac01b79d400fd1186fac950251d1b669..75547a9fac01b79d400fd1186fac950251d1b669
mode 100644,100755..100644