[283-perfdhcp-indicated-requests-rate-is-not-kept-during-testing] Minimal fixes to...

diff --git a/src/bin/perfdhcp/receiver.cc b/src/bin/perfdhcp/receiver.cc
index e26e06024e7a882d030d7e919fefcc732f63df6f..dce28f1dd435bb02e45b3d3452a30728368869c1 100644 (file)
--- a/src/bin/perfdhcp/receiver.cc
+++ b/src/bin/perfdhcp/receiver.cc
@@ -21,7 +21,7 @@ Receiver::start() {
         return;
     }
     assert(run_flag_.test_and_set() == false);
-    recv_thread_ = move(unique_ptr<thread>(new thread{&Receiver::run, this}));
+    recv_thread_.reset(new thread{&Receiver::run, this});
 }
 
 void

diff --git a/src/bin/perfdhcp/receiver.h b/src/bin/perfdhcp/receiver.h
index 9fe652fe1ad833243237ec3f49c56854a1fa1af5..ce7fc4b1144b689afec104965eaf77b710fd744f 100644 (file)
--- a/src/bin/perfdhcp/receiver.h
+++ b/src/bin/perfdhcp/receiver.h
@@ -37,9 +37,11 @@ typedef boost::shared_ptr<Pkt> PktPtr;
 /// in main thread packets can be consumed from the queue using getPkt
 /// method.
 class Receiver {
+public:
     /// \brief Socket for receiving.
     const BetterSocket& socket_;
 
+private:
     /// \brief Flag indicating if thread should run (true) or not (false).
     boost::atomic_flag run_flag_;
 

diff --git a/src/bin/perfdhcp/test_control.cc b/src/bin/perfdhcp/test_control.cc
index 066955fb67c0c7e585d40437c11bd65a0da7bfa6..d890edae5bf62ed24ccc023a747df31cf77b84fd 100644 (file)
--- a/src/bin/perfdhcp/test_control.cc
+++ b/src/bin/perfdhcp/test_control.cc
@@ -1238,7 +1238,7 @@ TestControl::processReceivedPacket6(const BetterSocket& socket,
 void
 TestControl::consumeReceivedPackets(Receiver& receiver, const BetterSocket& socket) {
     PktPtr pkt;
-    while (pkt = receiver.getPkt()) {
+    while ((pkt = receiver.getPkt())) {
         if (CommandOptions::instance().getIpVersion() == 4) {
             Pkt4Ptr pkt4 = boost::dynamic_pointer_cast<Pkt4>(pkt);
             processReceivedPacket4(socket, pkt4);