[#1928] Addressed review comments

Corrected typos, removed whitespace and fixed some doxygen warnings.

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
index 868a3bb217dd1f0090e62e2c0673d345574df759..557c538398e4f67705889ae1b14ff5294b3fc8c0 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
@@ -2473,7 +2473,7 @@ public:
                 // filename
                 if (!out_bindings[5]->amNull()) {
                     last_client_class->setFilename(out_bindings[5]->getString());
-                }                
+                }
 
                 // required
                 if (!out_bindings[6]->amNull()) {

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
index 703a40439ef84744446126d9c819bb304dcade72..bd936ca7e2928c485bbb359659809eb364ab482e 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
@@ -2854,7 +2854,7 @@ public:
             MySqlBinding::createString(FORMATTED_OPTION_VALUE_BUF_LENGTH), // option: formatted_value
             MySqlBinding::createString(OPTION_SPACE_BUF_LENGTH), // option: space
             MySqlBinding::createInteger<uint8_t>(), // option: persistent
-            MySqlBinding::createInteger<uint32_t>(), // option: dhcp4_subnet_id
+            MySqlBinding::createInteger<uint32_t>(), // option: dhcp6_subnet_id
             MySqlBinding::createInteger<uint8_t>(), // option: scope_id
             MySqlBinding::createString(USER_CONTEXT_BUF_LENGTH), // option: user_context
             MySqlBinding::createString(SHARED_NETWORK_NAME_BUF_LENGTH), // option: shared_network_name

diff --git a/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h b/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h
index 4754869ef36a0d345daaf0e4caab91a59b4c6045..d98d3cf65f620ed33cdaf6b58e1668ad930b337b 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h
+++ b/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h
@@ -784,7 +784,7 @@ namespace {
     MYSQL_GET_CLIENT_CLASS6_COMMON( \
     "LEFT JOIN dhcp6_client_class_server AS a " \
     "  ON c.id = a.class_id " \
-    "LEFT JOIN dhcp4_server AS s " \
+    "LEFT JOIN dhcp6_server AS s " \
     "  ON a.server_id = s.id ", \
     WHERE a.class_id IS NULL __VA_ARGS__)
 

diff --git a/src/lib/dhcpsrv/config_backend_dhcp4.h b/src/lib/dhcpsrv/config_backend_dhcp4.h
index 23f9ba1e1ba2a15a57b21c2d2a07829134b061a5..a235a4b7b05253a36d772ef56a9990c62774b2c0 100644 (file)
--- a/src/lib/dhcpsrv/config_backend_dhcp4.h
+++ b/src/lib/dhcpsrv/config_backend_dhcp4.h
@@ -296,7 +296,7 @@ public:
 
     /// @brief Retrieves a client class by name.
     ///
-    /// @param server_selector Server selector.
+    /// @param selector Server selector.
     /// @param name Client class name.
     /// @return Pointer to the retrieved client class.
     virtual ClientClassDefPtr

diff --git a/src/lib/dhcpsrv/config_backend_dhcp6.h b/src/lib/dhcpsrv/config_backend_dhcp6.h
index deacfecd1d499451b9169e3fb218a639e5bdbfe8..37a7e7f6c858a6f7961bdf49137e2a818208c337 100644 (file)
--- a/src/lib/dhcpsrv/config_backend_dhcp6.h
+++ b/src/lib/dhcpsrv/config_backend_dhcp6.h
@@ -297,7 +297,7 @@ public:
 
     /// @brief Retrieves a client class by name.
     ///
-    /// @param server_selector Server selector.
+    /// @param selector Server selector.
     /// @param name Client class name.
     /// @return Pointer to the retrieved client class.
     virtual ClientClassDefPtr
@@ -473,7 +473,7 @@ public:
     ///
     /// @param server_selector Server selector.
     /// @param client_class Client class to be added or updated.
-    /// @param follow_client_class name of the class after which the
+    /// @param follow_class_name name of the class after which the
     /// new or updated class should be positioned. An empty value
     /// causes the class to be appended at the end of the class
     /// hierarchy.

diff --git a/src/lib/dhcpsrv/config_backend_pool_dhcp4.h b/src/lib/dhcpsrv/config_backend_pool_dhcp4.h
index e0f562e1c0aea9232be4db1b1a01774849e399a3..3eb8ea6c9fe7dc0a63ef8c9c4dd4d229fd06d720 100644 (file)
--- a/src/lib/dhcpsrv/config_backend_pool_dhcp4.h
+++ b/src/lib/dhcpsrv/config_backend_pool_dhcp4.h
@@ -236,7 +236,7 @@ public:
     /// @brief Retrieves all client classes.
     ///
     /// @param backend_selector Backend selector.
-    /// @param selector Server selector.
+    /// @param server_selector Server selector.
     /// @return Collection of client classes.
     virtual ClientClassDictionary
     getAllClientClasses4(const db::BackendSelector& backend_selector,
@@ -245,7 +245,7 @@ public:
     /// @brief Retrieves client classes modified after specified time.
     ///
     /// @param backend_selector Backend selector.
-    /// @param selector Server selector.
+    /// @param server_selector Server selector.
     /// @param modification_time Modification time.
     /// @return Collection of client classes.
     virtual ClientClassDictionary

diff --git a/src/lib/dhcpsrv/config_backend_pool_dhcp6.h b/src/lib/dhcpsrv/config_backend_pool_dhcp6.h
index fbdaa593f5e4e84a410b093355165c1ae86f1cf2..344e92108690e92999c3b137cada8f0adde7668b 100644 (file)
--- a/src/lib/dhcpsrv/config_backend_pool_dhcp6.h
+++ b/src/lib/dhcpsrv/config_backend_pool_dhcp6.h
@@ -235,7 +235,7 @@ public:
     /// @brief Retrieves all client classes.
     ///
     /// @param backend_selector Backend selector.
-    /// @param selector Server selector.
+    /// @param server_selector Server selector.
     /// @return Collection of client classes.
     virtual ClientClassDictionary
     getAllClientClasses6(const db::BackendSelector& backend_selector,
@@ -244,7 +244,7 @@ public:
     /// @brief Retrieves client classes modified after specified time.
     ///
     /// @param backend_selector Backend selector.
-    /// @param selector Server selector.
+    /// @param server_selector Server selector.
     /// @param modification_time Modification time.
     /// @return Collection of client classes.
     virtual ClientClassDictionary
@@ -400,7 +400,7 @@ public:
     /// @param backend_selector Backend selector.
     /// @param server_selector Server selector.
     /// @param client_class Client class to be added or updated.
-    /// @param follow_client_class name of the class after which the
+    /// @param follow_class_name name of the class after which the
     /// new or updated class should be positioned. An empty value
     /// causes the class to be appended at the end of the class
     /// hierarchy.