archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 00:11:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

RPCN Client (#8663)

Browse source
This commit is contained in:
RipleyTom 2020-08-27 21:47:04 +02:00 • committed by GitHub
parent d000d648b0
commit 190822c2b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 8365 additions and 431 deletions
Download patch file Download diff file Expand all files Collapse all files

106
rpcs3/Emu/Cell/Modules/sceNp.cpp
View file

@ -15,7 +15,7 @@
LOG_CHANNEL(sceNp);
template<>
template <>
void fmt_class_string<SceNpError>::format(std::string& out, u64 arg)
{
format_enum(out, arg, [](auto error)
@ -639,6 +639,9 @@ error_code sceNpBasicRegisterHandler(vm::cptr<SceNpCommunicationId> context, vm:
return SCE_NP_BASIC_ERROR_INVALID_ARGUMENT;
}
nph->basic_handler = handler;
nph->basic_handler_arg = arg;
return CELL_OK;
}
@ -1140,6 +1143,13 @@ error_code sceNpBasicAddPlayersHistoryAsync(vm::cptr<SceNpId> npids, u32 count,
return SCE_NP_BASIC_ERROR_EXCEEDS_MAX;
}
auto req_id = nph->add_players_to_history(npids, count);
if (reqId)
{
*reqId = req_id;
}
return CELL_OK;
}
@ -1888,7 +1898,7 @@ error_code sceNpFriendlistAbortGui()
error_code sceNpLookupInit()
{
sceNp.todo("sceNpLookupInit()");
sceNp.warning("sceNpLookupInit()");
const auto nph = g_fxo->get<named_thread<np_handler>>();
@ -1930,7 +1940,7 @@ error_code sceNpLookupTerm()
error_code sceNpLookupCreateTitleCtx(vm::cptr<SceNpCommunicationId> communicationId, vm::cptr<SceNpId> selfNpId)
{
sceNp.todo("sceNpLookupCreateTitleCtx(communicationId=*0x%x, selfNpId=0x%x)", communicationId, selfNpId);
sceNp.warning("sceNpLookupCreateTitleCtx(communicationId=*0x%x, selfNpId=0x%x)", communicationId, selfNpId);
const auto nph = g_fxo->get<named_thread<np_handler>>();
@ -1944,12 +1954,12 @@ error_code sceNpLookupCreateTitleCtx(vm::cptr<SceNpCommunicationId> communicatio
return SCE_NP_COMMUNITY_ERROR_INSUFFICIENT_ARGUMENT;
}
return not_an_error(nph->create_lookup_context(communicationId));
return not_an_error(nph->create_lookup_title_context(communicationId));
}
error_code sceNpLookupDestroyTitleCtx(s32 titleCtxId)
{
sceNp.todo("sceNpLookupDestroyTitleCtx(titleCtxId=%d)", titleCtxId);
sceNp.warning("sceNpLookupDestroyTitleCtx(titleCtxId=%d)", titleCtxId);
const auto nph = g_fxo->get<named_thread<np_handler>>();
@ -1958,7 +1968,7 @@ error_code sceNpLookupDestroyTitleCtx(s32 titleCtxId)
return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
}
if (!nph->destroy_lookup_context(titleCtxId))
if (!nph->destroy_lookup_title_context(titleCtxId))
return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
return CELL_OK;
@ -1966,7 +1976,7 @@ error_code sceNpLookupDestroyTitleCtx(s32 titleCtxId)
error_code sceNpLookupCreateTransactionCtx(s32 titleCtxId)
{
sceNp.todo("sceNpLookupCreateTransactionCtx(titleCtxId=%d)", titleCtxId);
sceNp.warning("sceNpLookupCreateTransactionCtx(titleCtxId=%d)", titleCtxId);
const auto nph = g_fxo->get<named_thread<np_handler>>();
@ -1980,12 +1990,12 @@ error_code sceNpLookupCreateTransactionCtx(s32 titleCtxId)
return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
}
return CELL_OK;
return not_an_error(nph->create_lookup_transaction_context(titleCtxId));
}
error_code sceNpLookupDestroyTransactionCtx(s32 transId)
{
sceNp.todo("sceNpLookupDestroyTransactionCtx(transId=%d)", transId);
sceNp.warning("sceNpLookupDestroyTransactionCtx(transId=%d)", transId);
const auto nph = g_fxo->get<named_thread<np_handler>>();
@ -1994,6 +2004,11 @@ error_code sceNpLookupDestroyTransactionCtx(s32 transId)
return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
}
if (!nph->destroy_lookup_transaction_context(transId))
{
return SCE_NP_COMMUNITY_ERROR_INVALID_ID;
}
return CELL_OK;
}
@ -2008,7 +2023,7 @@ error_code sceNpLookupSetTimeout(s32 ctxId, usecond_t timeout)
return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
}
if (timeout > 10000000) // 10 seconds
if (timeout < 10000000) // 10 seconds
{
return SCE_NP_COMMUNITY_ERROR_INVALID_ARGUMENT;
}
@ -2046,7 +2061,7 @@ error_code sceNpLookupWaitAsync(s32 transId, vm::ptr<s32> result)
error_code sceNpLookupPollAsync(s32 transId, vm::ptr<s32> result)
{
sceNp.todo("sceNpLookupPollAsync(transId=%d, result=%d)", transId, result);
sceNp.todo("sceNpLookupPollAsync(transId=%d, result=*0x%x)", transId, result);
const auto nph = g_fxo->get<named_thread<np_handler>>();
@ -2055,6 +2070,8 @@ error_code sceNpLookupPollAsync(s32 transId, vm::ptr<s32> result)
return SCE_NP_COMMUNITY_ERROR_NOT_INITIALIZED;
}
*result = 0;
return CELL_OK;
}
@ -2394,6 +2411,8 @@ error_code sceNpLookupTitleSmallStorageAsync(s32 transId, vm::ptr<void> data, u6
return SCE_NP_COMMUNITY_ERROR_INVALID_ONLINE_ID;
}
std::memset(data.get_ptr(), 0, maxSize);
return CELL_OK;
}
@ -2413,6 +2432,9 @@ error_code sceNpManagerRegisterCallback(vm::ptr<SceNpManagerCallback> callback,
return SCE_NP_ERROR_INVALID_ARGUMENT;
}
nph->manager_cb = callback;
nph->manager_cb_arg = arg;
return CELL_OK;
}
@ -2427,6 +2449,8 @@ error_code sceNpManagerUnregisterCallback()
return SCE_NP_ERROR_NOT_INITIALIZED;
}
nph->manager_cb.set(0);
return CELL_OK;
}
@ -2438,7 +2462,7 @@ error_code sceNpManagerGetStatus(vm::ptr<s32> status)
if (!nph->is_NP_init)
{
return SCE_NP_ERROR_NOT_INITIALIZED;
//return SCE_NP_ERROR_NOT_INITIALIZED;
}
if (!status)
@ -2459,7 +2483,7 @@ error_code sceNpManagerGetNetworkTime(vm::ptr<CellRtcTick> pTick)
if (!nph->is_NP_init)
{
return SCE_NP_ERROR_NOT_INITIALIZED;
//return SCE_NP_ERROR_NOT_INITIALIZED;
}
if (!pTick)
@ -2486,13 +2510,13 @@ error_code sceNpManagerGetNetworkTime(vm::ptr<CellRtcTick> pTick)
error_code sceNpManagerGetOnlineId(vm::ptr<SceNpOnlineId> onlineId)
{
sceNp.todo("sceNpManagerGetOnlineId(onlineId=*0x%x)", onlineId);
sceNp.warning("sceNpManagerGetOnlineId(onlineId=*0x%x)", onlineId);
const auto nph = g_fxo->get<named_thread<np_handler>>();
if (!nph->is_NP_init)
{
return SCE_NP_ERROR_NOT_INITIALIZED;
//return SCE_NP_ERROR_NOT_INITIALIZED;
}
if (!onlineId)
@ -2517,14 +2541,14 @@ error_code sceNpManagerGetOnlineId(vm::ptr<SceNpOnlineId> onlineId)
error_code sceNpManagerGetNpId(ppu_thread& ppu, vm::ptr<SceNpId> npId)
{
sceNp.todo("sceNpManagerGetNpId(npId=*0x%x)", npId);
sceNp.warning("sceNpManagerGetNpId(npId=*0x%x)", npId);
const auto nph = g_fxo->get<named_thread<np_handler>>();
if (!nph->is_NP_init)
{
return SCE_NP_ERROR_NOT_INITIALIZED;
}
// if (!nph->is_NP_init)
// {
// return SCE_NP_ERROR_NOT_INITIALIZED;
// }
if (!npId)
{
@ -4320,6 +4344,8 @@ error_code sceNpSignalingCreateCtx(vm::ptr<SceNpId> npId, vm::ptr<SceNpSignaling
// return SCE_NP_SIGNALING_ERROR_CTX_MAX;
//}
*ctx_id = nph->create_signaling_context(npId, handler, arg);
return CELL_OK;
}
@ -4334,6 +4360,11 @@ error_code sceNpSignalingDestroyCtx(u32 ctx_id)
return SCE_NP_SIGNALING_ERROR_NOT_INITIALIZED;
}
if (!nph->destroy_signaling_context(ctx_id))
{
return SCE_NP_SIGNALING_ERROR_CTX_NOT_FOUND;
}
return CELL_OK;
}
@ -4529,6 +4560,15 @@ error_code sceNpSignalingGetLocalNetInfo(u32 ctx_id, vm::ptr<SceNpSignalingNetIn
return SCE_NP_SIGNALING_ERROR_INVALID_ARGUMENT;
}
info->local_addr = nph->get_local_ip_addr();
info->mapped_addr = nph->get_public_ip_addr();
// Pure speculation below
info->nat_status = 0;
info->upnp_status = 0;
info->npport_status = 0;
info->npport = 3658;
return CELL_OK;
}
@ -4607,24 +4647,24 @@ error_code sceNpUtilCmpNpId(vm::ptr<SceNpId> id1, vm::ptr<SceNpId> id2)
}
// Unknown what this constant means
if (id1->reserved[0] != 1 || id2->reserved[0] != 1)
{
return SCE_NP_UTIL_ERROR_INVALID_NP_ID;
}
// if (id1->reserved[0] != 1 || id2->reserved[0] != 1)
// {
// return SCE_NP_UTIL_ERROR_INVALID_NP_ID;
// }
if (strncmp(id1->handle.data, id2->handle.data, 16) || id1->unk1[0] != id2->unk1[0])
if (strncmp(id1->handle.data, id2->handle.data, 16))// || id1->unk1[0] != id2->unk1[0])
{
return SCE_NP_UTIL_ERROR_NOT_MATCH;
}
if (id1->unk1[1] != id2->unk1[1])
{
// If either is zero they match
if (id1->opt[4] && id2->opt[4])
{
return SCE_NP_UTIL_ERROR_NOT_MATCH;
}
}
// if (id1->unk1[1] != id2->unk1[1])
// {
// // If either is zero they match
// if (id1->opt[4] && id2->opt[4])
// {
// return SCE_NP_UTIL_ERROR_NOT_MATCH;
// }
// }
return CELL_OK;
}