mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-27 04:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

inet_ntop and inet_pton (#3317)

Browse Source
This commit is contained in:
Marcin Mikołajczyk 2025-07-25 08:53:41 +02:00 committed by GitHub
parent 4c22137255
commit 61ce393673
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,17 @@ static thread_local int32_t net_errno = 0;
static bool g_isNetInitialized = true; // TODO init it properly static bool g_isNetInitialized = true; // TODO init it properly
static int ConvertFamilies(int family) {
switch (family) {
case ORBIS_NET_AF_INET:
return AF_INET;
case ORBIS_NET_AF_INET6:
return AF_INET6;
default:
UNREACHABLE_MSG("unsupported socket family {}", family);
}
}
int PS4_SYSV_ABI in6addr_any() { int PS4_SYSV_ABI in6addr_any() {
LOG_ERROR(Lib_Net, "(STUBBED) called"); LOG_ERROR(Lib_Net, "(STUBBED) called");
return ORBIS_OK; return ORBIS_OK;
@ -971,7 +982,7 @@ u64 strlcpy(char* dst, const char* src, u64 size) {
#endif #endif
const char* freebsd_inet_ntop4(const char* src, char* dst, u64 size) { const char* freebsd_inet_ntop4(const unsigned char* src, char* dst, u64 size) {
static const char fmt[] = "%u.%u.%u.%u"; static const char fmt[] = "%u.%u.%u.%u";
char tmp[sizeof "255.255.255.255"]; char tmp[sizeof "255.255.255.255"];
int l; int l;
@ -984,7 +995,7 @@ const char* freebsd_inet_ntop4(const char* src, char* dst, u64 size) {
return (dst); return (dst);
} }
const char* freebsd_inet_ntop6(const char* src, char* dst, u64 size) { const char* freebsd_inet_ntop6(const unsigned char* src, char* dst, u64 size) {
/* /*
* Note that int32_t and int16_t need only be "at least" large enough * Note that int32_t and int16_t need only be "at least" large enough
* to contain a value of the specified size. On some systems, like * to contain a value of the specified size. On some systems, like
@ -1082,10 +1093,10 @@ const char* PS4_SYSV_ABI sceNetInetNtop(int af, const void* src, char* dst, u32
const char* returnvalue = nullptr; const char* returnvalue = nullptr;
switch (af) { switch (af) {
case ORBIS_NET_AF_INET: case ORBIS_NET_AF_INET:
returnvalue = freebsd_inet_ntop4((const char*)src, dst, size); returnvalue = freebsd_inet_ntop4((const unsigned char*)src, dst, size);
break; break;
case ORBIS_NET_AF_INET6: case ORBIS_NET_AF_INET6:
returnvalue = freebsd_inet_ntop6((const char*)src, dst, size); returnvalue = freebsd_inet_ntop6((const unsigned char*)src, dst, size);
break; break;
default: default:
*sceNetErrnoLoc() = ORBIS_NET_EAFNOSUPPORT; *sceNetErrnoLoc() = ORBIS_NET_EAFNOSUPPORT;
@ -1106,19 +1117,19 @@ int PS4_SYSV_ABI sceNetInetNtopWithScopeId() {
int PS4_SYSV_ABI sceNetInetPton(int af, const char* src, void* dst) { int PS4_SYSV_ABI sceNetInetPton(int af, const char* src, void* dst) {
#ifdef WIN32 #ifdef WIN32
int res = InetPtonA(af, src, dst); int res = InetPtonA(ConvertFamilies(af), src, dst);
#else #else
int res = inet_pton(af, src, dst); int res = inet_pton(ConvertFamilies(af), src, dst);
#endif #endif
if (res < 0) { if (res < 0) {
UNREACHABLE(); UNREACHABLE_MSG("af = {}, src = {}, dst = {}", af, src, fmt::ptr(dst));
} }
return res; return res;
} }
int PS4_SYSV_ABI sceNetInetPtonEx() { int PS4_SYSV_ABI sceNetInetPtonEx(int af, const char* src, void* dst, int flags) {
LOG_ERROR(Lib_Net, "(STUBBED) called"); LOG_WARNING(Lib_Net, "ignored flags, redirecting to sceNetInetPton");
return ORBIS_OK; return sceNetInetPton(af, src, dst);
} }
int PS4_SYSV_ABI sceNetInetPtonWithScopeId() { int PS4_SYSV_ABI sceNetInetPtonWithScopeId() {

2
src/core/libraries/network/net.h
View File

@ -284,7 +284,7 @@ u16 PS4_SYSV_ABI sceNetHtons(u16 host16);
const char* PS4_SYSV_ABI sceNetInetNtop(int af, const void* src, char* dst, u32 size); const char* PS4_SYSV_ABI sceNetInetNtop(int af, const void* src, char* dst, u32 size);
int PS4_SYSV_ABI sceNetInetNtopWithScopeId(); int PS4_SYSV_ABI sceNetInetNtopWithScopeId();
int PS4_SYSV_ABI sceNetInetPton(int af, const char* src, void* dst); int PS4_SYSV_ABI sceNetInetPton(int af, const char* src, void* dst);
int PS4_SYSV_ABI sceNetInetPtonEx(); int PS4_SYSV_ABI sceNetInetPtonEx(int af, const char* src, void* dst, int flags);
int PS4_SYSV_ABI sceNetInetPtonWithScopeId(); int PS4_SYSV_ABI sceNetInetPtonWithScopeId();
int PS4_SYSV_ABI sceNetInfoDumpStart(); int PS4_SYSV_ABI sceNetInfoDumpStart();
int PS4_SYSV_ABI sceNetInfoDumpStop(); int PS4_SYSV_ABI sceNetInfoDumpStop();