Leahnaya/friends
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/friends.git synced 2026-04-26 07:46:54 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: use Copy() on presence data to get around race condition

Browse Source
This commit is contained in:
Jonathan Barrow 2024-05-16 07:43:26 -04:00
parent c1e06be4d5
commit 7bc3dbf4f1
No known key found for this signature in database
GPG Key ID: E86E9FE9049C741F
8 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/wiiu/accept_friend_request_and_return_friend_info.go
View File

@ -68,7 +68,7 @@ func AcceptFriendRequestAndReturnFriendInfo(friendRequestID uint64) (*friends_wi
if ok && connectedUser != nil { if ok && connectedUser != nil {
// * Online // * Online
friendInfo.Presence = connectedUser.PresenceV2 friendInfo.Presence = connectedUser.PresenceV2.Copy().(*friends_wiiu_types.NintendoPresenceV2)
} else { } else {
// * Offline // * Offline
var lastOnlineTime uint64 var lastOnlineTime uint64

2
database/wiiu/get_user_friend_list.go
View File

@ -44,7 +44,7 @@ func GetUserFriendList(pid uint32) (*types.List[*friends_wiiu_types.FriendInfo],
if ok && connectedUser != nil { if ok && connectedUser != nil {
// * Online // * Online
friendInfo.Presence = connectedUser.PresenceV2 friendInfo.Presence = connectedUser.PresenceV2.Copy().(*friends_wiiu_types.NintendoPresenceV2)
} else { } else {
// * Offline // * Offline
var lastOnlineTime uint64 var lastOnlineTime uint64

2
nex/friends-3ds/get_friend_presence.go
View File

@ -23,7 +23,7 @@ func GetFriendPresence(err error, packet nex.PacketInterface, callID uint32, pid
if ok && connectedUser != nil && connectedUser.Presence != nil { if ok && connectedUser != nil && connectedUser.Presence != nil {
friendPresence := friends_3ds_types.NewFriendPresence() friendPresence := friends_3ds_types.NewFriendPresence()
friendPresence.PID = pid.Copy().(*types.PID) friendPresence.PID = pid.Copy().(*types.PID)
friendPresence.Presence = connectedUser.Presence friendPresence.Presence = connectedUser.Presence.Copy().(*friends_3ds_types.NintendoPresence)
presenceList.Append(friendPresence) presenceList.Append(friendPresence)
} }

2
nex/friends-3ds/update_presence.go
View File

@ -18,7 +18,7 @@ func UpdatePresence(err error, packet nex.PacketInterface, callID uint32, presen
connection := packet.Sender().(*nex.PRUDPConnection) connection := packet.Sender().(*nex.PRUDPConnection)
currentPresence := presence currentPresence := presence.Copy().(*friends_3ds_types.NintendoPresence)
// Send an entirely empty status, with every flag set to update // Send an entirely empty status, with every flag set to update
if !showGame.Value { if !showGame.Value {

2
nex/friends-wiiu/accept_friend_request.go
View File

@ -47,7 +47,7 @@ func AcceptFriendRequest(err error, packet nex.PacketInterface, callID uint32, i
return nil, nex.NewError(nex.ResultCodes.FPD.Unknown, "") // TODO - Add error message return nil, nex.NewError(nex.ResultCodes.FPD.Unknown, "") // TODO - Add error message
} }
senderFriendInfo.Presence = senderConnectedUser.PresenceV2 senderFriendInfo.Presence = senderConnectedUser.PresenceV2.Copy().(*friends_wiiu_types.NintendoPresenceV2)
status, err := database_wiiu.GetUserComment(senderPID) status, err := database_wiiu.GetUserComment(senderPID)
if err != nil { if err != nil {

2
nex/friends-wiiu/update_and_get_all_information.go
View File

@ -36,7 +36,7 @@ func UpdateAndGetAllInformation(err error, packet nex.PacketInterface, callID ui
globals.ConnectedUsers.Set(pid, connectedUser) globals.ConnectedUsers.Set(pid, connectedUser)
} }
connectedUser.PresenceV2 = presence connectedUser.PresenceV2 = presence.Copy().(*friends_wiiu_types.NintendoPresenceV2)
database_wiiu.UpdateNetworkAccountInfo(pid, nnaInfo, birthday) database_wiiu.UpdateNetworkAccountInfo(pid, nnaInfo, birthday)

2
nex/friends-wiiu/update_presence.go
View File

@ -36,7 +36,7 @@ func UpdatePresence(err error, packet nex.PacketInterface, callID uint32, presen
globals.ConnectedUsers.Set(pid, connectedUser) globals.ConnectedUsers.Set(pid, connectedUser)
} }
connectedUser.PresenceV2 = presence connectedUser.PresenceV2 = presence.Copy().(*friends_wiiu_types.NintendoPresenceV2)
notifications_wiiu.SendPresenceUpdate(presence) notifications_wiiu.SendPresenceUpdate(presence)

1
types/connected_user.go
View File

@ -10,7 +10,6 @@ type ConnectedUser struct {
PID uint32 PID uint32
Platform Platform Platform Platform
Connection *nex.PRUDPConnection Connection *nex.PRUDPConnection
NNAInfo *friends_wiiu_types.NNAInfo
Presence *friends_3ds_types.NintendoPresence Presence *friends_3ds_types.NintendoPresence
PresenceV2 *friends_wiiu_types.NintendoPresenceV2 PresenceV2 *friends_wiiu_types.NintendoPresenceV2
} }