isc-projects
diff --git a/‎src/bin/perfdhcp/test_control.cc
Lines changed: 4 additions & 4 deletions b/‎src/bin/perfdhcp/test_control.cc
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/lib/asiolink/tests/io_service_thread_pool_unittests.cc
Lines changed: 1 addition & 4 deletions b/‎src/lib/asiolink/tests/io_service_thread_pool_unittests.cc
Lines changed: 1 addition & 4 deletions
diff --git a/‎src/lib/dhcp/tests/option_opaque_data_tuples_unittest.cc
Lines changed: 9 additions & 9 deletions b/‎src/lib/dhcp/tests/option_opaque_data_tuples_unittest.cc
Lines changed: 9 additions & 9 deletions
diff --git a/‎src/lib/dhcpsrv/mysql_host_data_source.cc
Lines changed: 21 additions & 33 deletions b/‎src/lib/dhcpsrv/mysql_host_data_source.cc
Lines changed: 21 additions & 33 deletions
@@ -1823,11 +1823,11 @@ TestControl::setDefaults4(const Pkt4Ptr& pkt) {
     // The remote server's name or IP.
     pkt->setRemoteAddr(IOAddress(options_.getServerName()));
     // Set local address.
-    pkt->setLocalAddr(IOAddress(socket_.addr_));
+    pkt->setLocalAddr(socket_.addr_);
     // Set relay (GIADDR) address to local address if multiple
     // subnet mode is not enabled
     if (!options_.checkMultiSubnet()) {
-        pkt->setGiaddr(IOAddress(socket_.addr_));
+        pkt->setGiaddr(socket_.addr_);
     } else {
         pkt->setGiaddr(IOAddress(options_.getRandRelayAddr()));
     }
@@ -1868,9 +1868,9 @@ TestControl::setDefaults6(const Pkt6Ptr& pkt) {
       if (options_.checkMultiSubnet()) {
           relay_info.linkaddr_ = IOAddress(options_.getRandRelayAddr());
       } else {
-          relay_info.linkaddr_ = IOAddress(socket_.addr_);
+          relay_info.linkaddr_ = socket_.addr_;
       }
-      relay_info.peeraddr_ = IOAddress(socket_.addr_);
+      relay_info.peeraddr_ = socket_.addr_;
       relay_info.options_.insert(options_.getRelayOpts().begin(), options_.getRelayOpts().end());
       pkt->addRelayInfo(relay_info);
     }
 
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-2024 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
@@ -20,9 +20,6 @@ using namespace isc::asiolink;
 
 namespace {
 
-/// @brief Test timeout (ms).
-const long TEST_TIMEOUT = 10000;
-
 /// @brief Simple test fixture for testing IoServiceThreadPool.
 class IoServiceThreadPoolTest : public ::testing::Test {
 public:
 
@@ -530,9 +530,9 @@ TEST(OptionOpaqueDataTuples, unpack6Truncated) {
 // data is parsed correctly.
 TEST(OptionOpaqueDataTuples, unpack4NoTuple) {
     // Prepare data to decode.
-    const uint8_t buf_data[] = {
-    };
-    OptionBuffer buf(buf_data, buf_data + sizeof(buf_data));
+    std::vector<uint8_t> buf_vector;
+    const uint8_t* buf_data = buf_vector.data();
+    OptionBuffer buf(buf_data, buf_data + buf_vector.size());
 
     OptionOpaqueDataTuplesPtr data_tuple;
     ASSERT_NO_THROW(
@@ -549,9 +549,9 @@ TEST(OptionOpaqueDataTuples, unpack4NoTuple) {
 // data is parsed correctly when tuple's length field is coded on 2 octets.
 TEST(OptionOpaqueDataTuples, unpack4NoTuple_with_ltf) {
     // Prepare data to decode.
-    const uint8_t buf_data[] = {
-    };
-    OptionBuffer buf(buf_data, buf_data + sizeof(buf_data));
+    std::vector<uint8_t> buf_vector;
+    const uint8_t* buf_data = buf_vector.data();
+    OptionBuffer buf(buf_data, buf_data + buf_vector.size());
 
     OptionOpaqueDataTuplesPtr data_tuple;
     ASSERT_NO_THROW(
@@ -569,9 +569,9 @@ TEST(OptionOpaqueDataTuples, unpack4NoTuple_with_ltf) {
 // data is parsed correctly.
 TEST(OptionOpaqueDataTuples, unpack6NoTuple) {
     // Prepare data to decode.
-    const uint8_t buf_data[] = {
-    };
-    OptionBuffer buf(buf_data, buf_data + sizeof(buf_data));
+    std::vector<uint8_t> buf_vector;
+    const uint8_t* buf_data = buf_vector.data();
+    OptionBuffer buf(buf_data, buf_data + buf_vector.size());
 
     OptionOpaqueDataTuplesPtr data_tuple;
     ASSERT_NO_THROW(
 
@@ -168,7 +168,7 @@ class MySqlHostExchange {
         columns_[AUTH_KEY_COL] = "auth_key";
 
         BOOST_STATIC_ASSERT(13 < HOST_COLUMNS);
-    };
+    }
 
     /// @brief Virtual destructor.
     virtual ~MySqlHostExchange() {
@@ -199,7 +199,7 @@ class MySqlHostExchange {
     /// This method is used by derived classes.
     uint64_t getHostId() const {
         return (host_id_);
-    };
+    }
 
     /// @brief Set error indicators
     ///
@@ -217,7 +217,7 @@ class MySqlHostExchange {
             error[i] = MLM_FALSE;
             bind[i].error = reinterpret_cast<my_bool*>(&error[i]);
         }
-    };
+    }
 
     /// @brief Return columns in error
     ///
@@ -251,7 +251,7 @@ class MySqlHostExchange {
         }
 
         return (result);
-    };
+    }
 
     /// @brief Create MYSQL_BIND objects for Host Pointer
     ///
@@ -419,7 +419,7 @@ class MySqlHostExchange {
             vec.push_back(bind_[3]); // subnet_id
         }
         return (vec);
-    };
+    }
 
     /// @brief Create BIND array to receive Host data.
     ///
@@ -551,7 +551,7 @@ class MySqlHostExchange {
         // Add the data to the vector.  Note the end element is one after the
         // end of the array.
         return (bind_);
-    };
+    }
 
     /// @brief Copy received data into Host object
     ///
@@ -576,14 +576,14 @@ class MySqlHostExchange {
         // set to 0.
         SubnetID ipv4_subnet_id(SUBNET_ID_UNUSED);
         if (dhcp4_subnet_id_null_ == MLM_FALSE) {
-            ipv4_subnet_id = static_cast<SubnetID>(dhcp4_subnet_id_);
+            ipv4_subnet_id = dhcp4_subnet_id_;
         }
 
         // Set DHCPv6 subnet ID to the value returned. If NULL returned,
         // set to 0.
         SubnetID ipv6_subnet_id(SUBNET_ID_UNUSED);
         if (dhcp6_subnet_id_null_ == MLM_FALSE) {
-            ipv6_subnet_id = static_cast<SubnetID>(dhcp6_subnet_id_);
+            ipv6_subnet_id = dhcp6_subnet_id_;
         }
 
         // Set IPv4 address reservation if it was given, if not, set IPv4 zero
@@ -671,7 +671,7 @@ class MySqlHostExchange {
         }
 
         return (h);
-    };
+    }
 
     /// @brief Processes one row of data fetched from a database.
     ///
@@ -711,7 +711,7 @@ class MySqlHostExchange {
     ///         "(None)".
     std::string getErrorColumns() {
         return (getColumnsInError(error_, columns_));
-    };
+    }
 
 protected:
 
@@ -1310,7 +1310,7 @@ class MySqlHostWithOptionsExchange : public MySqlHostExchange {
     /// detects duplicated information and discards such entries.
     ///
     /// @param [out] hosts Container holding parsed hosts and options.
-    virtual void processFetchedData(ConstHostCollection& hosts) {
+    virtual void processFetchedData(ConstHostCollection& hosts) override {
         // Holds pointer to the previously parsed host.
         HostPtr most_recent_host;
         if (!hosts.empty()) {
@@ -1350,7 +1350,7 @@ class MySqlHostWithOptionsExchange : public MySqlHostExchange {
     /// @brief Bind variables for receiving option data.
     ///
     /// @return Vector of MYSQL_BIND object representing data to be retrieved.
-    virtual std::vector<MYSQL_BIND> createBindForReceive() {
+    virtual std::vector<MYSQL_BIND> createBindForReceive() override {
         // The following call sets bind_ values between 0 and 8.
         static_cast<void>(MySqlHostExchange::createBindForReceive());
 
@@ -1368,7 +1368,7 @@ class MySqlHostWithOptionsExchange : public MySqlHostExchange {
         setErrorIndicators(bind_, error_);
 
         return (bind_);
-    };
+    }
 
 private:
 
@@ -1453,7 +1453,7 @@ class MySqlHostIPv6Exchange : public MySqlHostWithOptionsExchange {
             return (reservation_id_);
         }
         return (0);
-    };
+    }
 
     /// @brief Creates IPv6 reservation from the data contained in the
     /// currently processed row.
@@ -1484,7 +1484,7 @@ class MySqlHostIPv6Exchange : public MySqlHostWithOptionsExchange {
         IOAddress addr6 = IOAddress::fromBytes(AF_INET6, ipv6_address_buffer_);
         IPv6Resrv r(type, addr6, prefix_len_);
         return (r);
-    };
+    }
 
     /// @brief Processes one row of data fetched from a database.
     ///
@@ -1505,7 +1505,7 @@ class MySqlHostIPv6Exchange : public MySqlHostWithOptionsExchange {
     ///
     /// @param [out] hosts Collection of hosts to which a new host created
     ///        from the processed data should be inserted.
-    virtual void processFetchedData(ConstHostCollection& hosts) {
+    virtual void processFetchedData(ConstHostCollection& hosts) override {
 
         // Call parent class to fetch host information and options.
         MySqlHostWithOptionsExchange::processFetchedData(hosts);
@@ -1539,7 +1539,7 @@ class MySqlHostIPv6Exchange : public MySqlHostWithOptionsExchange {
     /// objects with associated IPv6 reservations.
     ///
     /// @return Vector of MYSQL_BIND objects representing data to be retrieved.
-    virtual std::vector<MYSQL_BIND> createBindForReceive() {
+    virtual std::vector<MYSQL_BIND> createBindForReceive() override {
         // Reset most recent reservation id value because we're now making
         // a new SELECT query.
         most_recent_reservation_id_ = 0;
@@ -1580,7 +1580,7 @@ class MySqlHostIPv6Exchange : public MySqlHostWithOptionsExchange {
         setErrorIndicators(bind_, error_);
 
         return (bind_);
-    };
+    }
 
 private:
 
@@ -1798,18 +1798,6 @@ class MySqlIPv6ReservationExchange {
 ///
 /// This class supports inserting both DHCPv4 and DHCPv6 options.
 class MySqlOptionExchange {
-private:
-
-    static const size_t OPTION_ID_COL = 0;
-    static const size_t CODE_COL = 1;
-    static const size_t VALUE_COL = 2;
-    static const size_t FORMATTED_VALUE_COL = 3;
-    static const size_t SPACE_COL = 4;
-    static const size_t PERSISTENT_COL = 5;
-    static const size_t CANCELLED_COL = 6;
-    static const size_t USER_CONTEXT_COL = 7;
-    static const size_t DHCP_SUBNET_ID_COL = 8;
-    static const size_t HOST_ID_COL = 9;
     /// @brief Number of columns in the option tables holding bindable values.
     static const size_t OPTION_COLUMNS = 10;
 
@@ -3231,7 +3219,7 @@ MySqlHostDataSourceImpl::getHost(MySqlHostContextPtr& ctx,
     // Identifier type.
     char identifier_type_copy = static_cast<char>(identifier_type);
     inbind[1].buffer_type = MYSQL_TYPE_TINY;
-    inbind[1].buffer = reinterpret_cast<char*>(&identifier_type_copy);
+    inbind[1].buffer = &identifier_type_copy;
     inbind[1].is_unsigned = MLM_TRUE;
 
     ConstHostCollection collection;
@@ -3394,7 +3382,7 @@ MySqlHostDataSource::del4(const SubnetID& subnet_id,
     // identifier type
     char identifier_type_copy = static_cast<char>(identifier_type);
     inbind[1].buffer_type = MYSQL_TYPE_TINY;
-    inbind[1].buffer = reinterpret_cast<char*>(&identifier_type_copy);
+    inbind[1].buffer = &identifier_type_copy;
     inbind[1].is_unsigned = MLM_TRUE;
 
     // identifier value
@@ -3435,7 +3423,7 @@ MySqlHostDataSource::del6(const SubnetID& subnet_id,
     // identifier type
     char identifier_type_copy = static_cast<char>(identifier_type);
     inbind[1].buffer_type = MYSQL_TYPE_TINY;
-    inbind[1].buffer = reinterpret_cast<char*>(&identifier_type_copy);
+    inbind[1].buffer = &identifier_type_copy;
     inbind[1].is_unsigned = MLM_TRUE;
 
     // identifier value