Leahnaya/splatoon
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/splatoon.git synced 2026-09-08 03:15:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(secure): final fixups

Browse Source
This commit is contained in:
Andrea Toska
2024-09-30 17:22:54 +02:00
parent e1d5697479
commit 89a19985c6
1 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
nex/register_common_secure_server_protocols.go
View File

@@ -11,7 +11,6 @@ import (
"github.com/PretendoNetwork/splatoon/globals"
"strconv"
"strings"
"fmt"
commonmatchmaking "github.com/PretendoNetwork/nex-protocols-common-go/v2/match-making"
commonmatchmakingext "github.com/PretendoNetwork/nex-protocols-common-go/v2/match-making-ext"
@@ -39,11 +38,6 @@ func stubGetPlayingSession(err error, packet nex.PacketInterface, callID uint32,
lstPlayingSession := types.NewList[*match_making_types.PlayingSession]()
// * There are no sessions, I tell you!
//for _, playingSession := range playingSessions {
// lstPlayingSession.Append(playingSession)
//}
rmcResponseStream := nex.NewByteStreamOut(endpoint.LibraryVersions(), endpoint.ByteStreamSettings())
lstPlayingSession.WriteTo(rmcResponseStream)
@@ -93,30 +87,6 @@ func cleanupMatchmakeSessionSearchCriteriasHandler(searchCriterias *types.List[*
}
}
func gameSpecificMatchmakeSessionSearchCriteriaChecksHandler(searchCriteria *match_making_types.MatchmakeSessionSearchCriteria, matchmakeSession *match_making_types.MatchmakeSession) bool {
original := matchmakeSession.Attributes.Slice()
search := searchCriteria.Attribs.Slice()
if len(original) != len(search) {
return false
}
for index, originalAttribute := range original {
// ignore dummy criterias for matchmaking
// everyone ends up in different rooms if you don't skip these
if index == 1 || index == 4 {
continue
}
searchAttribute := search[index]
if !compareSearchCriteria(originalAttribute.Value, searchAttribute.Value) {
return false
}
}
return true
}
func onAfterAutoMatchmakeWithParamPostpone(_ nex.PacketInterface, _ *match_making_types.AutoMatchmakeParam) {
// * This is ugly but I can't work out a better way to do this
// * Set Splatfest rooms to open participation
@@ -140,13 +110,11 @@ func registerCommonSecureServerProtocols() {
matchMakingProtocol := matchmaking.NewProtocol()
globals.SecureEndpoint.RegisterServiceProtocol(matchMakingProtocol)
//commonmatchmaking.NewCommonProtocol(matchMakingProtocol)
commonMatchMakingProtocol := commonmatchmaking.NewCommonProtocol(matchMakingProtocol)
commonMatchMakingProtocol.SetManager(globals.MatchmakingManager)
matchMakingExtProtocol := matchmakingext.NewProtocol()
globals.SecureEndpoint.RegisterServiceProtocol(matchMakingExtProtocol)
// commonmatchmakingext.NewCommonProtocol(matchMakingExtProtocol)
commonMatchMakingExtProtocol := commonmatchmakingext.NewCommonProtocol(matchMakingExtProtocol)
commonMatchMakingExtProtocol.SetManager(globals.MatchmakingManager)
@@ -155,7 +123,6 @@ func registerCommonSecureServerProtocols() {
commonMatchmakeExtensionProtocol := commonmatchmakeextension.NewCommonProtocol(matchmakeExtensionProtocol)
matchmakeExtensionProtocol.SetHandlerGetPlayingSession(stubGetPlayingSession)
commonMatchmakeExtensionProtocol.CleanupMatchmakeSessionSearchCriterias = cleanupMatchmakeSessionSearchCriteriasHandler
fmt.Printf("Test")
commonMatchmakeExtensionProtocol.OnAfterAutoMatchmakeWithParamPostpone = onAfterAutoMatchmakeWithParamPostpone
commonMatchmakeExtensionProtocol.SetManager(globals.MatchmakingManager)