openttd-ottdgrfs: comparison src/network/network

equal deleted inserted replaced

-:70d78ac95d6c
+:7bd07f43b0e3
 	// Function: Indication to the client that the server needs a password
 	// Data:
 	//    uint8:  Type of password
 	//
+	/* Invalid packet when status is AUTH or higher */
+	if (cs->status >= STATUS_AUTH) return;
+	cs->status = STATUS_AUTHORIZING;
 	Packet *p = NetworkSend_Init(PACKET_SERVER_NEED_PASSWORD);
 	p->Send_uint8(type);
 	cs->Send_Packet(p);
 }
 	const NetworkClientInfo *ci;
 	type = (NetworkPasswordType)p->Recv_uint8();
 	p->Recv_string(password, sizeof(password));
-	if (cs->status == STATUS_INACTIVE && type == NETWORK_GAME_PASSWORD) {
+	if (cs->status == STATUS_AUTHORIZING && type == NETWORK_GAME_PASSWORD) {
 		// Check game-password
 		if (strcmp(password, _network_game_info.server_password) != 0) {
 			// Password is invalid
 			SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_WRONG_PASSWORD);
 			return;
 		}
 		// Valid password, allow user
 		SEND_COMMAND(PACKET_SERVER_WELCOME)(cs);
 		return;
-	} else if (cs->status == STATUS_INACTIVE && type == NETWORK_COMPANY_PASSWORD) {
+	} else if (cs->status == STATUS_AUTHORIZING && type == NETWORK_COMPANY_PASSWORD) {
 		ci = DEREF_CLIENT_INFO(cs);
 		if (strcmp(password, _network_player_info[ci->client_playas].password) != 0) {
 			// Password is invalid
 			SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_WRONG_PASSWORD);
 // If this fails, check the array above with network_data.h
 assert_compile(lengthof(_network_server_packet) == PACKET_END);
 // This update the company_info-stuff
-void NetworkPopulateCompanyInfo(void)
+void NetworkPopulateCompanyInfo()
 {
 	char password[NETWORK_PASSWORD_LENGTH];
 	const Player *p;
 	const Vehicle *v;
 	const Station *s;
 	// Go through all vehicles and count the type of vehicles
 	FOR_ALL_VEHICLES(v) {
 		if (!IsValidPlayer(v->owner)) continue;
 		switch (v->type) {
-			case VEH_Train:
+			case VEH_TRAIN:
 				if (IsFrontEngine(v)) _network_player_info[v->owner].num_vehicle[0]++;
 				break;
-			case VEH_Road:
+			case VEH_ROAD:
 				if (v->cargo_type != CT_PASSENGERS) {
 					_network_player_info[v->owner].num_vehicle[1]++;
 				} else {
 					_network_player_info[v->owner].num_vehicle[2]++;
 				}
 				break;
-			case VEH_Aircraft:
+			case VEH_AIRCRAFT:
 				if (IsNormalAircraft(v)) _network_player_info[v->owner].num_vehicle[3]++;
 				break;
-			case VEH_Ship:
+			case VEH_SHIP:
 				_network_player_info[v->owner].num_vehicle[4]++;
 				break;
-			case VEH_Special:
+			case VEH_SPECIAL:
-			case VEH_Disaster:
+			case VEH_DISASTER:
 				break;
 		}
 	}
 	// Go through all stations and count the types of stations
 		SEND_COMMAND(PACKET_SERVER_CLIENT_INFO)(cs, ci);
 	}
 }
 /* Check if we want to restart the map */
-static void NetworkCheckRestartMap(void)
+static void NetworkCheckRestartMap()
 {
 	if (_network_restart_game_year != 0 && _cur_year >= _network_restart_game_year) {
 		DEBUG(net, 0, "Auto-restarting map. Year %d reached", _cur_year);
 		StartNewGameWithoutGUI(GENERATE_NEW_SEED);
 /* Check if the server has autoclean_companies activated
 Two things happen:
 1) If a company is not protected, it is closed after 1 year (for example)
 2) If a company is protected, protection is disabled after 3 years (for example)
 (and item 1. happens a year later) */
-static void NetworkAutoCleanCompanies(void)
+static void NetworkAutoCleanCompanies()
 {
 	NetworkTCPSocketHandler *cs;
 	const NetworkClientInfo *ci;
 	const Player *p;
 	bool clients_in_company[MAX_PLAYERS];
 			int lag = NetworkCalculateLag(cs);
 			if (lag > _network_max_join_time) {
 				IConsolePrintF(_icolour_err,"Client #%d is dropped because it took longer than %d ticks for him to join", cs->index, _network_max_join_time);
 				NetworkCloseClient(cs);
 			}
+		} else if (cs->status == STATUS_INACTIVE) {
+			int lag = NetworkCalculateLag(cs);
+			if (lag > 4 * DAY_TICKS) {
+				IConsolePrintF(_icolour_err,"Client #%d is dropped because it took longer than %d ticks to start the joining process", cs->index, 4 * DAY_TICKS);
+				NetworkCloseClient(cs);
+			}
 		}
 		if (cs->status >= STATUS_PRE_ACTIVE) {
 			// Check if we can send command, and if we have anything in the queue
 			NetworkHandleCommandQueue(cs);
 	/* See if we need to advertise */
 	NetworkUDPAdvertise();
 }
-void NetworkServerYearlyLoop(void)
+void NetworkServerYearlyLoop()
 {
 	NetworkCheckRestartMap();
 }
-void NetworkServerMonthlyLoop(void)
+void NetworkServerMonthlyLoop()
 {
 	NetworkAutoCleanCompanies();
 }
 #endif /* ENABLE_NETWORK */

branch	gamebalance
changeset 9895	7bd07f43b0e3
parent 6504	5578f2fa1a73
child 9911	0b8b245a2391