GitLab

modified:
    alloc_engine.cc

# Conflicts:
#	src/lib/dhcpsrv/alloc_engine.cc

    Minor cleanup in alloc_engine.cc.

src/lib/dhcpsrv/alloc_engine.cc
    AllocEngine::allocateUnreservedLease4() - rather than first testing for a
    host reservation and then looking for an existing lease, we reverse the
    order, thus worrying about HRs only if there is no existing lease.

Added stable/development to the existing release dates in the changelog.

Per review comments.

Removed references to passive-backup mode, removed references to 1.7.x
versions of Kea etc.

The status-get command support was ported without High Availability status.

This is an enhancement to client classification in DHCPv4
and DHCPv6 servers. The client classes spefified in the
host database are taken into account in evaluation of the
client classes specified within the configuration files.
This works both for the global reservations and for the
non-global reservations when the selected subnet belongs
to a shared network. It can be used to influence subnet
selection within a shared network using host reservations
or pool selection within a subnet that doesn't necessarily
belong to a shared network.

Backport #950,!552 changes to v1_6_0

Changes:
    src/bin/dhcp4/dhcp4_messages.cc
    src/bin/dhcp4/dhcp4_messages.h
    src/bin/dhcp4/dhcp4_messages.mes
    src/bin/dhcp4/dhcp4_srv.cc
    src/bin/dhcp4/tests/vendor_opts_unittest.cc

Backport #950,!661 changes to v1_6_0

modified:
    ChangeLog
    doc/sphinx/arm/dhcp4-srv.rst
    src/lib/dhcp/libdhcp++.cc
    src/lib/dhcp/libdhcp++.h
    src/lib/dhcp/option.cc
    src/lib/dhcp/pkt4.cc
    src/lib/dhcp/tests/libdhcp++_unittest.cc

Backports #1093 to v1_6_0

modified:
    ChangeLog
    src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
    src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
    src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
    src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc

Backport #992 changes to v1_6_0

Changes:
    ChangeLog
    src/bin/dhcp4/dhcp4_srv.cc
    src/bin/dhcp4/tests/inform_unittest.cc

    Backprot #1108 changes to v1_6_0.

Added ChangeLog entry

src/bin/dhcp4/ctrl_dhcp4_srv.*
    ControlledDhcpv4Srv::dbLostCallback() - schedules a shutdown
    once retries have been exhausted/disableld

src/bin/dhcp6/ctrl_dhcp6_srv.*
    ControlledDhcpv6Srv::dbLostCallback() - schedules a shutdown
    once retries have been exhausted/disableld

src/lib/database/database_connection.h
    class DbUnrecoverableError - new exception

src/lib/mysql/mysql_connection.h
    MySqlConnection::check_error() - throws DbUnrecoverableError
    instead of calling exit()

src/lib/pgsql/pgsql_connection.*
    PgSqlConnection::checkStatementError() - throws DbUnrecoverableError
    instead of calling exit()

    Backport #1097 changes to v1_6_0.

Changes:
    ChangeLog
    src/lib/config/command_mgr.cc
    src/lib/config/tests/command_mgr_unittests.cc

Both libs should have bumped by current, but to avoid
collisions with master libs, they bumped only revision.

src/lib/dhcp/Makefile.am -> 13:2:0
src/lib/http/Makefile.am -> 6:2:0

src/lib/testutils/Makefile.am
    Added gtest_utils.h

Cherry picked master c75a7c10

src/lib/dhcp/libdhcp++.cc
    Cleaned up necessary exception decls

src/lib/dhcp/option.h
    Added commentary for SkipThisOptionError

src/lib/dhcp/option_definition.cc
    Cleaned up unnecessary exception decls

src/lib/dhcp/option_string.cc
    Replaced NULL with nul

src/lib/testutils/gtest_utils.h
    Added emissions of exception type name

Cherry picked from master a917e4ae

src/lib/dhcp/option.h
    class SkipThisOptionError - new exception type

src/lib/dhcp/libdhcp++.cc
    LibDHCP::unpackOptions4()
    LibDHCP::unpackOptions6() - explicitly catches and handles
    SkipThisOptionError expceptions

src/lib/dhcp/option_definition.cc
    OptionDefinition::optionFactory() - now rethrows SkipThisOptionError

src/lib/dhcp/option_int.h
    OptionInt::unpack() - altered ambiguous exception text

src/lib/dhcp/option_int_array.h
    OptionIntArray::unpack() - altered ambiguous exception text

src/lib/dhcp/option_string.cc
    OptionString::unpack() - now throws SkipThisOptionError if option, once
    trimmed, is empty

src/lib/dhcp/tests/option_string_unittest.cc
    Updated tests

src/lib/dhcp/tests/pkt4_unittest.cc
    TEST_F(Pkt4Test, testSkipThisOptionError) - new test

src/lib/dhcp/tests/pkt6_unittest.cc
    TEST_F(Pkt6Test, testSkipThisOptionError) - new test

src/lib/dhcpsrv/tests/cfg_option_unittest.cc
    Updated expected exception text

src/lib/testutils/gtest_utils.h
    Added two macros to emit exception info on throws.
    #define EXPECT_NO_THROW_LOG(statement)
    #define ASSERT_NO_THROW_LOG(statement)

    Fixed typo in ChangeLog.

    doc/sphinx/arm/admin.rst