[master] Merge branch 'trac2983' (4 extra hooks for DHCPv4)

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 6ef0d51870e9e027c3fbc1c092e9e2ff9ef05e18,d775692a65499124c66fd3ceb35cb9318f11bb0b..0dab48943755149f541c65996539141eef35bc23
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,55 -1,11 +1,60 @@@
 -6XX.  [func]          tomek
++667.  [func]          tomek
+       Additional hooks (buffer4_receive, lease4_renew,
+       lease4_release, buffer4_send) added to the DHCPv4 server.
 -      (Trac #2983, git ABCD)
++      (Trac #2983, git fd47f18f898695b98623a63a0a1c68d2e4b37568)
++
 +666.  [func]          vorner
 +      The CmdCtl's command "print_settings" was removed. It served no real
 +      purpose and was just experimental leftover from early development.
 +      (Trac #3028, git 0d22246092ad4822d48f5a52af5f644f5ae2f5e2)
 +
 +665.  [doc]           stephen
 +      Added the "Hook's Maintenance Guide" to the BIND 10 developer
 +      documentation.
 +      (Trac #3063, git 5d1ee7b7470fc644b798ac47db1811c829f5ac24)
 +
 +664.  [bug]           tmark
 +      Corrects a bug in Hooks processing that was improperly
 +      creating a new callout handle on every call, rather
 +      than maintaining it throughout the context of the
 +      packet being processed.
 +      (Trac #3062, git 28684bcfe5e54ad0421d75d4445a04b75358ce77)
 +
 +663.  [func]          marcin
 +      b10-dhcp6: Server processes the DHCPv6 Client FQDN Option
 +      sent by a client and generates the response. The DHCPv6 Client
 +      FQDN Option is represented by the new class in the libdhcp++.
 +      As a result of FQDN Option processing, the server generates
 +      NameChangeRequests which represent changes to DNS mappings for
 +      a particular lease (addition or removal of DNS mappings).
 +      Currently all generated NameChangeRequests are dropped. Sending
 +      them to b10-dhcp-ddns will be implemented with the future tickets.
 +      (Trac #3036, git 209f3964b9f12afbf36f3fa6b62964e03049ec6e)
 +
 +662.  [func]          marcin
 +      libdhcp++: Implemented an Option4ClientFqdn class which represents
 +      DHCPv4 Client FQDN Option (code 81) defined in RFC4702. This class
 +      supports the domain name encoding in canonical FQDN format as well
 +      as in deprecated ASCII format.
 +      (Trac# 3082, git 1b434debfbf4a43070eb480fa0975a6eff6429d4)
 +
 +661.    [func]                stephen
 +      Copy additional header files to the BIND 10 installation directory
 +      to allow the building of DHCP hooks libraries against an installed
 +      version of BIND 10.
 +      (Trac #3092, git e9beef0b435ba108af9e5979476bd2928808b342)
 +
 +660.  [func]          fujiwara
 +      src/lib/cc: Integer size of C++ CC library is changed to int64_t.
 +      b10-auth: The size of statistics counters is changed to uint64_t.
 +      b10-auth sends lower 63 bit of counter values to b10-stats.
 +      (Trac #3015,  git e5b3471d579937f19e446f8a380464e0fc059567
 +       and Trac #3016, git ffbcf9833ebd2f1952664cc0498608b988628d53)
  
  659.  [func]          stephen
 -      Added capability to configure the hooks libraries for the b10-dhcp4 and
 -      b10-dhcp6 servers through the BIND 10 configuration mechanism.
 +      Added capability to configure the hooks libraries for the
 +      b10-dhcp4 and b10-dhcp6 servers through the BIND 10
 +      configuration mechanism.
        (Trac #2981, git aff6b06b2490fe4fa6568e7575a9a9105cfd7fae)
  
  658.  [func]*         vorner

diff --cc src/bin/dhcp4/dhcp4_srv.cc
Simple merge

diff --cc src/bin/dhcp6/dhcp6_messages.mes
Simple merge

diff --cc src/lib/dhcpsrv/alloc_engine.cc
Simple merge

diff --cc src/lib/dhcpsrv/alloc_engine.h
Simple merge

diff --cc src/lib/dhcpsrv/tests/alloc_engine_unittest.cc
Simple merge