Send multiple PIDs in QR2 kick order

Author: ppebb

gpcm/kick.go

@@ -1,12 +1,15 @@
 package gpcm
 
 import (
+	"strings"
 	"time"
 	"wwfc/common"
 	"wwfc/qr2"
 )
 
 func kickPlayer(profileID uint32, reason string) {
+	pids := []uint32{profileID}
+
 	if session, exists := sessions[profileID]; exists {
 		errorMessage := WWFCMsgKickedGeneric
 
@@ -35,19 +38,26 @@ func kickPlayer(profileID uint32, reason string) {
 			return
 		}
 
-		session.replyError(GPError{
+		gpError := GPError{
 			ErrorCode:   ErrConnectionClosed.ErrorCode,
 			ErrorString: "The player was kicked from the server. Reason: " + reason,
 			Fatal:       true,
 			WWFCMessage: errorMessage,
-		})
+		}
+
+		for _, match := range findMatchingSessions(session) {
+			pids = append(pids, match.User.ProfileId)
+			match.replyError(gpError)
+		}
+
+		session.replyError(gpError)
 	}
 
 	// After 3 seconds, send kick order to all players
 	// This is to prevent the restricted player from staying in the group if he ignores the GPCM kick
 	go func() {
 		time.AfterFunc(3*time.Second, func() {
-			qr2.OrderKickFromGroups(profileID)
+			qr2.OrderKickFromGroups(pids)
 		})
 	}()
 }
@@ -59,25 +69,74 @@ func KickPlayer(profileID uint32, reason string) {
 	kickPlayer(profileID, reason)
 }
 
+func findMatchingSessions(badSession *GameSpySession) []*GameSpySession {
+	ret := []*GameSpySession{}
+
+	badAddrSplit := strings.Split(badSession.RemoteAddr, ":")
+
+	var badAddr string
+	// If the bad address cannot be split for some reason just send a blank string
+	if len(badAddrSplit) > 0 {
+		badAddr = badAddrSplit[0]
+	} else {
+		badAddr = ""
+	}
+
+	for _, session := range sessions {
+		if badSession.DeviceId != 67349608 && badSession.DeviceId == session.DeviceId {
+			ret = append(ret, session)
+			continue
+		}
+
+		if badAddr == "" {
+			continue
+		}
+
+		// Addresses are in the form of IP:Port
+		addrSplit := strings.Split(session.RemoteAddr, ":")
+
+		if len(addrSplit) == 0 {
+			continue
+		}
+
+		addr := addrSplit[0]
+
+		if addr == badAddr {
+			ret = append(ret, session)
+		}
+	}
+
+	return ret
+}
+
 func KickPlayerCustomMessage(profileID uint32, reason string, message WWFCErrorMessage) {
 	mutex.Lock()
 	defer mutex.Unlock()
 
+	pids := []uint32{profileID}
+
 	if session, exists := sessions[profileID]; exists {
-		session.replyError(GPError{
+		gpError := GPError{
 			ErrorCode:   ErrConnectionClosed.ErrorCode,
 			ErrorString: "The player was kicked from the server. Reason: " + reason,
 			Fatal:       true,
 			WWFCMessage: message,
 			Reason:      reason,
-		})
+		}
+
+		for _, match := range findMatchingSessions(session) {
+			pids = append(pids, match.User.ProfileId)
+			match.replyError(gpError)
+		}
+
+		session.replyError(gpError)
 	}
 
 	// After 3 seconds, send kick order to all players
 	// This is to prevent the restricted player from staying in the group if he ignores the GPCM kick
 	go func() {
 		time.AfterFunc(3*time.Second, func() {
-			qr2.OrderKickFromGroups(profileID)
+			qr2.OrderKickFromGroups(pids)
 		})
 	}()
 }

qr2/group.go

@@ -585,17 +585,39 @@ func loadGroups() error {
 }
 
 // Send kick order to all QR2-authenticated session to kick a player from their group
-func OrderKickFromGroups(profileToKick uint32) {
-	moduleName := "QR2:OrderKickFromGroup/" + strconv.FormatUint(uint64(profileToKick), 10)
+func OrderKickFromGroups(profilesToKick []uint32) {
+	// QR2 messages are limited at 0x80 in length. With a 7-byte header and a
+	// byte for length, that leaves 120 bytes worth of pids, thus 30 4-byte
+	// integers. Surely more than 30 online pids won't match at once :)
+
+	var profilesClamped []uint32
+	if len(profilesToKick) > 30 {
+		profilesClamped = profilesToKick[0:30]
+	}
+
+	moduleName := "QR2:OrderKickFromGroup/"
+
+	clampedLen := len(profilesClamped)
+	for i, pid := range profilesClamped {
+		moduleName += strconv.FormatUint(uint64(pid), 10)
+
+		if i != clampedLen {
+			moduleName += ", "
+		}
+	}
 
 	mutex.Lock()
 	defer mutex.Unlock()
 
 	var numSent int = 0
 	for _, session := range sessions {
-		message := createResponseHeader(ClientKickPeerOrder, session.SessionID)
-		message = append(message, 0) // padding for 4 byte alignment
-		message = binary.BigEndian.AppendUint32(message, profileToKick)
+		message := createResponseHeader(ClientKickPeerOrder, session.SessionID) // 7 byte header
+		message = append(message, byte(len(profilesClamped)))                   // 1 byte len
+
+		for _, pid := range profilesClamped {
+			message = binary.BigEndian.AppendUint32(message, pid) // All 4 bytes, preserves alignment
+		}
+
 		_, err := masterConn.WriteTo(message, &session.Addr)
 		if err != nil {
 			logging.Error(moduleName, "Error sending message:", err.Error())