Trying to fix game info validation.

src/net/common/netpacketvalidator.cpp

@@ -1145,7 +1145,7 @@ NetPacketValidator::ValidateErrorMessage(const NetPacket &packet)
 bool
 NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo)
 {
-/*	bool retVal = false;
+	bool retVal = false;
 	if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64)
 		&& VALIDATE_INT_RANGE(gameInfo.maxnumplayers(), 2, 10)
 		&& (!gameInfo.has_raiseeveryhands() || VALIDATE_INT_RANGE(gameInfo.raiseeveryhands(), 1, 1000))
@@ -1161,7 +1161,6 @@ NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo)
 
 		retVal = true;
 	}
-	return retVal;*/
-	return true;
+	return retVal;
 }
 

tests/src/de/pokerth/test/TestBase.java

@@ -320,15 +320,8 @@ public abstract class TestBase {
 	public NetGameInfo createGameInfo(NetGameInfo.NetGameType gameType, int playerActionTimeout, int proposedGuiSpeed, int delayBetweenHands, NetGameInfo.EndRaiseMode endMode, int endRaiseValue, int sb,
 			String gameName, Collection<Integer> manualBlinds, int maxNumPlayers, int raiseEveryMinutes, int raiseEveryHands, int startMoney) {
 
-		NetGameInfo.RaiseIntervalMode raiseInterval;
-		if (raiseEveryMinutes > 0) {
-			raiseInterval = NetGameInfo.RaiseIntervalMode.raiseOnMinutes;
-		}
-		else {
-			raiseInterval = NetGameInfo.RaiseIntervalMode.raiseOnHandNum;
-		}
-
-		NetGameInfo gameInfo = NetGameInfo.newBuilder()
+		NetGameInfo.Builder infoBuilder = NetGameInfo.newBuilder();
+		infoBuilder
 			.setNetGameType(gameType)
 			.setPlayerActionTimeout(playerActionTimeout)
 			.setProposedGuiSpeed(proposedGuiSpeed)
@@ -339,13 +332,20 @@ public abstract class TestBase {
 			.setGameName(gameName)
 			.setMaxNumPlayers(maxNumPlayers)
 			.addAllManualBlinds(manualBlinds)
-			.setRaiseIntervalMode(raiseInterval)
-			.setRaiseEveryMinutes(raiseEveryMinutes)
-			.setRaiseEveryHands(raiseEveryHands)
-			.setStartMoney(startMoney)
-			.build();
+			.setStartMoney(startMoney);
 
-		return gameInfo;
+		if (raiseEveryMinutes > 0) {
+			infoBuilder
+				.setRaiseIntervalMode(NetGameInfo.RaiseIntervalMode.raiseOnMinutes)
+				.setRaiseEveryMinutes(raiseEveryMinutes);
+		}
+		else {
+			infoBuilder
+				.setRaiseIntervalMode(NetGameInfo.RaiseIntervalMode.raiseOnHandNum)
+				.setRaiseEveryHands(raiseEveryHands);
+		}
+
+		return infoBuilder.build();
 	}
 
 	void failOnErrorMessage(PokerTHMessage msg) {