mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-04 07:55:18 +00:00
Code Issues Releases Wiki Activity

[#2438] raise the length of client classes in the limits MySQL schema

Browse Source
This commit is contained in:
Andrei Pavel
2022-06-23 12:13:01 +03:00
parent f7d8e23233
commit 0da6f84867
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/dhcpsrv/mysql_lease_mgr.cc
View File

@@ -97,6 +97,9 @@ const size_t ADDRESS6_TEXT_MAX_LEN = 39;
/// @brief Maximum length of user context. /// @brief Maximum length of user context.
const size_t USER_CONTEXT_MAX_LEN = 8192; const size_t USER_CONTEXT_MAX_LEN = 8192;
/// @brief Maximum length of the text returned by the limit checking functions.
const size_t LIMITS_TEXT_MAX_LEN = 512;
boost::array<TaggedStatement, MySqlLeaseMgr::NUM_STATEMENTS> boost::array<TaggedStatement, MySqlLeaseMgr::NUM_STATEMENTS>
tagged_statements = { { tagged_statements = { {
{MySqlLeaseMgr::DELETE_LEASE4, {MySqlLeaseMgr::DELETE_LEASE4,
@@ -3109,7 +3112,7 @@ MySqlLeaseMgr::checkLimits(ConstElementPtr const& user_context, StatementIndex c
MySqlBinding::createString(user_context->str()) MySqlBinding::createString(user_context->str())
}); });
MySqlBindingCollection out_bindings({ MySqlBindingCollection out_bindings({
MySqlBinding::createString(128) MySqlBinding::createString(LIMITS_TEXT_MAX_LEN)
}); });
// Execute the select. // Execute the select.

6
src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
View File

@@ -363,13 +363,13 @@ public:
/// @brief Pretends to check if the IPv4 lease limits set in the given user /// @brief Pretends to check if the IPv4 lease limits set in the given user
/// context are exceeded. /// context are exceeded.
std::string checkLimits4(isc::data::ConstElementPtr const& user_context) const override { std::string checkLimits4(isc::data::ConstElementPtr const& /* user_context */) const override {
isc_throw(NotImplemented, "ConcreteLeaseMgr::checkLimits4() not implemented"); isc_throw(NotImplemented, "ConcreteLeaseMgr::checkLimits4() not implemented");
} }
/// @brief Pretends to check if the IPv4 lease limits set in the given user /// @brief Pretends to check if the IPv6 lease limits set in the given user
/// context are exceeded. /// context are exceeded.
std::string checkLimits6(isc::data::ConstElementPtr const& user_context) const override{ std::string checkLimits6(isc::data::ConstElementPtr const& /* user_context */) const override{
isc_throw(NotImplemented, "ConcreteLeaseMgr::checkLimits6() not implemented"); isc_throw(NotImplemented, "ConcreteLeaseMgr::checkLimits6() not implemented");
} }

18
src/share/database/scripts/mysql/dhcpdb_create.mysql
View File

@@ -4517,7 +4517,7 @@ CREATE PROCEDURE lease4_AINS_lease4_stat_by_client_class(IN new_state TINYINT,
BEGIN BEGIN
-- Declarations -- Declarations
DECLARE client_classes TEXT; DECLARE client_classes TEXT;
DECLARE class VARCHAR(128); DECLARE class VARCHAR(255);
DECLARE length INT; DECLARE length INT;
DECLARE i INT; DECLARE i INT;
@@ -4562,7 +4562,7 @@ BEGIN
-- Declarations -- Declarations
DECLARE old_client_classes TEXT; DECLARE old_client_classes TEXT;
DECLARE new_client_classes TEXT; DECLARE new_client_classes TEXT;
DECLARE class VARCHAR(128); DECLARE class VARCHAR(255);
DECLARE length INT; DECLARE length INT;
DECLARE i INT; DECLARE i INT;
@@ -4615,7 +4615,7 @@ CREATE PROCEDURE lease4_ADEL_lease4_stat_by_client_class(IN old_state TINYINT,
BEGIN BEGIN
-- Declarations -- Declarations
DECLARE client_classes TEXT; DECLARE client_classes TEXT;
DECLARE class VARCHAR(128); DECLARE class VARCHAR(255);
DECLARE length INT; DECLARE length INT;
DECLARE i INT; DECLARE i INT;
@@ -4654,7 +4654,7 @@ CREATE PROCEDURE lease6_AINS_lease6_stat_by_client_class(IN new_state TINYINT,
BEGIN BEGIN
-- Declarations -- Declarations
DECLARE client_classes TEXT; DECLARE client_classes TEXT;
DECLARE class VARCHAR(128); DECLARE class VARCHAR(255);
DECLARE length INT; DECLARE length INT;
DECLARE i INT; DECLARE i INT;
@@ -4700,7 +4700,7 @@ BEGIN
-- Declarations -- Declarations
DECLARE old_client_classes TEXT; DECLARE old_client_classes TEXT;
DECLARE new_client_classes TEXT; DECLARE new_client_classes TEXT;
DECLARE class VARCHAR(128); DECLARE class VARCHAR(255);
DECLARE length INT; DECLARE length INT;
DECLARE i INT; DECLARE i INT;
@@ -4753,8 +4753,8 @@ CREATE PROCEDURE lease6_ADEL_lease6_stat_by_client_class(IN old_state TINYINT,
IN old_lease_type TINYINT) IN old_lease_type TINYINT)
BEGIN BEGIN
-- Declarations -- Declarations
DECLARE client_classes VARCHAR(1024); DECLARE client_classes TEXT;
DECLARE class VARCHAR(128); DECLARE class VARCHAR(255);
DECLARE length INT; DECLARE length INT;
DECLARE i INT; DECLARE i INT;
@@ -4912,7 +4912,7 @@ BEGIN
DECLARE json_element TEXT; DECLARE json_element TEXT;
DECLARE length INT; DECLARE length INT;
DECLARE class TEXT; DECLARE class TEXT;
DECLARE name VARCHAR(128); DECLARE name VARCHAR(255);
DECLARE i INT; DECLARE i INT;
DECLARE lease_limit INT; DECLARE lease_limit INT;
DECLARE lease_count INT; DECLARE lease_count INT;
@@ -4976,7 +4976,7 @@ BEGIN
DECLARE json_element TEXT; DECLARE json_element TEXT;
DECLARE length INT; DECLARE length INT;
DECLARE class TEXT; DECLARE class TEXT;
DECLARE name VARCHAR(128); DECLARE name VARCHAR(255);
DECLARE i INT; DECLARE i INT;
DECLARE lease_limit INT; DECLARE lease_limit INT;
DECLARE lease_count INT; DECLARE lease_count INT;

18
src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
View File

@@ -279,7 +279,7 @@ CREATE PROCEDURE lease4_AINS_lease4_stat_by_client_class(IN new_state TINYINT,
BEGIN BEGIN
-- Declarations -- Declarations
DECLARE client_classes TEXT; DECLARE client_classes TEXT;
DECLARE class VARCHAR(128); DECLARE class VARCHAR(255);
DECLARE length INT; DECLARE length INT;
DECLARE i INT; DECLARE i INT;
@@ -324,7 +324,7 @@ BEGIN
-- Declarations -- Declarations
DECLARE old_client_classes TEXT; DECLARE old_client_classes TEXT;
DECLARE new_client_classes TEXT; DECLARE new_client_classes TEXT;
DECLARE class VARCHAR(128); DECLARE class VARCHAR(255);
DECLARE length INT; DECLARE length INT;
DECLARE i INT; DECLARE i INT;
@@ -377,7 +377,7 @@ CREATE PROCEDURE lease4_ADEL_lease4_stat_by_client_class(IN old_state TINYINT,
BEGIN BEGIN
-- Declarations -- Declarations
DECLARE client_classes TEXT; DECLARE client_classes TEXT;
DECLARE class VARCHAR(128); DECLARE class VARCHAR(255);
DECLARE length INT; DECLARE length INT;
DECLARE i INT; DECLARE i INT;
@@ -416,7 +416,7 @@ CREATE PROCEDURE lease6_AINS_lease6_stat_by_client_class(IN new_state TINYINT,
BEGIN BEGIN
-- Declarations -- Declarations
DECLARE client_classes TEXT; DECLARE client_classes TEXT;
DECLARE class VARCHAR(128); DECLARE class VARCHAR(255);
DECLARE length INT; DECLARE length INT;
DECLARE i INT; DECLARE i INT;
@@ -462,7 +462,7 @@ BEGIN
-- Declarations -- Declarations
DECLARE old_client_classes TEXT; DECLARE old_client_classes TEXT;
DECLARE new_client_classes TEXT; DECLARE new_client_classes TEXT;
DECLARE class VARCHAR(128); DECLARE class VARCHAR(255);
DECLARE length INT; DECLARE length INT;
DECLARE i INT; DECLARE i INT;
@@ -515,8 +515,8 @@ CREATE PROCEDURE lease6_ADEL_lease6_stat_by_client_class(IN old_state TINYINT,
IN old_lease_type TINYINT) IN old_lease_type TINYINT)
BEGIN BEGIN
-- Declarations -- Declarations
DECLARE client_classes VARCHAR(1024); DECLARE client_classes TEXT;
DECLARE class VARCHAR(128); DECLARE class VARCHAR(255);
DECLARE length INT; DECLARE length INT;
DECLARE i INT; DECLARE i INT;
@@ -674,7 +674,7 @@ BEGIN
DECLARE json_element TEXT; DECLARE json_element TEXT;
DECLARE length INT; DECLARE length INT;
DECLARE class TEXT; DECLARE class TEXT;
DECLARE name VARCHAR(128); DECLARE name VARCHAR(255);
DECLARE i INT; DECLARE i INT;
DECLARE lease_limit INT; DECLARE lease_limit INT;
DECLARE lease_count INT; DECLARE lease_count INT;
@@ -738,7 +738,7 @@ BEGIN
DECLARE json_element TEXT; DECLARE json_element TEXT;
DECLARE length INT; DECLARE length INT;
DECLARE class TEXT; DECLARE class TEXT;
DECLARE name VARCHAR(128); DECLARE name VARCHAR(255);
DECLARE i INT; DECLARE i INT;
DECLARE lease_limit INT; DECLARE lease_limit INT;
DECLARE lease_count INT; DECLARE lease_count INT;