mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15925) -Codechange: remove _network_server_bind_ip as it's pretty AF dependant.

release/1.0
rubidium 2009-04-03 10:29:56 +00:00
parent dccfba6e20
commit 47602d7b60
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/core/address.cpp
View File

@ -124,6 +124,7 @@ static SOCKET ConnectLoopProc(addrinfo *runp)
if (connect(sock, runp->ai_addr, runp->ai_addrlen) != 0) { if (connect(sock, runp->ai_addr, runp->ai_addrlen) != 0) {
DEBUG(net, 1, "Could not connect socket: %s", strerror(errno)); DEBUG(net, 1, "Could not connect socket: %s", strerror(errno));
closesocket(sock);
return INVALID_SOCKET; return INVALID_SOCKET;
} }

11
src/network/network.cpp
View File

@ -62,7 +62,6 @@ uint32 _frame_counter_max; // To where we may go with our clients
uint32 _frame_counter; uint32 _frame_counter;
uint32 _last_sync_frame; // Used in the server to store the last time a sync packet was sent to clients. uint32 _last_sync_frame; // Used in the server to store the last time a sync packet was sent to clients.
uint32 _broadcast_list[MAX_INTERFACES + 1]; uint32 _broadcast_list[MAX_INTERFACES + 1];
uint32 _network_server_bind_ip;
uint32 _sync_seed_1, _sync_seed_2; uint32 _sync_seed_1, _sync_seed_2;
uint32 _sync_frame; uint32 _sync_frame;
bool _network_first_time; bool _network_first_time;
@ -776,7 +775,7 @@ bool NetworkServerStart()
/* Try to start UDP-server */ /* Try to start UDP-server */
_network_udp_server = true; _network_udp_server = true;
_network_udp_server = _udp_server_socket->Listen(NetworkAddress(_network_server_bind_ip, _settings_client.network.server_port), false); _network_udp_server = _udp_server_socket->Listen(NetworkAddress(_settings_client.network.server_bind_ip, _settings_client.network.server_port), false);
_network_company_states = CallocT<NetworkCompanyState>(MAX_COMPANIES); _network_company_states = CallocT<NetworkCompanyState>(MAX_COMPANIES);
_network_server = true; _network_server = true;
@ -1097,10 +1096,10 @@ void NetworkStartUp()
_network_need_advertise = true; _network_need_advertise = true;
_network_advertise_retries = 0; _network_advertise_retries = 0;
/* Load the ip from the openttd.cfg */ /* Set an ip when the hostname is empty */
_network_server_bind_ip = inet_addr(_settings_client.network.server_bind_ip); if (StrEmpty(_settings_client.network.server_bind_ip)) {
/* And put the data back in it in case it was an invalid ip */ snprintf(_settings_client.network.server_bind_ip, sizeof(_settings_client.network.server_bind_ip), "%s", NetworkAddress().GetHostname());
snprintf(_settings_client.network.server_bind_ip, sizeof(_settings_client.network.server_bind_ip), "%s", inet_ntoa(*(struct in_addr *)&_network_server_bind_ip)); }
/* Generate an unique id when there is none yet */ /* Generate an unique id when there is none yet */
if (StrEmpty(_settings_client.network.network_id)) NetworkGenerateUniqueId(); if (StrEmpty(_settings_client.network.network_id)) NetworkGenerateUniqueId();

2
src/network/network_internal.h
View File

@ -103,8 +103,6 @@ extern uint32 _last_sync_frame; // Used in the server to store the last time a s
/* networking settings */ /* networking settings */
extern uint32 _broadcast_list[MAX_INTERFACES + 1]; extern uint32 _broadcast_list[MAX_INTERFACES + 1];
extern uint32 _network_server_bind_ip;
extern uint32 _sync_seed_1, _sync_seed_2; extern uint32 _sync_seed_1, _sync_seed_2;
extern uint32 _sync_frame; extern uint32 _sync_frame;
extern bool _network_first_time; extern bool _network_first_time;

4
src/network/network_udp.cpp
View File

@ -483,7 +483,7 @@ void NetworkUDPRemoveAdvertise()
/* check for socket */ /* check for socket */
if (!_udp_master_socket->IsConnected()) { if (!_udp_master_socket->IsConnected()) {
if (!_udp_master_socket->Listen(NetworkAddress(_network_server_bind_ip, 0), false)) return; if (!_udp_master_socket->Listen(NetworkAddress(_settings_client.network.server_bind_ip, 0), false)) return;
} }
if (!ThreadObject::New(NetworkUDPRemoveAdvertiseThread, NULL)) { if (!ThreadObject::New(NetworkUDPRemoveAdvertiseThread, NULL)) {
@ -520,7 +520,7 @@ void NetworkUDPAdvertise()
/* check for socket */ /* check for socket */
if (!_udp_master_socket->IsConnected()) { if (!_udp_master_socket->IsConnected()) {
if (!_udp_master_socket->Listen(NetworkAddress(_network_server_bind_ip, 0), false)) return; if (!_udp_master_socket->Listen(NetworkAddress(_settings_client.network.server_bind_ip, 0), false)) return;
} }
if (_network_need_advertise) { if (_network_need_advertise) {