[3194] Minor fixes in libdhcp++ - add consts where applicable.

diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc
index 39ac072d1ba935ce950f9f723cebcbd45863ceb3..a238d4f739604af7252a151290fed045e7e15fd8 100644 (file)
--- a/src/lib/dhcp/libdhcp++.cc
+++ b/src/lib/dhcp/libdhcp++.cc
@@ -79,7 +79,7 @@ LibDHCP::getOptionDefs(const Option::Universe u) {
 }
 
 const OptionDefContainer*
-LibDHCP::getVendorOption4Defs(uint32_t vendor_id) {
+LibDHCP::getVendorOption4Defs(const uint32_t vendor_id) {
 
     if (vendor_id == VENDOR_ID_CABLE_LABS &&
         vendor4_defs_.find(VENDOR_ID_CABLE_LABS) == vendor4_defs_.end()) {
@@ -95,7 +95,7 @@ LibDHCP::getVendorOption4Defs(uint32_t vendor_id) {
 }
 
 const OptionDefContainer*
-LibDHCP::getVendorOption6Defs(uint32_t vendor_id) {
+LibDHCP::getVendorOption6Defs(const uint32_t vendor_id) {
 
     if (vendor_id == VENDOR_ID_CABLE_LABS &&
         vendor6_defs_.find(VENDOR_ID_CABLE_LABS) == vendor6_defs_.end()) {
@@ -369,7 +369,7 @@ size_t LibDHCP::unpackOptions4(const OptionBuffer& buf,
     return (offset);
 }
 
-size_t LibDHCP::unpackVendorOptions6(uint32_t vendor_id,
+size_t LibDHCP::unpackVendorOptions6(const uint32_t vendor_id,
                                      const OptionBuffer& buf,
                                      isc::dhcp::OptionCollection& options) {
     size_t offset = 0;
@@ -450,7 +450,7 @@ size_t LibDHCP::unpackVendorOptions6(uint32_t vendor_id,
     return (offset);
 }
 
-size_t LibDHCP::unpackVendorOptions4(uint32_t vendor_id, const OptionBuffer& buf,
+size_t LibDHCP::unpackVendorOptions4(const uint32_t vendor_id, const OptionBuffer& buf,
                                      isc::dhcp::OptionCollection& options) {
     size_t offset = 0;
 

diff --git a/src/lib/dhcp/libdhcp++.h b/src/lib/dhcp/libdhcp++.h
index 80f91d626c33a74acbc9ddfe3d603d81a146bd1d..d280e972c1278e1e59a94724f58fb3644c532d08 100644 (file)
--- a/src/lib/dhcp/libdhcp++.h
+++ b/src/lib/dhcp/libdhcp++.h
@@ -160,21 +160,21 @@ public:
                                       uint16_t type,
                                       Option::Factory * factory);
 
-    /// @brief returns v4 option definitions for a given vendor
+    /// @brief Returns v4 option definitions for a given vendor
     ///
     /// @param vendor_id enterprise-id of a given vendor
     /// @return a container for a given vendor (or NULL if not option
     ///         definitions are defined)
     static const OptionDefContainer*
-    getVendorOption4Defs(uint32_t vendor_id);
+    getVendorOption4Defs(const uint32_t vendor_id);
 
-    /// @brief returns v6 option definitions for a given vendor
+    /// @brief Returns v6 option definitions for a given vendor
     ///
     /// @param vendor_id enterprise-id of a given vendor
     /// @return a container for a given vendor (or NULL if not option
     ///         definitions are defined)
     static const OptionDefContainer*
-    getVendorOption6Defs(uint32_t vendor_id);
+    getVendorOption6Defs(const uint32_t vendor_id);
 
     /// @brief Parses provided buffer as DHCPv6 vendor options and creates
     ///        Option objects.
@@ -186,7 +186,7 @@ public:
     /// @param buf Buffer to be parsed.
     /// @param options Reference to option container. Options will be
     ///        put here.
-    static size_t unpackVendorOptions6(uint32_t vendor_id,
+    static size_t unpackVendorOptions6(const uint32_t vendor_id,
                                        const OptionBuffer& buf,
                                        isc::dhcp::OptionCollection& options);
 
@@ -200,7 +200,7 @@ public:
     /// @param buf Buffer to be parsed.
     /// @param options Reference to option container. Options will be
     ///        put here.
-    static size_t unpackVendorOptions4(uint32_t vendor_id, const OptionBuffer& buf,
+    static size_t unpackVendorOptions4(const uint32_t vendor_id, const OptionBuffer& buf,
                                        isc::dhcp::OptionCollection& options);
 
 private:

diff --git a/src/lib/dhcp_ddns/s-messages b/src/lib/dhcp_ddns/s-messages
new file mode 100644 (file)
index 0000000..e69de29