mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-22 18:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

review fixes

Browse Source
This commit is contained in:
Marcin Mikołajczyk 2025-07-18 23:50:00 +01:00
parent 9a787dbd34
commit da2afe2bf9
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/libraries/network/net.cpp
View File

@ -699,7 +699,6 @@ int PS4_SYSV_ABI sceNetEpollControl(OrbisNetId epollid, OrbisNetEpollFlag op, Or
} }
#ifdef __linux__ #ifdef __linux__
// const auto socket = Common::Singleton<NetInternal>::Instance()->socks[id];
auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance(); auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance();
auto* file = h->GetFile(id); auto* file = h->GetFile(id);
if (!file || file->type != Core::FileSys::FileType::Socket) { if (!file || file->type != Core::FileSys::FileType::Socket) {
@ -739,7 +738,12 @@ int PS4_SYSV_ABI sceNetEpollControl(OrbisNetId epollid, OrbisNetEpollFlag op, Or
} }
#ifdef __linux__ #ifdef __linux__
const auto socket = Common::Singleton<NetInternal>::Instance()->socks[id]; auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance();
auto* file = h->GetFile(id);
if (!file || file->type != Core::FileSys::FileType::Socket) {
return -ORBIS_NET_EBADF;
}
const auto socket = file->socket;
ASSERT(epoll_ctl(epoll->epoll_fd, EPOLL_CTL_DEL, socket->Native(), nullptr) == 0); ASSERT(epoll_ctl(epoll->epoll_fd, EPOLL_CTL_DEL, socket->Native(), nullptr) == 0);
#endif #endif
epoll->events.erase(it); epoll->events.erase(it);
@ -1220,7 +1224,7 @@ const char* PS4_SYSV_ABI sceNetInetNtop(int af, const void* src, char* dst, u32
LOG_ERROR(Lib_Net, "returned ORBIS_NET_ENOSPC"); LOG_ERROR(Lib_Net, "returned ORBIS_NET_ENOSPC");
return nullptr; return nullptr;
} }
LOG_DEBUG(Lib_Net, "called, af = {}"); LOG_DEBUG(Lib_Net, "called, af = {}", af);
const char* returnvalue = nullptr; const char* returnvalue = nullptr;
switch (af) { switch (af) {
@ -1267,7 +1271,7 @@ int PS4_SYSV_ABI sceNetInetPton(int af, const char* src, void* dst) {
int res = inet_pton(ConvertFamilies(af), src, dst); int res = inet_pton(ConvertFamilies(af), src, dst);
#endif #endif
if (res < 0) { if (res < 0) {
UNREACHABLE_MSG("af = {}, src = {}, dst = {:#x}", af, src, reinterpret_cast<u64>(dst)); UNREACHABLE_MSG("af = {}, src = {}, dst = {:#x}", af, src, fmt::ptr(dst));
} }
return res; return res;
} }
@ -1586,7 +1590,10 @@ int PS4_SYSV_ABI sceNetResolverStartNtoa(OrbisNetId resolverid, const char* host
if ((flags & ORBIS_NET_RESOLVER_ASYNC) != 0) { if ((flags & ORBIS_NET_RESOLVER_ASYNC) != 0) {
// moves processing to EpollWait // moves processing to EpollWait
UNREACHABLE_MSG("unimplemented"); LOG_ERROR(Lib_Net, "async resolution is not implemented");
*sceNetErrnoLoc() = ORBIS_NET_RESOLVER_EINTERNAL;
auto ret = -ORBIS_NET_RESOLVER_EINTERNAL | ORBIS_NET_ERROR_BASE;
return ret;
} }
const addrinfo hints = { const addrinfo hints = {

3
src/core/libraries/network/sys_net.cpp
View File

@ -33,8 +33,7 @@ int PS4_SYSV_ABI sys_connect(OrbisNetId s, const OrbisNetSockaddr* addr, u32 add
return -1; return -1;
} }
int PS4_SYSV_ABI sys_bind(OrbisNetId s, const OrbisNetSockaddr* addr, u32 addrlen) { int PS4_SYSV_ABI sys_bind(OrbisNetId s, const OrbisNetSockaddr* addr, u32 addrlen) {
LOG_DEBUG(Lib_Net, "s = {}, addr = {:#x}, addrlen = {}", s, reinterpret_cast<u64>(addr), LOG_DEBUG(Lib_Net, "s = {}, addr = {:#x}, addrlen = {}", s, fmt::ptr(addr), addrlen);
addrlen);
auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance(); auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance();
auto* file = h->GetFile(s); auto* file = h->GetFile(s);