Browse Source

[3173] Minor: fixed typos in perfdhcp files.

Marcin Siodelski 11 years ago
parent
commit
97c7bb8690

+ 4 - 3
tests/tools/perfdhcp/command_options.h

@@ -1,3 +1,4 @@
+
 // Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
 // Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
 //
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // Permission to use, copy, modify, and/or distribute this software for any
@@ -481,7 +482,7 @@ private:
     /// Indicates number of -d<value> parameters specified by user.
     /// Indicates number of -d<value> parameters specified by user.
     /// If this value goes above 2, command line parsing fails.
     /// If this value goes above 2, command line parsing fails.
     uint8_t drop_time_set_;
     uint8_t drop_time_set_;
-    /// Time to elapse before request is lost. The fisrt value of
+    /// Time to elapse before request is lost. The first value of
     /// two-element vector refers to DO/SA exchanges,
     /// two-element vector refers to DO/SA exchanges,
     /// second value refers to RA/RR. Default values are { 1, 1 }
     /// second value refers to RA/RR. Default values are { 1, 1 }
     std::vector<double> drop_time_;
     std::vector<double> drop_time_;
@@ -518,12 +519,12 @@ private:
     /// Indicates that we take server id from first received packet.
     /// Indicates that we take server id from first received packet.
     bool use_first_;
     bool use_first_;
     /// Packet template file names. These files store template packets
     /// Packet template file names. These files store template packets
-    /// that are used for initiating echanges. Template packets
+    /// that are used for initiating exchanges. Template packets
     /// read from files are later tuned with variable data.
     /// read from files are later tuned with variable data.
     std::vector<std::string> template_file_;
     std::vector<std::string> template_file_;
     /// Offset of transaction id in template files. First vector
     /// Offset of transaction id in template files. First vector
     /// element points to offset for DISCOVER/SOLICIT messages,
     /// element points to offset for DISCOVER/SOLICIT messages,
-    /// second element points to trasaction id offset for
+    /// second element points to transaction id offset for
     /// REQUEST messages
     /// REQUEST messages
     std::vector<int> xid_offset_;
     std::vector<int> xid_offset_;
     /// Random value offset in templates. Random value offset
     /// Random value offset in templates. Random value offset

+ 10 - 10
tests/tools/perfdhcp/test_control.h

@@ -167,7 +167,7 @@ public:
         /// \param socket socket descriptor.
         /// \param socket socket descriptor.
         TestControlSocket(const int socket);
         TestControlSocket(const int socket);
 
 
-        /// \brief Destriuctor of the socket wrapper class.
+        /// \brief Destructor of the socket wrapper class.
         ///
         ///
         /// Destructor closes wrapped socket.
         /// Destructor closes wrapped socket.
         ~TestControlSocket();
         ~TestControlSocket();
@@ -204,7 +204,7 @@ public:
     /// The default generator pointer.
     /// The default generator pointer.
     typedef boost::shared_ptr<NumberGenerator> NumberGeneratorPtr;
     typedef boost::shared_ptr<NumberGenerator> NumberGeneratorPtr;
 
 
-    /// \brief Sequential numbers generatorc class.
+    /// \brief Sequential numbers generator class.
     class SequentialGenerator : public NumberGenerator {
     class SequentialGenerator : public NumberGenerator {
     public:
     public:
         /// \brief Constructor.
         /// \brief Constructor.
@@ -220,7 +220,7 @@ public:
             }
             }
         }
         }
 
 
