diff options
| author | Eli Lipsitz <elipsitz@google.com> | 2023-03-08 23:42:24 +0000 |
|---|---|---|
| committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-03-08 23:42:24 +0000 |
| commit | bfdc41d95422448f98cfc8966586e63cc851dc95 (patch) | |
| tree | 01257f03b0aac695f49404b3a0d6fb5e1f846f20 /targets | |
| parent | fdd5b650e9d17dc9be94b2b345e0f84ea68aa6dd (diff) | |
| download | pigweed-bfdc41d95422448f98cfc8966586e63cc851dc95.tar.gz | |
pw_system: Remove usages of deprecated SocketStream::Serve
This method has been deprecated in favor of the new ServerSocket
class and its methods Listen and Accept.
This commit removes the two usages of the deprecated method
and replaces it with functionally identical usage of ServerSocket.
Change-Id: I153892cafbdc97efdc0fd86c2d73bf68ed0cb19e
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/132354
Commit-Queue: Eli Lipsitz <elipsitz@google.com>
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Diffstat (limited to 'targets')
| -rw-r--r-- | targets/host/system_rpc_server.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/targets/host/system_rpc_server.cc b/targets/host/system_rpc_server.cc index f3d870fc9..8ff75751a 100644 --- a/targets/host/system_rpc_server.cc +++ b/targets/host/system_rpc_server.cc @@ -35,6 +35,7 @@ uint16_t socket_port = 33000; static_assert(kMaxTransmissionUnit == hdlc::MaxEncodedFrameSize(rpc::cfg::kEncodingBufferSizeBytes)); +stream::ServerSocket server_socket; stream::SocketStream socket_stream; hdlc::FixedMtuChannelOutput<kMaxTransmissionUnit> hdlc_channel_output( @@ -58,7 +59,10 @@ void Init() { }); PW_LOG_INFO("Starting pw_rpc server on port %d", socket_port); - PW_CHECK_OK(socket_stream.Serve(socket_port)); + PW_CHECK_OK(server_socket.Listen(socket_port)); + auto accept_result = server_socket.Accept(); + PW_CHECK_OK(accept_result.status()); + socket_stream = *std::move(accept_result); } rpc::Server& Server() { return server; } |