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

RPCN v1.5.0

Browse source
This commit is contained in:
RipleyTom 2025-12-06 04:54:10 +01:00
parent 54206c62b3
commit 6a0cd76524
No known key found for this signature in database
GPG key ID: FC2B5DEF76BF4CC8
4 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3rdparty/flatbuffers vendored

@ -1 +1 @@
Subproject commit 595bf0007ab1929570c7671f091313c8fc20644e Subproject commit 187240970746d00bbd26b0f5873ed54d2477f9f3

2
rpcs3/Emu/NP/generated/np2_structs.fbs
View file

@ -206,7 +206,7 @@ table SetRoomDataInternalRequest {
flagAttr:uint32; flagAttr:uint32;
roomBinAttrInternal:[BinAttr]; roomBinAttrInternal:[BinAttr];
passwordConfig:[RoomGroupPasswordConfig]; passwordConfig:[RoomGroupPasswordConfig];
passwordSlotMask:uint64; passwordSlotMask:[uint64];
ownerPrivilegeRank:[uint16]; ownerPrivilegeRank:[uint16];
} }

26
rpcs3/Emu/NP/generated/np2_structs_generated.h
View file

@ -8,9 +8,9 @@
// Ensure the included flatbuffers.h is the same version as when this file was // Ensure the included flatbuffers.h is the same version as when this file was
// generated, otherwise it may not be compatible. // generated, otherwise it may not be compatible.
static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && static_assert(FLATBUFFERS_VERSION_MAJOR == 25 &&
FLATBUFFERS_VERSION_MINOR == 3 && FLATBUFFERS_VERSION_MINOR == 9 &&
FLATBUFFERS_VERSION_REVISION == 25, FLATBUFFERS_VERSION_REVISION == 23,
"Non-compatible flatbuffers version included"); "Non-compatible flatbuffers version included");
struct SignalingAddr; struct SignalingAddr;
@ -2762,8 +2762,8 @@ struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffer
const ::flatbuffers::Vector<::flatbuffers::Offset<RoomGroupPasswordConfig>> *passwordConfig() const { const ::flatbuffers::Vector<::flatbuffers::Offset<RoomGroupPasswordConfig>> *passwordConfig() const {
return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<RoomGroupPasswordConfig>> *>(VT_PASSWORDCONFIG); return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<RoomGroupPasswordConfig>> *>(VT_PASSWORDCONFIG);
} }
uint64_t passwordSlotMask() const { const ::flatbuffers::Vector<uint64_t> *passwordSlotMask() const {
return GetField<uint64_t>(VT_PASSWORDSLOTMASK, 0); return GetPointer<const ::flatbuffers::Vector<uint64_t> *>(VT_PASSWORDSLOTMASK);
} }
const ::flatbuffers::Vector<uint16_t> *ownerPrivilegeRank() const { const ::flatbuffers::Vector<uint16_t> *ownerPrivilegeRank() const {
return GetPointer<const ::flatbuffers::Vector<uint16_t> *>(VT_OWNERPRIVILEGERANK); return GetPointer<const ::flatbuffers::Vector<uint16_t> *>(VT_OWNERPRIVILEGERANK);
@ -2779,7 +2779,8 @@ struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private ::flatbuffer
VerifyOffset(verifier, VT_PASSWORDCONFIG) && VerifyOffset(verifier, VT_PASSWORDCONFIG) &&
verifier.VerifyVector(passwordConfig()) && verifier.VerifyVector(passwordConfig()) &&
verifier.VerifyVectorOfTables(passwordConfig()) && verifier.VerifyVectorOfTables(passwordConfig()) &&
VerifyField<uint64_t>(verifier, VT_PASSWORDSLOTMASK, 8) && VerifyOffset(verifier, VT_PASSWORDSLOTMASK) &&
verifier.VerifyVector(passwordSlotMask()) &&
VerifyOffset(verifier, VT_OWNERPRIVILEGERANK) && VerifyOffset(verifier, VT_OWNERPRIVILEGERANK) &&
verifier.VerifyVector(ownerPrivilegeRank()) && verifier.VerifyVector(ownerPrivilegeRank()) &&
verifier.EndTable(); verifier.EndTable();
@ -2805,8 +2806,8 @@ struct SetRoomDataInternalRequestBuilder {
void add_passwordConfig(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomGroupPasswordConfig>>> passwordConfig) { void add_passwordConfig(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomGroupPasswordConfig>>> passwordConfig) {
fbb_.AddOffset(SetRoomDataInternalRequest::VT_PASSWORDCONFIG, passwordConfig); fbb_.AddOffset(SetRoomDataInternalRequest::VT_PASSWORDCONFIG, passwordConfig);
} }
void add_passwordSlotMask(uint64_t passwordSlotMask) { void add_passwordSlotMask(::flatbuffers::Offset<::flatbuffers::Vector<uint64_t>> passwordSlotMask) {
fbb_.AddElement<uint64_t>(SetRoomDataInternalRequest::VT_PASSWORDSLOTMASK, passwordSlotMask, 0); fbb_.AddOffset(SetRoomDataInternalRequest::VT_PASSWORDSLOTMASK, passwordSlotMask);
} }
void add_ownerPrivilegeRank(::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> ownerPrivilegeRank) { void add_ownerPrivilegeRank(::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> ownerPrivilegeRank) {
fbb_.AddOffset(SetRoomDataInternalRequest::VT_OWNERPRIVILEGERANK, ownerPrivilegeRank); fbb_.AddOffset(SetRoomDataInternalRequest::VT_OWNERPRIVILEGERANK, ownerPrivilegeRank);
@ -2829,12 +2830,12 @@ inline ::flatbuffers::Offset<SetRoomDataInternalRequest> CreateSetRoomDataIntern
uint32_t flagAttr = 0, uint32_t flagAttr = 0,
::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomBinAttrInternal = 0, ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<BinAttr>>> roomBinAttrInternal = 0,
::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomGroupPasswordConfig>>> passwordConfig = 0, ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<RoomGroupPasswordConfig>>> passwordConfig = 0,
uint64_t passwordSlotMask = 0, ::flatbuffers::Offset<::flatbuffers::Vector<uint64_t>> passwordSlotMask = 0,
::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> ownerPrivilegeRank = 0) { ::flatbuffers::Offset<::flatbuffers::Vector<uint16_t>> ownerPrivilegeRank = 0) {
SetRoomDataInternalRequestBuilder builder_(_fbb); SetRoomDataInternalRequestBuilder builder_(_fbb);
builder_.add_passwordSlotMask(passwordSlotMask);
builder_.add_roomId(roomId); builder_.add_roomId(roomId);
builder_.add_ownerPrivilegeRank(ownerPrivilegeRank); builder_.add_ownerPrivilegeRank(ownerPrivilegeRank);
builder_.add_passwordSlotMask(passwordSlotMask);
builder_.add_passwordConfig(passwordConfig); builder_.add_passwordConfig(passwordConfig);
builder_.add_roomBinAttrInternal(roomBinAttrInternal); builder_.add_roomBinAttrInternal(roomBinAttrInternal);
builder_.add_flagAttr(flagAttr); builder_.add_flagAttr(flagAttr);
@ -2849,10 +2850,11 @@ inline ::flatbuffers::Offset<SetRoomDataInternalRequest> CreateSetRoomDataIntern
uint32_t flagAttr = 0, uint32_t flagAttr = 0,
const std::vector<::flatbuffers::Offset<BinAttr>> *roomBinAttrInternal = nullptr, const std::vector<::flatbuffers::Offset<BinAttr>> *roomBinAttrInternal = nullptr,
const std::vector<::flatbuffers::Offset<RoomGroupPasswordConfig>> *passwordConfig = nullptr, const std::vector<::flatbuffers::Offset<RoomGroupPasswordConfig>> *passwordConfig = nullptr,
uint64_t passwordSlotMask = 0, const std::vector<uint64_t> *passwordSlotMask = nullptr,
const std::vector<uint16_t> *ownerPrivilegeRank = nullptr) { const std::vector<uint16_t> *ownerPrivilegeRank = nullptr) {
auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomBinAttrInternal) : 0; auto roomBinAttrInternal__ = roomBinAttrInternal ? _fbb.CreateVector<::flatbuffers::Offset<BinAttr>>(*roomBinAttrInternal) : 0;
auto passwordConfig__ = passwordConfig ? _fbb.CreateVector<::flatbuffers::Offset<RoomGroupPasswordConfig>>(*passwordConfig) : 0; auto passwordConfig__ = passwordConfig ? _fbb.CreateVector<::flatbuffers::Offset<RoomGroupPasswordConfig>>(*passwordConfig) : 0;
auto passwordSlotMask__ = passwordSlotMask ? _fbb.CreateVector<uint64_t>(*passwordSlotMask) : 0;
auto ownerPrivilegeRank__ = ownerPrivilegeRank ? _fbb.CreateVector<uint16_t>(*ownerPrivilegeRank) : 0; auto ownerPrivilegeRank__ = ownerPrivilegeRank ? _fbb.CreateVector<uint16_t>(*ownerPrivilegeRank) : 0;
return CreateSetRoomDataInternalRequest( return CreateSetRoomDataInternalRequest(
_fbb, _fbb,
@ -2861,7 +2863,7 @@ inline ::flatbuffers::Offset<SetRoomDataInternalRequest> CreateSetRoomDataIntern
flagAttr, flagAttr,
roomBinAttrInternal__, roomBinAttrInternal__,
passwordConfig__, passwordConfig__,
passwordSlotMask, passwordSlotMask__,
ownerPrivilegeRank__); ownerPrivilegeRank__);
} }

10
rpcs3/Emu/NP/rpcn_client.cpp
View file

@ -255,7 +255,7 @@ namespace rpcn
rpcn_log.notice("online: %s, pr_com_id: %s, pr_title: %s, pr_status: %s, pr_comment: %s, pr_data: %s", online ? "true" : "false", pr_com_id.data, pr_title, pr_status, pr_comment, fmt::buf_to_hexstring(pr_data.data(), pr_data.size())); rpcn_log.notice("online: %s, pr_com_id: %s, pr_title: %s, pr_status: %s, pr_comment: %s, pr_data: %s", online ? "true" : "false", pr_com_id.data, pr_title, pr_status, pr_comment, fmt::buf_to_hexstring(pr_data.data(), pr_data.size()));
} }
constexpr u32 RPCN_PROTOCOL_VERSION = 26; constexpr u32 RPCN_PROTOCOL_VERSION = 27;
constexpr usz RPCN_HEADER_SIZE = 15; constexpr usz RPCN_HEADER_SIZE = 15;
const char* error_to_explanation(rpcn::ErrorType error) const char* error_to_explanation(rpcn::ErrorType error)
@ -2019,9 +2019,13 @@ namespace rpcn
} }
final_grouppasswordconfig_vec = builder.CreateVector(davec); final_grouppasswordconfig_vec = builder.CreateVector(davec);
} }
u64 final_passwordSlotMask = 0;
flatbuffers::Offset<flatbuffers::Vector<u64>> final_passwordSlotMask;
if (req->passwordSlotMask) if (req->passwordSlotMask)
final_passwordSlotMask = *req->passwordSlotMask; {
const u64 value = *req->passwordSlotMask;
final_passwordSlotMask = builder.CreateVector(&value, 1);
}
flatbuffers::Offset<flatbuffers::Vector<u16>> final_ownerprivilege_vec; flatbuffers::Offset<flatbuffers::Vector<u16>> final_ownerprivilege_vec;
if (req->ownerPrivilegeRankNum && req->ownerPrivilegeRank) if (req->ownerPrivilegeRankNum && req->ownerPrivilegeRank)