From 25b090da72407646fdf4fe18b32d091e3686c5bf Mon Sep 17 00:00:00 2001
From: Vinicius Zein <vtzein@gmail.com>
Date: Tue, 14 Apr 2026 23:34:40 -0400
Subject: [PATCH 1/2] fix: remediate misc-include-cleaner violations (batch 6)

---
 src/common/result.cpp                     |  2 ++
 src/core/session_manager.cpp              |  7 +++++
 src/e2e/e2e_crc.cpp                       |  4 ++-
 src/e2e/e2e_header.cpp                    |  9 ++++++
 src/e2e/e2e_profile_registry.cpp          |  9 +++++-
 src/e2e/e2e_profiles/standard_profile.cpp | 14 +++++++++-
 src/e2e/e2e_protection.cpp                |  5 ++++
 src/events/event_publisher.cpp            | 17 ++++++++----
 src/events/event_subscriber.cpp           | 16 ++++++++---
 src/rpc/rpc_client.cpp                    | 16 ++++++++---
 src/rpc/rpc_server.cpp                    | 16 ++++++++---
 src/sd/sd_client.cpp                      | 20 ++++++++++---
 src/sd/sd_message.cpp                     | 18 ++++++++++--
 src/sd/sd_server.cpp                      | 29 +++++++++++++++----
 src/serialization/serializer.cpp          | 16 +++++++++--
 src/someip/message.cpp                    | 17 ++++++++++--
 src/someip/types.cpp                      |  2 ++
 src/tp/tp_manager.cpp                     | 14 ++++++++--
 src/tp/tp_reassembler.cpp                 | 10 +++++++
 src/tp/tp_segmenter.cpp                   |  9 +++++-
 src/transport/endpoint.cpp                | 10 +++++--
 src/transport/tcp_transport.cpp           | 34 +++++++++++++++++++----
 src/transport/udp_transport.cpp           | 25 +++++++++++++++--
 23 files changed, 268 insertions(+), 51 deletions(-)

diff --git a/src/common/result.cpp b/src/common/result.cpp
index a0bf1ddc9..038e76435 100644
--- a/src/common/result.cpp
+++ b/src/common/result.cpp
@@ -1,4 +1,6 @@
 #include "common/result.h"
