commit 8c31d237f67caa5698fca5aedd449f8c98f0b0c0
author Ratan Gupta <ratagupt@in.ibm.com> Sun Aug 13 05:49:43 2017 +0530
committer Ratan Gupta <ratagupt@in.ibm.com> Sun Aug 13 05:49:43 2017 +0530
tree 2ce23f921c30cdb0f0102c7ba6862a932eff4f97
parent 01d4bd1a6301ebbd892b9c15cf4e5501e96da79b

Move generic network constants to types.hpp

Change-Id: Ic6de2d3d82d6e55c6abf73bae2fc0a23a36286b9
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>

chassishandler.cpp

diff --git a/chassishandler.cpp b/chassishandler.cpp
index 947c96c..fbb00a6 100644
--- a/chassishandler.cpp
+++ b/chassishandler.cpp
@@ -47,14 +47,6 @@
 constexpr size_t MAX_PREFIX_VALUE = 32;
 constexpr size_t SIZE_COOKIE = 4;
 constexpr size_t SIZE_VERSION = 2;
-constexpr auto MAC_ADDRESS_FORMAT = "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx";
-constexpr auto IP_ADDRESS_FORMAT = "%u.%u.%u.%u";
-constexpr auto   PREFIX_FORMAT = "%hhd";
-constexpr auto   ADDR_TYPE_FORMAT = "%hhx";
-constexpr auto   IPV4_ADDRESS_SIZE_BYTE = 4;
-constexpr auto   IPV6_ADDRESS_SIZE_BYTE = 16;
-constexpr auto   DEFAULT_MAC_ADDRESS = "00:00:00:00:00:00";
-constexpr auto   DEFAULT_ADDRESS = "0.0.0.0";
 
 //PetiBoot-Specific
 static constexpr uint8_t net_conf_initial_bytes[] = {0x80, 0x21, 0x70, 0x62,
@@ -280,7 +272,7 @@
 {
     ipmi::PropertyMap properties;
     int rc = 0;
-    uint8_t addrSize = IPV4_ADDRESS_SIZE_BYTE;
+    uint8_t addrSize = ipmi::network::IPV4_ADDRESS_SIZE_BYTE;
 
     try
     {
@@ -325,7 +317,7 @@
         //
         // if mac address is default mac address then
         // don't send blank override.
-        if ((MACAddress == DEFAULT_MAC_ADDRESS))
+        if ((MACAddress == ipmi::network::DEFAULT_MAC_ADDRESS))
         {
             memset(respptr->data, 0, SIZE_BOOT_OPTION);
             rc = -1;
@@ -335,8 +327,8 @@
         // should not be default one,don't send blank override.
         if (isStatic)
         {
-            if((ipAddress == DEFAULT_ADDRESS) ||
-               (gateway == DEFAULT_ADDRESS) ||
+            if((ipAddress == ipmi::network::DEFAULT_ADDRESS) ||
+               (gateway == ipmi::network::DEFAULT_ADDRESS) ||
                (!prefix))
             {
                 memset(respptr->data, 0, SIZE_BOOT_OPTION);
@@ -345,7 +337,7 @@
             }
         }
 
-        sscanf(MACAddress.c_str(), MAC_ADDRESS_FORMAT,
+        sscanf(MACAddress.c_str(), ipmi::network::MAC_ADDRESS_FORMAT,
                (respptr->data + MAC_OFFSET),
                (respptr->data + MAC_OFFSET + 1),
                (respptr->data + MAC_OFFSET + 2),
@@ -362,8 +354,9 @@
             "xyz.openbmc_project.Network.IP.Protocol.IPv4") ?
                 AF_INET : AF_INET6;
 
-        addrSize = (addressFamily == AF_INET) ? IPV4_ADDRESS_SIZE_BYTE :
-                                                IPV6_ADDRESS_SIZE_BYTE;
+        addrSize = (addressFamily == AF_INET) ?
+                       ipmi::network::IPV4_ADDRESS_SIZE_BYTE :
+                       ipmi::network::IPV6_ADDRESS_SIZE_BYTE;
 
         // ipaddress and gateway would be in IPv4 format
         inet_pton(addressFamily, ipAddress.c_str(),
@@ -501,7 +494,7 @@
                 elog<InternalFailure>();
             }
 
-            snprintf(mac, SIZE_MAC, MAC_ADDRESS_FORMAT,
+            snprintf(mac, SIZE_MAC, ipmi::network::MAC_ADDRESS_FORMAT,
                      reqptr->data[MAC_OFFSET],
                      reqptr->data[MAC_OFFSET + 1],
                      reqptr->data[MAC_OFFSET + 2],
@@ -528,7 +521,7 @@
 
             uint8_t gatewayOffset = prefixOffset + sizeof(decltype(prefix));
 
-            if (addrSize != IPV4_ADDRESS_SIZE_BYTE)
+            if (addrSize != ipmi::network::IPV4_ADDRESS_SIZE_BYTE)
             {
                 addressType = "xyz.openbmc_project.Network.IP.Protocol.IPv6";
                 family = AF_INET6;

types.hpp

diff --git a/types.hpp b/types.hpp
index afe479e..b6d27e3 100644
--- a/types.hpp
+++ b/types.hpp
@@ -24,6 +24,7 @@
 using PropertyMap = std::map<DbusProperty, Value>;
 using ObjectTree = std::map<DbusObjectPath,
                             std::map<DbusService, std::vector<DbusInterface>>>;
+
 namespace sensor
 {
 
@@ -89,5 +90,21 @@
 
 using InvObjectIDMap = std::map<InventoryPath, SelData>;
 
-}//namespce sensor
+}// namespace sensor
+
+namespace network
+{
+
+constexpr auto MAC_ADDRESS_FORMAT = "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx";
+constexpr auto IP_ADDRESS_FORMAT = "%u.%u.%u.%u";
+constexpr auto PREFIX_FORMAT = "%hhd";
+constexpr auto ADDR_TYPE_FORMAT = "%hhx";
+
+constexpr auto IPV4_ADDRESS_SIZE_BYTE = 4;
+constexpr auto IPV6_ADDRESS_SIZE_BYTE = 16;
+
+constexpr auto DEFAULT_MAC_ADDRESS = "00:00:00:00:00:00";
+constexpr auto DEFAULT_ADDRESS = "0.0.0.0";
+
+}//namespace network
 }//namespace ipmi