pacnpal/citron
1
0
Fork 0
mirror of https://git.eden-emu.dev/archive/citron synced 2026-04-17 18:20:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(sockets): SIGSEGV & Socket Handling

Browse Source 
Signed-off-by: Collecting <collecting@noreply.localhost>
This commit is contained in:
Collecting
2026-01-11 08:11:38 +00:00
parent 574710f573
commit 2311ed2bdf
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/hle/service/sockets/bsd.cpp
View File

@@ -562,6 +562,10 @@ std::pair<s32, Errno> BSD::SocketImpl(Domain domain, Type type, Protocol protoco
if (it != socket_pool.end() && !it->second.empty()) { if (it != socket_pool.end() && !it->second.empty()) {
descriptor.socket = it->second.back(); descriptor.socket = it->second.back();
it->second.pop_back(); it->second.pop_back();
// call Initialize here so socket_proxy.cpp functions work
descriptor.socket->Initialize(descriptor.domain, descriptor.type, descriptor.protocol);
LOG_DEBUG(Service, "Reused socket from pool for fd={}", fd); LOG_DEBUG(Service, "Reused socket from pool for fd={}", fd);
} else { } else {
descriptor.socket = std::make_shared<Network::ProxySocket>(room_network); descriptor.socket = std::make_shared<Network::ProxySocket>(room_network);
@@ -1089,12 +1093,19 @@ void BSD::BuildErrnoResponse(HLERequestContext& ctx, Errno bsd_errno) const noex
} }
void BSD::OnProxyPacketReceived(const Network::ProxyPacket& packet) { void BSD::OnProxyPacketReceived(const Network::ProxyPacket& packet) {
for (auto& optional_descriptor : file_descriptors) { // We must ensure we only deliver the packet ONCE
if (!optional_descriptor.has_value()) { std::vector<Network::SocketBase*> processed_sockets;
continue;
for (auto& optional_desc : file_descriptors) {
if (optional_desc.has_value() && optional_desc->socket) {
Network::SocketBase* socket_ptr = optional_desc->socket.get();
// If we haven't given this specific socket the packet yet...
if (std::find(processed_sockets.begin(), processed_sockets.end(), socket_ptr) == processed_sockets.end()) {
socket_ptr->HandleProxyPacket(packet);
processed_sockets.push_back(socket_ptr);
}
} }
FileDescriptor& descriptor = *optional_descriptor;
descriptor.socket.get()->HandleProxyPacket(packet);
} }
} }