From 37f44b5b2cb7cd12dab7abc96ff2a1368cf7bf1a Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalancette@gmail.com>
Date: Thu, 11 Jan 2024 20:31:48 +0000
Subject: [PATCH] Remove unnecessary (and incorrect) copy of sequence_number

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
---
 rmw_zenoh_cpp/src/rmw_zenoh.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/rmw_zenoh_cpp/src/rmw_zenoh.cpp b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
index 88e0d830..268c7520 100644
--- a/rmw_zenoh_cpp/src/rmw_zenoh.cpp
+++ b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
@@ -2119,7 +2119,6 @@ rmw_take_response(
 
   std::lock_guard<std::mutex> lock(client_data->message_mutex);
   if (client_data->replies.empty()) {
-    // TODO(francocipollone): Verify behavior.
     RCUTILS_LOG_ERROR_NAMED("rmw_zenoh_cpp", "[rmw_take_response] Response message is empty");
     return RMW_RET_ERROR;
   }
@@ -2613,12 +2612,6 @@ rmw_send_response(
 
   size_t data_length = ser.getSerializedDataLength();
 
-  size_t meta_length = sizeof(request_header->sequence_number);
-  memcpy(
-    &response_bytes[data_length],
-    reinterpret_cast<char *>(&request_header->sequence_number),
-    meta_length);
-
   // Create the queryable payload
   std::lock_guard<std::mutex> lock(service_data->sequence_to_query_map_mutex);
   auto query_it = service_data->sequence_to_query_map.find(request_header->sequence_number);
@@ -2645,7 +2638,7 @@ rmw_send_response(
   options.encoding = z_encoding(Z_ENCODING_PREFIX_EMPTY, NULL);
   z_query_reply(
     &loaned_query, z_loan(service_data->keyexpr), reinterpret_cast<const uint8_t *>(
-      response_bytes), data_length + meta_length, &options);
+      response_bytes), data_length, &options);
 
   z_drop(z_move(query_it->second));
   service_data->sequence_to_query_map.erase(query_it);