Copporch changes for p4orch.

sonic-net · Nov 19, 2021 · 31d8f17 · 31d8f17
1 parent aad347b
commit 31d8f17
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/orchagent/copporch.cpp b/orchagent/copporch.cpp
@@ -1034,16 +1034,20 @@ bool CoppOrch::getAttribsFromTrapGroup (vector<FieldValueTuple> &fv_tuple,
             genetlink_attribs.push_back(attr);
 
             attr.id = SAI_HOSTIF_ATTR_NAME;
+            auto size = sizeof(attr.value.chardata);
             strncpy(attr.value.chardata, fvValue(*i).c_str(),
-                    sizeof(attr.value.chardata));
+                    size - 1);
+            attr.value.chardata[size - 1] = '\0';
             genetlink_attribs.push_back(attr);
 
         }
         else if (fvField(*i) == copp_genetlink_mcgrp_name)
         {
             attr.id = SAI_HOSTIF_ATTR_GENETLINK_MCGRP_NAME;
+            auto size = sizeof(attr.value.chardata);
             strncpy(attr.value.chardata, fvValue(*i).c_str(),
-                    sizeof(attr.value.chardata));
+                    size - 1);
+            attr.value.chardata[size - 1] = '\0';
             genetlink_attribs.push_back(attr);
         }
         else

diff --git a/orchagent/copporch.h b/orchagent/copporch.h
@@ -50,6 +50,16 @@ class CoppOrch : public Orch
 {
 public:
     CoppOrch(swss::DBConnector* db, std::string tableName);
+
+    inline object_map getTrapGroupMap()
+    {
+        return m_trap_group_map;
+    }
+
+    inline TrapGroupHostIfMap getTrapGroupHostIfMap()
+    {
+        return m_trap_group_hostif_map;
+    }
 protected:
     object_map m_trap_group_map;