fix: remediate misc-include-cleaner violations (batch 6)

src/common/result.cpp

@@ -1,4 +1,6 @@
 #include "common/result.h"
+
+#include <string>
 #include <unordered_map>
 
 namespace someip {

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 {
 
 /**

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

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

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 {
 

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

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 {
 
 /**

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 {
 

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 {
 

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>
 

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 {
 

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 {
 

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
@@ -366,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;
 }
@@ -575,4 +577,6 @@ bool SdMessage::deserialize(const std::vector<uint8_t>& data) {
     return true;
 }
 
+// NOLINTEND(misc-include-cleaner)
+
 }  // namespace someip::sd

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