Clans: Emulator and server implementation

rpcs3/Emu/CMakeLists.txt

@@ -441,6 +441,8 @@ target_sources(rpcs3_emu PRIVATE
     NP/np_requests.cpp
     NP/signaling_handler.cpp
     NP/np_structs_extra.cpp
+    NP/clans_client.cpp
+    NP/clans_config.cpp
     NP/rpcn_client.cpp
     NP/rpcn_config.cpp
     NP/rpcn_countries.cpp

rpcs3/Emu/Cell/Modules/sceNp.h

@@ -32,6 +32,7 @@ using SceNpBasicMessageRecvAction = u32;
 
 using SceNpClanId = u32;
 using SceNpClansMessageId = u32;
+using SceNpClansMemberRole = u32;
 using SceNpClansMemberStatus = s32;
 
 using SceNpCustomMenuIndexMask = u32;

rpcs3/Emu/Cell/Modules/sceNpClans.h

@@ -5,6 +5,8 @@
 // Return codes
 enum SceNpClansError : u32
 {
+	SCE_NP_CLANS_SUCCESS 								 	= CELL_OK,
+
 	SCE_NP_CLANS_ERROR_ALREADY_INITIALIZED                  = 0x80022701,
 	SCE_NP_CLANS_ERROR_NOT_INITIALIZED                      = 0x80022702,
 	SCE_NP_CLANS_ERROR_NOT_SUPPORTED                        = 0x80022703,
@@ -138,7 +140,7 @@ enum
 };
 
 // Request handle for clan API
-using SceNpClansRequestHandle = vm::ptr<struct SceNpClansRequest>;
+using SceNpClansRequestHandle = u32;
 
 // Paging request structure
 struct SceNpClansPagingRequest
@@ -159,8 +161,8 @@ struct SceNpClansClanBasicInfo
 {
 	be_t<u32> clanId;
 	be_t<u32> numMembers;
-	s8 name[SCE_NP_CLANS_CLAN_NAME_MAX_LENGTH + 1];
-	s8 tag[SCE_NP_CLANS_CLAN_TAG_MAX_LENGTH + 1];
+	char name[SCE_NP_CLANS_CLAN_NAME_MAX_LENGTH + 1];
+	char tag[SCE_NP_CLANS_CLAN_TAG_MAX_LENGTH + 1];
 	u8 reserved[2];
 };
 
@@ -197,23 +199,23 @@ struct SceNpClansSearchableProfile
 	be_t<s32> intAttr2SearchOp;
 	be_t<s32> intAttr3SearchOp;
 	be_t<s32> binAttr1SearchOp;
-	s8 tag[SCE_NP_CLANS_CLAN_TAG_MAX_LENGTH + 1];
+	char tag[SCE_NP_CLANS_CLAN_TAG_MAX_LENGTH + 1];
 	u8 reserved[3];
 };
 
 // Clan search name structure
 struct SceNpClansSearchableName
 {
 	be_t<s32> nameSearchOp;
-	s8 name[SCE_NP_CLANS_CLAN_NAME_MAX_LENGTH + 1];
+	char name[SCE_NP_CLANS_CLAN_NAME_MAX_LENGTH + 1];
 	u8 reserved[3];
 };
 
 // Updatable clan information structure
 struct SceNpClansUpdatableClanInfo
 {
 	be_t<u32> fields;
-	s8 description[SCE_NP_CLANS_CLAN_DESCRIPTION_MAX_LENGTH + 1];
+	char description[SCE_NP_CLANS_CLAN_DESCRIPTION_MAX_LENGTH + 1];
 	SceNpClansSearchableAttr attr;
 	u8 binData1;
 	be_t<u32> binData1Size;
@@ -233,8 +235,8 @@ struct SceNpClansUpdatableMemberInfo
 	be_t<u32> fields;
 	u8 binData1;
 	be_t<u32> binData1Size;
-	u8 binAttr1[SCE_NP_CLANS_CLAN_BINARY_ATTRIBUTE1_MAX_SIZE + 1];
-	s8 description[SCE_NP_CLANS_MEMBER_DESCRIPTION_MAX_LENGTH + 1];
+	u8 binAttr1[SCE_NP_CLANS_MEMBER_BINARY_ATTRIBUTE1_MAX_SIZE];
+	char description[SCE_NP_CLANS_MEMBER_DESCRIPTION_MAX_LENGTH + 1];
 	b8 allowMsg;
 	u8 reserved[3];
 };
@@ -271,7 +273,7 @@ struct SceNpClansMessageEntry
 	SceNpClansMessage message;
 	SceNpClansMessageData data;
 	SceNpId npid;
-	u8 reserved[4];
+	SceNpClanId postedBy;
 };
 
 // Blacklist entry structure
@@ -280,10 +282,3 @@ struct SceNpClansBlacklistEntry
 	SceNpId entry;
 	SceNpId registeredBy;
 };
-
-// fxm objects
-
-struct sce_np_clans_manager
-{
-	atomic_t<bool> is_initialized = false;
-};