Merge branch 'isc-master' into docbook-upgrade

.gitignore

@@ -4,6 +4,7 @@
 *.la
 *.lo
 *.o
+*~
 .deps/
 .libs/
 __pycache__/
@@ -43,3 +44,5 @@ config.h.in~
 /local.zone.sqlite3
 /logger_lockfile
 /report.info
+
+/ext/gtest/

AUTHORS

@@ -5,14 +5,16 @@
 Primary developers:
  - Tomek Mrugalski (lead developer: DHCPv4, DHCPv6 components, prefix
                     delegation, memfile, database interface, core libdhcp++,
-		    host reservation, MAC extraction in DHCPv6, statistics manager)
+		    host reservation, MAC extraction in DHCPv6, statistics manager,
+                    kea-shell)
  - Stephen Morris (Hooks, MySQL)
  - Marcin Siodelski (DHCPv4, DHCPv6 components, options handling, perfdhcp,
-		     host reservation, lease file cleanup, lease expiration)
+		     host reservation, lease file cleanup, lease expiration,
+                     control agent)
  - Thomas Markwalder (DDNS, user_chk)
  - Jeremy C. Reed (documentation, build system, testing, release engineering)
  - Wlodek Wencel (testing, release engineering)
- - Francis Dupont (crypto, perfdhcp)
+ - Francis Dupont (crypto, perfdhcp, control agent)
  - Shawn Routhier (lease file cleanup)
 
 Primary area of work mentioned in parentheses. The list is in a roughly
@@ -123,16 +125,35 @@ We have received the following contributions:
 
  - Andrei Pavel, Qualitance
    2016-10: Support for DHCPv6 options defined in RFC6603 and RFC7598
+   2017-02: Doxygen support updated to 1.8.11
+   2017-02: Improved PgSQL backend version handling
+   2017-02: Numerous spelling mistakes
 
  - Vincent Legout
    2016-11: Fixed serveral spelling mistakes
 
