Handle multiple station URLs on Register and more

globals/matchmaking_globals.go

@@ -12,3 +12,4 @@ type CommonMatchmakeSession struct {
 }
 
 var Sessions map[uint32]*CommonMatchmakeSession
+var CurrentGatheringID uint32

globals/matchmaking_utils.go

@@ -14,17 +14,12 @@ import (
 // GetAvailableGatheringID returns a gathering ID which doesn't belong to any session
 // Returns 0 if no IDs are available (math.MaxUint32 has been reached)
 func GetAvailableGatheringID() uint32 {
-	var gatheringID uint32 = 1
-	for gatheringID < math.MaxUint32 {
-		// * If the session does not exist, the gathering ID is free
-		if _, ok := Sessions[gatheringID]; !ok {
-			return gatheringID
-		}
-
-		gatheringID++
+	if CurrentGatheringID == math.MaxUint32 {
+		return 0
 	}
 
-	return 0
+	CurrentGatheringID++
+	return CurrentGatheringID
 }
 
 // FindOtherConnectionID searches a connection ID on the session that isn't the given one

matchmake-extension/auto_matchmake_postpone.go

@@ -10,16 +10,17 @@ import (
 )
 
 func autoMatchmake_Postpone(err error, client *nex.Client, callID uint32, anyGathering *nex.DataHolder, message string) uint32 {
+	if commonMatchmakeExtensionProtocol.cleanupSearchMatchmakeSessionHandler == nil {
+		logger.Warning("MatchmakeExtension::AutoMatchmake_Postpone missing CleanupSearchMatchmakeSessionHandler!")
+		return nex.Errors.Core.NotImplemented
+	}
+
 	if err != nil {
 		logger.Error(err.Error())
 		return nex.Errors.Core.InvalidArgument
 	}
 
 	server := commonMatchmakeExtensionProtocol.server
-	if commonMatchmakeExtensionProtocol.cleanupSearchMatchmakeSessionHandler == nil {
-		logger.Warning("MatchmakeExtension::AutoMatchmake_Postpone missing CleanupSearchMatchmakeSessionHandler!")
-		return nex.Errors.Core.Exception
-	}
 
 	// A client may disconnect from a session without leaving reliably,
 	// so let's make sure the client is removed from the session

matchmake-extension/auto_matchmake_with_search_criteria_postpone.go

@@ -11,7 +11,7 @@ import (
 
 func autoMatchmakeWithSearchCriteria_Postpone(err error, client *nex.Client, callID uint32, lstSearchCriteria []*match_making_types.MatchmakeSessionSearchCriteria, anyGathering *nex.DataHolder, message string) uint32 {
 	if commonMatchmakeExtensionProtocol.cleanupMatchmakeSessionSearchCriteriaHandler == nil {
-		logger.Warning("MatchmakeExtension::AutoMatchmake_Postpone missing CleanupMatchmakeSessionSearchCriteriaHandler!")
+		logger.Warning("MatchmakeExtension::AutoMatchmakeWithSearchCriteria_Postpone missing CleanupMatchmakeSessionSearchCriteriaHandler!")
 		return nex.Errors.Core.NotImplemented
 	}
 

matchmake-extension/close_participation.go

@@ -0,0 +1,55 @@
+package matchmake_extension
+
+import (
+	nex "github.com/PretendoNetwork/nex-go"
+	common_globals "github.com/PretendoNetwork/nex-protocols-common-go/globals"
+	matchmake_extension "github.com/PretendoNetwork/nex-protocols-go/matchmake-extension"
+)
+
+func closeParticipation(err error, client *nex.Client, callID uint32, gid uint32) uint32 {
+	if err != nil {
+		logger.Error(err.Error())
+		return nex.Errors.Core.InvalidArgument
+	}
+
+	var session *common_globals.CommonMatchmakeSession
+	var ok bool
+	if session, ok = common_globals.Sessions[gid]; !ok {
+		return nex.Errors.RendezVous.SessionVoid
+	}
+
+	if session.GameMatchmakeSession.Gathering.OwnerPID != client.PID() {
+		return nex.Errors.RendezVous.PermissionDenied
+	}
+
+	session.GameMatchmakeSession.OpenParticipation = false
+
+	server := commonMatchmakeExtensionProtocol.server
+
+	rmcResponse := nex.NewRMCResponse(matchmake_extension.ProtocolID, callID)
+	rmcResponse.SetSuccess(matchmake_extension.MethodCloseParticipation, nil)
+
+	rmcResponseBytes := rmcResponse.Bytes()
+
+	var responsePacket nex.PacketInterface
+
+	if server.PRUDPVersion() == 0 {
+		responsePacket, _ = nex.NewPacketV0(client, nil)
+		responsePacket.SetVersion(0)
+	} else {
+		responsePacket, _ = nex.NewPacketV1(client, nil)
+		responsePacket.SetVersion(1)
+	}
+
+	responsePacket.SetSource(0xA1)
+	responsePacket.SetDestination(0xAF)
+	responsePacket.SetType(nex.DataPacket)
+	responsePacket.SetPayload(rmcResponseBytes)
+
+	responsePacket.AddFlag(nex.FlagNeedsAck)
+	responsePacket.AddFlag(nex.FlagReliable)
+
+	server.Send(responsePacket)
+
+	return 0
+}

matchmake-extension/modify_current_game_attribute.go

@@ -19,6 +19,10 @@ func modifyCurrentGameAttribute(err error, client *nex.Client, callID uint32, gi
 		return nex.Errors.RendezVous.SessionVoid
 	}
 
+	if session.GameMatchmakeSession.Gathering.OwnerPID != client.PID() {
+		return nex.Errors.RendezVous.PermissionDenied
+	}
+
 	if int(attribIndex) > len(session.GameMatchmakeSession.Attributes) {
 		return nex.Errors.Core.InvalidIndex
 	}

matchmake-extension/protocol.go

@@ -42,6 +42,7 @@ func initDefault(c *CommonMatchmakeExtensionProtocol) {
 	// TODO - Organize by method ID
 	c.DefaultProtocol = matchmake_extension.NewProtocol(c.server)
 	c.DefaultProtocol.OpenParticipation(openParticipation)
+	c.DefaultProtocol.CloseParticipation(closeParticipation)
 	c.DefaultProtocol.CreateMatchmakeSession(createMatchmakeSession)
 	c.DefaultProtocol.GetSimplePlayingSession(getSimplePlayingSession)
 	c.DefaultProtocol.AutoMatchmakePostpone(autoMatchmake_Postpone)
@@ -58,6 +59,7 @@ func initMarioKart8(c *CommonMatchmakeExtensionProtocol) {
 	// TODO - Organize by method ID
 	c.MarioKart8Protocol = matchmake_extension_mario_kart_8.NewProtocol(c.server)
 	c.MarioKart8Protocol.OpenParticipation(openParticipation)
+	c.MarioKart8Protocol.CloseParticipation(closeParticipation)
 	c.MarioKart8Protocol.CreateMatchmakeSession(createMatchmakeSession)
 	c.MarioKart8Protocol.GetSimplePlayingSession(getSimplePlayingSession)
 	c.MarioKart8Protocol.AutoMatchmakePostpone(autoMatchmake_Postpone)

secure-connection/register.go

@@ -17,15 +17,27 @@ func register(err error, client *nex.Client, callID uint32, stationUrls []*nex.S
 	client.SetConnectionID(nextConnectionID)
 
 	localStation := stationUrls[0]
-	publicStation := localStation.Copy()
 
-	publicStation.SetAddress(client.Address().IP.String())
-	publicStation.SetPort(uint32(client.Address().Port))
-	publicStation.SetNatf(0)
-	publicStation.SetNatm(0)
-	publicStation.SetType(3)
+	// * A NEX client can set the public station URL by setting two URLs on the array
+	var publicStation *nex.StationURL
+	if len(stationUrls) > 1 {
+		publicStation = stationUrls[1]
+	} else {
+		publicStation = localStation.Copy()
+
+		publicStation.SetAddress(client.Address().IP.String())
+		publicStation.SetPort(uint32(client.Address().Port))
+		publicStation.SetNatf(0)
+		publicStation.SetNatm(0)
+		publicStation.SetType(3)
+	}
+
+	localStation.SetPID(client.PID())
 	publicStation.SetPID(client.PID())
 
+	localStation.SetRVCID(client.ConnectionID())
+	publicStation.SetRVCID(client.ConnectionID())
+
 	localStation.SetLocal()
 	publicStation.SetPublic()