Commit e6827b24 authored by Francis Dupont's avatar Francis Dupont
Browse files

[master] spelling

parent 5b018cab
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
// \brief Coroutine object // \brief Coroutine object
// //
// A coroutine object maintains the state of a re-enterable routine. It // A coroutine object maintains the state of a re-enterable routine. It
// is assignable and copy-constructable, and can be used as a base class // is assignable and copy-constructible, and can be used as a base class
// for a class that uses it, or as a data member. The copy overhead is // for a class that uses it, or as a data member. The copy overhead is
// a single int. // a single int.
// //
// A reenterable function contains a CORO_REENTER (coroutine) { ... } // A reentrant function contains a CORO_REENTER (coroutine) { ... }
// block. Whenever an asychrnonous operation is initiated within the // block. Whenever an asychrnonous operation is initiated within the
// routine, the function is provided as the handler object. (The simplest // routine, the function is provided as the handler object. (The simplest
// way to do this is to have the reenterable function be the operator() // way to do this is to have the reentrant function be the operator()
// member for the coroutine object itself.) For example: // member for the coroutine object itself.) For example:
// //
// CORO_YIELD socket->async_read_some(buffer, *this); // CORO_YIELD socket->async_read_some(buffer, *this);
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
// The CORO_YIELD keyword updates the current status of the coroutine to // The CORO_YIELD keyword updates the current status of the coroutine to
// indicate the line number currently being executed. The // indicate the line number currently being executed. The
// async_read_some() call is initiated, with a copy of the updated // async_read_some() call is initiated, with a copy of the updated
// corotutine as its handler object, and the current coroutine exits. When // coroutine as its handler object, and the current coroutine exits. When
// the async_read_some() call finishes, the copied coroutine will be // the async_read_some() call finishes, the copied coroutine will be
// called, and will resume processing exactly where the original one left // called, and will resume processing exactly where the original one left
// off--right after asynchronous call. This allows asynchronous I/O // off--right after asynchronous call. This allows asynchronous I/O
......
...@@ -182,7 +182,7 @@ private: ...@@ -182,7 +182,7 @@ private:
/// this method. /// this method.
/// ///
/// @param max_leases Maximum number of leases to be reclaimed. /// @param max_leases Maximum number of leases to be reclaimed.
/// @param timeout Maximum amount of time that the reclaimation routine /// @param timeout Maximum amount of time that the reclamation routine
/// may be processing expired leases, expressed in milliseconds. /// may be processing expired leases, expressed in milliseconds.
/// @param remove_lease A boolean value indicating if the lease should /// @param remove_lease A boolean value indicating if the lease should
/// be removed when it is reclaimed (if true) or it should be left in the /// be removed when it is reclaimed (if true) or it should be left in the
......
// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // 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 // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -899,7 +899,7 @@ Dhcpv4Srv::processPacket(Pkt4Ptr& query, Pkt4Ptr& rsp) { ...@@ -899,7 +899,7 @@ Dhcpv4Srv::processPacket(Pkt4Ptr& query, Pkt4Ptr& rsp) {
.arg(query->getIface()) .arg(query->getIface())
.arg(e.what()); .arg(e.what());
// Increase the statistics of parse failues and dropped packets. // Increase the statistics of parse failures and dropped packets.
isc::stats::StatsMgr::instance().addValue("pkt4-parse-failed", isc::stats::StatsMgr::instance().addValue("pkt4-parse-failed",
static_cast<int64_t>(1)); static_cast<int64_t>(1));
isc::stats::StatsMgr::instance().addValue("pkt4-receive-drop", isc::stats::StatsMgr::instance().addValue("pkt4-receive-drop",
...@@ -2044,7 +2044,7 @@ Dhcpv4Srv::setFixedFields(Dhcpv4Exchange& ex) { ...@@ -2044,7 +2044,7 @@ Dhcpv4Srv::setFixedFields(Dhcpv4Exchange& ex) {
getClientClassDictionary()->getClasses(); getClientClassDictionary()->getClasses();
// Now we need to iterate over the classes assigned to the // Now we need to iterate over the classes assigned to the
// query packet and find corresponding class defintions for it. // query packet and find corresponding class definitions for it.
for (ClientClasses::const_iterator name = classes.begin(); for (ClientClasses::const_iterator name = classes.begin();
name != classes.end(); ++name) { name != classes.end(); ++name) {
...@@ -2065,7 +2065,7 @@ Dhcpv4Srv::setFixedFields(Dhcpv4Exchange& ex) { ...@@ -2065,7 +2065,7 @@ Dhcpv4Srv::setFixedFields(Dhcpv4Exchange& ex) {
const string& sname = cl->second->getSname(); const string& sname = cl->second->getSname();
if (!sname.empty()) { if (!sname.empty()) {
// Converting string to (const uint8_t*, size_t len) format is // Converting string to (const uint8_t*, size_t len) format is
// tricky. reineterpret_cast is not the most elegant solution, // tricky. reinterpret_cast is not the most elegant solution,
// but it does avoid us making unnecessary copy. We will convert // but it does avoid us making unnecessary copy. We will convert
// sname and file fields in Pkt4 to string one day and life // sname and file fields in Pkt4 to string one day and life
// will be easier. // will be easier.
...@@ -2076,7 +2076,7 @@ Dhcpv4Srv::setFixedFields(Dhcpv4Exchange& ex) { ...@@ -2076,7 +2076,7 @@ Dhcpv4Srv::setFixedFields(Dhcpv4Exchange& ex) {
const string& filename = cl->second->getFilename(); const string& filename = cl->second->getFilename();
if (!filename.empty()) { if (!filename.empty()) {
// Converting string to (const uint8_t*, size_t len) format is // Converting string to (const uint8_t*, size_t len) format is
// tricky. reineterpret_cast is not the most elegant solution, // tricky. reinterpret_cast is not the most elegant solution,
// but it does avoid us making unnecessary copy. We will convert // but it does avoid us making unnecessary copy. We will convert
// sname and file fields in Pkt4 to string one day and life // sname and file fields in Pkt4 to string one day and life
// will be easier. // will be easier.
......
...@@ -332,7 +332,7 @@ protected: ...@@ -332,7 +332,7 @@ protected:
subnet4->get4o6().enabled(true); subnet4->get4o6().enabled(true);
} }
// Try 4o6 specific paramter: 4o6-interface-id // Try 4o6 specific parameter: 4o6-interface-id
std::string ifaceid = string_values_->getOptionalParam("4o6-interface-id", ""); std::string ifaceid = string_values_->getOptionalParam("4o6-interface-id", "");
if (!ifaceid.empty()) { if (!ifaceid.empty()) {
OptionBuffer tmp(ifaceid.begin(), ifaceid.end()); OptionBuffer tmp(ifaceid.begin(), ifaceid.end());
......
...@@ -182,7 +182,7 @@ private: ...@@ -182,7 +182,7 @@ private:
/// this method. /// this method.
/// ///
/// @param max_leases Maximum number of leases to be reclaimed. /// @param max_leases Maximum number of leases to be reclaimed.
/// @param timeout Maximum amount of time that the reclaimation routine /// @param timeout Maximum amount of time that the reclamation routine
/// may be processing expired leases, expressed in milliseconds. /// may be processing expired leases, expressed in milliseconds.
/// @param remove_lease A boolean value indicating if the lease should /// @param remove_lease A boolean value indicating if the lease should
/// be removed when it is reclaimed (if true) or it should be left in the /// be removed when it is reclaimed (if true) or it should be left in the
......
// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // 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 // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -1646,7 +1646,7 @@ Dhcpv6Srv::extendIA_NA(const Pkt6Ptr& query, const Pkt6Ptr& answer, ...@@ -1646,7 +1646,7 @@ Dhcpv6Srv::extendIA_NA(const Pkt6Ptr& query, const Pkt6Ptr& answer,
ia_rsp->setT1(subnet->getT1()); ia_rsp->setT1(subnet->getT1());
ia_rsp->setT2(subnet->getT2()); ia_rsp->setT2(subnet->getT2());
// Get DDNS udpate directions // Get DDNS update directions
bool do_fwd = false; bool do_fwd = false;
bool do_rev = false; bool do_rev = false;
Option6ClientFqdnPtr fqdn = boost::dynamic_pointer_cast< Option6ClientFqdnPtr fqdn = boost::dynamic_pointer_cast<
...@@ -1753,7 +1753,7 @@ Dhcpv6Srv::extendIA_NA(const Pkt6Ptr& query, const Pkt6Ptr& answer, ...@@ -1753,7 +1753,7 @@ Dhcpv6Srv::extendIA_NA(const Pkt6Ptr& query, const Pkt6Ptr& answer,
// All is left is to insert the status code. // All is left is to insert the status code.
if (leases.empty()) { if (leases.empty()) {
// The server wasn't able allocate new lease and renew an exising // The server wasn't able allocate new lease and renew an existing
// lease. In that case, the server sends NoAddrsAvail per RFC7550. // lease. In that case, the server sends NoAddrsAvail per RFC7550.
ia_rsp->addOption(createStatusCode(*query, *ia_rsp, ia_rsp->addOption(createStatusCode(*query, *ia_rsp,
STATUS_NoAddrsAvail, STATUS_NoAddrsAvail,
...@@ -1916,7 +1916,7 @@ Dhcpv6Srv::extendIA_PD(const Pkt6Ptr& query, ...@@ -1916,7 +1916,7 @@ Dhcpv6Srv::extendIA_PD(const Pkt6Ptr& query,
// All is left is to insert the status code. // All is left is to insert the status code.
if (leases.empty()) { if (leases.empty()) {
// The server wasn't able allocate new lease and renew an exising // The server wasn't able allocate new lease and renew an existing
// lease. In that case, the server sends NoPrefixAvail per RFC7550. // lease. In that case, the server sends NoPrefixAvail per RFC7550.
ia_rsp->addOption(createStatusCode(*query, *ia_rsp, ia_rsp->addOption(createStatusCode(*query, *ia_rsp,
STATUS_NoPrefixAvail, STATUS_NoPrefixAvail,
...@@ -2903,7 +2903,7 @@ Dhcpv6Srv::processInfRequest(const Pkt6Ptr& inf_request) { ...@@ -2903,7 +2903,7 @@ Dhcpv6Srv::processInfRequest(const Pkt6Ptr& inf_request) {
// Try to assign options that were requested by the client. // Try to assign options that were requested by the client.
appendRequestedOptions(inf_request, reply, co_list); appendRequestedOptions(inf_request, reply, co_list);
// Try to assigne vendor options that were requested by the client. // Try to assign vendor options that were requested by the client.
appendRequestedVendorOptions(inf_request, reply, ctx, co_list); appendRequestedVendorOptions(inf_request, reply, ctx, co_list);
return (reply); return (reply);
......
// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // 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 // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -82,7 +82,7 @@ public: ...@@ -82,7 +82,7 @@ public:
/// redeclaration/redefinition. @ref Daemon::getVersion() /// redeclaration/redefinition. @ref Daemon::getVersion()
static std::string getVersion(bool extended); static std::string getVersion(bool extended);
/// @brief Returns server-indentifier option. /// @brief Returns server-identifier option.
/// ///
/// @return server-id option /// @return server-id option
OptionPtr getServerID() { return serverid_; } OptionPtr getServerID() { return serverid_; }
...@@ -692,7 +692,7 @@ protected: ...@@ -692,7 +692,7 @@ protected:
/// This method iterates over all IA_NA options and calls @ref declineIA on /// This method iterates over all IA_NA options and calls @ref declineIA on
/// each of them. /// each of them.
/// ///
/// @param decline Decline messege sent by a client /// @param decline Decline message sent by a client
/// @param reply Server's response (IA_NA with status will be added here) /// @param reply Server's response (IA_NA with status will be added here)
/// @param ctx context /// @param ctx context
/// @return true when expected to continue, false when hooks told us to drop /// @return true when expected to continue, false when hooks told us to drop
...@@ -722,7 +722,7 @@ protected: ...@@ -722,7 +722,7 @@ protected:
/// - cleans up DNS, if necessary /// - cleans up DNS, if necessary
/// - updates subnet[X].declined-addresses (per subnet stat) /// - updates subnet[X].declined-addresses (per subnet stat)
/// - updates declined-addresses (global stat) /// - updates declined-addresses (global stat)
/// - deassociates client information from the lease /// - disassociates client information from the lease
/// - moves the lease to DECLINED state /// - moves the lease to DECLINED state
/// - sets lease expiration time to decline-probation-period /// - sets lease expiration time to decline-probation-period
/// - adds status-code success /// - adds status-code success
......
...@@ -856,7 +856,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) { ...@@ -856,7 +856,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
// rollback informs whether error occurred and original data // rollback informs whether error occurred and original data
// have to be restored to global storages. // have to be restored to global storages.
bool rollback = false; bool rollback = false;
// config_pair holds ther details of the current parser when iterating over // config_pair holds the details of the current parser when iterating over
// the parsers. It is declared outside the loop so in case of error, the // the parsers. It is declared outside the loop so in case of error, the
// name of the failing parser can be retrieved within the "catch" clause. // name of the failing parser can be retrieved within the "catch" clause.
ConfigPair config_pair; ConfigPair config_pair;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment