From: Andrei Pavel <andrei@isc.org>
Date: Fri, 18 Jun 2021 15:00:18 +0000 (+0300)
Subject: [#1119] rename to sendMultipleMessages4 (minor)
X-Git-Tag: Kea-1.9.9~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d629855f4fa3489865854dde52cd2dca2e7ea48a;p=thirdparty%2Fkea.git

[#1119] rename to sendMultipleMessages4 (minor)
---

diff --git a/src/bin/perfdhcp/basic_scen.cc b/src/bin/perfdhcp/basic_scen.cc
index 570939cdbf..a9b696f61b 100644
--- a/src/bin/perfdhcp/basic_scen.cc
+++ b/src/bin/perfdhcp/basic_scen.cc
@@ -177,7 +177,7 @@ BasicScen::run() {
 
             // Send multiple renews to satisfy the desired rate.
             if (options_.getIpVersion() == 4) {
-                tc_.sendMultipleMessages(DHCPREQUEST, renew_packets_due);
+                tc_.sendMultipleMessages4(DHCPREQUEST, renew_packets_due);
             } else {
                 tc_.sendMultipleMessages6(DHCPV6_RENEW, renew_packets_due);
             }
@@ -191,7 +191,7 @@ BasicScen::run() {
             // Send Release messages.
 
             if (options_.getIpVersion() == 4) {
-                tc_.sendMultipleMessages(DHCPRELEASE, release_packets_due);
+                tc_.sendMultipleMessages4(DHCPRELEASE, release_packets_due);
             } else {
                 tc_.sendMultipleMessages6(DHCPV6_RELEASE, release_packets_due);
             }
diff --git a/src/bin/perfdhcp/test_control.cc b/src/bin/perfdhcp/test_control.cc
index a1f4f7cd55..996508ad87 100644
--- a/src/bin/perfdhcp/test_control.cc
+++ b/src/bin/perfdhcp/test_control.cc
@@ -553,8 +553,8 @@ TestControl::sendPackets(const uint64_t packets_num,
 }
 
 uint64_t
-TestControl::sendMultipleMessages(const uint32_t msg_type,
-                                  const uint64_t msg_num) {
+TestControl::sendMultipleMessages4(const uint32_t msg_type,
+                                   const uint64_t msg_num) {
     for (uint64_t i = 0; i < msg_num; ++i) {
         if (!sendMessageFromAck(msg_type)) {
             return (i);
diff --git a/src/bin/perfdhcp/test_control.h b/src/bin/perfdhcp/test_control.h
index 292eb36220..4346d939ad 100644
--- a/src/bin/perfdhcp/test_control.h
+++ b/src/bin/perfdhcp/test_control.h
@@ -274,8 +274,8 @@ public:
     /// \param msg_num A number of messages to be sent.
     ///
     /// \return A number of messages actually sent.
-    uint64_t sendMultipleMessages(const uint32_t msg_type,
-                                  const uint64_t msg_num);
+    uint64_t sendMultipleMessages4(const uint32_t msg_type,
+                                   const uint64_t msg_num);
 
     /// \brief Send number of DHCPv6 Renew or Release messages to the server.
     ///
diff --git a/src/bin/perfdhcp/tests/test_control_unittest.cc b/src/bin/perfdhcp/tests/test_control_unittest.cc
index 1760f4bae0..c3650698f6 100644
--- a/src/bin/perfdhcp/tests/test_control_unittest.cc
+++ b/src/bin/perfdhcp/tests/test_control_unittest.cc
@@ -160,7 +160,7 @@ public:
     using TestControl::sendDiscover4;
     using TestControl::sendRequest4;
     using TestControl::sendPackets;
-    using TestControl::sendMultipleMessages;
+    using TestControl::sendMultipleMessages4;
     using TestControl::sendMultipleMessages6;
     using TestControl::sendRequest6;
     using TestControl::sendSolicit6;
@@ -726,19 +726,19 @@ public:
         // Try to send 5 messages. It should be successful because 10
         // DHCPREQUEST messages has been received. For each of them we
         // should be able to send renewal.
-        msg_num = tc.sendMultipleMessages(msg_type, 5);
+        msg_num = tc.sendMultipleMessages4(msg_type, 5);
         // Make sure that we have sent 5 messages.
         EXPECT_EQ(5, msg_num);
 
         // Try to do it again. We should still have 5 Reply packets for
         // which renews haven't been sent yet.
-        msg_num = tc.sendMultipleMessages(msg_type, 5);
+        msg_num = tc.sendMultipleMessages4(msg_type, 5);
         EXPECT_EQ(5, msg_num);
 
         // We used all the DHCPACK packets (we sent renew or release for each of
         // them already). Therefore, no further renew messages should be sent
         // before we acquire new leases.
-        msg_num = tc.sendMultipleMessages(msg_type, 5);
+        msg_num = tc.sendMultipleMessages4(msg_type, 5);
         // Make sure that no message has been sent.
         EXPECT_EQ(0, msg_num);
     }