diff options
Diffstat (limited to 'src/core/internal_network')
| -rw-r--r-- | src/core/internal_network/network.cpp | 4 | ||||
| -rw-r--r-- | src/core/internal_network/socket_proxy.cpp | 4 | ||||
| -rw-r--r-- | src/core/internal_network/socket_proxy.h | 5 | ||||
| -rw-r--r-- | src/core/internal_network/sockets.h | 9 |
4 files changed, 10 insertions, 12 deletions
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 7494fb62d..282ea1ff9 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp | |||
| @@ -550,7 +550,7 @@ std::pair<s32, Errno> Socket::RecvFrom(int flags, std::vector<u8>& message, Sock | |||
| 550 | return {-1, GetAndLogLastError()}; | 550 | return {-1, GetAndLogLastError()}; |
| 551 | } | 551 | } |
| 552 | 552 | ||
| 553 | std::pair<s32, Errno> Socket::Send(std::span<const u8> message, int flags) { | 553 | std::pair<s32, Errno> Socket::Send(const std::vector<u8>& message, int flags) { |
| 554 | ASSERT(message.size() < static_cast<size_t>(std::numeric_limits<int>::max())); | 554 | ASSERT(message.size() < static_cast<size_t>(std::numeric_limits<int>::max())); |
| 555 | ASSERT(flags == 0); | 555 | ASSERT(flags == 0); |
| 556 | 556 | ||
| @@ -563,7 +563,7 @@ std::pair<s32, Errno> Socket::Send(std::span<const u8> message, int flags) { | |||
| 563 | return {-1, GetAndLogLastError()}; | 563 | return {-1, GetAndLogLastError()}; |
| 564 | } | 564 | } |
| 565 | 565 | ||
| 566 | std::pair<s32, Errno> Socket::SendTo(u32 flags, std::span<const u8> message, | 566 | std::pair<s32, Errno> Socket::SendTo(u32 flags, const std::vector<u8>& message, |
| 567 | const SockAddrIn* addr) { | 567 | const SockAddrIn* addr) { |
| 568 | ASSERT(flags == 0); | 568 | ASSERT(flags == 0); |
| 569 | 569 | ||
diff --git a/src/core/internal_network/socket_proxy.cpp b/src/core/internal_network/socket_proxy.cpp index 7a77171c2..1e1c42cea 100644 --- a/src/core/internal_network/socket_proxy.cpp +++ b/src/core/internal_network/socket_proxy.cpp | |||
| @@ -182,7 +182,7 @@ std::pair<s32, Errno> ProxySocket::ReceivePacket(int flags, std::vector<u8>& mes | |||
| 182 | return {static_cast<u32>(read_bytes), Errno::SUCCESS}; | 182 | return {static_cast<u32>(read_bytes), Errno::SUCCESS}; |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | std::pair<s32, Errno> ProxySocket::Send(std::span<const u8> message, int flags) { | 185 | std::pair<s32, Errno> ProxySocket::Send(const std::vector<u8>& message, int flags) { |
| 186 | LOG_WARNING(Network, "(STUBBED) called"); | 186 | LOG_WARNING(Network, "(STUBBED) called"); |
| 187 | ASSERT(message.size() < static_cast<size_t>(std::numeric_limits<int>::max())); | 187 | ASSERT(message.size() < static_cast<size_t>(std::numeric_limits<int>::max())); |
| 188 | ASSERT(flags == 0); | 188 | ASSERT(flags == 0); |
| @@ -200,7 +200,7 @@ void ProxySocket::SendPacket(ProxyPacket& packet) { | |||
| 200 | } | 200 | } |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | std::pair<s32, Errno> ProxySocket::SendTo(u32 flags, std::span<const u8> message, | 203 | std::pair<s32, Errno> ProxySocket::SendTo(u32 flags, const std::vector<u8>& message, |
| 204 | const SockAddrIn* addr) { | 204 | const SockAddrIn* addr) { |
| 205 | ASSERT(flags == 0); | 205 | ASSERT(flags == 0); |
| 206 | 206 | ||
diff --git a/src/core/internal_network/socket_proxy.h b/src/core/internal_network/socket_proxy.h index 9421492bc..f12b5f567 100644 --- a/src/core/internal_network/socket_proxy.h +++ b/src/core/internal_network/socket_proxy.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #pragma once | 4 | #pragma once |
| 5 | 5 | ||
| 6 | #include <mutex> | 6 | #include <mutex> |
| 7 | #include <span> | ||
| 8 | #include <vector> | 7 | #include <vector> |
| 9 | #include <queue> | 8 | #include <queue> |
| 10 | 9 | ||
| @@ -49,11 +48,11 @@ public: | |||
| 49 | std::pair<s32, Errno> ReceivePacket(int flags, std::vector<u8>& message, SockAddrIn* addr, | 48 | std::pair<s32, Errno> ReceivePacket(int flags, std::vector<u8>& message, SockAddrIn* addr, |
| 50 | std::size_t max_length); | 49 | std::size_t max_length); |
| 51 | 50 | ||
| 52 | std::pair<s32, Errno> Send(std::span<const u8> message, int flags) override; | 51 | std::pair<s32, Errno> Send(const std::vector<u8>& message, int flags) override; |
| 53 | 52 | ||
| 54 | void SendPacket(ProxyPacket& packet); | 53 | void SendPacket(ProxyPacket& packet); |
| 55 | 54 | ||
| 56 | std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message, | 55 | std::pair<s32, Errno> SendTo(u32 flags, const std::vector<u8>& message, |
| 57 | const SockAddrIn* addr) override; | 56 | const SockAddrIn* addr) override; |
| 58 | 57 | ||
| 59 | Errno SetLinger(bool enable, u32 linger) override; | 58 | Errno SetLinger(bool enable, u32 linger) override; |
diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h index 4c7489258..2e328c645 100644 --- a/src/core/internal_network/sockets.h +++ b/src/core/internal_network/sockets.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | #include <map> | 6 | #include <map> |
| 7 | #include <memory> | 7 | #include <memory> |
| 8 | #include <span> | ||
| 9 | #include <utility> | 8 | #include <utility> |
| 10 | 9 | ||
| 11 | #if defined(_WIN32) | 10 | #if defined(_WIN32) |
| @@ -67,9 +66,9 @@ public: | |||
| 67 | virtual std::pair<s32, Errno> RecvFrom(int flags, std::vector<u8>& message, | 66 | virtual std::pair<s32, Errno> RecvFrom(int flags, std::vector<u8>& message, |
| 68 | SockAddrIn* addr) = 0; | 67 | SockAddrIn* addr) = 0; |
| 69 | 68 | ||
| 70 | virtual std::pair<s32, Errno> Send(std::span<const u8> message, int flags) = 0; | 69 | virtual std::pair<s32, Errno> Send(const std::vector<u8>& message, int flags) = 0; |
| 71 | 70 | ||
| 72 | virtual std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message, | 71 | virtual std::pair<s32, Errno> SendTo(u32 flags, const std::vector<u8>& message, |
| 73 | const SockAddrIn* addr) = 0; | 72 | const SockAddrIn* addr) = 0; |
| 74 | 73 | ||
| 75 | virtual Errno SetLinger(bool enable, u32 linger) = 0; | 74 | virtual Errno SetLinger(bool enable, u32 linger) = 0; |
| @@ -139,9 +138,9 @@ public: | |||
| 139 | 138 | ||
| 140 | std::pair<s32, Errno> RecvFrom(int flags, std::vector<u8>& message, SockAddrIn* addr) override; | 139 | std::pair<s32, Errno> RecvFrom(int flags, std::vector<u8>& message, SockAddrIn* addr) override; |
| 141 | 140 | ||
| 142 | std::pair<s32, Errno> Send(std::span<const u8> message, int flags) override; | 141 | std::pair<s32, Errno> Send(const std::vector<u8>& message, int flags) override; |
| 143 | 142 | ||
| 144 | std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message, | 143 | std::pair<s32, Errno> SendTo(u32 flags, const std::vector<u8>& message, |
| 145 | const SockAddrIn* addr) override; | 144 | const SockAddrIn* addr) override; |
| 146 | 145 | ||
| 147 | Errno SetLinger(bool enable, u32 linger) override; | 146 | Errno SetLinger(bool enable, u32 linger) override; |