petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r3409) - Change the server advertisement interval to use the frame counter instead

Browse Source 
of game days. This allows a paused server to continue to advertise itself.
  This also fixes advertising for games that start before 1922.
This commit is contained in:
peter1138
2006-01-19 17:50:40 +00:00
parent 6971aee967
commit e78997fdfd
4 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
network_udp.c
View File

@@ -35,9 +35,9 @@ typedef enum {
} PacketUDPType;
enum {
ADVERTISE_NORMAL_INTERVAL = 450, // interval between advertising in days
ADVERTISE_RETRY_INTERVAL = 5, // readvertise when no response after this amount of days
ADVERTISE_RETRY_TIMES = 3 // give up readvertising after this much failed retries
ADVERTISE_NORMAL_INTERVAL = 30000, // interval between advertising in ticks (15 minutes)
ADVERTISE_RETRY_INTERVAL = 300, // readvertise when no response after this many ticks (9 seconds)
ADVERTISE_RETRY_TIMES = 3 // give up readvertising after this much failed retries
};
#define DEF_UDP_RECEIVE_COMMAND(type) void NetworkPacketReceive_ ## type ## _command(Packet *p, struct sockaddr_in *client_addr)
@@ -611,18 +611,23 @@ void NetworkUDPAdvertise(void)
if (!NetworkUDPListen(&_udp_master_socket, _network_server_bind_ip, 0, false))
return;
/* Only send once in the 450 game-days (about 15 minutes) */
if (_network_advertise_retries == 0) {
if ( (_network_last_advertise_date + ADVERTISE_NORMAL_INTERVAL) > _date)
return;
if (_network_need_advertise) {
_network_need_advertise = false;
_network_advertise_retries = ADVERTISE_RETRY_TIMES;
} else {
/* Only send once every ADVERTISE_NORMAL_INTERVAL ticks */
if (_network_advertise_retries == 0) {
if ((_network_last_advertise_frame + ADVERTISE_NORMAL_INTERVAL) > _frame_counter)
return;
_network_advertise_retries = ADVERTISE_RETRY_TIMES;
}
if ((_network_last_advertise_frame + ADVERTISE_RETRY_INTERVAL) > _frame_counter)
return;
}
if ( (_network_last_advertise_date + ADVERTISE_RETRY_INTERVAL) > _date)
return;
_network_advertise_retries--;
_network_last_advertise_date = _date;
_network_last_advertise_frame = _frame_counter;
/* Find somewhere to send */
out_addr.sin_family = AF_INET;