+
+#include <string>
 #include <unordered_map>
 
 namespace someip {
diff --git a/src/core/session_manager.cpp b/src/core/session_manager.cpp
index 7e3d6bb36..c9aa5c661 100644
--- a/src/core/session_manager.cpp
+++ b/src/core/session_manager.cpp
@@ -13,6 +13,13 @@
 
 #include "core/session_manager.h"
 
+#include "platform/thread.h"
+
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+
 namespace someip {
 
 /**
diff --git a/src/e2e/e2e_crc.cpp b/src/e2e/e2e_crc.cpp
index 42a808a91..99cc0cb25 100644
--- a/src/e2e/e2e_crc.cpp
+++ b/src/e2e/e2e_crc.cpp
@@ -12,10 +12,12 @@
  ********************************************************************************/
 
 #include "e2e/e2e_crc.h"
-#include <algorithm>
+
 #include <array>
 #include <cstddef>
 #include <cstdint>
+#include <optional>
+#include <vector>
 
 /**
  * @brief E2E CRC calculation functions
diff --git a/src/e2e/e2e_header.cpp b/src/e2e/e2e_header.cpp
index 1ecfb89fc..9950dc881 100644
--- a/src/e2e/e2e_header.cpp
+++ b/src/e2e/e2e_header.cpp
@@ -12,10 +12,17 @@
  ********************************************************************************/
 
 #include "e2e/e2e_header.h"
+
+// NOLINTNEXTLINE(misc-include-cleaner) - someip_hton*/someip_ntoh* macros from byteorder_impl.h
 #include "platform/byteorder.h"
+
+#include <cstddef>
+#include <cstdint>
 #include <cstring>
+#include <vector>
 
 namespace someip::e2e {
+// NOLINTBEGIN(misc-include-cleaner) - someip_hton*/someip_ntoh* macros from platform/byteorder.h -> byteorder_impl.h
 
 /**
  * @brief Serialize E2E header to byte vector
@@ -87,4 +94,6 @@ bool E2EHeader::is_valid() const {
     return true;
 }
 
+// NOLINTEND(misc-include-cleaner)
+
 }  // namespace someip::e2e
diff --git a/src/e2e/e2e_profile_registry.cpp b/src/e2e/e2e_profile_registry.cpp
index bcabc8a7b..a3840cc9d 100644
--- a/src/e2e/e2e_profile_registry.cpp
+++ b/src/e2e/e2e_profile_registry.cpp
@@ -12,7 +12,14 @@
  ********************************************************************************/
 
 #include "e2e/e2e_profile_registry.h"
-#include <algorithm>
+
+#include "e2e/e2e_config.h"
+#include "platform/thread.h"
+
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <utility>
 
 namespace someip::e2e {
 
diff --git a/src/e2e/e2e_profiles/standard_profile.cpp b/src/e2e/e2e_profiles/standard_profile.cpp
index 57fa42e5a..dd829c24a 100644
--- a/src/e2e/e2e_profiles/standard_profile.cpp
+++ b/src/e2e/e2e_profiles/standard_profile.cpp
@@ -12,19 +12,29 @@
  ********************************************************************************/
 
 #include "e2e/e2e_profile.h"
+
 #include "e2e/e2e_header.h"
 #include "e2e/e2e_crc.h"
 #include "e2e/e2e_config.h"
 #include "e2e/e2e_profile_registry.h"
 #include "someip/message.h"
 #include "common/result.h"
+#include "platform/thread.h"
+// NOLINTNEXTLINE(misc-include-cleaner) - someip_htonl macro from byteorder_impl.h
 #include "platform/byteorder.h"
+
 #include <chrono>
-#include <unordered_map>
+#include <cstddef>
 #include <cstdint>
 #include <memory>
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 namespace someip::e2e {
+// NOLINTBEGIN(misc-include-cleaner) - someip_htonl macro from platform/byteorder.h -> byteorder_impl.h
 
 /**
  * @brief Basic E2E protection profile
@@ -302,4 +312,6 @@ void initialize_basic_profile() {
     registry.register_profile(std::move(profile));
 }
 
+// NOLINTEND(misc-include-cleaner)
+
 }  // namespace someip::e2e
diff --git a/src/e2e/e2e_protection.cpp b/src/e2e/e2e_protection.cpp
index fa031c83a..0bedc7887 100644
--- a/src/e2e/e2e_protection.cpp
+++ b/src/e2e/e2e_protection.cpp
@@ -12,11 +12,16 @@
  ********************************************************************************/
 
 #include "e2e/e2e_protection.h"
+
+#include "e2e/e2e_config.h"
+#include "e2e/e2e_profile.h"
 #include "e2e/e2e_profile_registry.h"
 #include "e2e/e2e_header.h"
 #include "someip/message.h"
 #include "common/result.h"
 
+#include <optional>
+
 namespace someip::e2e {
 
 /**
diff --git a/src/events/event_publisher.cpp b/src/events/event_publisher.cpp
index 974d116ea..fe123b5b0 100644
--- a/src/events/event_publisher.cpp
+++ b/src/events/event_publisher.cpp
@@ -12,16 +12,23 @@
  ********************************************************************************/
 
 #include "events/event_publisher.h"
+
+#include "common/result.h"
 #include "events/event_types.h"
-#include "transport/udp_transport.h"
+#include "platform/thread.h"
+#include "someip/message.h"
+#include "someip/types.h"
 #include "transport/endpoint.h"
 #include "transport/transport.h"
-#include "someip/message.h"
-#include <unordered_map>
-#include <unordered_set>
+#include "transport/udp_transport.h"
+
+#include <algorithm>
 #include <atomic>
 #include <chrono>
-#include <algorithm>
+#include <cstdint>
+#include <memory>
+#include <unordered_map>
+#include <vector>
 
 namespace someip::events {
 
diff --git a/src/events/event_subscriber.cpp b/src/events/event_subscriber.cpp
index 4f8e05ba1..72a0efa30 100644
--- a/src/events/event_subscriber.cpp
+++ b/src/events/event_subscriber.cpp
@@ -12,16 +12,24 @@
  ********************************************************************************/
 
 #include "events/event_subscriber.h"
+
+#include "common/result.h"
 #include "events/event_types.h"
 #include "platform/thread.h"
-#include "transport/udp_transport.h"
+#include "someip/message.h"
+#include "someip/types.h"
 #include "transport/endpoint.h"
 #include "transport/transport.h"
-#include "someip/message.h"
-#include <unordered_map>
+#include "transport/udp_transport.h"
+
 #include <atomic>
-#include <algorithm>
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <unordered_map>
 #include <utility>
+#include <vector>
 
 namespace someip::events {
 
diff --git a/src/rpc/rpc_client.cpp b/src/rpc/rpc_client.cpp
index 2fc56f16d..7496bbb06 100644
--- a/src/rpc/rpc_client.cpp
+++ b/src/rpc/rpc_client.cpp
@@ -12,16 +12,24 @@
  ********************************************************************************/
 
 #include "rpc/rpc_client.h"
+
+#include "common/result.h"
+#include "core/session_manager.h"
+#include "platform/thread.h"
 #include "rpc/rpc_types.h"
-#include "transport/udp_transport.h"
+#include "someip/message.h"
+#include "someip/types.h"
 #include "transport/endpoint.h"
 #include "transport/transport.h"
-#include "someip/message.h"
-#include "core/session_manager.h"
-#include <unordered_map>
+#include "transport/udp_transport.h"
+
+#include <algorithm>
 #include <atomic>
 #include <chrono>
+#include <cstdint>
+#include <functional>
 #include <memory>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
diff --git a/src/rpc/rpc_server.cpp b/src/rpc/rpc_server.cpp
index cb2861046..f0e678496 100644
--- a/src/rpc/rpc_server.cpp
+++ b/src/rpc/rpc_server.cpp
@@ -12,15 +12,23 @@
  ********************************************************************************/
 
 #include "rpc/rpc_server.h"
+
+#include "common/result.h"
+#include "platform/thread.h"
 #include "rpc/rpc_types.h"
-#include "transport/udp_transport.h"
+#include "someip/message.h"
+#include "someip/types.h"
 #include "transport/endpoint.h"
 #include "transport/transport.h"
-#include "someip/message.h"
-#include "common/result.h"
-#include <unordered_map>
+#include "transport/udp_transport.h"
+
 #include <atomic>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <unordered_map>
 #include <utility>
+#include <vector>
 
 namespace someip::rpc {
 
diff --git a/src/sd/sd_client.cpp b/src/sd/sd_client.cpp
index 73996c92d..843ac335d 100644
--- a/src/sd/sd_client.cpp
+++ b/src/sd/sd_client.cpp
@@ -12,15 +12,27 @@
  ********************************************************************************/
 
 #include "sd/sd_client.h"
+
+#include "common/result.h"
+#include "platform/thread.h"
 #include "sd/sd_message.h"
-#include "transport/udp_transport.h"
+#include "sd/sd_types.h"
+#include "someip/message.h"
+#include "someip/types.h"
 #include "transport/endpoint.h"
 #include "transport/transport.h"
-#include "someip/message.h"
-#include <unordered_map>
+#include "transport/udp_transport.h"
+
+#include <algorithm>
 #include <atomic>
 #include <chrono>
-#include <algorithm>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 namespace someip::sd {
 
diff --git a/src/sd/sd_message.cpp b/src/sd/sd_message.cpp
index a327dceb1..9720c5604 100644
--- a/src/sd/sd_message.cpp
+++ b/src/sd/sd_message.cpp
@@ -12,16 +12,28 @@
  ********************************************************************************/
 
 #include "sd/sd_message.h"
-#include "serialization/serializer.h"
+
+#include "sd/sd_types.h"
+// NOLINTNEXTLINE(misc-include-cleaner) - someip_hton*/someip_ntoh* macros from byteorder_impl.h
 #include "platform/byteorder.h"
+// NOLINTNEXTLINE(misc-include-cleaner) - someip_inet_*/AF_INET/in_addr via net_impl.h
 #include "platform/net.h"
-#include <algorithm>
+
 #include <array>
+#include <cstddef>
+#include <cstdint>
 #include <iostream>
+#include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 namespace someip::sd {
 
+// NOLINTBEGIN(misc-include-cleaner) - someip_hton*/someip_ntoh*/someip_inet_*/AF_INET/in_addr/
+// INET_ADDRSTRLEN are macros and types from platform/byteorder.h and platform/net.h that
+// misc-include-cleaner cannot trace through the abstraction layer.
+
 /**
  * @brief Service Discovery message serialization
  * @satisfies feat_req_someipsd_300
@@ -575,4 +587,6 @@ bool SdMessage::deserialize(const std::vector<uint8_t>& data) {
     return true;
 }
 
+// NOLINTEND(misc-include-cleaner)
+
 }  // namespace someip::sd
diff --git a/src/sd/sd_server.cpp b/src/sd/sd_server.cpp
index c85485cd6..ce15bcaec 100644
--- a/src/sd/sd_server.cpp
+++ b/src/sd/sd_server.cpp
@@ -12,20 +12,37 @@
  ********************************************************************************/
 
 #include "sd/sd_server.h"
+
+#include "common/result.h"
+#include "platform/thread.h"
 #include "sd/sd_message.h"
-#include "transport/udp_transport.h"
+#include "sd/sd_types.h"
+#include "someip/message.h"
+#include "someip/types.h"
 #include "transport/endpoint.h"
 #include "transport/transport.h"
-#include "someip/message.h"
-#include <unordered_map>
-#include <atomic>
-#include <chrono>
+#include "transport/udp_transport.h"
+// NOLINTNEXTLINE(misc-include-cleaner) - someip_hton*/someip_ntoh* macros from byteorder_impl.h
 #include "platform/byteorder.h"
+// NOLINTNEXTLINE(misc-include-cleaner) - someip_inet_*/AF_INET/in_addr via net_impl.h
 #include "platform/net.h"
+
 #include <algorithm>
+#include <atomic>
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 namespace someip::sd {
 
+// NOLINTBEGIN(misc-include-cleaner) - someip_hton*/someip_inet_*/in_addr_t are macros/types from
+// platform/byteorder.h and platform/net.h that misc-include-cleaner cannot trace.
+
 namespace {
 
 std::shared_ptr<transport::UdpTransport> create_sd_transport(const SdConfig& config) {
@@ -619,4 +636,6 @@ SdServer::Statistics SdServer::get_statistics() const {
     return impl_->get_statistics();
 }
 
+// NOLINTEND(misc-include-cleaner)
+
 }  // namespace someip::sd
diff --git a/src/serialization/serializer.cpp b/src/serialization/serializer.cpp
index d292cc539..921b531a3 100644
--- a/src/serialization/serializer.cpp
+++ b/src/serialization/serializer.cpp
@@ -12,11 +12,21 @@
  ********************************************************************************/
 
 #include "serialization/serializer.h"
-#include <cstring>
-#include <algorithm>
+
+// NOLINTNEXTLINE(misc-include-cleaner) - someip_hton*/someip_ntoh* macros from byteorder_impl.h
 #include "platform/byteorder.h"
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace someip::serialization {
+// NOLINTBEGIN(misc-include-cleaner) - someip_hton*/someip_ntoh* macros from platform/byteorder.h -> byteorder_impl.h
 
 /**
  * @brief SOME/IP Serializer implementation
@@ -524,4 +534,6 @@ std::optional<double> Deserializer::read_be_double() {
     return result;
 }
 
+// NOLINTEND(misc-include-cleaner)
+
 }  // namespace someip::serialization
diff --git a/src/someip/message.cpp b/src/someip/message.cpp
index a6e45e3c1..95cf9b474 100644
--- a/src/someip/message.cpp
+++ b/src/someip/message.cpp
@@ -12,15 +12,26 @@
  ********************************************************************************/
 
 #include "someip/message.h"
+
 #include "e2e/e2e_header.h"
-#include "common/result.h"
+#include "someip/types.h"
+// NOLINTNEXTLINE(misc-include-cleaner) - someip_hton*/someip_ntoh* macros from byteorder_impl.h
+#include "platform/byteorder.h"
+
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
 #include <cstring>
-#include <sstream>
 #include <iomanip>
 #include <iostream>
-#include "platform/byteorder.h"
+#include <optional>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace someip {
+// NOLINTBEGIN(misc-include-cleaner) - someip_hton*/someip_ntoh* macros from platform/byteorder.h -> byteorder_impl.h
 
 /**
  * @brief SOME/IP Message implementation
diff --git a/src/someip/types.cpp b/src/someip/types.cpp
index 13cfa188d..6a1d65d12 100644
--- a/src/someip/types.cpp
+++ b/src/someip/types.cpp
@@ -12,6 +12,8 @@
  ********************************************************************************/
 
 #include "someip/types.h"
+
+#include <string>
 #include <unordered_map>
 
 namespace someip {
diff --git a/src/tp/tp_manager.cpp b/src/tp/tp_manager.cpp
index 09f291af4..48e73f46f 100644
--- a/src/tp/tp_manager.cpp
+++ b/src/tp/tp_manager.cpp
@@ -12,10 +12,18 @@
  ********************************************************************************/
 
 #include "tp/tp_manager.h"
-#include "tp/tp_segmenter.h"
-#include "tp/tp_reassembler.h"
+
+#include "platform/thread.h"
 #include "someip/message.h"
-#include <algorithm>
+#include "tp/tp_reassembler.h"
+#include "tp/tp_segmenter.h"
+#include "tp/tp_types.h"
+
+#include <chrono>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
diff --git a/src/tp/tp_reassembler.cpp b/src/tp/tp_reassembler.cpp
index 05bbb79b2..4bbe084d5 100644
--- a/src/tp/tp_reassembler.cpp
+++ b/src/tp/tp_reassembler.cpp
@@ -12,8 +12,18 @@
  ********************************************************************************/
 
 #include "tp/tp_reassembler.h"
+
+#include "platform/thread.h"
+#include "tp/tp_types.h"
+
 #include <algorithm>
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
 #include <iostream>
+#include <memory>
+#include <utility>
+#include <vector>
 
 namespace someip::tp {
 
diff --git a/src/tp/tp_segmenter.cpp b/src/tp/tp_segmenter.cpp
index 4fcfd5c43..c09b8abf2 100644
--- a/src/tp/tp_segmenter.cpp
+++ b/src/tp/tp_segmenter.cpp
@@ -12,10 +12,17 @@
  ********************************************************************************/
 
 #include "tp/tp_segmenter.h"
+
 #include "someip/message.h"
+#include "someip/types.h"
+#include "tp/tp_types.h"
+
 #include <algorithm>
 #include <array>
-#include <iostream>
+#include <cstddef>
+#include <cstdint>
+#include <utility>
+#include <vector>
 
 namespace someip::tp {
 
diff --git a/src/transport/endpoint.cpp b/src/transport/endpoint.cpp
index 4584ce0a0..6fd94419a 100644
--- a/src/transport/endpoint.cpp
+++ b/src/transport/endpoint.cpp
@@ -12,11 +12,15 @@
  ********************************************************************************/
 
 #include "transport/endpoint.h"
-#include <sstream>
-#include <functional>
+
+#include <cctype>
+#include <cstdint>
 #include <cstdlib>
 #include <cstring>
-#include <cctype>
+#include <functional>
+#include <sstream>
+#include <string>
+#include <utility>
 
 namespace someip::transport {
 
diff --git a/src/transport/tcp_transport.cpp b/src/transport/tcp_transport.cpp
index 61f277f3e..c795f84db 100644
--- a/src/transport/tcp_transport.cpp
+++ b/src/transport/tcp_transport.cpp
@@ -12,17 +12,35 @@
  ********************************************************************************/
 
 #include "transport/tcp_transport.h"
-#include "platform/net.h"
-#include "platform/memory.h"
+
 #include "common/result.h"
-#include <array>
-#include <cstring>
-#include <iostream>
+// NOLINTNEXTLINE(misc-include-cleaner) - platform::allocate_message from memory_impl.h
+#include "platform/memory.h"
+// NOLINTNEXTLINE(misc-include-cleaner) - socket/POSIX types and someip_* helpers from net_impl.h
+#include "platform/net.h"
+#include "platform/thread.h"
+#include "someip/message.h"
+#include "someip/types.h"
+#include "transport/endpoint.h"
+#include "transport/transport.h"
+
 #include <algorithm>
-#include <cstdio>
+#include <array>
+#include <atomic>
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <queue>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace someip::transport {
 
+// NOLINTBEGIN(misc-include-cleaner) - sockaddr/timeval/fd_set and someip_* wrappers/macros come from
+// platform/net.h -> net_impl.h; misc-include-cleaner does not trace through this abstraction.
+
 /**
  * @brief TCP Transport constructor
  * @implements REQ_TRANSPORT_002a, REQ_TRANSPORT_002b, REQ_TRANSPORT_003a, REQ_TRANSPORT_003b, REQ_TRANSPORT_005
@@ -576,4 +594,8 @@ bool TcpTransport::parse_message_from_buffer(std::vector<uint8_t>& buffer, Messa
     return message && message->deserialize(message_data);
 }
 
+// NOLINTEND(misc-include-cleaner)
+
+// NOLINTEND(misc-include-cleaner)
+
 }  // namespace someip::transport
diff --git a/src/transport/udp_transport.cpp b/src/transport/udp_transport.cpp
index bef2279fe..d6936ec0b 100644
--- a/src/transport/udp_transport.cpp
+++ b/src/transport/udp_transport.cpp
@@ -12,15 +12,34 @@
  ********************************************************************************/
 
 #include "transport/udp_transport.h"
-#include "platform/net.h"
-#include "platform/memory.h"
+
 #include "common/result.h"
+// NOLINTNEXTLINE(misc-include-cleaner) - platform::allocate_message from memory_impl.h
+#include "platform/memory.h"
+// NOLINTNEXTLINE(misc-include-cleaner) - socket/POSIX types and someip_* helpers from net_impl.h
+#include "platform/net.h"
+#include "platform/thread.h"
+#include "someip/message.h"
+#include "someip/types.h"
+#include "transport/endpoint.h"
+#include "transport/transport.h"
+
 #include <array>
+#include <atomic>
+#include <chrono>
+#include <cstdint>
 #include <cstring>
 #include <iostream>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <vector>
 
 namespace someip::transport {
 
+// NOLINTBEGIN(misc-include-cleaner) - sockaddr_in/ip_mreq/INADDR_ANY and someip_* wrappers/macros
+// come from platform/net.h -> net_impl.h; misc-include-cleaner cannot trace through this abstraction.
+
 /**
  * @brief UDP Transport constructor
  * @implements REQ_TRANSPORT_001a, REQ_TRANSPORT_001b, REQ_TRANSPORT_001c, REQ_TRANSPORT_005, REQ_TRANSPORT_012
@@ -481,4 +500,6 @@ bool UdpTransport::is_multicast_address(const std::string& address) const {
     return (host_addr >= 0xE0000000) && (host_addr <= 0xEFFFFFFF);
 }
 
+// NOLINTEND(misc-include-cleaner)
+
 }  // namespace someip::transport

From d0cb58b1487e76f667159bbf044f464caae4c030 Mon Sep 17 00:00:00 2001
From: Vinicius Zein <vtzein@gmail.com>
Date: Tue, 14 Apr 2026 23:45:05 -0400
Subject: [PATCH 2/2] fix: address CodeRabbit review findings

---
 src/sd/sd_message.cpp           | 18 ++++--------------
 src/someip/message.cpp          |  2 ++
 src/transport/tcp_transport.cpp |  2 --
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/sd/sd_message.cpp b/src/sd/sd_message.cpp
index 9720c5604..85bd48482 100644
--- a/src/sd/sd_message.cpp
+++ b/src/sd/sd_message.cpp
@@ -378,25 +378,15 @@ bool IPv4MulticastOption::deserialize(const std::vector<uint8_t>& data, size_t&
 // ConfigurationOption implementation
 /** @implements REQ_SD_236, REQ_SD_243 */
 std::vector<uint8_t> ConfigurationOption::serialize() const {
-    std::vector<uint8_t> data;
-
-    // Type (1 byte)
-    data.push_back(static_cast<uint8_t>(OptionType::CONFIGURATION));
-
-    // Reserved (1 byte)
-    data.push_back(0);
-
-    // Length (2 bytes) - will be filled later
-    data.push_back(0);
-    data.push_back(0);
+    std::vector<uint8_t> data = SdOption::serialize();
 
     // Configuration string
     data.insert(data.end(), config_string_.begin(), config_string_.end());
 
-    // Update length
+    // Update length field (bytes 0-1) to cover type + reserved + config string
     const auto length = static_cast<uint16_t>(config_string_.size());
-    data[2] = static_cast<uint8_t>((static_cast<uint32_t>(length) >> 8U) & 0xFFU);
-    data[3] = static_cast<uint8_t>(length & 0xFFU);
+    data[0] = static_cast<uint8_t>((static_cast<uint32_t>(length) >> 8U) & 0xFFU);
+    data[1] = static_cast<uint8_t>(length & 0xFFU);
 
     return data;
 }
diff --git a/src/someip/message.cpp b/src/someip/message.cpp
index 95cf9b474..83649f5e5 100644
--- a/src/someip/message.cpp
+++ b/src/someip/message.cpp
@@ -539,4 +539,6 @@ std::string Message::to_string() const {
     return ss.str();
 }
 
+// NOLINTEND(misc-include-cleaner)
+
 } // namespace someip
diff --git a/src/transport/tcp_transport.cpp b/src/transport/tcp_transport.cpp
index c795f84db..4490c7266 100644
--- a/src/transport/tcp_transport.cpp
+++ b/src/transport/tcp_transport.cpp
@@ -596,6 +596,4 @@ bool TcpTransport::parse_message_from_buffer(std::vector<uint8_t>& buffer, Messa
 
 // NOLINTEND(misc-include-cleaner)
 
-// NOLINTEND(misc-include-cleaner)
-
 }  // namespace someip::transport