diff options
| -rw-r--r-- | src/bin/agent/agent_hooks.dox | 10 | ||||
| -rw-r--r-- | src/lib/dhcp/option_data_types.h | 1 | ||||
| -rw-r--r-- | src/lib/dhcp/pkt.h | 4 | ||||
| -rw-r--r-- | src/lib/http/client.cc | 5 | ||||
| -rw-r--r-- | src/lib/testutils/log_utils.h | 1 | ||||
| -rw-r--r-- | src/lib/yang/adaptor_config.h | 2 |
6 files changed, 10 insertions, 13 deletions
diff --git a/src/bin/agent/agent_hooks.dox b/src/bin/agent/agent_hooks.dox index c0d352c912..be2c833fd0 100644 --- a/src/bin/agent/agent_hooks.dox +++ b/src/bin/agent/agent_hooks.dox @@ -32,12 +32,12 @@ command. - @b Description: this callout is executed when Control Agent receives a control command over the RESTful interface (HTTP). The "request" argument is a pointer to the request, in fact a - PostHttpRequestJsonPtr. The "response" argument is the response in - case of errors. The purpose of this callout is to implement authentication + PostHttpRequestJsonPtr. The "response" argument is the response in case + of errors. The purpose of this callout is to implement authentication and authorization. It is called after basic HTTP authentication. - The next step status is used only to ask to reset the handle : if - the response is set the processing will stop and the response is - returned. In particular the command is not forwarded. + The next step status is used only to ask to reset the handle: if the + response is set the processing will stop and the response is returned. + In particular the command is not forwarded. @subsection agentHooksResponse response diff --git a/src/lib/dhcp/option_data_types.h b/src/lib/dhcp/option_data_types.h index ebcc260780..f0364fe9aa 100644 --- a/src/lib/dhcp/option_data_types.h +++ b/src/lib/dhcp/option_data_types.h @@ -400,7 +400,6 @@ public: /// @param tuple reference of the tuple to read into /// @throw isc::dhcp::BadDataTypeCast when the data being read /// is truncated. - /// @return tuple being read. static void readTuple(const std::vector<uint8_t>& buf, OpaqueDataTuple& tuple); diff --git a/src/lib/dhcp/pkt.h b/src/lib/dhcp/pkt.h index 3934a432fd..3436d2695b 100644 --- a/src/lib/dhcp/pkt.h +++ b/src/lib/dhcp/pkt.h @@ -516,8 +516,8 @@ public: /// Sets interface name over which packet was received or is /// going to be transmitted. /// - /// @return interface name - void setIface(const std::string& iface ) { iface_ = iface; }; + /// @param iface The interface name + void setIface(const std::string& iface) { iface_ = iface; }; /// @brief Sets remote hardware address. /// diff --git a/src/lib/http/client.cc b/src/lib/http/client.cc index 1d7074b618..087623465f 100644 --- a/src/lib/http/client.cc +++ b/src/lib/http/client.cc @@ -1680,8 +1680,9 @@ Connection::receiveCallback(const uint64_t transid, // EAGAIN and EWOULDBLOCK don't indicate an error in this case. All // other errors should terminate the transaction. - } if ((ec.value() != boost::asio::error::try_again) && - (ec.value() != boost::asio::error::would_block)) { + } + if ((ec.value() != boost::asio::error::try_again) && + (ec.value() != boost::asio::error::would_block)) { terminate(ec); return; diff --git a/src/lib/testutils/log_utils.h b/src/lib/testutils/log_utils.h index 9735e5ae8d..f110f225ca 100644 --- a/src/lib/testutils/log_utils.h +++ b/src/lib/testutils/log_utils.h @@ -82,7 +82,6 @@ public: /// @brief Add a string to the vector of expected strings /// /// @param new_string the string to add to the end of the vector - /// @return void void addString(const string& new_string); vector<string> exp_strings_; diff --git a/src/lib/yang/adaptor_config.h b/src/lib/yang/adaptor_config.h index da71b9cc7a..414536422b 100644 --- a/src/lib/yang/adaptor_config.h +++ b/src/lib/yang/adaptor_config.h @@ -93,7 +93,6 @@ protected: /// @param subnets The subnet list. /// @param set The reference to the set of assigned IDs. /// @param next The next ID. - /// @return True if all subnets have an ID, false otherwise. static void subnetsAssignID(isc::data::ConstElementPtr subnets, SubnetIDSet& set, isc::dhcp::SubnetID& next); @@ -106,7 +105,6 @@ protected: /// @param set The reference to the set of assigned IDs. /// @param next The next ID. /// @param subsel The subnet list name. - /// @return True if all subnets have an ID, false otherwise. static void sharedNetworksAssignID(isc::data::ConstElementPtr networks, SubnetIDSet& set, isc::dhcp::SubnetID& next, |