Add cloning of reservation data

Fixes the bug where someone joining your lobby that you have on your friends list causing you to disconnect.

Author: ZacharyPL

common/match_command.go

@@ -724,3 +724,15 @@ func LogMatchCommand(moduleName string, dest string, command byte, data MatchCom
 		logging.Notice(moduleName, "Reason:", aurora.BrightRed(data.ResvDeny.ReasonString), "("+aurora.Cyan(reasonByte).String()+")")
 	}
 }
+
+func CloneReservationData(data MatchCommandData) MatchCommandData {
+	clone := MatchCommandData{
+		Version: data.Version,
+		Command: data.Command,
+	}
+
+	reservationCopy := *data.Reservation
+	clone.Reservation = &reservationCopy
+
+	return clone
+}

gpcm/message.go

@@ -230,6 +230,17 @@ func (g *GameSpySession) bestieMessage(command common.GameSpyCommand) {
 			msgMatchData.Reservation.LocalPort = 0
 		}
 	} else if cmd == common.MatchResvOK || cmd == common.MatchResvDeny || cmd == common.MatchResvWait {
+		if toSession.ReservationPID != g.User.ProfileId || toSession.Reservation.Reservation == nil || toSession.Reservation.Version != msgMatchData.Version {
+			if resvData, resvID, sessionKey, ok := qr2.GetReservationForProfile(toSession.User.ProfileId); ok {
+				if qr2.GetSearchID(g.QR2IP) == 0 || resvID == 0 || qr2.GetSearchID(g.QR2IP) == resvID {
+					toSession.Reservation, toSession.ReservationPID = resvData, g.User.ProfileId
+				}
+				if toSession.QR2IP == 0 && sessionKey != 0 {
+					toSession.QR2IP = sessionKey
+				}
+			}
+		}
+
 		if toSession.ReservationPID != g.User.ProfileId || toSession.Reservation.Reservation == nil {
 			logging.Error(g.ModuleName, "Destination", aurora.Cyan(toProfileId), "has no reservation with the sender")
 			// Allow the message through anyway to avoid a room deadlock

qr2/session.go

@@ -324,6 +324,18 @@ func GetSearchID(addr uint64) uint64 {
 	return 0
 }
 
+func GetReservationForProfile(profileID uint32) (common.MatchCommandData, uint64, uint64, bool) {
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	sessionKey := makeLookupAddr(logins[profileID].session.Addr.String())
+	if logins[profileID].session.Reservation.Reservation == nil {
+		return common.MatchCommandData{}, logins[profileID].session.ReservationID, sessionKey, false
+	}
+
+	return common.CloneReservationData(logins[profileID].session.Reservation), logins[profileID].session.ReservationID, sessionKey, true
+}
+
 // Save the sessions to a file. Expects the mutex to be locked.
 func saveSessions() error {
 	file, err := os.OpenFile("state/qr2_sessions.gob", os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)