-        /// \brief Generate number sequentialy.
+        /// \brief Generate number sequentially.
         ///
         ///
         /// \return generated number.
         /// \return generated number.
         virtual uint32_t generate() {
         virtual uint32_t generate() {
@@ -248,7 +248,7 @@ public:
     /// brief\ Run performance test.
     /// brief\ Run performance test.
     ///
     ///
     /// Method runs whole performance test. Command line options must
     /// Method runs whole performance test. Command line options must
-    /// be parsed prior to running this function. Othewise function will
+    /// be parsed prior to running this function. Otherwise function will
     /// throw exception.
     /// throw exception.
     ///
     ///
     /// \throw isc::InvalidOperation if command line options are not parsed.
     /// \throw isc::InvalidOperation if command line options are not parsed.
@@ -287,7 +287,7 @@ protected:
     /// only via \ref instance method.
     /// only via \ref instance method.
     TestControl();
     TestControl();
 
 
-    /// \brief Check if test exit condtitions fulfilled.
+    /// \brief Check if test exit conditions fulfilled.
     ///
     ///
     /// Method checks if the test exit conditions are fulfilled.
     /// Method checks if the test exit conditions are fulfilled.
     /// Exit conditions are checked periodically from the
     /// Exit conditions are checked periodically from the
@@ -389,7 +389,7 @@ protected:
 
 
     /// \brief Factory function to create DHCPv4 Request List option.
     /// \brief Factory function to create DHCPv4 Request List option.
     ///
     ///
-    /// This factory function creayes DHCPv4 PARAMETER_REQUEST_LIST option
+    /// This factory function creates DHCPv4 PARAMETER_REQUEST_LIST option
     /// instance with the following set of requested options:
     /// instance with the following set of requested options:
     /// - DHO_SUBNET_MASK,
     /// - DHO_SUBNET_MASK,
     /// - DHO_BROADCAST_ADDRESS,
     /// - DHO_BROADCAST_ADDRESS,
@@ -545,7 +545,7 @@ protected:
     /// \brief Process received DHCPv6 packet.
     /// \brief Process received DHCPv6 packet.
     ///
     ///
     /// Method performs processing of the received DHCPv6 packet,
     /// Method performs processing of the received DHCPv6 packet,
-    /// updates statistics and responsds to the server if required,
+    /// updates statistics and responds to the server if required,
     /// e.g. when ADVERTISE packet arrives, this function will initiate
     /// e.g. when ADVERTISE packet arrives, this function will initiate
     /// REQUEST message to the server.
     /// REQUEST message to the server.
     ///
     ///
@@ -596,7 +596,7 @@ protected:
     /// \brief Register option factory functions for DHCPv4 or DHCPv6.
     /// \brief Register option factory functions for DHCPv4 or DHCPv6.
     ///
     ///
     /// Method registers option factory functions for DHCPv4 or DHCPv6,
     /// Method registers option factory functions for DHCPv4 or DHCPv6,
-    /// depending in whch mode test is currently running.
+    /// depending in which mode test is currently running.
     void registerOptionFactories() const;
     void registerOptionFactories() const;
 
 
 
 
@@ -630,7 +630,7 @@ protected:
     /// type and keeps them around until test finishes. Then they
     /// type and keeps them around until test finishes. Then they
     /// are printed to the user. If packet of specified type has
     /// are printed to the user. If packet of specified type has
     /// been already stored this function perfroms no operation.
     /// been already stored this function perfroms no operation.
-    /// This function does not perform sainty check if packet
+    /// This function does not perform sanity check if packet
     /// pointer is valid. Make sure it is before calling it.
     /// pointer is valid. Make sure it is before calling it.
     ///
     ///
     /// \param pkt packet to be stored.
     /// \param pkt packet to be stored.
@@ -869,7 +869,7 @@ private:
     /// \warning
     /// \warning
     ///
     ///
     /// \param [in] pkt_from A packet from which options should be copied.
     /// \param [in] pkt_from A packet from which options should be copied.
-    /// \parma [out] pkt_to A packet to which options should be copied.
+    /// \param [out] pkt_to A packet to which options should be copied.
     ///
     ///
     /// \throw isc::perfdhcp::OptionNotFound if a required option is not
     /// \throw isc::perfdhcp::OptionNotFound if a required option is not
     /// found in the packet from which options should be copied.
     /// found in the packet from which options should be copied.

+ 5 - 5
tests/tools/perfdhcp/tests/test_control_unittest.cc

@@ -40,7 +40,7 @@ using namespace isc::perfdhcp;
 class NakedTestControl: public TestControl {
 class NakedTestControl: public TestControl {
 public:
 public:
 
 
-    /// \brief Incremental transaction id generaator.
+    /// \brief Incremental transaction id generator.
     ///
     ///
     /// This is incremental transaction id generator. It overrides
     /// This is incremental transaction id generator. It overrides
     /// the default transaction id generator that generates transaction
     /// the default transaction id generator that generates transaction
@@ -123,7 +123,7 @@ public:
     /// truncated.
     /// truncated.
     ///
     ///
     /// \param filename template file to be created.
     /// \param filename template file to be created.
-    /// \param buffer with binary datato be stored in file.
+    /// \param buffer with binary data to be stored in file.
     /// \param size target size of the file.
     /// \param size target size of the file.
     /// \param invalid_chars inject invalid chars to the template file.
     /// \param invalid_chars inject invalid chars to the template file.
     /// \return true if file creation successful.
     /// \return true if file creation successful.
@@ -283,7 +283,7 @@ public:
 
 
     /// brief Test generation of mulitple DUIDs
     /// brief Test generation of mulitple DUIDs
     ///
     ///
-    /// Thie method checks the generation of multiple DUIDs. Number
+    /// This method checks the generation of multiple DUIDs. Number
     /// of iterations depends on the number of simulated clients.
     /// of iterations depends on the number of simulated clients.
     /// It is expected that DUID's size is 14 (consists of DUID-LLT
     /// It is expected that DUID's size is 14 (consists of DUID-LLT
     /// HW type field, 4 octets of time value and MAC address). The
     /// HW type field, 4 octets of time value and MAC address). The
@@ -497,7 +497,7 @@ public:
 
 
         // Incremental transaction id generator will generate
         // Incremental transaction id generator will generate
         // predictable values of transaction id for each iteration.
         // predictable values of transaction id for each iteration.
-        // This is important because we need to simulate reponses
+        // This is important because we need to simulate responses
         // from the server and use the same transaction ids as in
         // from the server and use the same transaction ids as in
         // packets sent by client.
         // packets sent by client.
         TestControl::NumberGeneratorPtr
         TestControl::NumberGeneratorPtr
@@ -754,7 +754,7 @@ TEST_F(TestControlTest, Options4) {
 
 
     // Get the option buffer. It should hold the combination of values
     // Get the option buffer. It should hold the combination of values
     // listed in requested_options array. However their order can be
     // listed in requested_options array. However their order can be
-    // different in general so we need to search each value separatelly.
+    // different in general so we need to search each value separately.
     const OptionBuffer& requested_options_buf =
     const OptionBuffer& requested_options_buf =
         opt_requested_options->getData();
         opt_requested_options->getData();
     EXPECT_EQ(requested_options_ref.size(), requested_options_buf.size());
     EXPECT_EQ(requested_options_ref.size(), requested_options_buf.size());