author | peter1138 |
Sun, 03 Aug 2008 17:35:08 +0000 | |
changeset 9834 | 7474149531c1 |
parent 9659 | 187142ff9b6c |
child 9844 | 705fc23bedba |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
6121
2aae24b0881f
(svn r8857) -Documentation: Added some doxygen @file tags, repaired others (the @file tag MUST be found before any line of code, that includes preprocessor directives).
celestar
parents:
5918
diff
changeset
|
3 |
/** |
2aae24b0881f
(svn r8857) -Documentation: Added some doxygen @file tags, repaired others (the @file tag MUST be found before any line of code, that includes preprocessor directives).
celestar
parents:
5918
diff
changeset
|
4 |
* @file network_udp.cpp This file handles the UDP related communication. |
2aae24b0881f
(svn r8857) -Documentation: Added some doxygen @file tags, repaired others (the @file tag MUST be found before any line of code, that includes preprocessor directives).
celestar
parents:
5918
diff
changeset
|
5 |
* |
2aae24b0881f
(svn r8857) -Documentation: Added some doxygen @file tags, repaired others (the @file tag MUST be found before any line of code, that includes preprocessor directives).
celestar
parents:
5918
diff
changeset
|
6 |
* This is the GameServer <-> MasterServer and GameServer <-> GameClient |
2aae24b0881f
(svn r8857) -Documentation: Added some doxygen @file tags, repaired others (the @file tag MUST be found before any line of code, that includes preprocessor directives).
celestar
parents:
5918
diff
changeset
|
7 |
* communication before the game is being joined. |
2aae24b0881f
(svn r8857) -Documentation: Added some doxygen @file tags, repaired others (the @file tag MUST be found before any line of code, that includes preprocessor directives).
celestar
parents:
5918
diff
changeset
|
8 |
*/ |
2aae24b0881f
(svn r8857) -Documentation: Added some doxygen @file tags, repaired others (the @file tag MUST be found before any line of code, that includes preprocessor directives).
celestar
parents:
5918
diff
changeset
|
9 |
|
4826
6a545d194528
(svn r6750) -Codechange: Juggle around some header includes as they're only used when
Darkvater
parents:
4344
diff
changeset
|
10 |
#ifdef ENABLE_NETWORK |
6a545d194528
(svn r6750) -Codechange: Juggle around some header includes as they're only used when
Darkvater
parents:
4344
diff
changeset
|
11 |
|
5469
7edfc643abbc
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5380
diff
changeset
|
12 |
#include "../stdafx.h" |
7edfc643abbc
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5380
diff
changeset
|
13 |
#include "../debug.h" |
8140
0d0d8c94f84b
(svn r11702) -Codechange: move all date related stuff to date*.
rubidium
parents:
8139
diff
changeset
|
14 |
#include "../date_func.h" |
8139
4e91c448c409
(svn r11701) -Codechange: removal unnecessary inclusions of map.h (and split map.h).
rubidium
parents:
8132
diff
changeset
|
15 |
#include "../map_func.h" |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
16 |
#include "network_gamelist.h" |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
17 |
#include "network_udp.h" |
9428
1ba05b499957
(svn r13343) -Codechange: reorder/move variable/functions in the network headers so that nothing from the network directory needs to include basically all network headers.
rubidium
parents:
9420
diff
changeset
|
18 |
#include "network_internal.h" |
5469
7edfc643abbc
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5380
diff
changeset
|
19 |
#include "../variables.h" |
7edfc643abbc
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5380
diff
changeset
|
20 |
#include "../newgrf_config.h" |
8132
f4c7a8e4f25a
(svn r11694) -Codechange: move more endianness related stuff to endian_func.hpp.
rubidium
parents:
7931
diff
changeset
|
21 |
#include "../core/endian_func.hpp" |
8214
971f861d5543
(svn r11777) -Codechange: split the string header and make do not include it when it's not necessary.
rubidium
parents:
8140
diff
changeset
|
22 |
#include "../string_func.h" |
8254
1496654ca5e7
(svn r11818) -Codechange: split player.h into smaller pieces.
rubidium
parents:
8214
diff
changeset
|
23 |
#include "../player_base.h" |
1496654ca5e7
(svn r11818) -Codechange: split player.h into smaller pieces.
rubidium
parents:
8214
diff
changeset
|
24 |
#include "../player_func.h" |
8270
e7c342f6b14c
(svn r11834) -Codechange: only include settings_type.h if needed.
rubidium
parents:
8254
diff
changeset
|
25 |
#include "../settings_type.h" |
9451
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
26 |
#include "../rev.h" |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
27 |
|
5469
7edfc643abbc
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5380
diff
changeset
|
28 |
#include "core/udp.h" |
7edfc643abbc
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5380
diff
changeset
|
29 |
|
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
30 |
enum { |
2861
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
31 |
ADVERTISE_NORMAL_INTERVAL = 30000, // interval between advertising in ticks (15 minutes) |
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
32 |
ADVERTISE_RETRY_INTERVAL = 300, // readvertise when no response after this many ticks (9 seconds) |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4326
diff
changeset
|
33 |
ADVERTISE_RETRY_TIMES = 3 // give up readvertising after this much failed retries |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
34 |
}; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
35 |
|
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
36 |
NetworkUDPSocketHandler *_udp_client_socket; ///< udp client socket |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
37 |
NetworkUDPSocketHandler *_udp_server_socket; ///< udp server socket |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
38 |
NetworkUDPSocketHandler *_udp_master_socket; ///< udp master socket |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
39 |
|
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
40 |
///*** Communication with the masterserver ***/ |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
41 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
42 |
class MasterNetworkUDPSocketHandler : public NetworkUDPSocketHandler { |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
43 |
protected: |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
44 |
DECLARE_UDP_RECEIVE_COMMAND(PACKET_UDP_MASTER_ACK_REGISTER); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
45 |
public: |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
46 |
virtual ~MasterNetworkUDPSocketHandler() {} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
47 |
}; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
48 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
49 |
DEF_UDP_RECEIVE_COMMAND(Master, PACKET_UDP_MASTER_ACK_REGISTER) |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
50 |
{ |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
51 |
_network_advertise_retries = 0; |
7372
6fac48ff7c4d
(svn r10736) -Fix: Correct all mispellings of 'successful'.
peter1138
parents:
7331
diff
changeset
|
52 |
DEBUG(net, 2, "[udp] advertising on master server successful"); |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
53 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
54 |
/* We are advertised, but we don't want to! */ |
9481
25ed9b0c242a
(svn r13433) -Codechange: remove a now useless global variable.
rubidium
parents:
9451
diff
changeset
|
55 |
if (!_settings_client.network.server_advertise) NetworkUDPRemoveAdvertise(); |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
56 |
} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
57 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
58 |
///*** Communication with clients (we are server) ***/ |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
59 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
60 |
class ServerNetworkUDPSocketHandler : public NetworkUDPSocketHandler { |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
61 |
protected: |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
62 |
DECLARE_UDP_RECEIVE_COMMAND(PACKET_UDP_CLIENT_FIND_SERVER); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
63 |
DECLARE_UDP_RECEIVE_COMMAND(PACKET_UDP_CLIENT_DETAIL_INFO); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
64 |
DECLARE_UDP_RECEIVE_COMMAND(PACKET_UDP_CLIENT_GET_NEWGRFS); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
65 |
public: |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
66 |
virtual ~ServerNetworkUDPSocketHandler() {} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
67 |
}; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
68 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
69 |
DEF_UDP_RECEIVE_COMMAND(Server, PACKET_UDP_CLIENT_FIND_SERVER) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
70 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
71 |
// Just a fail-safe.. should never happen |
9451
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
72 |
if (!_network_udp_server) { |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
73 |
return; |
9451
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
74 |
} |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
75 |
|
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
76 |
NetworkGameInfo ngi; |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
77 |
|
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
78 |
/* Update some game_info */ |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
79 |
ngi.clients_on = _network_game_info.clients_on; |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
80 |
ngi.start_date = _network_game_info.start_date; |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
81 |
|
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
82 |
ngi.server_lang = _settings_client.network.server_lang; |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
83 |
ngi.use_password = !StrEmpty(_settings_client.network.server_password); |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
84 |
ngi.clients_max = _settings_client.network.max_clients; |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
85 |
ngi.companies_on = ActivePlayerCount(); |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
86 |
ngi.companies_max = _settings_client.network.max_companies; |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
87 |
ngi.spectators_on = NetworkSpectatorCount(); |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
88 |
ngi.spectators_max = _settings_client.network.max_spectators; |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
89 |
ngi.game_date = _date; |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
90 |
ngi.map_width = MapSizeX(); |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
91 |
ngi.map_height = MapSizeY(); |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
92 |
ngi.map_set = _settings_game.game_creation.landscape; |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
93 |
ngi.dedicated = _network_dedicated; |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
94 |
ngi.grfconfig = _grfconfig; |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
95 |
|
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
96 |
ttd_strlcpy(ngi.map_name, _network_game_info.map_name, lengthof(ngi.map_name)); |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
97 |
ttd_strlcpy(ngi.server_name, _settings_client.network.server_name, lengthof(ngi.server_name)); |
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
98 |
ttd_strlcpy(ngi.server_revision, _openttd_revision, lengthof(ngi.server_revision)); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
99 |
|
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
100 |
Packet packet(PACKET_UDP_SERVER_RESPONSE); |
9451
0d6806ba5504
(svn r13369) -Codechange: remove duplication of network configuration settings between NetworkSettings and NetworkGameInfo.
rubidium
parents:
9428
diff
changeset
|
101 |
this->Send_NetworkGameInfo(&packet, &ngi); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
102 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
103 |
// Let the client know that we are here |
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
104 |
this->SendPacket(&packet, client_addr); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
105 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5341
diff
changeset
|
106 |
DEBUG(net, 2, "[udp] queried from '%s'", inet_ntoa(client_addr->sin_addr)); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
107 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
108 |
|
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
109 |
DEF_UDP_RECEIVE_COMMAND(Server, PACKET_UDP_CLIENT_DETAIL_INFO) |
638
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
110 |
{ |
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
111 |
// Just a fail-safe.. should never happen |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4035
diff
changeset
|
112 |
if (!_network_udp_server) return; |
638
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
113 |
|
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
114 |
Packet packet(PACKET_UDP_SERVER_DETAIL_INFO); |
638
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
115 |
|
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
116 |
/* Send the amount of active companies */ |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
117 |
packet.Send_uint8 (NETWORK_COMPANY_INFO_VERSION); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
118 |
packet.Send_uint8 (ActivePlayerCount()); |
638
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
119 |
|
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
120 |
/* Fetch the latest version of everything */ |
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
121 |
NetworkPopulateCompanyInfo(); |
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
122 |
|
9646
8c5f5d33027d
(svn r13713) -Fix: possible crash on creating a network packet.
rubidium
parents:
9481
diff
changeset
|
123 |
Player *player; |
8c5f5d33027d
(svn r13713) -Fix: possible crash on creating a network packet.
rubidium
parents:
9481
diff
changeset
|
124 |
byte current = 0; |
638
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
125 |
/* Go through all the players */ |
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
126 |
FOR_ALL_PLAYERS(player) { |
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
127 |
current++; |
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
128 |
|
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
129 |
/* Send the information */ |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
130 |
packet.Send_uint8 (current); |
638
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
131 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
132 |
packet.Send_string(_network_player_info[player->index].company_name); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
133 |
packet.Send_uint32(_network_player_info[player->index].inaugurated_year); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
134 |
packet.Send_uint64(_network_player_info[player->index].company_value); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
135 |
packet.Send_uint64(_network_player_info[player->index].money); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
136 |
packet.Send_uint64(_network_player_info[player->index].income); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
137 |
packet.Send_uint16(_network_player_info[player->index].performance); |
638
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
138 |
|
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4035
diff
changeset
|
139 |
/* Send 1 if there is a passord for the company else send 0 */ |
7048
0850931d1c81
(svn r10313) -Fix (r8546): value for password "protected" was sent toggled for UDP packets, i.e. unpassworded companies showed up passworded and vice versa.
rubidium
parents:
7034
diff
changeset
|
140 |
packet.Send_bool (!StrEmpty(_network_player_info[player->index].password)); |
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
1011
diff
changeset
|
141 |
|
9646
8c5f5d33027d
(svn r13713) -Fix: possible crash on creating a network packet.
rubidium
parents:
9481
diff
changeset
|
142 |
for (int i = 0; i < NETWORK_VEHICLE_TYPES; i++) { |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
143 |
packet.Send_uint16(_network_player_info[player->index].num_vehicle[i]); |
638
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
144 |
} |
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
145 |
|
9646
8c5f5d33027d
(svn r13713) -Fix: possible crash on creating a network packet.
rubidium
parents:
9481
diff
changeset
|
146 |
for (int i = 0; i < NETWORK_STATION_TYPES; i++) { |
8c5f5d33027d
(svn r13713) -Fix: possible crash on creating a network packet.
rubidium
parents:
9481
diff
changeset
|
147 |
packet.Send_uint16(_network_player_info[player->index].num_station[i]); |
638
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
148 |
} |
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
149 |
} |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
150 |
|
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
151 |
this->SendPacket(&packet, client_addr); |
638
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
152 |
} |
cb9f5f50d3c7
(svn r1069) -Add: [Network] Added UDP-packet for detail info about a server for
truelight
parents:
629
diff
changeset
|
153 |
|
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
154 |
/** |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
155 |
* A client has requested the names of some NewGRFs. |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
156 |
* |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
157 |
* Replying this can be tricky as we have a limit of SEND_MTU bytes |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
158 |
* in the reply packet and we can send up to 100 bytes per NewGRF |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
159 |
* (GRF ID, MD5sum and NETWORK_GRF_NAME_LENGTH bytes for the name). |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
160 |
* As SEND_MTU is _much_ less than 100 * NETWORK_MAX_GRF_COUNT, it |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
161 |
* could be that a packet overflows. To stop this we only reply |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
162 |
* with the first N NewGRFs so that if the first N + 1 NewGRFs |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
163 |
* would be sent, the packet overflows. |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
164 |
* in_reply and in_reply_count are used to keep a list of GRFs to |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
165 |
* send in the reply. |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
166 |
*/ |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
167 |
DEF_UDP_RECEIVE_COMMAND(Server, PACKET_UDP_CLIENT_GET_NEWGRFS) |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
168 |
{ |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
169 |
uint8 num_grfs; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
170 |
uint i; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
171 |
|
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
172 |
const GRFConfig *in_reply[NETWORK_MAX_GRF_COUNT]; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
173 |
uint8 in_reply_count = 0; |
9146
dbe2317185eb
(svn r13008) -Fix [FS#1997]: silence some MSVC x64 warnings
glx
parents:
9108
diff
changeset
|
174 |
size_t packet_len = 0; |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
175 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5341
diff
changeset
|
176 |
DEBUG(net, 6, "[udp] newgrf data request from %s:%d", inet_ntoa(client_addr->sin_addr), ntohs(client_addr->sin_port)); |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
177 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
178 |
num_grfs = p->Recv_uint8 (); |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
179 |
if (num_grfs > NETWORK_MAX_GRF_COUNT) return; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
180 |
|
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
181 |
for (i = 0; i < num_grfs; i++) { |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
182 |
GRFConfig c; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
183 |
const GRFConfig *f; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
184 |
|
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
185 |
this->Recv_GRFIdentifier(p, &c); |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
186 |
|
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
187 |
/* Find the matching GRF file */ |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
188 |
f = FindGRFConfig(c.grfid, c.md5sum); |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
189 |
if (f == NULL) continue; // The GRF is unknown to this server |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
190 |
|
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
191 |
/* If the reply might exceed the size of the packet, only reply |
5341
02fb6f89fc8a
(svn r7507) -Fix (7505): the name of a GRF could be "", which causes a segmentation fault. So take the filename, which cannot be "", when the of the GRF name is "". Also check for "" length when receiving GRF names.
rubidium
parents:
5339
diff
changeset
|
192 |
* the current list and do not send the other data. |
02fb6f89fc8a
(svn r7507) -Fix (7505): the name of a GRF could be "", which causes a segmentation fault. So take the filename, which cannot be "", when the of the GRF name is "". Also check for "" length when receiving GRF names.
rubidium
parents:
5339
diff
changeset
|
193 |
* The name could be an empty string, if so take the filename. */ |
02fb6f89fc8a
(svn r7507) -Fix (7505): the name of a GRF could be "", which causes a segmentation fault. So take the filename, which cannot be "", when the of the GRF name is "". Also check for "" length when receiving GRF names.
rubidium
parents:
5339
diff
changeset
|
194 |
packet_len += sizeof(c.grfid) + sizeof(c.md5sum) + |
5638
ee1871005c80
(svn r8097) Replace strlen() {==,!=,>} 0 by the more concise {,!}StrEmpty(). Additionally the test takes O(1) instead of O(n) now
tron
parents:
5624
diff
changeset
|
195 |
min(strlen((f->name != NULL && !StrEmpty(f->name)) ? f->name : f->filename) + 1, (size_t)NETWORK_GRF_NAME_LENGTH); |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
196 |
if (packet_len > SEND_MTU - 4) { // 4 is 3 byte header + grf count in reply |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
197 |
break; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
198 |
} |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
199 |
in_reply[in_reply_count] = f; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
200 |
in_reply_count++; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
201 |
} |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
202 |
|
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
203 |
if (in_reply_count == 0) return; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
204 |
|
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
205 |
Packet packet(PACKET_UDP_SERVER_NEWGRFS); |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
206 |
packet.Send_uint8(in_reply_count); |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
207 |
for (i = 0; i < in_reply_count; i++) { |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
208 |
char name[NETWORK_GRF_NAME_LENGTH]; |
5341
02fb6f89fc8a
(svn r7507) -Fix (7505): the name of a GRF could be "", which causes a segmentation fault. So take the filename, which cannot be "", when the of the GRF name is "". Also check for "" length when receiving GRF names.
rubidium
parents:
5339
diff
changeset
|
209 |
|
02fb6f89fc8a
(svn r7507) -Fix (7505): the name of a GRF could be "", which causes a segmentation fault. So take the filename, which cannot be "", when the of the GRF name is "". Also check for "" length when receiving GRF names.
rubidium
parents:
5339
diff
changeset
|
210 |
/* The name could be an empty string, if so take the filename */ |
5638
ee1871005c80
(svn r8097) Replace strlen() {==,!=,>} 0 by the more concise {,!}StrEmpty(). Additionally the test takes O(1) instead of O(n) now
tron
parents:
5624
diff
changeset
|
211 |
ttd_strlcpy(name, (in_reply[i]->name != NULL && !StrEmpty(in_reply[i]->name)) ? |
5341
02fb6f89fc8a
(svn r7507) -Fix (7505): the name of a GRF could be "", which causes a segmentation fault. So take the filename, which cannot be "", when the of the GRF name is "". Also check for "" length when receiving GRF names.
rubidium
parents:
5339
diff
changeset
|
212 |
in_reply[i]->name : in_reply[i]->filename, sizeof(name)); |
6492
286a52449b54
(svn r9673) -Cleanup: remove spaces before tabs and replace non-indenting tabs with spaces.
rubidium
parents:
6424
diff
changeset
|
213 |
this->Send_GRFIdentifier(&packet, in_reply[i]); |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
214 |
packet.Send_string(name); |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
215 |
} |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
216 |
|
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
217 |
this->SendPacket(&packet, client_addr); |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
218 |
} |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
219 |
|
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
220 |
///*** Communication with servers (we are client) ***/ |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
221 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
222 |
class ClientNetworkUDPSocketHandler : public NetworkUDPSocketHandler { |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
223 |
protected: |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
224 |
DECLARE_UDP_RECEIVE_COMMAND(PACKET_UDP_SERVER_RESPONSE); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
225 |
DECLARE_UDP_RECEIVE_COMMAND(PACKET_UDP_MASTER_RESPONSE_LIST); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
226 |
DECLARE_UDP_RECEIVE_COMMAND(PACKET_UDP_SERVER_NEWGRFS); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
227 |
virtual void HandleIncomingNetworkGameInfoGRFConfig(GRFConfig *config); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
228 |
public: |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
229 |
virtual ~ClientNetworkUDPSocketHandler() {} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
230 |
}; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
231 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
232 |
DEF_UDP_RECEIVE_COMMAND(Client, PACKET_UDP_SERVER_RESPONSE) |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
233 |
{ |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
234 |
NetworkGameList *item; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
235 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
236 |
// Just a fail-safe.. should never happen |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
237 |
if (_network_udp_server) return; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
238 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
239 |
DEBUG(net, 4, "[udp] server response from %s:%d", inet_ntoa(client_addr->sin_addr), ntohs(client_addr->sin_port)); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
240 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
241 |
// Find next item |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
242 |
item = NetworkGameListAddItem(inet_addr(inet_ntoa(client_addr->sin_addr)), ntohs(client_addr->sin_port)); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
243 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
244 |
this->Recv_NetworkGameInfo(p, &item->info); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
245 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
246 |
item->info.compatible = true; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
247 |
{ |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
248 |
/* Checks whether there needs to be a request for names of GRFs and makes |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
249 |
* the request if necessary. GRFs that need to be requested are the GRFs |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
250 |
* that do not exist on the clients system and we do not have the name |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
251 |
* resolved of, i.e. the name is still UNKNOWN_GRF_NAME_PLACEHOLDER. |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
252 |
* The in_request array and in_request_count are used so there is no need |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
253 |
* to do a second loop over the GRF list, which can be relatively expensive |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
254 |
* due to the string comparisons. */ |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
255 |
const GRFConfig *in_request[NETWORK_MAX_GRF_COUNT]; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
256 |
const GRFConfig *c; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
257 |
uint in_request_count = 0; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
258 |
struct sockaddr_in out_addr; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
259 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
260 |
for (c = item->info.grfconfig; c != NULL; c = c->next) { |
6229
695400602ab0
(svn r9031) -Codechange: Introduce grfconfig->status, and use it for states that are
maedhros
parents:
6178
diff
changeset
|
261 |
if (c->status == GCS_NOT_FOUND) item->info.compatible = false; |
8970
da7261f48b7e
(svn r12762) -Fix: tabs after the first non-tab character are generally not okay (or lines starting with a space and then tabs).
rubidium
parents:
8826
diff
changeset
|
262 |
if (c->status != GCS_NOT_FOUND || strcmp(c->name, UNKNOWN_GRF_NAME_PLACEHOLDER) != 0) continue; |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
263 |
in_request[in_request_count] = c; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
264 |
in_request_count++; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
265 |
} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
266 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
267 |
if (in_request_count > 0) { |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
268 |
/* There are 'unknown' GRFs, now send a request for them */ |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
269 |
uint i; |
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
270 |
Packet packet(PACKET_UDP_CLIENT_GET_NEWGRFS); |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
271 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
272 |
packet.Send_uint8(in_request_count); |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
273 |
for (i = 0; i < in_request_count; i++) { |
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
274 |
this->Send_GRFIdentifier(&packet, in_request[i]); |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
275 |
} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
276 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
277 |
out_addr.sin_family = AF_INET; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
278 |
out_addr.sin_port = htons(item->port); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
279 |
out_addr.sin_addr.s_addr = item->ip; |
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
280 |
this->SendPacket(&packet, &out_addr); |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
281 |
} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
282 |
} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
283 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
284 |
if (item->info.hostname[0] == '\0') |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
285 |
snprintf(item->info.hostname, sizeof(item->info.hostname), "%s", inet_ntoa(client_addr->sin_addr)); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
286 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
287 |
/* Check if we are allowed on this server based on the revision-match */ |
6178
c29a7d37c3ce
(svn r8949) -Codechange: only test the first NETWORK_REVISION_LENGTH - 1 characters when determining network compatability. This makes it possible to have 'long' branch names while still being able to play network games.
rubidium
parents:
6121
diff
changeset
|
288 |
item->info.version_compatible = IsNetworkCompatibleVersion(item->info.server_revision); |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
289 |
item->info.compatible &= item->info.version_compatible; // Already contains match for GRFs |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
290 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
291 |
item->online = true; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
292 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
293 |
UpdateNetworkGameWindow(false); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
294 |
} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
295 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
296 |
DEF_UDP_RECEIVE_COMMAND(Client, PACKET_UDP_MASTER_RESPONSE_LIST) |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
297 |
{ |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
298 |
int i; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
299 |
struct in_addr ip; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
300 |
uint16 port; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
301 |
uint8 ver; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
302 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
303 |
/* packet begins with the protocol version (uint8) |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
304 |
* then an uint16 which indicates how many |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
305 |
* ip:port pairs are in this packet, after that |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
306 |
* an uint32 (ip) and an uint16 (port) for each pair |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
307 |
*/ |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
308 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
309 |
ver = p->Recv_uint8(); |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
310 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
311 |
if (ver == 1) { |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
312 |
for (i = p->Recv_uint16(); i != 0 ; i--) { |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
313 |
ip.s_addr = TO_LE32(p->Recv_uint32()); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
314 |
port = p->Recv_uint16(); |
5624
6afe9d27430a
(svn r8083) -Codechange: make a NetworkSocketHandler as base for all sockets and move a little of NetworkClientState functionality to the NetworkSocketHandler. Move the rest of the NetworkClientState to the new NetworkTCPSocketHandler class/struct, which is not yet implemented in an object oriented manner. The UDP socket handler now extends the NetworkSocketHandler instead of having a reference to a NetworkClientState.
rubidium
parents:
5619
diff
changeset
|
315 |
|
6afe9d27430a
(svn r8083) -Codechange: make a NetworkSocketHandler as base for all sockets and move a little of NetworkClientState functionality to the NetworkSocketHandler. Move the rest of the NetworkClientState to the new NetworkTCPSocketHandler class/struct, which is not yet implemented in an object oriented manner. The UDP socket handler now extends the NetworkSocketHandler instead of having a reference to a NetworkClientState.
rubidium
parents:
5619
diff
changeset
|
316 |
/* Somehow we reached the end of the packet */ |
6afe9d27430a
(svn r8083) -Codechange: make a NetworkSocketHandler as base for all sockets and move a little of NetworkClientState functionality to the NetworkSocketHandler. Move the rest of the NetworkClientState to the new NetworkTCPSocketHandler class/struct, which is not yet implemented in an object oriented manner. The UDP socket handler now extends the NetworkSocketHandler instead of having a reference to a NetworkClientState.
rubidium
parents:
5619
diff
changeset
|
317 |
if (this->HasClientQuit()) return; |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
318 |
NetworkUDPQueryServer(inet_ntoa(ip), port); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
319 |
} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
320 |
} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
321 |
} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
322 |
|
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
323 |
/** The return of the client's request of the names of some NewGRFs */ |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
324 |
DEF_UDP_RECEIVE_COMMAND(Client, PACKET_UDP_SERVER_NEWGRFS) |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
325 |
{ |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
326 |
uint8 num_grfs; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
327 |
uint i; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
328 |
|
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
329 |
DEBUG(net, 6, "[udp] newgrf data reply from %s:%d", inet_ntoa(client_addr->sin_addr), ntohs(client_addr->sin_port)); |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
330 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
331 |
num_grfs = p->Recv_uint8 (); |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
332 |
if (num_grfs > NETWORK_MAX_GRF_COUNT) return; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
333 |
|
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
334 |
for (i = 0; i < num_grfs; i++) { |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
335 |
char *unknown_name; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
336 |
char name[NETWORK_GRF_NAME_LENGTH]; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
337 |
GRFConfig c; |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
338 |
|
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
339 |
this->Recv_GRFIdentifier(p, &c); |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
340 |
p->Recv_string(name, sizeof(name)); |
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
341 |
|
5341
02fb6f89fc8a
(svn r7507) -Fix (7505): the name of a GRF could be "", which causes a segmentation fault. So take the filename, which cannot be "", when the of the GRF name is "". Also check for "" length when receiving GRF names.
rubidium
parents:
5339
diff
changeset
|
342 |
/* An empty name is not possible under normal circumstances |
02fb6f89fc8a
(svn r7507) -Fix (7505): the name of a GRF could be "", which causes a segmentation fault. So take the filename, which cannot be "", when the of the GRF name is "". Also check for "" length when receiving GRF names.
rubidium
parents:
5339
diff
changeset
|
343 |
* and causes problems when showing the NewGRF list. */ |
5638
ee1871005c80
(svn r8097) Replace strlen() {==,!=,>} 0 by the more concise {,!}StrEmpty(). Additionally the test takes O(1) instead of O(n) now
tron
parents:
5624
diff
changeset
|
344 |
if (StrEmpty(name)) continue; |
5341
02fb6f89fc8a
(svn r7507) -Fix (7505): the name of a GRF could be "", which causes a segmentation fault. So take the filename, which cannot be "", when the of the GRF name is "". Also check for "" length when receiving GRF names.
rubidium
parents:
5339
diff
changeset
|
345 |
|
5339
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
346 |
/* Finds the fake GRFConfig for the just read GRF ID and MD5sum tuple. |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
347 |
* If it exists and not resolved yet, then name of the fake GRF is |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
348 |
* overwritten with the name from the reply. */ |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
349 |
unknown_name = FindUnknownGRFName(c.grfid, c.md5sum, false); |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
350 |
if (unknown_name != NULL && strcmp(unknown_name, UNKNOWN_GRF_NAME_PLACEHOLDER) == 0) { |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
351 |
ttd_strlcpy(unknown_name, name, NETWORK_GRF_NAME_LENGTH); |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
352 |
} |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
353 |
} |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
354 |
} |
96ac3f4933bb
(svn r7505) -Feature: show NewGRFs used on a game server, show which NewGRFs you do and do not have.
rubidium
parents:
5034
diff
changeset
|
355 |
|
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
356 |
void ClientNetworkUDPSocketHandler::HandleIncomingNetworkGameInfoGRFConfig(GRFConfig *config) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
357 |
{ |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
358 |
/* Find the matching GRF file */ |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
359 |
const GRFConfig *f = FindGRFConfig(config->grfid, config->md5sum); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
360 |
if (f == NULL) { |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
361 |
/* Don't know the GRF, so mark game incompatible and the (possibly) |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
362 |
* already resolved name for this GRF (another server has sent the |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
363 |
* name of the GRF already */ |
6424
d410d4c31d15
(svn r9560) -Codechange: add support for multiple 'base' directories for newgrf searching.
rubidium
parents:
6247
diff
changeset
|
364 |
config->name = FindUnknownGRFName(config->grfid, config->md5sum, true); |
d410d4c31d15
(svn r9560) -Codechange: add support for multiple 'base' directories for newgrf searching.
rubidium
parents:
6247
diff
changeset
|
365 |
config->status = GCS_NOT_FOUND; |
3547
fea14ff86f9e
(svn r4413) -Fix: fixed a bug which pushed the client back to the main menu when a
truelight
parents:
3456
diff
changeset
|
366 |
} else { |
6424
d410d4c31d15
(svn r9560) -Codechange: add support for multiple 'base' directories for newgrf searching.
rubidium
parents:
6247
diff
changeset
|
367 |
config->filename = f->filename; |
d410d4c31d15
(svn r9560) -Codechange: add support for multiple 'base' directories for newgrf searching.
rubidium
parents:
6247
diff
changeset
|
368 |
config->name = f->name; |
d410d4c31d15
(svn r9560) -Codechange: add support for multiple 'base' directories for newgrf searching.
rubidium
parents:
6247
diff
changeset
|
369 |
config->info = f->info; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
370 |
} |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7372
diff
changeset
|
371 |
SetBit(config->flags, GCF_COPY); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
372 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
373 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
374 |
// Close UDP connection |
6247 | 375 |
void NetworkUDPCloseAll() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
376 |
{ |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5341
diff
changeset
|
377 |
DEBUG(net, 1, "[udp] closed listeners"); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
378 |
|
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
379 |
_udp_server_socket->Close(); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
380 |
_udp_master_socket->Close(); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
381 |
_udp_client_socket->Close(); |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
382 |
|
5521
53a834d67956
(svn r7825) -Codechange: make NetworkUDPClose close a single UDP socket. Use NetworkUDPStop to close all opened udp sockets (those were called NetworkUDPClose).
rubidium
parents:
5519
diff
changeset
|
383 |
_network_udp_server = false; |
53a834d67956
(svn r7825) -Codechange: make NetworkUDPClose close a single UDP socket. Use NetworkUDPStop to close all opened udp sockets (those were called NetworkUDPClose).
rubidium
parents:
5519
diff
changeset
|
384 |
_network_udp_broadcast = 0; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
385 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
386 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
387 |
// Broadcast to all ips |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
388 |
static void NetworkUDPBroadCast(NetworkUDPSocketHandler *socket) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
389 |
{ |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4035
diff
changeset
|
390 |
uint i; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
391 |
|
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4035
diff
changeset
|
392 |
for (i = 0; _broadcast_list[i] != 0; i++) { |
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
393 |
Packet p(PACKET_UDP_CLIENT_FIND_SERVER); |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4035
diff
changeset
|
394 |
struct sockaddr_in out_addr; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
395 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
396 |
out_addr.sin_family = AF_INET; |
9420
8a38703928e8
(svn r13334) -Codechange: move the network settings variables from network/network_internal to settings.
rubidium
parents:
9413
diff
changeset
|
397 |
out_addr.sin_port = htons(_settings_client.network.server_port); |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4026
diff
changeset
|
398 |
out_addr.sin_addr.s_addr = _broadcast_list[i]; |
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4026
diff
changeset
|
399 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5341
diff
changeset
|
400 |
DEBUG(net, 4, "[udp] broadcasting to %s", inet_ntoa(out_addr.sin_addr)); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
401 |
|
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
402 |
socket->SendPacket(&p, &out_addr); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
403 |
} |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
404 |
} |
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
405 |
|
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
406 |
|
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
407 |
// Request the the server-list from the master server |
6247 | 408 |
void NetworkUDPQueryMasterServer() |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
409 |
{ |
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
410 |
struct sockaddr_in out_addr; |
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
411 |
|
5624
6afe9d27430a
(svn r8083) -Codechange: make a NetworkSocketHandler as base for all sockets and move a little of NetworkClientState functionality to the NetworkSocketHandler. Move the rest of the NetworkClientState to the new NetworkTCPSocketHandler class/struct, which is not yet implemented in an object oriented manner. The UDP socket handler now extends the NetworkSocketHandler instead of having a reference to a NetworkClientState.
rubidium
parents:
5619
diff
changeset
|
412 |
if (!_udp_client_socket->IsConnected()) { |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
413 |
if (!_udp_client_socket->Listen(0, 0, true)) return; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
414 |
} |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
415 |
|
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
416 |
Packet p(PACKET_UDP_CLIENT_GET_LIST); |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
417 |
|
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
418 |
out_addr.sin_family = AF_INET; |
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
419 |
out_addr.sin_port = htons(NETWORK_MASTER_SERVER_PORT); |
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
420 |
out_addr.sin_addr.s_addr = NetworkResolveHost(NETWORK_MASTER_SERVER_HOST); |
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
421 |
|
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
422 |
// packet only contains protocol version |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
423 |
p.Send_uint8(NETWORK_MASTER_SERVER_VERSION); |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
424 |
|
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
425 |
_udp_client_socket->SendPacket(&p, &out_addr); |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
426 |
|
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
427 |
DEBUG(net, 2, "[udp] master server queried at %s:%d", inet_ntoa(out_addr.sin_addr), ntohs(out_addr.sin_port)); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
428 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
429 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
430 |
// Find all servers |
6247 | 431 |
void NetworkUDPSearchGame() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
432 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
433 |
// We are still searching.. |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5341
diff
changeset
|
434 |
if (_network_udp_broadcast > 0) return; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
435 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
436 |
// No UDP-socket yet.. |
5624
6afe9d27430a
(svn r8083) -Codechange: make a NetworkSocketHandler as base for all sockets and move a little of NetworkClientState functionality to the NetworkSocketHandler. Move the rest of the NetworkClientState to the new NetworkTCPSocketHandler class/struct, which is not yet implemented in an object oriented manner. The UDP socket handler now extends the NetworkSocketHandler instead of having a reference to a NetworkClientState.
rubidium
parents:
5619
diff
changeset
|
437 |
if (!_udp_client_socket->IsConnected()) { |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
438 |
if (!_udp_client_socket->Listen(0, 0, true)) return; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
439 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
440 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5341
diff
changeset
|
441 |
DEBUG(net, 0, "[udp] searching server"); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
442 |
|
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
443 |
NetworkUDPBroadCast(_udp_client_socket); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
444 |
_network_udp_broadcast = 300; // Stay searching for 300 ticks |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
445 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
446 |
|
5916
8931f4450f51
(svn r8543) -Codechange: make a real difference between querying the server via UDP and TCP.
rubidium
parents:
5900
diff
changeset
|
447 |
void NetworkUDPQueryServer(const char* host, unsigned short port, bool manually) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
448 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
449 |
struct sockaddr_in out_addr; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
450 |
NetworkGameList *item; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
451 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
452 |
// No UDP-socket yet.. |
5624
6afe9d27430a
(svn r8083) -Codechange: make a NetworkSocketHandler as base for all sockets and move a little of NetworkClientState functionality to the NetworkSocketHandler. Move the rest of the NetworkClientState to the new NetworkTCPSocketHandler class/struct, which is not yet implemented in an object oriented manner. The UDP socket handler now extends the NetworkSocketHandler instead of having a reference to a NetworkClientState.
rubidium
parents:
5619
diff
changeset
|
453 |
if (!_udp_client_socket->IsConnected()) { |
5916
8931f4450f51
(svn r8543) -Codechange: make a real difference between querying the server via UDP and TCP.
rubidium
parents:
5900
diff
changeset
|
454 |
if (!_udp_client_socket->Listen(0, 0, true)) return; |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
455 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
456 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
457 |
out_addr.sin_family = AF_INET; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
458 |
out_addr.sin_port = htons(port); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
459 |
out_addr.sin_addr.s_addr = NetworkResolveHost(host); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
460 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
461 |
// Clear item in gamelist |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
462 |
item = NetworkGameListAddItem(inet_addr(inet_ntoa(out_addr.sin_addr)), ntohs(out_addr.sin_port)); |
9108
9af955aa5b1b
(svn r12968) -Fix: Don't segfault when adding a server if 0.0.0.0 was entered for the address.
maedhros
parents:
8970
diff
changeset
|
463 |
if (item == NULL) return; |
9af955aa5b1b
(svn r12968) -Fix: Don't segfault when adding a server if 0.0.0.0 was entered for the address.
maedhros
parents:
8970
diff
changeset
|
464 |
|
7331
7e3503b13496
(svn r10694) -Codechange: update the server information in the game list every once in a while so the information stays fairly up-to-date when you are looking through the servers.
rubidium
parents:
7085
diff
changeset
|
465 |
if (StrEmpty(item->info.server_name)) { |
7e3503b13496
(svn r10694) -Codechange: update the server information in the game list every once in a while so the information stays fairly up-to-date when you are looking through the servers.
rubidium
parents:
7085
diff
changeset
|
466 |
memset(&item->info, 0, sizeof(item->info)); |
7e3503b13496
(svn r10694) -Codechange: update the server information in the game list every once in a while so the information stays fairly up-to-date when you are looking through the servers.
rubidium
parents:
7085
diff
changeset
|
467 |
ttd_strlcpy(item->info.server_name, host, lengthof(item->info.server_name)); |
7e3503b13496
(svn r10694) -Codechange: update the server information in the game list every once in a while so the information stays fairly up-to-date when you are looking through the servers.
rubidium
parents:
7085
diff
changeset
|
468 |
ttd_strlcpy(item->info.hostname, host, lengthof(item->info.hostname)); |
7e3503b13496
(svn r10694) -Codechange: update the server information in the game list every once in a while so the information stays fairly up-to-date when you are looking through the servers.
rubidium
parents:
7085
diff
changeset
|
469 |
item->online = false; |
7e3503b13496
(svn r10694) -Codechange: update the server information in the game list every once in a while so the information stays fairly up-to-date when you are looking through the servers.
rubidium
parents:
7085
diff
changeset
|
470 |
} |
5916
8931f4450f51
(svn r8543) -Codechange: make a real difference between querying the server via UDP and TCP.
rubidium
parents:
5900
diff
changeset
|
471 |
item->manually = manually; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
472 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
473 |
// Init the packet |
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
474 |
Packet p(PACKET_UDP_CLIENT_FIND_SERVER); |
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
475 |
_udp_client_socket->SendPacket(&p, &out_addr); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
476 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
477 |
UpdateNetworkGameWindow(false); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
478 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
479 |
|
765
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
480 |
/* Remove our advertise from the master-server */ |
6247 | 481 |
void NetworkUDPRemoveAdvertise() |
765
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
482 |
{ |
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
483 |
struct sockaddr_in out_addr; |
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
484 |
|
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
485 |
/* Check if we are advertising */ |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5341
diff
changeset
|
486 |
if (!_networking || !_network_server || !_network_udp_server) return; |
765
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
487 |
|
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
488 |
/* check for socket */ |
5624
6afe9d27430a
(svn r8083) -Codechange: make a NetworkSocketHandler as base for all sockets and move a little of NetworkClientState functionality to the NetworkSocketHandler. Move the rest of the NetworkClientState to the new NetworkTCPSocketHandler class/struct, which is not yet implemented in an object oriented manner. The UDP socket handler now extends the NetworkSocketHandler instead of having a reference to a NetworkClientState.
rubidium
parents:
5619
diff
changeset
|
489 |
if (!_udp_master_socket->IsConnected()) { |
8826
8fbb67bcf292
(svn r12574) -Fix: binding to a specific IP could cause OpenTTD to not register properly with the masterserver if one has multiple external interfaces.
rubidium
parents:
8270
diff
changeset
|
490 |
if (!_udp_master_socket->Listen(_network_server_bind_ip, 0, false)) return; |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
491 |
} |
765
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
492 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5341
diff
changeset
|
493 |
DEBUG(net, 1, "[udp] removing advertise from master server"); |
765
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
494 |
|
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
495 |
/* Find somewhere to send */ |
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
496 |
out_addr.sin_family = AF_INET; |
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
497 |
out_addr.sin_port = htons(NETWORK_MASTER_SERVER_PORT); |
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
498 |
out_addr.sin_addr.s_addr = NetworkResolveHost(NETWORK_MASTER_SERVER_HOST); |
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
499 |
|
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
500 |
/* Send the packet */ |
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
501 |
Packet p(PACKET_UDP_SERVER_UNREGISTER); |
765
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
502 |
/* Packet is: Version, server_port */ |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
503 |
p.Send_uint8 (NETWORK_MASTER_SERVER_VERSION); |
9420
8a38703928e8
(svn r13334) -Codechange: move the network settings variables from network/network_internal to settings.
rubidium
parents:
9413
diff
changeset
|
504 |
p.Send_uint16(_settings_client.network.server_port); |
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
505 |
_udp_master_socket->SendPacket(&p, &out_addr); |
765
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
506 |
} |
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
507 |
|
668
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
508 |
/* Register us to the master server |
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
509 |
This function checks if it needs to send an advertise */ |
6247 | 510 |
void NetworkUDPAdvertise() |
668
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
511 |
{ |
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
512 |
struct sockaddr_in out_addr; |
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
513 |
|
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
514 |
/* Check if we should send an advertise */ |
9481
25ed9b0c242a
(svn r13433) -Codechange: remove a now useless global variable.
rubidium
parents:
9451
diff
changeset
|
515 |
if (!_networking || !_network_server || !_network_udp_server || !_settings_client.network.server_advertise) |
668
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
516 |
return; |
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
517 |
|
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
518 |
/* check for socket */ |
5624
6afe9d27430a
(svn r8083) -Codechange: make a NetworkSocketHandler as base for all sockets and move a little of NetworkClientState functionality to the NetworkSocketHandler. Move the rest of the NetworkClientState to the new NetworkTCPSocketHandler class/struct, which is not yet implemented in an object oriented manner. The UDP socket handler now extends the NetworkSocketHandler instead of having a reference to a NetworkClientState.
rubidium
parents:
5619
diff
changeset
|
519 |
if (!_udp_master_socket->IsConnected()) { |
8826
8fbb67bcf292
(svn r12574) -Fix: binding to a specific IP could cause OpenTTD to not register properly with the masterserver if one has multiple external interfaces.
rubidium
parents:
8270
diff
changeset
|
520 |
if (!_udp_master_socket->Listen(_network_server_bind_ip, 0, false)) return; |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
521 |
} |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
522 |
|
2861
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
523 |
if (_network_need_advertise) { |
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
524 |
_network_need_advertise = false; |
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
525 |
_network_advertise_retries = ADVERTISE_RETRY_TIMES; |
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
526 |
} else { |
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
527 |
/* Only send once every ADVERTISE_NORMAL_INTERVAL ticks */ |
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
528 |
if (_network_advertise_retries == 0) { |
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
529 |
if ((_network_last_advertise_frame + ADVERTISE_NORMAL_INTERVAL) > _frame_counter) |
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
530 |
return; |
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
531 |
_network_advertise_retries = ADVERTISE_RETRY_TIMES; |
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
532 |
} |
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
533 |
|
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
534 |
if ((_network_last_advertise_frame + ADVERTISE_RETRY_INTERVAL) > _frame_counter) |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
535 |
return; |
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
536 |
} |
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
537 |
|
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
738
diff
changeset
|
538 |
_network_advertise_retries--; |
2861
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2817
diff
changeset
|
539 |
_network_last_advertise_frame = _frame_counter; |
668
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
540 |
|
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
541 |
/* Find somewhere to send */ |
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
542 |
out_addr.sin_family = AF_INET; |
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
543 |
out_addr.sin_port = htons(NETWORK_MASTER_SERVER_PORT); |
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
544 |
out_addr.sin_addr.s_addr = NetworkResolveHost(NETWORK_MASTER_SERVER_HOST); |
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
545 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5341
diff
changeset
|
546 |
DEBUG(net, 1, "[udp] advertising to master server"); |
668
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
547 |
|
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
548 |
/* Send the packet */ |
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
549 |
Packet p(PACKET_UDP_SERVER_REGISTER); |
668
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
550 |
/* Packet is: WELCOME_MESSAGE, Version, server_port */ |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
551 |
p.Send_string(NETWORK_MASTER_SERVER_WELCOME_MESSAGE); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
552 |
p.Send_uint8 (NETWORK_MASTER_SERVER_VERSION); |
9420
8a38703928e8
(svn r13334) -Codechange: move the network settings variables from network/network_internal to settings.
rubidium
parents:
9413
diff
changeset
|
553 |
p.Send_uint16(_settings_client.network.server_port); |
5898
4c682e9a58cc
(svn r8521) -Codechange: initial step in converting Packet to a class; make and use constructors and functions related to the reading/saving the packet size.
rubidium
parents:
5861
diff
changeset
|
554 |
_udp_master_socket->SendPacket(&p, &out_addr); |
668
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
555 |
} |
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
638
diff
changeset
|
556 |
|
6247 | 557 |
void NetworkUDPInitialize() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
558 |
{ |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
559 |
_udp_client_socket = new ClientNetworkUDPSocketHandler(); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
560 |
_udp_server_socket = new ServerNetworkUDPSocketHandler(); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
561 |
_udp_master_socket = new MasterNetworkUDPSocketHandler(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
562 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
563 |
_network_udp_server = false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
564 |
_network_udp_broadcast = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
565 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
566 |
|
6247 | 567 |
void NetworkUDPShutdown() |
5619
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
568 |
{ |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
569 |
NetworkUDPCloseAll(); |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
570 |
|
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
571 |
delete _udp_client_socket; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
572 |
delete _udp_server_socket; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
573 |
delete _udp_master_socket; |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
574 |
} |
9f5a7152403a
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
rubidium
parents:
5587
diff
changeset
|
575 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
576 |
#endif /* ENABLE_NETWORK */ |