+ - Sebasian Schrader
+   2017-01: Fix build dir in doc/guide/Makefile.am
+
+ - Marvin Frick (MrMarvin)
+   2017-04: -h and --host parameters added to kea-admin
+
+ - Olivier Clavel (zeitounator)
+   2017-04: Improvements in valgrind test script
+
+ - Josh Soref (jsoref)
+   2017-07: Many spelling corrections.
+
+ - Walt Steverson (waltsteverson)
+   2017-07: Compilation fixed for Alpine Linux
+   2017-07: option6_pdexclude.h now installed properly
+
 Kea uses log4cplus (http://sourceforge.net/projects/log4cplus/) for logging,
 Boost (http://www.boost.org/) library for almost everything, and can use Botan
 (http://botan.randombit.net/) or OpenSSL (https://www.openssl.org/) for
 cryptographic operations. It can also optionally use PostgreSQL
 (http://www.postgresql.org/) and/or MySQL (http://www.mysql.com/) as a database.
 
-Kea can use googletest for unit-tests (http://code.google.com/p/googletest/).
+Kea can use googletest for unit-tests (https://github.com/google/googletest).
 
-Kea uses ISC Forge (http://kea.isc.org/wiki/IscForge) for conformance testing.
+Kea uses ISC Forge (https://github.com/isc-projects/forge/) for conformance testing.

COPYING

-Copyright (C) 2009-2016 Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2009-2017 Internet Systems Consortium, Inc. ("ISC")
 
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this

README

 Kea provides DHCPv4 and DHCPv6 servers, a dynamic DNS update module,
-a portable DHCP library, libdhcp++, and a DHCP benchmarking tool,
-perfdhcp.
+a portable DHCP library, libdhcp++, control agent that provides management
+REST interface, and a DHCP benchmarking tool, perfdhcp.
 
 Kea is developed by Internet Systems Consortium.
 

compatcheck/README

 This directory is a collection of compatibility checker programs.
 They will be run before any other installation attempts on 'make install'
 to see if the installation causes any substantial compatibility problems
-with existing configuratons.  If any checker program finds an issue,
+with existing configurations.  If any checker program finds an issue,
 'make install' will stop at that point.

doc/Makefile.am

 SUBDIRS = guide design
 
 EXTRA_DIST  = version.ent.in Doxyfile Doxyfile-xml
+EXTRA_DIST += devel/bison.dox
 EXTRA_DIST += devel/config-backend.dox
 EXTRA_DIST += devel/contribute.dox
 EXTRA_DIST += devel/mainpage.dox
+EXTRA_DIST += devel/terminology.dox
 EXTRA_DIST += devel/unit-tests.dox
 
-nobase_dist_doc_DATA  = examples/ddns/sample1.json
+nobase_dist_doc_DATA  = examples/agent/simple.json
+nobase_dist_doc_DATA += examples/ddns/sample1.json
 nobase_dist_doc_DATA += examples/ddns/template.json
+nobase_dist_doc_DATA += examples/https/httpd2/kea-httpd2.conf
+nobase_dist_doc_DATA += examples/https/nginx/kea-nginx.conf
+nobase_dist_doc_DATA += examples/kea4/advanced.json
 nobase_dist_doc_DATA += examples/kea4/backends.json
+nobase_dist_doc_DATA += examples/kea4/cassandra.json
 nobase_dist_doc_DATA += examples/kea4/classify.json
+nobase_dist_doc_DATA += examples/kea4/dhcpv4-over-dhcpv6.json
 nobase_dist_doc_DATA += examples/kea4/hooks.json
 nobase_dist_doc_DATA += examples/kea4/leases-expiration.json
 nobase_dist_doc_DATA += examples/kea4/multiple-options.json
@@ -18,9 +26,13 @@ nobase_dist_doc_DATA += examples/kea4/pgsql-reservations.json
 nobase_dist_doc_DATA += examples/kea4/reservations.json
 nobase_dist_doc_DATA += examples/kea4/several-subnets.json
 nobase_dist_doc_DATA += examples/kea4/single-subnet.json
+nobase_dist_doc_DATA += examples/kea4/with-ddns.json
 nobase_dist_doc_DATA += examples/kea6/advanced.json
 nobase_dist_doc_DATA += examples/kea6/backends.json
+nobase_dist_doc_DATA += examples/kea6/cassandra.json
 nobase_dist_doc_DATA += examples/kea6/classify.json
+nobase_dist_doc_DATA += examples/kea6/dhcpv4-over-dhcpv6.json
+nobase_dist_doc_DATA += examples/kea6/duid.json
 nobase_dist_doc_DATA += examples/kea6/hooks.json
 nobase_dist_doc_DATA += examples/kea6/leases-expiration.json
 nobase_dist_doc_DATA += examples/kea6/multiple-options.json
@@ -31,6 +43,7 @@ nobase_dist_doc_DATA += examples/kea6/several-subnets.json
 nobase_dist_doc_DATA += examples/kea6/simple.json
 nobase_dist_doc_DATA += examples/kea6/softwire46.json
 nobase_dist_doc_DATA += examples/kea6/stateless.json
+nobase_dist_doc_DATA += examples/kea6/with-ddns.json
 
 devel:
 	mkdir -p html

doc/design/datasrc/data-source-classes.txt

@@ -310,7 +310,7 @@ image::memmgr-mapped-init.png[]
 
 4. The memmgr module then calls
    `ConfigurableClientList::getZoneTableAccessor()`, and calls the
-   `getItertor()` method on it to get a list of zones for which
+   `getIterator()` method on it to get a list of zones for which
    zone data are to be loaded into the memory segment.
 
 5. The memmgr module loads the zone data for each such zone.  This

doc/design/ipc-high.txt

@@ -372,7 +372,7 @@ It is meant mostly as signalling protocol. Sending millions of
 messages or messages of several tens of megabytes is probably a bad
 idea. While there's no architectural limitation with regards of the
 number of transferred messages and the maximum size of message is 4GB,
-the code is not optimised and it would probably be very slow.
+the code is not optimized and it would probably be very slow.
 
 We currently expect the system not to be at heavy load. Therefore, we
 expect the system to keep up with users sending messages. The

doc/design/resolver/01-scaling-across-cores

@@ -66,9 +66,9 @@ Legend
 Goals
 -----
  * Run the CPU intensive tasks in multiple threads to allow concurrency.
- * Minimise waiting for locks.
+ * Minimize waiting for locks.
  * Don't require too much memory.
- * Minimise the number of upstream queries (both because they are slow and
+ * Minimize the number of upstream queries (both because they are slow and
    expensive and also because we don't want to eat too much bandwidth and spam
    the authoritative servers).
  * Design simple enough so it can be implemented.

doc/devel/config-backend.dox

@@ -13,7 +13,7 @@
 Kea started as a sub-project in BIND10 that used a program (called
 bindctl) to deliver configuration information to its modules. This
 potentially allowed for modules to get their configuration information
-in a variaty of ways using what were known as configuration backends.
+in a variety of ways using what were known as configuration backends.
 After BIND10 was cancelled, the Kea project briefly tried to maintain
 backward compatibility with the BIND10 framework, but the effort
 was discontinued due to lack of interest.

doc/guide/Makefile.am

@@ -8,14 +8,14 @@ dist_html_DATA = $(HTMLDOCS) kea-guide.css kea-logo-100x70.png
 DOCBOOK = kea-guide.xml intro.xml quickstart.xml install.xml admin.xml config.xml
 DOCBOOK += keactrl.xml dhcp4-srv.xml dhcp6-srv.xml lease-expiration.xml logging.xml
 DOCBOOK += ddns.xml hooks.xml libdhcp.xml lfc.xml stats.xml ctrl-channel.xml faq.xml
-DOCBOOK += classify.xml
+DOCBOOK += classify.xml shell.xml agent.xml
 
 EXTRA_DIST = $(DOCBOOK)
 
 DISTCLEANFILES = $(HTMLDOCS) $(DOCS) kea-messages.xml
 
 kea-messages.xml:
-	$(top_srcdir)/tools/system_messages -o $@ \
+	$(top_builddir)/tools/system_messages -o $@ \
 	`find $(top_srcdir) -name "*.mes" -print`
 
 # This is not a "man" manual, but reuse this for now for docbook.
@@ -58,7 +58,7 @@ CLEANFILES = kea-guide.pdf kea-messages.pdf
 DBLATEX_FLAGS = --xslt-opts=--path --xslt-opts=$(abs_top_builddir)/doc \
 	-P doc.collab.show=0 -P latex.output.revhistory=0 \
 	-P term.breakline=1 -P filename.as.url=0 \
-	-P imagedata.default.scale="maxwidth=50px,maxheigth=35px"
+	-P imagedata.default.scale="maxwidth=50px,maxheight=35px"
 
 pdf: kea-guide.pdf kea-messages.pdf