From: Francis Dupont <fdupont@isc.org>
Date: Sat, 13 Jun 2015 08:15:32 +0000 (+0200)
Subject: [master] Finished merge of trac3732 (removed BUNDY)
X-Git-Tag: trac3732a_base~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=243a0b134181ef9d95c24527d2341eee958b6497;p=thirdparty%2Fkea.git

[master] Finished merge of trac3732 (removed BUNDY)
---

243a0b134181ef9d95c24527d2341eee958b6497
diff --cc src/bin/dhcp4/tests/Makefile.am
index 0b6737ac71,49dc7aed74..0eb8d3b9f9
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@@ -86,17 -85,8 +84,9 @@@ dhcp4_unittests_SOURCES += marker_file.
  dhcp4_unittests_SOURCES += dhcp4_client.cc dhcp4_client.h
  dhcp4_unittests_SOURCES += inform_unittest.cc
  dhcp4_unittests_SOURCES += dora_unittest.cc
 +dhcp4_unittests_SOURCES += release_unittest.cc
  
- if CONFIG_BACKEND_BUNDY
- # For Bundy backend, we only need to run the usual tests. There are no
- # Bundy-specific tests yet.
- dhcp4_unittests_SOURCES += bundy_controller_unittest.cc
- endif
- 
- if CONFIG_BACKEND_JSON
  dhcp4_unittests_SOURCES += kea_controller_unittest.cc
- endif
  
  nodist_dhcp4_unittests_SOURCES = marker_file.h test_libraries.h
  
diff --cc src/bin/dhcp6/ctrl_dhcp6_srv.h
index 8a5d2fad5c,b9735a9ee3..763c4e97df
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.h
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h
@@@ -25,13 -26,8 +25,18 @@@ namespace dhcp 
  
  /// @brief Controlled version of the DHCPv6 server
  ///
++<<<<<<< HEAD
 +/// This is a class that is responsible for DHCPv6 server being controllable.
 +/// It does various things, depending on the configuration backend.
 +/// For Bundy backend it establishes a connection with msgq and later receives
 +/// commands over it. For Kea backend, it reads configuration file from disk.
 +///
 +/// For detailed explanation or relations between main(), ControlledDhcpv6Srv,
 +/// Dhcpv6Srv and other classes, see \ref dhcpv6Session.
++=======
+ /// This is a class that is responsible for DHCPv6 server being controllable,
+ /// by reading configuration file from disk.
++>>>>>>> trac3732
  class ControlledDhcpv6Srv : public isc::dhcp::Dhcpv6Srv {
  public:
  
diff --cc src/lib/cc/.gitignore
index 50439e6a6b,50439e6a6b..0dd03ab83f
--- a/src/lib/cc/.gitignore
+++ b/src/lib/cc/.gitignore
@@@ -1,5 -1,5 +1,3 @@@
  /cc_messages.cc
  /cc_messages.h
--/session_config.h
--/session_config.h.pre
  /s-messages
diff --cc src/lib/cc/Makefile.am
index 418a3491e2,50589f4495..8bef5abe39
--- a/src/lib/cc/Makefile.am
+++ b/src/lib/cc/Makefile.am
@@@ -14,17 -15,17 +14,13 @@@ AM_CXXFLAGS += -fno-strict-aliasin
  endif
  
  lib_LTLIBRARIES = libkea-cc.la
 -libkea_cc_la_SOURCES = data.cc data.h session.cc session.h
 +libkea_cc_la_SOURCES = data.cc data.h
 +libkea_cc_la_SOURCES += command_interpreter.cc command_interpreter.h
  libkea_cc_la_SOURCES += logger.cc logger.h
  nodist_libkea_cc_la_SOURCES = cc_messages.cc cc_messages.h
 -libkea_cc_la_SOURCES += proto_defs.cc proto_defs.h
  libkea_cc_la_LIBADD = $(top_builddir)/src/lib/log/libkea-log.la
  
--CLEANFILES = *.gcno *.gcda session_config.h cc_messages.cc cc_messages.h \
--	s-messages
--
--session_config.h: session_config.h.pre
--	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" session_config.h.pre >$@
++CLEANFILES = *.gcno *.gcda cc_messages.cc cc_messages.h s-messages
  
  cc_messages.cc cc_messages.h: s-messages
  
@@@ -32,6 -33,11 +28,6 @@@ s-messages: cc_messages.me
  	$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/cc/cc_messages.mes
  	touch $@
  
- BUILT_SOURCES = session_config.h cc_messages.cc cc_messages.h
 -BUILT_SOURCES = session_config.h cc_messages.cc cc_messages.h proto_defs.h
 -
 -# This rule is here, but we added proto_defs.h to the git repo,
 -# so the script is no longer needed.
 -#proto_defs.h: $(top_srcdir)/src/lib/util/python/const2hdr.py proto_defs.cc
 -#	$(PYTHON) $(top_srcdir)/src/lib/util/python/const2hdr.py $(srcdir)/proto_defs.cc $@
++BUILT_SOURCES = cc_messages.cc cc_messages.h
  
  EXTRA_DIST = cc_messages.mes
diff --cc src/lib/cc/tests/.gitignore
index f10451cd2f,f10451cd2f..d6d1ec87a1
--- a/src/lib/cc/tests/.gitignore
+++ b/src/lib/cc/tests/.gitignore
@@@ -1,2 -1,2 +1,1 @@@
  /run_unittests
--/session_unittests_config.h