make writes actually work

project-chip · Jan 22, 2025 · 0b7c13b · 0b7c13b
1 parent 08a2bc8
commit 0b7c13b
Showing 1 changed file with 33 additions and 1 deletion.
diff --git a/examples/common/pigweed/rpc_services/Attributes.h b/examples/common/pigweed/rpc_services/Attributes.h
@@ -53,6 +53,27 @@ class Attributes : public pw_rpc::nanopb::Attributes::Service<Attributes>
         {
             // We can directly reference the embedded TLV data here
             result.Init(data.tlv_data.bytes, data.tlv_data.size);
+            CHIP_ERROR err = result.Next();
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Support, "Input TLV data did not have data: %" CHIP_ERROR_FORMAT, err.Format());
+                return pw::Status::InvalidArgument();
+            }
+
+            TLV::TLVType outer;
+            err = result.EnterContainer(outer);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Support, "Input TLV data has no wrapper container: %" CHIP_ERROR_FORMAT, err.Format());
+                return pw::Status::InvalidArgument();
+            }
+
+            err = result.Next();
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(Support, "Input TLV stucture did not have a first element: %" CHIP_ERROR_FORMAT, err.Format());
+                return pw::Status::InvalidArgument();
+            }
             return result;
         }
 
@@ -64,6 +85,10 @@ class Attributes : public pw_rpc::nanopb::Attributes::Service<Attributes>
 
         constexpr TLV::Tag kDataTag = TLV::ContextTag(to_underlying(chip::app::AttributeDataIB::Tag::kData));
 
+        TLV::TLVType outer;
+        VerifyOrReturnError(writer.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, outer) == CHIP_NO_ERROR,
+                            pw::Status::Internal());
+
         switch (data.which_data)
         {
         case chip_rpc_AttributeData_data_bool_tag:
@@ -106,7 +131,14 @@ class Attributes : public pw_rpc::nanopb::Attributes::Service<Attributes>
             return pw::Status::Internal();
         }
 
-        return pw::OkStatus();
+        VerifyOrReturnValue(writer.EndContainer(outer) == CHIP_NO_ERROR, pw::Status::Internal());
+        result.Init(tempBuffer.data(), writer.GetLengthWritten());
+
+        VerifyOrReturnError(result.Next() == CHIP_NO_ERROR, pw::Status::Internal());
+        VerifyOrReturnError(result.EnterContainer(outer) == CHIP_NO_ERROR, pw::Status::Internal());
+        VerifyOrReturnError(result.Next() == CHIP_NO_ERROR, pw::Status::Internal());
+
+        return result;
     }
 
     ::pw::Status Write(const chip_rpc_AttributeWrite & request, pw_protobuf_Empty & response)