diff options
author | bunnei <bunneidev@gmail.com> | 2023-01-30 21:17:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-30 21:17:09 +0100 |
commit | ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a (patch) | |
tree | 54b6ce04e859b1dee33f4331f392c0d645f4db43 /src/core/hle/service/sockets/bsd.h | |
parent | Merge pull request #9701 from german77/common_protocol (diff) | |
parent | hle_ipc: Use thread_local ReadBuffer (diff) | |
download | yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.gz yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.bz2 yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.lz yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.xz yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.zst yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.zip |
Diffstat (limited to 'src/core/hle/service/sockets/bsd.h')
-rw-r--r-- | src/core/hle/service/sockets/bsd.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/core/hle/service/sockets/bsd.h b/src/core/hle/service/sockets/bsd.h index 81e855e0f..56bb3f8b1 100644 --- a/src/core/hle/service/sockets/bsd.h +++ b/src/core/hle/service/sockets/bsd.h @@ -4,6 +4,7 @@ #pragma once #include <memory> +#include <span> #include <vector> #include "common/common_types.h" @@ -44,7 +45,7 @@ private: s32 nfds; s32 timeout; - std::vector<u8> read_buffer; + std::span<const u8> read_buffer; std::vector<u8> write_buffer; s32 ret{}; Errno bsd_errno{}; @@ -65,7 +66,7 @@ private: void Response(Kernel::HLERequestContext& ctx); s32 fd; - std::vector<u8> addr; + std::span<const u8> addr; Errno bsd_errno{}; }; @@ -98,7 +99,7 @@ private: s32 fd; u32 flags; - std::vector<u8> message; + std::span<const u8> message; s32 ret{}; Errno bsd_errno{}; }; @@ -109,8 +110,8 @@ private: s32 fd; u32 flags; - std::vector<u8> message; - std::vector<u8> addr; + std::span<const u8> message; + std::span<const u8> addr; s32 ret{}; Errno bsd_errno{}; }; @@ -143,11 +144,11 @@ private: void ExecuteWork(Kernel::HLERequestContext& ctx, Work work); std::pair<s32, Errno> SocketImpl(Domain domain, Type type, Protocol protocol); - std::pair<s32, Errno> PollImpl(std::vector<u8>& write_buffer, std::vector<u8> read_buffer, + std::pair<s32, Errno> PollImpl(std::vector<u8>& write_buffer, std::span<const u8> read_buffer, s32 nfds, s32 timeout); std::pair<s32, Errno> AcceptImpl(s32 fd, std::vector<u8>& write_buffer); - Errno BindImpl(s32 fd, const std::vector<u8>& addr); - Errno ConnectImpl(s32 fd, const std::vector<u8>& addr); + Errno BindImpl(s32 fd, std::span<const u8> addr); + Errno ConnectImpl(s32 fd, std::span<const u8> addr); Errno GetPeerNameImpl(s32 fd, std::vector<u8>& write_buffer); Errno GetSockNameImpl(s32 fd, std::vector<u8>& write_buffer); Errno ListenImpl(s32 fd, s32 backlog); @@ -157,9 +158,9 @@ private: std::pair<s32, Errno> RecvImpl(s32 fd, u32 flags, std::vector<u8>& message); std::pair<s32, Errno> RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& message, std::vector<u8>& addr); - std::pair<s32, Errno> SendImpl(s32 fd, u32 flags, const std::vector<u8>& message); - std::pair<s32, Errno> SendToImpl(s32 fd, u32 flags, const std::vector<u8>& message, - const std::vector<u8>& addr); + std::pair<s32, Errno> SendImpl(s32 fd, u32 flags, std::span<const u8> message); + std::pair<s32, Errno> SendToImpl(s32 fd, u32 flags, std::span<const u8> message, + std::span<const u8> addr); Errno CloseImpl(s32 fd); s32 FindFreeFileDescriptorHandle() noexcept; |