-
Notifications
You must be signed in to change notification settings - Fork 11
feat(transport): event-driven transport adapters (#172) #178
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
vtz
wants to merge
7
commits into
main
Choose a base branch
from
feat/172-event-driven-transport
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
f9e3ca4
feat(transport): add event-driven transport interfaces (#172)
vtz 758d08f
fix(transport): address CodeRabbit review findings on thread safety
vtz b77786e
fix(transport): address second round of CodeRabbit review findings
vtz c715a48
fix(transport): address third round of CodeRabbit review findings
vtz e539a78
refactor(transport): rename misleading length_from_client_id to messa…
vtz 8f6da44
fix(transport): address remaining CodeRabbit review findings
vtz 021a480
fix(sd): suppress nodiscard warning on leave_multicast_group in teardown
vtz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2025 Vinicius Tadeu Zein | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| #ifndef SOMEIP_TRANSPORT_EVENT_DRIVEN_TCP_TRANSPORT_H | ||
| #define SOMEIP_TRANSPORT_EVENT_DRIVEN_TCP_TRANSPORT_H | ||
|
|
||
| #include "transport/transport.h" | ||
| #include "transport/tcp_socket_adapter.h" | ||
| #include "platform/thread.h" | ||
| #include <atomic> | ||
| #include <queue> | ||
| #include <vector> | ||
|
|
||
| namespace someip { | ||
| namespace transport { | ||
|
|
||
| /** | ||
| * @brief Configuration for event-driven TCP transport (stream reassembly limits). | ||
| */ | ||
| struct EventDrivenTcpTransportConfig { | ||
| size_t max_receive_buffer{65536}; | ||
| }; | ||
|
|
||
| /** | ||
| * @brief ITransport implementation driven by an ITcpSocketAdapter. | ||
| * | ||
| * Unlike EventDrivenUdpTransport, TCP requires explicit lifecycle steps | ||
| * that are not part of the ITransport interface. Callers must use the | ||
| * concrete type to call initialize(), and optionally enable_server_mode() | ||
| * / try_accept_connection() for server-side usage, before calling start(). | ||
| */ | ||
| class EventDrivenTcpTransport : public ITransport { | ||
| public: | ||
| explicit EventDrivenTcpTransport(ITcpSocketAdapter& adapter, | ||
| const EventDrivenTcpTransportConfig& config = EventDrivenTcpTransportConfig()); | ||
|
|
||
| ~EventDrivenTcpTransport() override; | ||
|
|
||
| EventDrivenTcpTransport(const EventDrivenTcpTransport&) = delete; | ||
| EventDrivenTcpTransport& operator=(const EventDrivenTcpTransport&) = delete; | ||
|
|
||
| /** @brief Concrete-type-only: bind the adapter to a local endpoint. */ | ||
| [[nodiscard]] Result initialize(const Endpoint& local_endpoint); | ||
|
|
||
| /** @brief Concrete-type-only: switch to server mode after initialize(). */ | ||
| [[nodiscard]] Result enable_server_mode(int backlog = 5); | ||
|
|
||
| /** | ||
| * @brief Concrete-type-only: non-blocking accept (server mode). | ||
| * Adapter invokes connected/disconnected callbacks on completion. | ||
| */ | ||
| [[nodiscard]] Result try_accept_connection(Endpoint& remote_out); | ||
|
|
||
| [[nodiscard]] Result send_message(const Message& message, const Endpoint& endpoint) override; | ||
| MessagePtr receive_message() override; | ||
| Result connect(const Endpoint& endpoint) override; | ||
| Result disconnect() override; | ||
| bool is_connected() const override; | ||
| Endpoint get_local_endpoint() const override; | ||
| void set_listener(ITransportListener* listener) override; | ||
| Result start() override; | ||
| Result stop() override; | ||
| bool is_running() const override; | ||
|
|
||
| private: | ||
| void on_adapter_receive(const std::vector<uint8_t>& data); | ||
| void on_adapter_connected(const Endpoint& remote); | ||
| void on_adapter_disconnected(); | ||
| bool parse_message_from_buffer(std::vector<uint8_t>& buffer, MessagePtr& message); | ||
|
|
||
| ITcpSocketAdapter& adapter_; | ||
| EventDrivenTcpTransportConfig config_; | ||
| Endpoint local_endpoint_; | ||
| Endpoint connection_remote_; | ||
| std::atomic<ITransportListener*> listener_{nullptr}; | ||
|
|
||
| std::atomic<bool> running_{false}; | ||
| std::atomic<bool> initialized_{false}; | ||
| std::atomic<bool> server_mode_{false}; | ||
|
|
||
| std::vector<uint8_t> receive_buffer_; | ||
| std::queue<std::pair<MessagePtr, Endpoint>> message_queue_; | ||
| platform::Mutex queue_mutex_; | ||
|
|
||
| static const size_t SOMEIP_HEADER_SIZE; | ||
| static const size_t MAX_MESSAGE_SIZE; | ||
| }; | ||
|
|
||
| } // namespace transport | ||
| } // namespace someip | ||
|
|
||
| #endif // SOMEIP_TRANSPORT_EVENT_DRIVEN_TCP_TRANSPORT_H | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2025 Vinicius Tadeu Zein | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| #ifndef SOMEIP_TRANSPORT_EVENT_DRIVEN_UDP_TRANSPORT_H | ||
| #define SOMEIP_TRANSPORT_EVENT_DRIVEN_UDP_TRANSPORT_H | ||
|
|
||
| #include "transport/transport.h" | ||
| #include "transport/multicast_transport.h" | ||
| #include "transport/udp_socket_adapter.h" | ||
| #include "platform/thread.h" | ||
| #include <atomic> | ||
| #include <queue> | ||
| #include <string> | ||
|
|
||
| namespace someip { | ||
| namespace transport { | ||
|
|
||
| /** | ||
| * @brief Configuration for event-driven UDP transport. | ||
| */ | ||
| struct EventDrivenUdpTransportConfig { | ||
| std::string multicast_interface{}; | ||
| size_t max_message_size{1400}; | ||
| }; | ||
|
|
||
| /** | ||
| * @brief ITransport implementation driven by an IUdpSocketAdapter. | ||
| */ | ||
| class EventDrivenUdpTransport : public ITransport, public IMulticastTransport { | ||
| public: | ||
| explicit EventDrivenUdpTransport(IUdpSocketAdapter& adapter, | ||
| const Endpoint& local_endpoint, | ||
| const EventDrivenUdpTransportConfig& config = EventDrivenUdpTransportConfig()); | ||
|
|
||
| ~EventDrivenUdpTransport() override; | ||
|
|
||
| EventDrivenUdpTransport(const EventDrivenUdpTransport&) = delete; | ||
| EventDrivenUdpTransport& operator=(const EventDrivenUdpTransport&) = delete; | ||
|
|
||
| /** @brief Check whether the transport was constructed with a valid endpoint. */ | ||
| [[nodiscard]] bool is_valid() const { return local_endpoint_.is_valid(); } | ||
|
|
||
| [[nodiscard]] Result send_message(const Message& message, const Endpoint& endpoint) override; | ||
| MessagePtr receive_message() override; | ||
| Result connect(const Endpoint& endpoint) override; | ||
| Result disconnect() override; | ||
| bool is_connected() const override; | ||
| Endpoint get_local_endpoint() const override; | ||
| void set_listener(ITransportListener* listener) override; | ||
| Result start() override; | ||
| Result stop() override; | ||
| bool is_running() const override; | ||
|
|
||
| Result join_multicast_group(const std::string& multicast_address) override; | ||
| Result leave_multicast_group(const std::string& multicast_address) override; | ||
|
|
||
| private: | ||
| void on_adapter_receive(const std::vector<uint8_t>& data, const Endpoint& sender); | ||
| static bool is_multicast_ipv4(const std::string& address); | ||
|
|
||
| IUdpSocketAdapter& adapter_; | ||
| Endpoint local_endpoint_; | ||
| EventDrivenUdpTransportConfig config_; | ||
| std::atomic<bool> running_{false}; | ||
| std::atomic<bool> opened_{false}; | ||
| std::atomic<ITransportListener*> listener_{nullptr}; | ||
|
|
||
| std::queue<MessagePtr> receive_queue_; | ||
| platform::Mutex queue_mutex_; | ||
|
|
||
| static constexpr size_t MAX_UDP_PAYLOAD = 65507; | ||
| }; | ||
|
|
||
| } // namespace transport | ||
| } // namespace someip | ||
|
|
||
| #endif // SOMEIP_TRANSPORT_EVENT_DRIVEN_UDP_TRANSPORT_H |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2025 Vinicius Tadeu Zein | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| #ifndef SOMEIP_TRANSPORT_MULTICAST_TRANSPORT_H | ||
| #define SOMEIP_TRANSPORT_MULTICAST_TRANSPORT_H | ||
|
|
||
| #include "common/result.h" | ||
| #include <string> | ||
|
|
||
| namespace someip { | ||
| namespace transport { | ||
|
|
||
| /** | ||
| * @brief Interface for transports that support IPv4 multicast group management. | ||
| * | ||
| * Both UdpTransport (BSD sockets) and EventDrivenUdpTransport (adapter-based) | ||
| * implement this so that SD and other callers can join/leave multicast groups | ||
| * without knowing the concrete transport type. | ||
| */ | ||
| class IMulticastTransport { | ||
| public: | ||
| virtual ~IMulticastTransport() = default; | ||
|
|
||
| [[nodiscard]] virtual Result join_multicast_group(const std::string& multicast_address) = 0; | ||
| [[nodiscard]] virtual Result leave_multicast_group(const std::string& multicast_address) = 0; | ||
| }; | ||
|
|
||
| } // namespace transport | ||
| } // namespace someip | ||
|
|
||
| #endif // SOMEIP_TRANSPORT_MULTICAST_TRANSPORT_H |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /******************************************************************************** | ||
| * Copyright (c) 2025 Vinicius Tadeu Zein | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| #ifndef SOMEIP_TRANSPORT_TCP_SOCKET_ADAPTER_H | ||
| #define SOMEIP_TRANSPORT_TCP_SOCKET_ADAPTER_H | ||
|
|
||
| #include "transport/endpoint.h" | ||
| #include "common/result.h" | ||
| #include <functional> | ||
| #include <vector> | ||
|
|
||
| namespace someip { | ||
| namespace transport { | ||
|
|
||
| /** | ||
| * @brief Invoked when payload bytes arrive on the established connection. | ||
| */ | ||
| using TcpReceiveCallback = std::function<void(const std::vector<uint8_t>& data)>; | ||
|
|
||
| /** | ||
| * @brief Invoked when the connection is ready (outgoing connect or accepted peer). | ||
| */ | ||
| using TcpConnectedCallback = std::function<void(const Endpoint& remote)>; | ||
|
|
||
| /** | ||
| * @brief Invoked when the connection is closed or reset. | ||
| */ | ||
| using TcpDisconnectedCallback = std::function<void()>; | ||
|
|
||
| /** | ||
| * @brief TCP socket abstraction for event-driven SOME/IP transport. | ||
| * | ||
| * Implemented by integrators using non-BSD stacks. The adapter owns the | ||
| * semantics of connect/accept; it must invoke callbacks from its event context. | ||
| */ | ||
| class ITcpSocketAdapter { | ||
| public: | ||
| virtual ~ITcpSocketAdapter() = default; | ||
|
|
||
| /** | ||
| * @brief Create socket bound to the local endpoint (listening or pre-connect). | ||
| */ | ||
| [[nodiscard]] virtual Result open(const Endpoint& local_endpoint) = 0; | ||
|
|
||
| virtual void close() = 0; | ||
|
|
||
| /** | ||
| * @brief Start listening after open (server mode). No-op or NOT_IMPLEMENTED for client-only adapters. | ||
| */ | ||
| [[nodiscard]] virtual Result listen(int backlog) = 0; | ||
|
|
||
| /** | ||
| * @brief Connect to a remote endpoint (client mode). | ||
| */ | ||
| [[nodiscard]] virtual Result connect(const Endpoint& remote_endpoint) = 0; | ||
|
|
||
| /** | ||
| * @brief Accept one pending connection if available (non-blocking from SOME/IP's perspective). | ||
| * @param remote_out Peer endpoint when Result::SUCCESS | ||
| */ | ||
| [[nodiscard]] virtual Result accept(Endpoint& remote_out) = 0; | ||
|
|
||
| /** | ||
| * @brief Send bytes on the active connection. | ||
| */ | ||
| [[nodiscard]] virtual Result send(const std::vector<uint8_t>& data) = 0; | ||
|
|
||
| /** | ||
| * Quiescence guarantee: after any set_*_callback(nullptr) returns, the | ||
| * adapter must not invoke that previously registered callback. | ||
| * Implementations must ensure no in-flight callback is executing when | ||
| * the setter returns. | ||
| */ | ||
| virtual void set_receive_callback(TcpReceiveCallback callback) = 0; | ||
| virtual void set_connected_callback(TcpConnectedCallback callback) = 0; | ||
| virtual void set_disconnected_callback(TcpDisconnectedCallback callback) = 0; | ||
|
|
||
| [[nodiscard]] virtual Endpoint get_local_endpoint() const = 0; | ||
| [[nodiscard]] virtual bool is_connected() const = 0; | ||
| }; | ||
|
|
||
| } // namespace transport | ||
| } // namespace someip | ||
|
|
||
| #endif // SOMEIP_TRANSPORT_TCP_SOCKET_ADAPTER_H |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧹 Nitpick | 🔵 Trivial
Non-polymorphic initialization methods may cause usage errors.
initialize(),enable_server_mode(), andtry_accept_connection()are not part of theITransportinterface. Code usingITransport*polymorphically cannot call these required setup methods, potentially leading toNOT_INITIALIZEDerrors at runtime.Consider either:
local_endpointin the constructor (matchingEventDrivenUdpTransport)🤖 Prompt for AI Agents