refactor

Signed-off-by: Ze Gan <zegan@microsoft.com>
sonic-net · Jun 4, 2024 · b7a3541 · b7a3541
1 parent 31acaec
commit b7a3541
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/dash-pipeline/SAI/src/utils.cpp b/dash-pipeline/SAI/src/utils.cpp
@@ -67,3 +67,25 @@ int dash::utils::leadingNonZeroBits(const sai_ip6_t& ipv6)
 
     return 0;
 }
+
+
+int dash::utils::getPrefixLength(const sai_ip_prefix_t &value)
+{
+    switch(value.addr_family)
+    {
+        case SAI_IP_ADDR_FAMILY_IPV4:
+            // LPM entry match field prefix length calculation needs to be fixed to accomodate 128 bit size.
+            // So the 96 is added to the prefix length.
+            return leadingNonZeroBits(htonl(value.mask.ip4)) + 96;
+        case SAI_IP_ADDR_FAMILY_IPV6:
+            return leadingNonZeroBits(value.mask.ip6);
+        default:
+            assert(0 && "unrecognzed value.ipaddr.addr_family");
+    }
+    return 0;
+}
+
+int dash::utils::getPrefixLength(const sai_attribute_value_t &value)
+{
+    return getPrefixLength(value.ipprefix);
+}
diff --git a/dash-pipeline/SAI/src/utils.h b/dash-pipeline/SAI/src/utils.h
@@ -238,26 +238,9 @@ namespace dash
 
         int leadingNonZeroBits(const sai_ip6_t& ipv6);
 
-        inline int getPrefixLength(const sai_ip_prefix_t &value)
-        {
-            switch(value.addr_family)
-            {
-                case SAI_IP_ADDR_FAMILY_IPV4:
-                    // LPM entry match field prefix length calculation needs to be fixed to accomodate 128 bit size.
-                    // So the 96 is added to the prefix length.
-                    return leadingNonZeroBits(htonl(value.mask.ip4)) + 96;
-                case SAI_IP_ADDR_FAMILY_IPV6:
-                    return leadingNonZeroBits(value.mask.ip6);
-                default:
-                    assert(0 && "unrecognzed value.ipaddr.addr_family");
-            }
-            return 0;
-        }
-
-        inline int getPrefixLength(const sai_attribute_value_t &value)
-        {
-            return getPrefixLength(value.ipprefix);
-        }
+        int getPrefixLength(const sai_ip_prefix_t &value);
+
+        int getPrefixLength(const sai_attribute_value_t &value);
 
         template<typename T>
             void ipPrefixSetVal(const sai_attribute_value_t &value, T &t, int bits = -1)