author | rubidium |
Fri, 11 Jan 2008 00:30:32 +0000 | |
changeset 8247 | 16e1c8db6f55 |
parent 8214 | 971f861d5543 |
child 8254 | 1496654ca5e7 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
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:
5432
diff
changeset
|
3 |
#include "../stdafx.h" |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
4 |
#include "network_data.h" |
0 | 5 |
|
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
7454
diff
changeset
|
6 |
extern const char _openttd_revision[]; |
663
80c66fd07863
(svn r1098) -Fix: server without revision build doesn't care about the client's version. Also moved all revision things where it belongs (network.c)
darkvater
parents:
662
diff
changeset
|
7 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
8 |
#ifdef ENABLE_NETWORK |
0 | 9 |
|
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:
5432
diff
changeset
|
10 |
#include "../openttd.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:
5432
diff
changeset
|
11 |
#include "../debug.h" |
8114
dd6d21dc99c1
(svn r11675) -Codechange: split the string types from the string functions.
rubidium
parents:
8024
diff
changeset
|
12 |
#include "../strings_func.h" |
8139
4e91c448c409
(svn r11701) -Codechange: removal unnecessary inclusions of map.h (and split map.h).
rubidium
parents:
8133
diff
changeset
|
13 |
#include "../map_func.h" |
8116
8da76dcb3287
(svn r11677) -Codechange: move price and command related types/functions to their respective places.
rubidium
parents:
8114
diff
changeset
|
14 |
#include "../command_func.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:
5432
diff
changeset
|
15 |
#include "../variables.h" |
8140
0d0d8c94f84b
(svn r11702) -Codechange: move all date related stuff to date*.
rubidium
parents:
8139
diff
changeset
|
16 |
#include "../date_func.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:
5432
diff
changeset
|
17 |
#include "../newgrf_config.h" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
5469
diff
changeset
|
18 |
#include "table/strings.h" |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
19 |
#include "network_client.h" |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
20 |
#include "network_server.h" |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
21 |
#include "network_udp.h" |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
22 |
#include "network_gamelist.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:
5432
diff
changeset
|
23 |
#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:
5432
diff
changeset
|
24 |
#include "core/tcp.h" |
5523
623a8856e35b
(svn r7829) -Codechange: move the network (core) initialization/shutdown functions into network/core, so the can be reused in the masterserver_updater.
rubidium
parents:
5521
diff
changeset
|
25 |
#include "core/core.h" |
5432
5940d6a253c5
(svn r7638) -Codechange: Remove special window ShowJoinStatusWindowAfterJoin and shuffle around
Darkvater
parents:
5380
diff
changeset
|
26 |
#include "network_gui.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:
5432
diff
changeset
|
27 |
#include "../console.h" /* IConsoleCmdExec */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
28 |
#include <stdarg.h> /* va_list */ |
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:
5432
diff
changeset
|
29 |
#include "../md5.h" |
7187
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
30 |
#include "../fileio.h" |
8119
52b48108425a
(svn r11680) -Codechange: refactor more out of openttd.h and functions.h.
rubidium
parents:
8116
diff
changeset
|
31 |
#include "../texteff.hpp" |
8131
160939e24ed3
(svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'
rubidium
parents:
8119
diff
changeset
|
32 |
#include "../core/random_func.hpp" |
160939e24ed3
(svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'
rubidium
parents:
8119
diff
changeset
|
33 |
#include "../window_func.h" |
8214
971f861d5543
(svn r11777) -Codechange: split the string header and make do not include it when it's not necessary.
rubidium
parents:
8199
diff
changeset
|
34 |
#include "../string_func.h" |
8199
3c13a496ca80
(svn r11762) -Fix: compilation with DEBUG_DUMP_COMMANDS was broken
glx
parents:
8140
diff
changeset
|
35 |
#ifdef DEBUG_DUMP_COMMANDS |
3c13a496ca80
(svn r11762) -Fix: compilation with DEBUG_DUMP_COMMANDS was broken
glx
parents:
8140
diff
changeset
|
36 |
#include "../core/alloc_func.hpp" |
8247
16e1c8db6f55
(svn r11811) -Fix: make compilation without networking work again (and thus move the debugdumpcommand stuff out of the network 'area').
rubidium
parents:
8214
diff
changeset
|
37 |
#endif /* DEBUG_DUMP_COMMANDS */ |
0 | 38 |
|
5810
d24e5ce302b9
(svn r8372) -Fix (8361): NUM_LANDSCAPE comes (via some detour) from openttd.h, which does not exist in the masterserver/updater.
rubidium
parents:
5704
diff
changeset
|
39 |
/* Check whether NETWORK_NUM_LANDSCAPES is still in sync with NUM_LANDSCAPE */ |
d24e5ce302b9
(svn r8372) -Fix (8361): NUM_LANDSCAPE comes (via some detour) from openttd.h, which does not exist in the masterserver/updater.
rubidium
parents:
5704
diff
changeset
|
40 |
assert_compile((int)NETWORK_NUM_LANDSCAPES == (int)NUM_LANDSCAPE); |
d24e5ce302b9
(svn r8372) -Fix (8361): NUM_LANDSCAPE comes (via some detour) from openttd.h, which does not exist in the masterserver/updater.
rubidium
parents:
5704
diff
changeset
|
41 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
42 |
// global variables (declared in network_data.h) |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
43 |
CommandPacket *_local_command_queue; |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
44 |
|
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
|
45 |
extern 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
|
46 |
extern 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
|
47 |
extern NetworkUDPSocketHandler *_udp_master_socket; ///< udp master socket |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
48 |
|
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
49 |
// Here we keep track of the clients |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
50 |
// (and the client uses [0] for his own communication) |
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
|
51 |
NetworkTCPSocketHandler _clients[MAX_CLIENTS]; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
52 |
|
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
53 |
|
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
54 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
55 |
// The listen socket for the server |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
56 |
static SOCKET _listensocket; |
0 | 57 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
58 |
// The amount of clients connected |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
59 |
static byte _network_clients_connected = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
60 |
// The index counter for new clients (is never decreased) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
61 |
static uint16 _network_client_index = NETWORK_SERVER_INDEX + 1; |
0 | 62 |
|
716
8af847728d5b
(svn r1168) -Cleanup: [Network] Cleaned the network code a bit. Added 'const'
truelight
parents:
710
diff
changeset
|
63 |
/* Some externs / forwards */ |
6247 | 64 |
extern void StateGameLoop(); |
716
8af847728d5b
(svn r1168) -Cleanup: [Network] Cleaned the network code a bit. Added 'const'
truelight
parents:
710
diff
changeset
|
65 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
66 |
// Function that looks up the CI for a given client-index |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
67 |
NetworkClientInfo *NetworkFindClientInfoFromIndex(uint16 client_index) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
68 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
69 |
NetworkClientInfo *ci; |
0 | 70 |
|
4883
c9c7d15c0b0b
(svn r6820) -Codechange: Some more const correctness, coding style.
Darkvater
parents:
4880
diff
changeset
|
71 |
for (ci = _network_client_info; ci != endof(_network_client_info); ci++) { |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
72 |
if (ci->client_index == client_index) return ci; |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
73 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
74 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
75 |
return NULL; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
76 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
77 |
|
2859
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
78 |
/** Return the CI for a given IP |
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
79 |
* @param ip IP of the client we are looking for. This must be in string-format |
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
80 |
* @return return a pointer to the corresponding NetworkClientInfo struct or NULL on failure */ |
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
81 |
NetworkClientInfo *NetworkFindClientInfoFromIP(const char *ip) |
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
82 |
{ |
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
83 |
NetworkClientInfo *ci; |
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
84 |
uint32 ip_number = inet_addr(ip); |
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
85 |
|
4883
c9c7d15c0b0b
(svn r6820) -Codechange: Some more const correctness, coding style.
Darkvater
parents:
4880
diff
changeset
|
86 |
for (ci = _network_client_info; ci != endof(_network_client_info); ci++) { |
2859
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
87 |
if (ci->client_ip == ip_number) return ci; |
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
88 |
} |
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
89 |
|
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
90 |
return NULL; |
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
91 |
} |
ed471404f531
(svn r3407) - Feature: Kick and ban now with IP numbers.
Darkvater
parents:
2639
diff
changeset
|
92 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
93 |
// Function that looks up the CS for a given client-index |
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
|
94 |
NetworkTCPSocketHandler *NetworkFindClientStateFromIndex(uint16 client_index) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
95 |
{ |
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
|
96 |
NetworkTCPSocketHandler *cs; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
97 |
|
5569
d89d1235add5
(svn r7984) -Fix: out-of-bounds read access on _clients array (Quark)
Darkvater
parents:
5524
diff
changeset
|
98 |
for (cs = _clients; cs != endof(_clients); cs++) { |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
99 |
if (cs->index == client_index) return cs; |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
100 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
101 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
102 |
return NULL; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
103 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
104 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
105 |
// NetworkGetClientName is a server-safe function to get the name of the client |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
106 |
// if the user did not send it yet, Client #<no> is used. |
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
|
107 |
void NetworkGetClientName(char *client_name, size_t size, const NetworkTCPSocketHandler *cs) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
108 |
{ |
3623
9b612a4bbd39
(svn r4521) - Fix: be consistent about the size of the player-name in MP. This hopefully fixes a crash on lesser OS's (eg Win98). Use ttd_strlcpy() to just copy over strings and properly terminate them because different implementations of snprintf() behave differently. Courtesy of TrueLight
Darkvater
parents:
3438
diff
changeset
|
109 |
const NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs); |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
110 |
|
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
111 |
if (ci->client_name[0] == '\0') { |
3623
9b612a4bbd39
(svn r4521) - Fix: be consistent about the size of the player-name in MP. This hopefully fixes a crash on lesser OS's (eg Win98). Use ttd_strlcpy() to just copy over strings and properly terminate them because different implementations of snprintf() behave differently. Courtesy of TrueLight
Darkvater
parents:
3438
diff
changeset
|
112 |
snprintf(client_name, size, "Client #%4d", cs->index); |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
113 |
} else { |
3623
9b612a4bbd39
(svn r4521) - Fix: be consistent about the size of the player-name in MP. This hopefully fixes a crash on lesser OS's (eg Win98). Use ttd_strlcpy() to just copy over strings and properly terminate them because different implementations of snprintf() behave differently. Courtesy of TrueLight
Darkvater
parents:
3438
diff
changeset
|
114 |
ttd_strlcpy(client_name, ci->client_name, size); |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
115 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
116 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
117 |
|
6247 | 118 |
byte NetworkSpectatorCount() |
2944
2360b2da2bb0
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2915
diff
changeset
|
119 |
{ |
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
|
120 |
NetworkTCPSocketHandler *cs; |
2944
2360b2da2bb0
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2915
diff
changeset
|
121 |
byte count = 0; |
2360b2da2bb0
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2915
diff
changeset
|
122 |
|
2360b2da2bb0
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2915
diff
changeset
|
123 |
FOR_ALL_CLIENTS(cs) { |
4848
45f848b46222
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4829
diff
changeset
|
124 |
if (DEREF_CLIENT_INFO(cs)->client_playas == PLAYER_SPECTATOR) count++; |
2944
2360b2da2bb0
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2915
diff
changeset
|
125 |
} |
2360b2da2bb0
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2915
diff
changeset
|
126 |
|
2360b2da2bb0
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2915
diff
changeset
|
127 |
return count; |
2360b2da2bb0
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2915
diff
changeset
|
128 |
} |
2360b2da2bb0
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2915
diff
changeset
|
129 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
130 |
// This puts a text-message to the console, or in the future, the chat-box, |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
131 |
// (to keep it all a bit more general) |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
132 |
// If 'self_send' is true, this is the client who is sending the message |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
133 |
void CDECL NetworkTextMessage(NetworkAction action, uint16 color, bool self_send, const char *name, const char *str, ...) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
134 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
135 |
char buf[1024]; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
136 |
va_list va; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
137 |
const int duration = 10; // Game days the messages stay visible |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
138 |
char message[1024]; |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
139 |
char temp[1024]; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
140 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
141 |
va_start(va, str); |
2373
e073ec69bf56
(svn r2899) -Fix: Several format string vulnerabilities and buffer overflows in the network code
tron
parents:
2235
diff
changeset
|
142 |
vsnprintf(buf, lengthof(buf), str, va); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
143 |
va_end(va); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
144 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
145 |
switch (action) { |
4944
f597859bba38
(svn r6932) -Codechange: Send server messages with format NETWORK_ACTION_SERVER_MESSAGE so it is
Darkvater
parents:
4943
diff
changeset
|
146 |
case NETWORK_ACTION_SERVER_MESSAGE: |
f597859bba38
(svn r6932) -Codechange: Send server messages with format NETWORK_ACTION_SERVER_MESSAGE so it is
Darkvater
parents:
4943
diff
changeset
|
147 |
color = 1; |
f597859bba38
(svn r6932) -Codechange: Send server messages with format NETWORK_ACTION_SERVER_MESSAGE so it is
Darkvater
parents:
4943
diff
changeset
|
148 |
snprintf(message, sizeof(message), "*** %s", buf); |
f597859bba38
(svn r6932) -Codechange: Send server messages with format NETWORK_ACTION_SERVER_MESSAGE so it is
Darkvater
parents:
4943
diff
changeset
|
149 |
break; |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
150 |
case NETWORK_ACTION_JOIN: |
4944
f597859bba38
(svn r6932) -Codechange: Send server messages with format NETWORK_ACTION_SERVER_MESSAGE so it is
Darkvater
parents:
4943
diff
changeset
|
151 |
color = 1; |
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4908
diff
changeset
|
152 |
GetString(temp, STR_NETWORK_CLIENT_JOINED, lastof(temp)); |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
153 |
snprintf(message, sizeof(message), "*** %s %s", name, temp); |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
154 |
break; |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
155 |
case NETWORK_ACTION_LEAVE: |
4944
f597859bba38
(svn r6932) -Codechange: Send server messages with format NETWORK_ACTION_SERVER_MESSAGE so it is
Darkvater
parents:
4943
diff
changeset
|
156 |
color = 1; |
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4908
diff
changeset
|
157 |
GetString(temp, STR_NETWORK_ERR_LEFT, lastof(temp)); |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
158 |
snprintf(message, sizeof(message), "*** %s %s (%s)", name, temp, buf); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
159 |
break; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
160 |
case NETWORK_ACTION_GIVE_MONEY: |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
161 |
if (self_send) { |
2055
4926ed1a7562
(svn r2564) Fix: Fixed conceptual issue in network_gui.c. AllocateName is not meant to be used by GUI-code, because it modifies the "game-state".
ludde
parents:
1899
diff
changeset
|
162 |
SetDParamStr(0, name); |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
163 |
SetDParam(1, atoi(buf)); |
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4908
diff
changeset
|
164 |
GetString(temp, STR_NETWORK_GAVE_MONEY_AWAY, lastof(temp)); |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
165 |
snprintf(message, sizeof(message), "*** %s", temp); |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
166 |
} else { |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
167 |
SetDParam(0, atoi(buf)); |
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4908
diff
changeset
|
168 |
GetString(temp, STR_NETWORK_GIVE_MONEY, lastof(temp)); |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
169 |
snprintf(message, sizeof(message), "*** %s %s", name, temp); |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
170 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
171 |
break; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
172 |
case NETWORK_ACTION_NAME_CHANGE: |
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4908
diff
changeset
|
173 |
GetString(temp, STR_NETWORK_NAME_CHANGE, lastof(temp)); |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
174 |
snprintf(message, sizeof(message), "*** %s %s %s", name, temp, buf); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
175 |
break; |
4943
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
176 |
case NETWORK_ACTION_CHAT_COMPANY: |
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
177 |
SetDParamStr(0, name); |
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
178 |
SetDParamStr(1, buf); |
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
179 |
GetString(temp, self_send ? STR_NETWORK_CHAT_TO_COMPANY : STR_NETWORK_CHAT_COMPANY, lastof(temp)); |
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
180 |
ttd_strlcpy(message, temp, sizeof(message)); |
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
181 |
break; |
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
182 |
case NETWORK_ACTION_CHAT_CLIENT: |
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
183 |
SetDParamStr(0, name); |
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
184 |
SetDParamStr(1, buf); |
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
185 |
GetString(temp, self_send ? STR_NETWORK_CHAT_TO_CLIENT : STR_NETWORK_CHAT_CLIENT, lastof(temp)); |
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
186 |
ttd_strlcpy(message, temp, sizeof(message)); |
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
187 |
break; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
188 |
default: |
2055
4926ed1a7562
(svn r2564) Fix: Fixed conceptual issue in network_gui.c. AllocateName is not meant to be used by GUI-code, because it modifies the "game-state".
ludde
parents:
1899
diff
changeset
|
189 |
SetDParamStr(0, name); |
4943
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
190 |
SetDParamStr(1, buf); |
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4908
diff
changeset
|
191 |
GetString(temp, STR_NETWORK_CHAT_ALL, lastof(temp)); |
4943
d3b8e26a7071
(svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are
Darkvater
parents:
4912
diff
changeset
|
192 |
ttd_strlcpy(message, temp, sizeof(message)); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
193 |
break; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
194 |
} |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
195 |
|
8247
16e1c8db6f55
(svn r11811) -Fix: make compilation without networking work again (and thus move the debugdumpcommand stuff out of the network 'area').
rubidium
parents:
8214
diff
changeset
|
196 |
DebugDumpCommands("ddc:cmsg:%d;%d;%s\n", _date, _date_fract, message); |
732
0b3002da2589
(svn r1184) -Fix: [Network] %p as chat message no longer gives funny result (tnx to
truelight
parents:
722
diff
changeset
|
197 |
IConsolePrintF(color, "%s", message); |
7454
e55eea8c05c7
(svn r10932) -Codechange: replace "text" with "chat" for the chat related function and variables.
rubidium
parents:
7220
diff
changeset
|
198 |
AddChatMessage(color, duration, "%s", message); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
199 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
200 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
201 |
// Calculate the frame-lag of a client |
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
|
202 |
uint NetworkCalculateLag(const NetworkTCPSocketHandler *cs) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
203 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
204 |
int lag = cs->last_frame_server - cs->last_frame; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
205 |
// This client has missed his ACK packet after 1 DAY_TICKS.. |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
206 |
// so we increase his lag for every frame that passes! |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
207 |
// The packet can be out by a max of _net_frame_freq |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
208 |
if (cs->last_frame_server + DAY_TICKS + _network_frame_freq < _frame_counter) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
209 |
lag += _frame_counter - (cs->last_frame_server + DAY_TICKS + _network_frame_freq); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
210 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
211 |
return lag; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
212 |
} |
0 | 213 |
|
214 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
215 |
// There was a non-recoverable error, drop back to the main menu with a nice |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
216 |
// error |
1095 | 217 |
static void NetworkError(StringID error_string) |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
218 |
{ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
219 |
_switch_mode = SM_MENU; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
220 |
_switch_mode_errorstr = error_string; |
105 | 221 |
} |
222 |
||
1010
977aafc6b8e3
(svn r1509) Const correctness and add static where appropriate while touching the lines anyway
tron
parents:
959
diff
changeset
|
223 |
static void ClientStartError(const char *error) |
977aafc6b8e3
(svn r1509) Const correctness and add static where appropriate while touching the lines anyway
tron
parents:
959
diff
changeset
|
224 |
{ |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
225 |
DEBUG(net, 0, "[client] could not start network: %s",error); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
226 |
NetworkError(STR_NETWORK_ERR_CLIENT_START); |
0 | 227 |
} |
228 |
||
1010
977aafc6b8e3
(svn r1509) Const correctness and add static where appropriate while touching the lines anyway
tron
parents:
959
diff
changeset
|
229 |
static void ServerStartError(const char *error) |
977aafc6b8e3
(svn r1509) Const correctness and add static where appropriate while touching the lines anyway
tron
parents:
959
diff
changeset
|
230 |
{ |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
231 |
DEBUG(net, 0, "[server] could not start network: %s",error); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
232 |
NetworkError(STR_NETWORK_ERR_SERVER_START); |
208 | 233 |
} |
234 |
||
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
|
235 |
static void NetworkClientError(NetworkRecvStatus res, NetworkTCPSocketHandler* cs) |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
236 |
{ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
237 |
// First, send a CLIENT_ERROR to the server, so he knows we are |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
238 |
// disconnection (and why!) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
239 |
NetworkErrorCode errorno; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
240 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
241 |
// We just want to close the connection.. |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
242 |
if (res == NETWORK_RECV_STATUS_CLOSE_QUERY) { |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
243 |
cs->has_quit = true; |
716
8af847728d5b
(svn r1168) -Cleanup: [Network] Cleaned the network code a bit. Added 'const'
truelight
parents:
710
diff
changeset
|
244 |
NetworkCloseClient(cs); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
245 |
_networking = false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
246 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
247 |
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
248 |
return; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
249 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
250 |
|
2952 | 251 |
switch (res) { |
5872
63eafeb3f393
(svn r8461) -Feature: check for NewGRF compatability before actually downloading the map from a game server when connecting from the command prompt and internal console.
rubidium
parents:
5810
diff
changeset
|
252 |
case NETWORK_RECV_STATUS_DESYNC: errorno = NETWORK_ERROR_DESYNC; break; |
63eafeb3f393
(svn r8461) -Feature: check for NewGRF compatability before actually downloading the map from a game server when connecting from the command prompt and internal console.
rubidium
parents:
5810
diff
changeset
|
253 |
case NETWORK_RECV_STATUS_SAVEGAME: errorno = NETWORK_ERROR_SAVEGAME_FAILED; break; |
63eafeb3f393
(svn r8461) -Feature: check for NewGRF compatability before actually downloading the map from a game server when connecting from the command prompt and internal console.
rubidium
parents:
5810
diff
changeset
|
254 |
case NETWORK_RECV_STATUS_NEWGRF_MISMATCH: errorno = NETWORK_ERROR_NEWGRF_MISMATCH; break; |
63eafeb3f393
(svn r8461) -Feature: check for NewGRF compatability before actually downloading the map from a game server when connecting from the command prompt and internal console.
rubidium
parents:
5810
diff
changeset
|
255 |
default: errorno = NETWORK_ERROR_GENERAL; break; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
256 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
257 |
// This means we fucked up and the server closed the connection |
841
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
258 |
if (res != NETWORK_RECV_STATUS_SERVER_ERROR && res != NETWORK_RECV_STATUS_SERVER_FULL && |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
259 |
res != NETWORK_RECV_STATUS_SERVER_BANNED) { |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
260 |
SEND_COMMAND(PACKET_CLIENT_ERROR)(errorno); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
261 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
262 |
// Dequeue all commands before closing the socket |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5898
diff
changeset
|
263 |
DEREF_CLIENT(0)->Send_Packets(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
264 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
265 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
266 |
_switch_mode = SM_MENU; |
716
8af847728d5b
(svn r1168) -Cleanup: [Network] Cleaned the network code a bit. Added 'const'
truelight
parents:
710
diff
changeset
|
267 |
NetworkCloseClient(cs); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
268 |
_networking = false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
269 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
270 |
|
3437
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
271 |
/** Retrieve a string representation of an internal error number |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
272 |
* @param buf buffer where the error message will be stored |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
273 |
* @param err NetworkErrorCode |
3437
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
274 |
* @return returns a pointer to the error message (buf) */ |
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4908
diff
changeset
|
275 |
char* GetNetworkErrorMsg(char* buf, NetworkErrorCode err, const char* last) |
3437
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
276 |
{ |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
277 |
/* List of possible network errors, used by |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
278 |
* PACKET_SERVER_ERROR and PACKET_CLIENT_ERROR */ |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
279 |
static const StringID network_error_strings[] = { |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
280 |
STR_NETWORK_ERR_CLIENT_GENERAL, |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
281 |
STR_NETWORK_ERR_CLIENT_DESYNC, |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
282 |
STR_NETWORK_ERR_CLIENT_SAVEGAME, |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
283 |
STR_NETWORK_ERR_CLIENT_CONNECTION_LOST, |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
284 |
STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR, |
5872
63eafeb3f393
(svn r8461) -Feature: check for NewGRF compatability before actually downloading the map from a game server when connecting from the command prompt and internal console.
rubidium
parents:
5810
diff
changeset
|
285 |
STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH, |
3437
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
286 |
STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED, |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
287 |
STR_NETWORK_ERR_CLIENT_NOT_EXPECTED, |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
288 |
STR_NETWORK_ERR_CLIENT_WRONG_REVISION, |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
289 |
STR_NETWORK_ERR_CLIENT_NAME_IN_USE, |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
290 |
STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD, |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
291 |
STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH, |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
292 |
STR_NETWORK_ERR_CLIENT_KICKED, |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
293 |
STR_NETWORK_ERR_CLIENT_CHEATER, |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
294 |
STR_NETWORK_ERR_CLIENT_SERVER_FULL |
3437
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
295 |
}; |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
296 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
297 |
if (err >= (ptrdiff_t)lengthof(network_error_strings)) err = NETWORK_ERROR_GENERAL; |
3437
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
298 |
|
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4908
diff
changeset
|
299 |
return GetString(buf, network_error_strings[err], last); |
3437
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
300 |
} |
044111ac24cf
(svn r4267) - Fix (r4241): also validate the error number that a client receives from a server, and encapsulate this functionality into GetNetworkErrorMsg().
Darkvater
parents:
2952
diff
changeset
|
301 |
|
4716
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
302 |
/* Count the number of active clients connected */ |
6247 | 303 |
static uint NetworkCountPlayers() |
4716
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
304 |
{ |
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
|
305 |
NetworkTCPSocketHandler *cs; |
4716
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
306 |
uint count = 0; |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
307 |
|
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
308 |
FOR_ALL_CLIENTS(cs) { |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
309 |
const NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs); |
4878
4d4f76a898fd
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4859
diff
changeset
|
310 |
if (IsValidPlayer(ci->client_playas)) count++; |
4716
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
311 |
} |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
312 |
|
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
313 |
return count; |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
314 |
} |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
315 |
|
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
316 |
static bool _min_players_paused = false; |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
317 |
|
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
318 |
/* Check if the minimum number of players has been reached and pause or unpause the game as appropriate */ |
6247 | 319 |
void CheckMinPlayers() |
4716
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
320 |
{ |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
321 |
if (!_network_dedicated) return; |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
322 |
|
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
323 |
if (NetworkCountPlayers() < _network_min_players) { |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
324 |
if (_min_players_paused) return; |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
325 |
|
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
326 |
_min_players_paused = true; |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
327 |
DoCommandP(0, 1, 0, NULL, CMD_PAUSE); |
4944
f597859bba38
(svn r6932) -Codechange: Send server messages with format NETWORK_ACTION_SERVER_MESSAGE so it is
Darkvater
parents:
4943
diff
changeset
|
328 |
NetworkServer_HandleChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_BROADCAST, 0, "Game paused (not enough players)", NETWORK_SERVER_INDEX); |
4716
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
329 |
} else { |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
330 |
if (!_min_players_paused) return; |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
331 |
|
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
332 |
_min_players_paused = false; |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
333 |
DoCommandP(0, 0, 0, NULL, CMD_PAUSE); |
4944
f597859bba38
(svn r6932) -Codechange: Send server messages with format NETWORK_ACTION_SERVER_MESSAGE so it is
Darkvater
parents:
4943
diff
changeset
|
334 |
NetworkServer_HandleChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_BROADCAST, 0, "Game unpaused (enough players)", NETWORK_SERVER_INDEX); |
4716
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
335 |
} |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
336 |
} |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
337 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
338 |
// Find all IP-aliases for this host |
6247 | 339 |
static void NetworkFindIPs() |
0 | 340 |
{ |
5976
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
341 |
#if !defined(PSP) |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
342 |
int i; |
0 | 343 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
344 |
#if defined(BEOS_NET_SERVER) /* doesn't have neither getifaddrs or net/if.h */ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
345 |
/* Based on Andrew Bachmann's netstat+.c. Big thanks to him! */ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
346 |
int _netstat(int fd, char **output, int verbose); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
347 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
348 |
int seek_past_header(char **pos, const char *header) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
349 |
char *new_pos = strstr(*pos, header); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
350 |
if (new_pos == 0) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
351 |
return B_ERROR; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
352 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
353 |
*pos += strlen(header) + new_pos - *pos + 1; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
354 |
return B_OK; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
355 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
356 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
357 |
int output_length; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
358 |
char *output_pointer = NULL; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
359 |
char **output; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
360 |
int sock = socket(AF_INET, SOCK_DGRAM, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
361 |
i = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
362 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
363 |
// If something fails, make sure the list is empty |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
364 |
_broadcast_list[0] = 0; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
365 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
366 |
if (sock < 0) { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
367 |
DEBUG(net, 0, "[core] error creating socket"); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
368 |
return; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
369 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
370 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
371 |
output_length = _netstat(sock, &output_pointer, 1); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
372 |
if (output_length < 0) { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
373 |
DEBUG(net, 0, "[core] error running _netstat"); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
374 |
return; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
375 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
376 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
377 |
output = &output_pointer; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
378 |
if (seek_past_header(output, "IP Interfaces:") == B_OK) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
379 |
for (;;) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
380 |
uint32 n, fields, read; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
381 |
uint8 i1, i2, i3, i4, j1, j2, j3, j4; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
382 |
struct in_addr inaddr; |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
383 |
uint32 ip; |
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
384 |
uint32 netmask; |
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
385 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
386 |
fields = sscanf(*output, "%u: %hhu.%hhu.%hhu.%hhu, netmask %hhu.%hhu.%hhu.%hhu%n", |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
387 |
&n, &i1,&i2,&i3,&i4, &j1,&j2,&j3,&j4, &read); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
388 |
read += 1; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
389 |
if (fields != 9) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
390 |
break; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
391 |
} |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
392 |
|
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
393 |
ip = (uint32)i1 << 24 | (uint32)i2 << 16 | (uint32)i3 << 8 | (uint32)i4; |
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
394 |
netmask = (uint32)j1 << 24 | (uint32)j2 << 16 | (uint32)j3 << 8 | (uint32)j4; |
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
395 |
|
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
396 |
if (ip != INADDR_LOOPBACK && ip != INADDR_ANY) { |
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
397 |
inaddr.s_addr = htonl(ip | ~netmask); |
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
398 |
_broadcast_list[i] = inaddr.s_addr; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
399 |
i++; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
400 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
401 |
if (read < 0) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
402 |
break; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
403 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
404 |
*output += read; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
405 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
406 |
/* XXX - Using either one of these crashes openttd heavily? - wber */ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
407 |
/*free(output_pointer);*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
408 |
/*free(output);*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
409 |
closesocket(sock); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
410 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
411 |
#elif defined(HAVE_GETIFADDRS) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
412 |
struct ifaddrs *ifap, *ifa; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
413 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
414 |
// If something fails, make sure the list is empty |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
415 |
_broadcast_list[0] = 0; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
416 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
417 |
if (getifaddrs(&ifap) != 0) |
0 | 418 |
return; |
419 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
420 |
i = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
421 |
for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) { |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
422 |
if (!(ifa->ifa_flags & IFF_BROADCAST)) continue; |
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
423 |
if (ifa->ifa_broadaddr == NULL) continue; |
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
424 |
if (ifa->ifa_broadaddr->sa_family != AF_INET) continue; |
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
425 |
_broadcast_list[i] = ((struct sockaddr_in*)ifa->ifa_broadaddr)->sin_addr.s_addr; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
426 |
i++; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
427 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
428 |
freeifaddrs(ifap); |
0 | 429 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
430 |
#else /* not HAVE_GETIFADDRS */ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
431 |
SOCKET sock; |
4033
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
432 |
#ifdef WIN32 |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
433 |
DWORD len = 0; |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
434 |
INTERFACE_INFO ifo[MAX_INTERFACES]; |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
435 |
uint j; |
4033
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
436 |
#else |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
437 |
char buf[4 * 1024]; // Arbitrary buffer size |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
438 |
struct ifconf ifconf; |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
439 |
const char* buf_end; |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
440 |
const char* p; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
441 |
#endif |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
442 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
443 |
// If something fails, make sure the list is empty |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
444 |
_broadcast_list[0] = 0; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
445 |
|
1466 | 446 |
sock = socket(AF_INET, SOCK_DGRAM, 0); |
447 |
if (sock == INVALID_SOCKET) return; |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
448 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
449 |
#ifdef WIN32 |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
450 |
memset(&ifo[0], 0, sizeof(ifo)); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
451 |
if ((WSAIoctl(sock, SIO_GET_INTERFACE_LIST, NULL, 0, &ifo[0], sizeof(ifo), &len, NULL, NULL)) != 0) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
452 |
closesocket(sock); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
453 |
return; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
454 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
455 |
|
4036
8e08ed32acfd
(svn r5295) Handle a quirk in the Windows interface detection code and fix a typo in r5293 (thanks to Darkvater for testing)
tron
parents:
4034
diff
changeset
|
456 |
i = 0; |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
457 |
for (j = 0; j < len / sizeof(*ifo); j++) { |
4036
8e08ed32acfd
(svn r5295) Handle a quirk in the Windows interface detection code and fix a typo in r5293 (thanks to Darkvater for testing)
tron
parents:
4034
diff
changeset
|
458 |
if (ifo[j].iiFlags & IFF_LOOPBACK) continue; |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
459 |
if (!(ifo[j].iiFlags & IFF_BROADCAST)) continue; |
4036
8e08ed32acfd
(svn r5295) Handle a quirk in the Windows interface detection code and fix a typo in r5293 (thanks to Darkvater for testing)
tron
parents:
4034
diff
changeset
|
460 |
/* iiBroadcast is unusable, because it always seems to be set to |
8e08ed32acfd
(svn r5295) Handle a quirk in the Windows interface detection code and fix a typo in r5293 (thanks to Darkvater for testing)
tron
parents:
4034
diff
changeset
|
461 |
* 255.255.255.255. |
8e08ed32acfd
(svn r5295) Handle a quirk in the Windows interface detection code and fix a typo in r5293 (thanks to Darkvater for testing)
tron
parents:
4034
diff
changeset
|
462 |
*/ |
8e08ed32acfd
(svn r5295) Handle a quirk in the Windows interface detection code and fix a typo in r5293 (thanks to Darkvater for testing)
tron
parents:
4034
diff
changeset
|
463 |
_broadcast_list[i++] = |
8e08ed32acfd
(svn r5295) Handle a quirk in the Windows interface detection code and fix a typo in r5293 (thanks to Darkvater for testing)
tron
parents:
4034
diff
changeset
|
464 |
ifo[j].iiAddress.AddressIn.sin_addr.s_addr | |
8e08ed32acfd
(svn r5295) Handle a quirk in the Windows interface detection code and fix a typo in r5293 (thanks to Darkvater for testing)
tron
parents:
4034
diff
changeset
|
465 |
~ifo[j].iiNetmask.AddressIn.sin_addr.s_addr; |
4033
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
466 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
467 |
#else |
4033
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
468 |
ifconf.ifc_len = sizeof(buf); |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
469 |
ifconf.ifc_buf = buf; |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
470 |
if (ioctl(sock, SIOCGIFCONF, &ifconf) == -1) { |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
471 |
closesocket(sock); |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
472 |
return; |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
473 |
} |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
474 |
|
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
475 |
i = 0; |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
476 |
buf_end = buf + ifconf.ifc_len; |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
477 |
for (p = buf; p < buf_end;) { |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
478 |
const struct ifreq* req = (const struct ifreq*)p; |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
479 |
|
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
480 |
if (req->ifr_addr.sa_family == AF_INET) { |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
481 |
struct ifreq r; |
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
482 |
|
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
483 |
strncpy(r.ifr_name, req->ifr_name, lengthof(r.ifr_name)); |
4037
10d5b916cc92
(svn r5297) Check the interface flags if IFF_BROADCAST is set before asking for the broadcast address
tron
parents:
4036
diff
changeset
|
484 |
if (ioctl(sock, SIOCGIFFLAGS, &r) != -1 && |
10d5b916cc92
(svn r5297) Check the interface flags if IFF_BROADCAST is set before asking for the broadcast address
tron
parents:
4036
diff
changeset
|
485 |
r.ifr_flags & IFF_BROADCAST && |
10d5b916cc92
(svn r5297) Check the interface flags if IFF_BROADCAST is set before asking for the broadcast address
tron
parents:
4036
diff
changeset
|
486 |
ioctl(sock, SIOCGIFBRDADDR, &r) != -1) { |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
487 |
_broadcast_list[i++] = |
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
488 |
((struct sockaddr_in*)&r.ifr_broadaddr)->sin_addr.s_addr; |
4033
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
489 |
} |
0 | 490 |
} |
491 |
||
4033
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
492 |
p += sizeof(struct ifreq); |
6219
343fba5c9a44
(svn r9016) [SunOS] -Fix: Don't use a struct-member that doesn't exist.
celestar
parents:
6178
diff
changeset
|
493 |
#if defined(AF_LINK) && !defined(SUNOS) |
4033
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
494 |
p += req->ifr_addr.sa_len - sizeof(struct sockaddr); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
495 |
#endif |
0 | 496 |
} |
4033
20c942fbe0c0
(svn r5292) -Fix: When using SIOCGIFCONF to detect network interfaces accomodate for the fact that struct sockaddr doesn't have fixed size in all implementations
tron
parents:
4000
diff
changeset
|
497 |
#endif |
0 | 498 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
499 |
closesocket(sock); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
500 |
#endif /* not HAVE_GETIFADDRS */ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
501 |
|
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
502 |
_broadcast_list[i] = 0; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
503 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
504 |
DEBUG(net, 3, "Detected broadcast addresses:"); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
505 |
// Now display to the debug all the detected ips |
4034
581c6cb62e72
(svn r5293) -Fix: Not all network interfaces are capable of broadcasting. Don't record those which aren't
tron
parents:
4033
diff
changeset
|
506 |
for (i = 0; _broadcast_list[i] != 0; i++) { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
507 |
DEBUG(net, 3, "%d) %s", i, inet_ntoa(*(struct in_addr *)&_broadcast_list[i]));//inet_ntoa(inaddr)); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
508 |
} |
5976
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
509 |
#endif /* PSP */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
510 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
511 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
512 |
// Resolve a hostname to a inet_addr |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
513 |
unsigned long NetworkResolveHost(const char *hostname) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
514 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
515 |
in_addr_t ip; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
516 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
517 |
// First try: is it an ip address? |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
518 |
ip = inet_addr(hostname); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
519 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
520 |
// If not try to resolve the name |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
521 |
if (ip == INADDR_NONE) { |
5976
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
522 |
struct in_addr addr; |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
523 |
#if !defined(PSP) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
524 |
struct hostent *he = gethostbyname(hostname); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
525 |
if (he == NULL) { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
526 |
DEBUG(net, 0, "Cannot resolve '%s'", hostname); |
5976
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
527 |
return ip; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
528 |
} |
5976
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
529 |
addr = *(struct in_addr *)he->h_addr_list[0]; |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
530 |
#else |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
531 |
int rid = -1; |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
532 |
char buf[1024]; |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
533 |
|
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
534 |
/* Create a resolver */ |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
535 |
if (sceNetResolverCreate(&rid, buf, sizeof(buf)) < 0) { |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
536 |
DEBUG(net, 0, "[NET] Error connecting resolver"); |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
537 |
return ip; |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
538 |
} |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
539 |
|
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
540 |
/* Try to resolve the name */ |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
541 |
if (sceNetResolverStartNtoA(rid, hostname, &addr, 2, 3) < 0) { |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
542 |
DEBUG(net, 0, "[NET] Cannot resolve %s", hostname); |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
543 |
sceNetResolverDelete(rid); |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
544 |
return ip; |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
545 |
} |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
546 |
sceNetResolverDelete(rid); |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
547 |
#endif /* PSP */ |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
548 |
|
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
549 |
DEBUG(net, 1, "[NET] Resolved %s to %s", hostname, inet_ntoa(addr)); |
aa1cae2b975a
(svn r8674) [PSP] -Add: added network code for PSP, based on the work of Turulo
truelight
parents:
5959
diff
changeset
|
550 |
ip = addr.s_addr; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
551 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
552 |
return ip; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
553 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
554 |
|
5704
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
555 |
/** Converts a string to ip/port/player |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
556 |
* Format: IP#player:port |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
557 |
* |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
558 |
* connection_string will be re-terminated to seperate out the hostname, and player and port will |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
559 |
* be set to the player and port strings given by the user, inside the memory area originally |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
560 |
* occupied by connection_string. */ |
1329 | 561 |
void ParseConnectionString(const char **player, const char **port, char *connection_string) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
562 |
{ |
1329 | 563 |
char *p; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
564 |
for (p = connection_string; *p != '\0'; p++) { |
5704
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
565 |
switch (*p) { |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
566 |
case '#': |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
567 |
*player = p + 1; |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
568 |
*p = '\0'; |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
569 |
break; |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
570 |
case ':': |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
571 |
*port = p + 1; |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
572 |
*p = '\0'; |
0e8e27d44b3c
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
Darkvater
parents:
5624
diff
changeset
|
573 |
break; |
0 | 574 |
} |
575 |
} |
|
576 |
} |
|
577 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
578 |
// Creates a new client from a socket |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
579 |
// Used both by the server and the client |
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
|
580 |
static NetworkTCPSocketHandler *NetworkAllocClient(SOCKET s) |
0 | 581 |
{ |
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
|
582 |
NetworkTCPSocketHandler *cs; |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
583 |
byte client_no = 0; |
0 | 584 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
585 |
if (_network_server) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
586 |
// Can we handle a new client? |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
587 |
if (_network_clients_connected >= MAX_CLIENTS) return NULL; |
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
588 |
if (_network_game_info.clients_on >= _network_game_info.clients_max) return NULL; |
206 | 589 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
590 |
// Register the login |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
591 |
client_no = _network_clients_connected++; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
592 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
593 |
|
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
594 |
cs = DEREF_CLIENT(client_no); |
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
|
595 |
cs->Initialize(); |
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
|
596 |
cs->sock = s; |
1602
79f98b4b83fc
(svn r2106) -Fix: improved the network-join algoritm, it is now a bit more stable
truelight
parents:
1466
diff
changeset
|
597 |
cs->last_frame = _frame_counter; |
79f98b4b83fc
(svn r2106) -Fix: improved the network-join algoritm, it is now a bit more stable
truelight
parents:
1466
diff
changeset
|
598 |
cs->last_frame_server = _frame_counter; |
79f98b4b83fc
(svn r2106) -Fix: improved the network-join algoritm, it is now a bit more stable
truelight
parents:
1466
diff
changeset
|
599 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
600 |
if (_network_server) { |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
601 |
NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
602 |
memset(ci, 0, sizeof(*ci)); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
603 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
604 |
cs->index = _network_client_index++; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
605 |
ci->client_index = cs->index; |
4878
4d4f76a898fd
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4859
diff
changeset
|
606 |
ci->client_playas = PLAYER_INACTIVE_CLIENT; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
607 |
ci->join_date = _date; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
608 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
609 |
InvalidateWindow(WC_CLIENT_LIST, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
610 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
611 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
612 |
return cs; |
206 | 613 |
} |
614 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
615 |
// Close a connection |
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
|
616 |
void NetworkCloseClient(NetworkTCPSocketHandler *cs) |
0 | 617 |
{ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
618 |
NetworkClientInfo *ci; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
619 |
// Socket is already dead |
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
|
620 |
if (cs->sock == INVALID_SOCKET) { |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
621 |
cs->has_quit = true; |
903
a301a264e0fc
(svn r1389) -Add: [Network] Added packet protection. No longer a client or server
truelight
parents:
895
diff
changeset
|
622 |
return; |
a301a264e0fc
(svn r1389) -Add: [Network] Added packet protection. No longer a client or server
truelight
parents:
895
diff
changeset
|
623 |
} |
260
4819bcce8389
(svn r266) -Fix: hopefully fixed the desync problem nicely (and reverted the
truelight
parents:
256
diff
changeset
|
624 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
625 |
DEBUG(net, 1, "Closed client connection %d", cs->index); |
0 | 626 |
|
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
627 |
if (!cs->has_quit && _network_server && cs->status > STATUS_INACTIVE) { |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
628 |
// We did not receive a leave message from this client... |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
629 |
NetworkErrorCode errorno = NETWORK_ERROR_CONNECTION_LOST; |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
716
diff
changeset
|
630 |
char str[100]; |
3623
9b612a4bbd39
(svn r4521) - Fix: be consistent about the size of the player-name in MP. This hopefully fixes a crash on lesser OS's (eg Win98). Use ttd_strlcpy() to just copy over strings and properly terminate them because different implementations of snprintf() behave differently. Courtesy of TrueLight
Darkvater
parents:
3438
diff
changeset
|
631 |
char client_name[NETWORK_CLIENT_NAME_LENGTH]; |
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
|
632 |
NetworkTCPSocketHandler *new_cs; |
0 | 633 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
634 |
NetworkGetClientName(client_name, sizeof(client_name), cs); |
0 | 635 |
|
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4908
diff
changeset
|
636 |
GetNetworkErrorMsg(str, errorno, lastof(str)); |
0 | 637 |
|
2373
e073ec69bf56
(svn r2899) -Fix: Several format string vulnerabilities and buffer overflows in the network code
tron
parents:
2235
diff
changeset
|
638 |
NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
639 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
640 |
// Inform other clients of this... strange leaving ;) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
641 |
FOR_ALL_CLIENTS(new_cs) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
642 |
if (new_cs->status > STATUS_AUTH && cs != new_cs) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
643 |
SEND_COMMAND(PACKET_SERVER_ERROR_QUIT)(new_cs, cs->index, errorno); |
0 | 644 |
} |
645 |
} |
|
1604
e5a1b1ff044d
(svn r2108) -Fix: the server now also unpause when a client desyncs or something
truelight
parents:
1602
diff
changeset
|
646 |
} |
1602
79f98b4b83fc
(svn r2106) -Fix: improved the network-join algoritm, it is now a bit more stable
truelight
parents:
1466
diff
changeset
|
647 |
|
1604
e5a1b1ff044d
(svn r2108) -Fix: the server now also unpause when a client desyncs or something
truelight
parents:
1602
diff
changeset
|
648 |
/* When the client was PRE_ACTIVE, the server was in pause mode, so unpause */ |
e5a1b1ff044d
(svn r2108) -Fix: the server now also unpause when a client desyncs or something
truelight
parents:
1602
diff
changeset
|
649 |
if (cs->status == STATUS_PRE_ACTIVE && _network_pause_on_join) { |
e5a1b1ff044d
(svn r2108) -Fix: the server now also unpause when a client desyncs or something
truelight
parents:
1602
diff
changeset
|
650 |
DoCommandP(0, 0, 0, NULL, CMD_PAUSE); |
4944
f597859bba38
(svn r6932) -Codechange: Send server messages with format NETWORK_ACTION_SERVER_MESSAGE so it is
Darkvater
parents:
4943
diff
changeset
|
651 |
NetworkServer_HandleChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_BROADCAST, 0, "Game unpaused", NETWORK_SERVER_INDEX); |
0 | 652 |
} |
653 |
||
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5898
diff
changeset
|
654 |
cs->Destroy(); |
0 | 655 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
656 |
// Close the gap in the client-list |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
657 |
ci = DEREF_CLIENT_INFO(cs); |
0 | 658 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
659 |
if (_network_server) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
660 |
// We just lost one client :( |
6347
b6f059f16318
(svn r9378) -Fix [FS#688] (r9038): cancel in password queries reduces amount of players in the network game when they haven't joined the game yet.
rubidium
parents:
6247
diff
changeset
|
661 |
if (cs->status >= STATUS_AUTH) _network_game_info.clients_on--; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
662 |
_network_clients_connected--; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
663 |
|
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
|
664 |
while ((cs + 1) != DEREF_CLIENT(MAX_CLIENTS) && (cs + 1)->sock != INVALID_SOCKET) { |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
665 |
*cs = *(cs + 1); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
666 |
*ci = *(ci + 1); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
667 |
cs++; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
668 |
ci++; |
0 | 669 |
} |
670 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
671 |
InvalidateWindow(WC_CLIENT_LIST, 0); |
0 | 672 |
} |
673 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
674 |
// Reset the status of the last 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
|
675 |
cs->sock = INVALID_SOCKET; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
676 |
cs->status = STATUS_INACTIVE; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
677 |
cs->index = NETWORK_EMPTY_INDEX; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
678 |
ci->client_index = NETWORK_EMPTY_INDEX; |
4716
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
679 |
|
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
680 |
CheckMinPlayers(); |
0 | 681 |
} |
682 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
683 |
// A client wants to connect to a server |
716
8af847728d5b
(svn r1168) -Cleanup: [Network] Cleaned the network code a bit. Added 'const'
truelight
parents:
710
diff
changeset
|
684 |
static bool NetworkConnect(const char *hostname, int port) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
685 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
686 |
SOCKET s; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
687 |
struct sockaddr_in sin; |
0 | 688 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
689 |
DEBUG(net, 1, "Connecting to %s %d", hostname, port); |
0 | 690 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
691 |
s = socket(AF_INET, SOCK_STREAM, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
692 |
if (s == INVALID_SOCKET) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
693 |
ClientStartError("socket() failed"); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
694 |
return false; |
0 | 695 |
} |
696 |
||
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
697 |
if (!SetNoDelay(s)) DEBUG(net, 1, "Setting TCP_NODELAY failed"); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
698 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
699 |
sin.sin_family = AF_INET; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
700 |
sin.sin_addr.s_addr = NetworkResolveHost(hostname); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
701 |
sin.sin_port = htons(port); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
702 |
_network_last_host_ip = sin.sin_addr.s_addr; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
703 |
|
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
704 |
/* We failed to connect for which reason what so ever */ |
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
705 |
if (connect(s, (struct sockaddr*) &sin, sizeof(sin)) != 0) return false; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
706 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
707 |
if (!SetNonBlocking(s)) DEBUG(net, 0, "Setting non-blocking mode failed"); // XXX should this be an error? |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
708 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
709 |
// in client mode, only the first client field is used. it's pointing to the server. |
716
8af847728d5b
(svn r1168) -Cleanup: [Network] Cleaned the network code a bit. Added 'const'
truelight
parents:
710
diff
changeset
|
710 |
NetworkAllocClient(s); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
711 |
|
5432
5940d6a253c5
(svn r7638) -Codechange: Remove special window ShowJoinStatusWindowAfterJoin and shuffle around
Darkvater
parents:
5380
diff
changeset
|
712 |
_network_join_status = NETWORK_JOIN_STATUS_CONNECTING; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
713 |
ShowJoinStatusWindow(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
714 |
|
0 | 715 |
return true; |
716 |
} |
|
717 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
718 |
// For the server, to accept new clients |
6247 | 719 |
static void NetworkAcceptClients() |
0 | 720 |
{ |
721 |
struct sockaddr_in sin; |
|
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
|
722 |
NetworkTCPSocketHandler *cs; |
959
e6a3bbda610f
(svn r1451) Fix some of the signed/unsigned comparison warnings
tron
parents:
903
diff
changeset
|
723 |
uint i; |
841
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
724 |
bool banned; |
0 | 725 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
726 |
// Should never ever happen.. is it possible?? |
0 | 727 |
assert(_listensocket != INVALID_SOCKET); |
728 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
729 |
for (;;) { |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
730 |
socklen_t sin_len = sizeof(sin); |
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
731 |
SOCKET s = accept(_listensocket, (struct sockaddr*)&sin, &sin_len); |
0 | 732 |
if (s == INVALID_SOCKET) return; |
733 |
||
1332
0cae74c93b5d
(svn r1836) Clean up some strange constructs concerning socket options
tron
parents:
1329
diff
changeset
|
734 |
SetNonBlocking(s); // XXX error handling? |
0 | 735 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
736 |
DEBUG(net, 1, "Client connected from %s on frame %d", inet_ntoa(sin.sin_addr), _frame_counter); |
0 | 737 |
|
1332
0cae74c93b5d
(svn r1836) Clean up some strange constructs concerning socket options
tron
parents:
1329
diff
changeset
|
738 |
SetNoDelay(s); // XXX error handling? |
0 | 739 |
|
841
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
740 |
/* Check if the client is banned */ |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
741 |
banned = false; |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
742 |
for (i = 0; i < lengthof(_network_ban_list); i++) { |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
743 |
if (_network_ban_list[i] == NULL) continue; |
841
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
744 |
|
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
745 |
if (sin.sin_addr.s_addr == inet_addr(_network_ban_list[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:
5897
diff
changeset
|
746 |
Packet p(PACKET_SERVER_BANNED); |
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:
5897
diff
changeset
|
747 |
p.PrepareToSend(); |
841
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
748 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
749 |
DEBUG(net, 1, "Banned ip tried to join (%s), refused", _network_ban_list[i]); |
841
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
750 |
|
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:
5897
diff
changeset
|
751 |
send(s, (const char*)p.buffer, p.size, 0); |
841
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
752 |
closesocket(s); |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
753 |
|
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
754 |
banned = true; |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
755 |
break; |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
756 |
} |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
757 |
} |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
758 |
/* If this client is banned, continue with next client */ |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
759 |
if (banned) continue; |
841
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
760 |
|
716
8af847728d5b
(svn r1168) -Cleanup: [Network] Cleaned the network code a bit. Added 'const'
truelight
parents:
710
diff
changeset
|
761 |
cs = NetworkAllocClient(s); |
0 | 762 |
if (cs == NULL) { |
763 |
// no more clients allowed? |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
764 |
// Send to the client that we are full! |
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:
5897
diff
changeset
|
765 |
Packet p(PACKET_SERVER_FULL); |
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:
5897
diff
changeset
|
766 |
p.PrepareToSend(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
767 |
|
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:
5897
diff
changeset
|
768 |
send(s, (const char*)p.buffer, p.size, 0); |
0 | 769 |
closesocket(s); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
770 |
|
0 | 771 |
continue; |
772 |
} |
|
773 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
774 |
// a new client has connected. We set him at inactive for now |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
775 |
// maybe he is only requesting server-info. Till he has sent a PACKET_CLIENT_MAP_OK |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
776 |
// the client stays inactive |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
777 |
cs->status = STATUS_INACTIVE; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
778 |
|
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
779 |
DEREF_CLIENT_INFO(cs)->client_ip = sin.sin_addr.s_addr; // Save the IP of the client |
0 | 780 |
} |
781 |
} |
|
782 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
783 |
// Set up the listen socket for the server |
6247 | 784 |
static bool NetworkListen() |
211 | 785 |
{ |
105 | 786 |
SOCKET ls; |
787 |
struct sockaddr_in sin; |
|
788 |
||
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
789 |
DEBUG(net, 1, "Listening on %s:%d", _network_server_bind_ip_host, _network_server_port); |
105 | 790 |
|
791 |
ls = socket(AF_INET, SOCK_STREAM, 0); |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
792 |
if (ls == INVALID_SOCKET) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
793 |
ServerStartError("socket() on listen socket failed"); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
794 |
return false; |
105 | 795 |
} |
796 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
797 |
{ // reuse the socket |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
798 |
int reuse = 1; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
799 |
// The (const char*) cast is needed for windows!! |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
800 |
if (setsockopt(ls, SOL_SOCKET, SO_REUSEADDR, (const char*)&reuse, sizeof(reuse)) == -1) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
801 |
ServerStartError("setsockopt() on listen socket failed"); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
802 |
return false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
803 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
804 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
805 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
806 |
if (!SetNonBlocking(ls)) DEBUG(net, 0, "Setting non-blocking mode failed"); // XXX should this be an error? |
105 | 807 |
|
808 |
sin.sin_family = AF_INET; |
|
629
4bb1f0fb0109
(svn r1059) -Fix: [Console] Renamed 'set port' to 'set server_port'
truelight
parents:
619
diff
changeset
|
809 |
sin.sin_addr.s_addr = _network_server_bind_ip; |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
810 |
sin.sin_port = htons(_network_server_port); |
105 | 811 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
812 |
if (bind(ls, (struct sockaddr*)&sin, sizeof(sin)) != 0) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
813 |
ServerStartError("bind() failed"); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
814 |
return false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
815 |
} |
105 | 816 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
817 |
if (listen(ls, 1) != 0) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
818 |
ServerStartError("listen() failed"); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
819 |
return false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
820 |
} |
105 | 821 |
|
822 |
_listensocket = ls; |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
823 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
824 |
return true; |
105 | 825 |
} |
826 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
827 |
// Close all current connections |
6247 | 828 |
static void NetworkClose() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
829 |
{ |
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
|
830 |
NetworkTCPSocketHandler *cs; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
831 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
832 |
FOR_ALL_CLIENTS(cs) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
833 |
if (!_network_server) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
834 |
SEND_COMMAND(PACKET_CLIENT_QUIT)("leaving"); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5898
diff
changeset
|
835 |
cs->Send_Packets(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
836 |
} |
716
8af847728d5b
(svn r1168) -Cleanup: [Network] Cleaned the network code a bit. Added 'const'
truelight
parents:
710
diff
changeset
|
837 |
NetworkCloseClient(cs); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
838 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
839 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
840 |
if (_network_server) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
841 |
// We are a server, also close the listensocket |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
842 |
closesocket(_listensocket); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
843 |
_listensocket = INVALID_SOCKET; |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
844 |
DEBUG(net, 1, "Closed listener"); |
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
|
845 |
NetworkUDPCloseAll(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
846 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
847 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
848 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
849 |
// Inits the network (cleans sockets and stuff) |
6247 | 850 |
static void NetworkInitialize() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
851 |
{ |
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
|
852 |
NetworkTCPSocketHandler *cs; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
853 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
854 |
_local_command_queue = NULL; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
855 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
856 |
// Clean all client-sockets |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
857 |
for (cs = _clients; cs != &_clients[MAX_CLIENTS]; cs++) { |
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
|
858 |
cs->Initialize(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
859 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
860 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
861 |
// Clean the client_info memory |
2879
365ecd52f2db
(svn r3427) - Feature: Allow seeing and setting the maximum amount of companies and spectators for a server. This can be changed/viewed during runtime as well in the console.
Darkvater
parents:
2861
diff
changeset
|
862 |
memset(&_network_client_info, 0, sizeof(_network_client_info)); |
365ecd52f2db
(svn r3427) - Feature: Allow seeing and setting the maximum amount of companies and spectators for a server. This can be changed/viewed during runtime as well in the console.
Darkvater
parents:
2861
diff
changeset
|
863 |
memset(&_network_player_info, 0, sizeof(_network_player_info)); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
864 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
865 |
_sync_frame = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
866 |
_network_first_time = true; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
867 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
868 |
_network_reconnect = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
869 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
870 |
NetworkUDPInitialize(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
871 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
872 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
873 |
// Query a server to fetch his game-info |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
874 |
// If game_info is true, only the gameinfo is fetched, |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
875 |
// else only the client_info is fetched |
5916
8931f4450f51
(svn r8543) -Codechange: make a real difference between querying the server via UDP and TCP.
rubidium
parents:
5902
diff
changeset
|
876 |
void NetworkTCPQueryServer(const char* host, unsigned short port) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
877 |
{ |
5916
8931f4450f51
(svn r8543) -Codechange: make a real difference between querying the server via UDP and TCP.
rubidium
parents:
5902
diff
changeset
|
878 |
if (!_network_available) return; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
879 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
880 |
NetworkDisconnect(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
881 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
882 |
NetworkInitialize(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
883 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
884 |
_network_server = false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
885 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
886 |
// Try to connect |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
887 |
_networking = NetworkConnect(host, port); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
888 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
889 |
// We are connected |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
890 |
if (_networking) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
891 |
SEND_COMMAND(PACKET_CLIENT_COMPANY_INFO)(); |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
892 |
} else { // No networking, close everything down again |
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
893 |
NetworkDisconnect(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
894 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
895 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
896 |
|
738
b96ab9e63d22
(svn r1194) Feature: You can now add and remove servers from the server list. Those will be remembered until you delete them by pressing the Delete key.
dominik
parents:
734
diff
changeset
|
897 |
/* Validates an address entered as a string and adds the server to |
2881
ade9a553be53
(svn r3429) - Feature (Followup): Change the gamelist window to accomodate for the new information.
Darkvater
parents:
2879
diff
changeset
|
898 |
* the list. If you use this function, the games will be marked |
738
b96ab9e63d22
(svn r1194) Feature: You can now add and remove servers from the server list. Those will be remembered until you delete them by pressing the Delete key.
dominik
parents:
734
diff
changeset
|
899 |
* as manually added. */ |
1329 | 900 |
void NetworkAddServer(const char *b) |
710
2a13862fe86b
(svn r1162) The server list can now be automatically filled from the config file. Add a section [servers] with the addresses each in a new line. Those will be checked upon OpenTTD startup.
dominik
parents:
693
diff
changeset
|
901 |
{ |
2a13862fe86b
(svn r1162) The server list can now be automatically filled from the config file. Add a section [servers] with the addresses each in a new line. Those will be checked upon OpenTTD startup.
dominik
parents:
693
diff
changeset
|
902 |
if (*b != '\0') { |
1329 | 903 |
const char *port = NULL; |
904 |
const char *player = NULL; |
|
905 |
char host[NETWORK_HOSTNAME_LENGTH]; |
|
710
2a13862fe86b
(svn r1162) The server list can now be automatically filled from the config file. Add a section [servers] with the addresses each in a new line. Those will be checked upon OpenTTD startup.
dominik
parents:
693
diff
changeset
|
906 |
uint16 rport; |
2a13862fe86b
(svn r1162) The server list can now be automatically filled from the config file. Add a section [servers] with the addresses each in a new line. Those will be checked upon OpenTTD startup.
dominik
parents:
693
diff
changeset
|
907 |
|
716
8af847728d5b
(svn r1168) -Cleanup: [Network] Cleaned the network code a bit. Added 'const'
truelight
parents:
710
diff
changeset
|
908 |
ttd_strlcpy(host, b, lengthof(host)); |
8af847728d5b
(svn r1168) -Cleanup: [Network] Cleaned the network code a bit. Added 'const'
truelight
parents:
710
diff
changeset
|
909 |
|
710
2a13862fe86b
(svn r1162) The server list can now be automatically filled from the config file. Add a section [servers] with the addresses each in a new line. Those will be checked upon OpenTTD startup.
dominik
parents:
693
diff
changeset
|
910 |
ttd_strlcpy(_network_default_ip, b, lengthof(_network_default_ip)); |
2a13862fe86b
(svn r1162) The server list can now be automatically filled from the config file. Add a section [servers] with the addresses each in a new line. Those will be checked upon OpenTTD startup.
dominik
parents:
693
diff
changeset
|
911 |
rport = NETWORK_DEFAULT_PORT; |
2a13862fe86b
(svn r1162) The server list can now be automatically filled from the config file. Add a section [servers] with the addresses each in a new line. Those will be checked upon OpenTTD startup.
dominik
parents:
693
diff
changeset
|
912 |
|
716
8af847728d5b
(svn r1168) -Cleanup: [Network] Cleaned the network code a bit. Added 'const'
truelight
parents:
710
diff
changeset
|
913 |
ParseConnectionString(&player, &port, host); |
710
2a13862fe86b
(svn r1162) The server list can now be automatically filled from the config file. Add a section [servers] with the addresses each in a new line. Those will be checked upon OpenTTD startup.
dominik
parents:
693
diff
changeset
|
914 |
if (port != NULL) rport = atoi(port); |
2a13862fe86b
(svn r1162) The server list can now be automatically filled from the config file. Add a section [servers] with the addresses each in a new line. Those will be checked upon OpenTTD startup.
dominik
parents:
693
diff
changeset
|
915 |
|
5916
8931f4450f51
(svn r8543) -Codechange: make a real difference between querying the server via UDP and TCP.
rubidium
parents:
5902
diff
changeset
|
916 |
NetworkUDPQueryServer(host, rport, true); |
738
b96ab9e63d22
(svn r1194) Feature: You can now add and remove servers from the server list. Those will be remembered until you delete them by pressing the Delete key.
dominik
parents:
734
diff
changeset
|
917 |
} |
b96ab9e63d22
(svn r1194) Feature: You can now add and remove servers from the server list. Those will be remembered until you delete them by pressing the Delete key.
dominik
parents:
734
diff
changeset
|
918 |
} |
b96ab9e63d22
(svn r1194) Feature: You can now add and remove servers from the server list. Those will be remembered until you delete them by pressing the Delete key.
dominik
parents:
734
diff
changeset
|
919 |
|
746 | 920 |
/* Generates the list of manually added hosts from NetworkGameList and |
738
b96ab9e63d22
(svn r1194) Feature: You can now add and remove servers from the server list. Those will be remembered until you delete them by pressing the Delete key.
dominik
parents:
734
diff
changeset
|
921 |
* dumps them into the array _network_host_list. This array is needed |
b96ab9e63d22
(svn r1194) Feature: You can now add and remove servers from the server list. Those will be remembered until you delete them by pressing the Delete key.
dominik
parents:
734
diff
changeset
|
922 |
* by the function that generates the config file. */ |
6247 | 923 |
void NetworkRebuildHostList() |
738
b96ab9e63d22
(svn r1194) Feature: You can now add and remove servers from the server list. Those will be remembered until you delete them by pressing the Delete key.
dominik
parents:
734
diff
changeset
|
924 |
{ |
959
e6a3bbda610f
(svn r1451) Fix some of the signed/unsigned comparison warnings
tron
parents:
903
diff
changeset
|
925 |
uint i = 0; |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
926 |
const NetworkGameList *item = _network_game_list; |
841
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
927 |
while (item != NULL && i != lengthof(_network_host_list)) { |
2915
e08f661f1b8e
(svn r3470) - Fix: plug a memleak in _network_host_list.
Darkvater
parents:
2881
diff
changeset
|
928 |
if (item->manually) { |
e08f661f1b8e
(svn r3470) - Fix: plug a memleak in _network_host_list.
Darkvater
parents:
2881
diff
changeset
|
929 |
free(_network_host_list[i]); |
895
4d8e39aba340
(svn r1381) Fix: [ 1095143 ] Servers list now also saves the port
dominik
parents:
863
diff
changeset
|
930 |
_network_host_list[i++] = str_fmt("%s:%i", item->info.hostname, item->port); |
2915
e08f661f1b8e
(svn r3470) - Fix: plug a memleak in _network_host_list.
Darkvater
parents:
2881
diff
changeset
|
931 |
} |
738
b96ab9e63d22
(svn r1194) Feature: You can now add and remove servers from the server list. Those will be remembered until you delete them by pressing the Delete key.
dominik
parents:
734
diff
changeset
|
932 |
item = item->next; |
b96ab9e63d22
(svn r1194) Feature: You can now add and remove servers from the server list. Those will be remembered until you delete them by pressing the Delete key.
dominik
parents:
734
diff
changeset
|
933 |
} |
b96ab9e63d22
(svn r1194) Feature: You can now add and remove servers from the server list. Those will be remembered until you delete them by pressing the Delete key.
dominik
parents:
734
diff
changeset
|
934 |
|
841
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
826
diff
changeset
|
935 |
for (; i < lengthof(_network_host_list); i++) { |
2915
e08f661f1b8e
(svn r3470) - Fix: plug a memleak in _network_host_list.
Darkvater
parents:
2881
diff
changeset
|
936 |
free(_network_host_list[i]); |
e08f661f1b8e
(svn r3470) - Fix: plug a memleak in _network_host_list.
Darkvater
parents:
2881
diff
changeset
|
937 |
_network_host_list[i] = NULL; |
710
2a13862fe86b
(svn r1162) The server list can now be automatically filled from the config file. Add a section [servers] with the addresses each in a new line. Those will be checked upon OpenTTD startup.
dominik
parents:
693
diff
changeset
|
938 |
} |
2a13862fe86b
(svn r1162) The server list can now be automatically filled from the config file. Add a section [servers] with the addresses each in a new line. Those will be checked upon OpenTTD startup.
dominik
parents:
693
diff
changeset
|
939 |
} |
2a13862fe86b
(svn r1162) The server list can now be automatically filled from the config file. Add a section [servers] with the addresses each in a new line. Those will be checked upon OpenTTD startup.
dominik
parents:
693
diff
changeset
|
940 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
941 |
// Used by clients, to connect to a server |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
942 |
bool NetworkClientConnectGame(const char *host, uint16 port) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
943 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
944 |
if (!_network_available) return false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
945 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
946 |
if (port == 0) return false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
947 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
948 |
ttd_strlcpy(_network_last_host, host, sizeof(_network_last_host)); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
949 |
_network_last_port = port; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
950 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
951 |
NetworkDisconnect(); |
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
|
952 |
NetworkUDPCloseAll(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
953 |
NetworkInitialize(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
954 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
955 |
// Try to connect |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
956 |
_networking = NetworkConnect(host, port); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
957 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
958 |
// We are connected |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
959 |
if (_networking) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
960 |
IConsoleCmdExec("exec scripts/on_client.scr 0"); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
961 |
NetworkClient_Connected(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
962 |
} else { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
963 |
// Connecting failed |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
964 |
NetworkError(STR_NETWORK_ERR_NOCONNECTION); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
965 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
966 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
967 |
return _networking; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
968 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
969 |
|
6247 | 970 |
static void NetworkInitGameInfo() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
971 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
972 |
NetworkClientInfo *ci; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
973 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
974 |
ttd_strlcpy(_network_game_info.server_name, _network_server_name, sizeof(_network_game_info.server_name)); |
1026
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1010
diff
changeset
|
975 |
ttd_strlcpy(_network_game_info.server_password, _network_server_password, sizeof(_network_server_password)); |
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1010
diff
changeset
|
976 |
ttd_strlcpy(_network_game_info.rcon_password, _network_rcon_password, sizeof(_network_rcon_password)); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
977 |
if (_network_game_info.server_name[0] == '\0') |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
978 |
snprintf(_network_game_info.server_name, sizeof(_network_game_info.server_name), "Unnamed Server"); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
979 |
|
2879
365ecd52f2db
(svn r3427) - Feature: Allow seeing and setting the maximum amount of companies and spectators for a server. This can be changed/viewed during runtime as well in the console.
Darkvater
parents:
2861
diff
changeset
|
980 |
ttd_strlcpy(_network_game_info.server_revision, _openttd_revision, sizeof(_network_game_info.server_revision)); |
365ecd52f2db
(svn r3427) - Feature: Allow seeing and setting the maximum amount of companies and spectators for a server. This can be changed/viewed during runtime as well in the console.
Darkvater
parents:
2861
diff
changeset
|
981 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
982 |
// The server is a client too ;) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
983 |
if (_network_dedicated) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
984 |
_network_game_info.clients_on = 0; |
2879
365ecd52f2db
(svn r3427) - Feature: Allow seeing and setting the maximum amount of companies and spectators for a server. This can be changed/viewed during runtime as well in the console.
Darkvater
parents:
2861
diff
changeset
|
985 |
_network_game_info.companies_on = 0; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
986 |
_network_game_info.dedicated = true; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
987 |
} else { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
988 |
_network_game_info.clients_on = 1; |
2879
365ecd52f2db
(svn r3427) - Feature: Allow seeing and setting the maximum amount of companies and spectators for a server. This can be changed/viewed during runtime as well in the console.
Darkvater
parents:
2861
diff
changeset
|
989 |
_network_game_info.companies_on = 1; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
990 |
_network_game_info.dedicated = false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
991 |
} |
2879
365ecd52f2db
(svn r3427) - Feature: Allow seeing and setting the maximum amount of companies and spectators for a server. This can be changed/viewed during runtime as well in the console.
Darkvater
parents:
2861
diff
changeset
|
992 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
993 |
_network_game_info.spectators_on = 0; |
2879
365ecd52f2db
(svn r3427) - Feature: Allow seeing and setting the maximum amount of companies and spectators for a server. This can be changed/viewed during runtime as well in the console.
Darkvater
parents:
2861
diff
changeset
|
994 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
995 |
_network_game_info.game_date = _date; |
4295
51b5d00b5f09
(svn r5928) -Cleanup: remove ConvertIntDate and use ConvertYMDToDate as ConvertIntDate was only called with Years.
rubidium
parents:
4285
diff
changeset
|
996 |
_network_game_info.start_date = ConvertYMDToDate(_patches.starting_year, 0, 1); |
863
6a1444534f62
(svn r1344) Use MapSize[XY]() (or MapSize()/MapMax[XY]() where appropriate) instead of TILES_[XY]
tron
parents:
841
diff
changeset
|
997 |
_network_game_info.map_width = MapSizeX(); |
6a1444534f62
(svn r1344) Use MapSize[XY]() (or MapSize()/MapMax[XY]() where appropriate) instead of TILES_[XY]
tron
parents:
841
diff
changeset
|
998 |
_network_game_info.map_height = MapSizeY(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
999 |
_network_game_info.map_set = _opt.landscape; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1000 |
|
1899
81214598ab45
(svn r2405) Simplify a few '? true : false' and '? false : true', especially the latter is confusing
tron
parents:
1832
diff
changeset
|
1001 |
_network_game_info.use_password = (_network_server_password[0] != '\0'); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1002 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1003 |
// We use _network_client_info[MAX_CLIENT_INFO - 1] to store the server-data in it |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1004 |
// The index is NETWORK_SERVER_INDEX ( = 1) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1005 |
ci = &_network_client_info[MAX_CLIENT_INFO - 1]; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1006 |
memset(ci, 0, sizeof(*ci)); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1007 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1008 |
ci->client_index = NETWORK_SERVER_INDEX; |
4878
4d4f76a898fd
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4859
diff
changeset
|
1009 |
ci->client_playas = _network_dedicated ? PLAYER_SPECTATOR : _local_player; |
4d4f76a898fd
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4859
diff
changeset
|
1010 |
|
693
5b1c1929bb91
(svn r1137) -Fix: [Network] Replaces all strncpy with ttd_strlcpy.. windows really
truelight
parents:
683
diff
changeset
|
1011 |
ttd_strlcpy(ci->client_name, _network_player_name, sizeof(ci->client_name)); |
5b1c1929bb91
(svn r1137) -Fix: [Network] Replaces all strncpy with ttd_strlcpy.. windows really
truelight
parents:
683
diff
changeset
|
1012 |
ttd_strlcpy(ci->unique_id, _network_unique_id, sizeof(ci->unique_id)); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1013 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1014 |
|
6247 | 1015 |
bool NetworkServerStart() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1016 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1017 |
if (!_network_available) return false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1018 |
|
629
4bb1f0fb0109
(svn r1059) -Fix: [Console] Renamed 'set port' to 'set server_port'
truelight
parents:
619
diff
changeset
|
1019 |
/* Call the pre-scripts */ |
4bb1f0fb0109
(svn r1059) -Fix: [Console] Renamed 'set port' to 'set server_port'
truelight
parents:
619
diff
changeset
|
1020 |
IConsoleCmdExec("exec scripts/pre_server.scr 0"); |
4bb1f0fb0109
(svn r1059) -Fix: [Console] Renamed 'set port' to 'set server_port'
truelight
parents:
619
diff
changeset
|
1021 |
if (_network_dedicated) IConsoleCmdExec("exec scripts/pre_dedicated.scr 0"); |
4bb1f0fb0109
(svn r1059) -Fix: [Console] Renamed 'set port' to 'set server_port'
truelight
parents:
619
diff
changeset
|
1022 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1023 |
NetworkInitialize(); |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
1024 |
if (!NetworkListen()) return false; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1025 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1026 |
// Try to start UDP-server |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1027 |
_network_udp_server = true; |
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
|
1028 |
_network_udp_server = _udp_server_socket->Listen(_network_server_bind_ip, _network_server_port, false); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1029 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1030 |
_network_server = true; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1031 |
_networking = true; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1032 |
_frame_counter = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1033 |
_frame_counter_server = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1034 |
_frame_counter_max = 0; |
2079
c9c32cf56cb9
(svn r2589) Fix: [network] Fixed static variable that wasn't initialized. Would stop the sync checking from working in some cases.
ludde
parents:
2078
diff
changeset
|
1035 |
_last_sync_frame = 0; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1036 |
_network_own_client_index = NETWORK_SERVER_INDEX; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1037 |
|
4878
4d4f76a898fd
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4859
diff
changeset
|
1038 |
/* Non-dedicated server will always be player #1 */ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1039 |
if (!_network_dedicated) _network_playas = PLAYER_FIRST; |
683
3bd410628868
(svn r1124) -Fix: [Network] Also the server now has the option Give Money in
truelight
parents:
679
diff
changeset
|
1040 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1041 |
_network_clients_connected = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1042 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1043 |
NetworkInitGameInfo(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1044 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1045 |
// execute server initialization script |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1046 |
IConsoleCmdExec("exec scripts/on_server.scr 0"); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1047 |
// if the server is dedicated ... add some other script |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1048 |
if (_network_dedicated) IConsoleCmdExec("exec scripts/on_dedicated.scr 0"); |
668
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
663
diff
changeset
|
1049 |
|
4716
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
1050 |
_min_players_paused = false; |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
1051 |
CheckMinPlayers(); |
8a05bf6d951d
(svn r6628) - Feature: Add the ability to pause a server if not enough players are connected. The setting for this is 'min_players' and can be set in the config and via the console. If the number of players drops below this number, the server will pause the game.
peter1138
parents:
4417
diff
changeset
|
1052 |
|
668
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
663
diff
changeset
|
1053 |
/* Try to register us to the master server */ |
2861
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2859
diff
changeset
|
1054 |
_network_last_advertise_frame = 0; |
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2859
diff
changeset
|
1055 |
_network_need_advertise = true; |
668
1fe298df8526
(svn r1106) -Add: [Network] Added master-server protocol and advertise to
truelight
parents:
663
diff
changeset
|
1056 |
NetworkUDPAdvertise(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1057 |
return true; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1058 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1059 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1060 |
// The server is rebooting... |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1061 |
// The only difference with NetworkDisconnect, is the packets that is sent |
6247 | 1062 |
void NetworkReboot() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1063 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1064 |
if (_network_server) { |
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
|
1065 |
NetworkTCPSocketHandler *cs; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1066 |
FOR_ALL_CLIENTS(cs) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1067 |
SEND_COMMAND(PACKET_SERVER_NEWGAME)(cs); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5898
diff
changeset
|
1068 |
cs->Send_Packets(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1069 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1070 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1071 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1072 |
NetworkClose(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1073 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1074 |
// Free all queued commands |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1075 |
while (_local_command_queue != NULL) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1076 |
CommandPacket *p = _local_command_queue; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1077 |
_local_command_queue = _local_command_queue->next; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1078 |
free(p); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1079 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1080 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1081 |
_networking = false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1082 |
_network_server = false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1083 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1084 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1085 |
// We want to disconnect from the host/clients |
6247 | 1086 |
void NetworkDisconnect() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1087 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1088 |
if (_network_server) { |
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
|
1089 |
NetworkTCPSocketHandler *cs; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1090 |
FOR_ALL_CLIENTS(cs) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1091 |
SEND_COMMAND(PACKET_SERVER_SHUTDOWN)(cs); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5898
diff
changeset
|
1092 |
cs->Send_Packets(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1093 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1094 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1095 |
|
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
1096 |
if (_network_advertise) NetworkUDPRemoveAdvertise(); |
765
18104986675d
(svn r1228) -Add: [Network] When a server normally shuts down, it removed itself
truelight
parents:
764
diff
changeset
|
1097 |
|
598
b8c5ae66f9ff
(svn r1022) -Fix: [Network] [ 1083690 ] The password dialog made the network
truelight
parents:
543
diff
changeset
|
1098 |
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); |
b8c5ae66f9ff
(svn r1022) -Fix: [Network] [ 1083690 ] The password dialog made the network
truelight
parents:
543
diff
changeset
|
1099 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1100 |
NetworkClose(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1101 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1102 |
// Free all queued commands |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1103 |
while (_local_command_queue != NULL) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1104 |
CommandPacket *p = _local_command_queue; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1105 |
_local_command_queue = _local_command_queue->next; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1106 |
free(p); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1107 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1108 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1109 |
_networking = false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1110 |
_network_server = false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1111 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1112 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1113 |
// Receives something from the network |
6247 | 1114 |
static bool NetworkReceive() |
0 | 1115 |
{ |
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
|
1116 |
NetworkTCPSocketHandler *cs; |
0 | 1117 |
int n; |
1118 |
fd_set read_fd, write_fd; |
|
1119 |
struct timeval tv; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1120 |
|
0 | 1121 |
FD_ZERO(&read_fd); |
1122 |
FD_ZERO(&write_fd); |
|
1123 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1124 |
FOR_ALL_CLIENTS(cs) { |
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
|
1125 |
FD_SET(cs->sock, &read_fd); |
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
|
1126 |
FD_SET(cs->sock, &write_fd); |
0 | 1127 |
} |
1128 |
||
1129 |
// take care of listener port |
|
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
1130 |
if (_network_server) FD_SET(_listensocket, &read_fd); |
0 | 1131 |
|
1132 |
tv.tv_sec = tv.tv_usec = 0; // don't block at all. |
|
1133 |
#if !defined(__MORPHOS__) && !defined(__AMIGA__) |
|
1134 |
n = select(FD_SETSIZE, &read_fd, &write_fd, NULL, &tv); |
|
1135 |
#else |
|
1136 |
n = WaitSelect(FD_SETSIZE, &read_fd, &write_fd, NULL, &tv, NULL); |
|
1137 |
#endif |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1138 |
if (n == -1 && !_network_server) NetworkError(STR_NETWORK_ERR_LOSTCONNECTION); |
0 | 1139 |
|
1140 |
// accept clients.. |
|
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
1141 |
if (_network_server && FD_ISSET(_listensocket, &read_fd)) NetworkAcceptClients(); |
0 | 1142 |
|
1143 |
// read stuff from clients |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1144 |
FOR_ALL_CLIENTS(cs) { |
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
|
1145 |
cs->writable = !!FD_ISSET(cs->sock, &write_fd); |
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
|
1146 |
if (FD_ISSET(cs->sock, &read_fd)) { |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
1147 |
if (_network_server) { |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1148 |
NetworkServer_ReadPackets(cs); |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
1149 |
} else { |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
1150 |
NetworkRecvStatus res; |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
1151 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1152 |
// The client already was quiting! |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
1153 |
if (cs->has_quit) return false; |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
1154 |
|
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
1155 |
res = NetworkClient_ReadPackets(cs); |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4038
diff
changeset
|
1156 |
if (res != NETWORK_RECV_STATUS_OKAY) { |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1157 |
// The client made an error of which we can not recover |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1158 |
// close the client and drop back to main menu |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1159 |
NetworkClientError(res, cs); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1160 |
return false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1161 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1162 |
} |
0 | 1163 |
} |
1164 |
} |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1165 |
return true; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1166 |
} |
0 | 1167 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1168 |
// This sends all buffered commands (if possible) |
6247 | 1169 |
static void NetworkSend() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1170 |
{ |
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
|
1171 |
NetworkTCPSocketHandler *cs; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1172 |
FOR_ALL_CLIENTS(cs) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1173 |
if (cs->writable) { |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5898
diff
changeset
|
1174 |
cs->Send_Packets(); |
0 | 1175 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1176 |
if (cs->status == STATUS_MAP) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1177 |
// This client is in the middle of a map-send, call the function for that |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1178 |
SEND_COMMAND(PACKET_SERVER_MAP)(cs); |
0 | 1179 |
} |
1180 |
} |
|
1181 |
} |
|
1182 |
} |
|
1183 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1184 |
// Handle the local-command-queue |
6247 | 1185 |
static void NetworkHandleLocalQueue() |
0 | 1186 |
{ |
2080
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1187 |
CommandPacket *cp, **cp_prev; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1188 |
|
2080
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1189 |
cp_prev = &_local_command_queue; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1190 |
|
2080
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1191 |
while ( (cp = *cp_prev) != NULL) { |
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1192 |
|
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1193 |
// The queue is always in order, which means |
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1194 |
// that the first element will be executed first. |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
1195 |
if (_frame_counter < cp->frame) break; |
2080
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1196 |
|
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1197 |
if (_frame_counter > cp->frame) { |
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1198 |
// If we reach here, it means for whatever reason, we've already executed |
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1199 |
// past the command we need to execute. |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
1200 |
DEBUG(net, 0, "Trying to execute a packet in the past!"); |
2080
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1201 |
assert(0); |
0 | 1202 |
} |
2080
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1203 |
|
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1204 |
// We can execute this command |
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1205 |
NetworkExecuteCommand(cp); |
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1206 |
|
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1207 |
*cp_prev = cp->next; |
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1208 |
free(cp); |
0 | 1209 |
} |
2080
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1210 |
|
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1211 |
// Just a safety check, to be removed in the future. |
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1212 |
// Make sure that no older command appears towards the end of the queue |
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1213 |
// In that case we missed executing it. This will never happen. |
2952 | 1214 |
for (cp = _local_command_queue; cp; cp = cp->next) { |
2080
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1215 |
assert(_frame_counter < cp->frame); |
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1216 |
} |
cee8c96659b1
(svn r2590) Fix: [network] Fixed NetworkHandleLocalQueue
ludde
parents:
2079
diff
changeset
|
1217 |
|
0 | 1218 |
} |
1219 |
||
6247 | 1220 |
static bool NetworkDoClientLoop() |
0 | 1221 |
{ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1222 |
_frame_counter++; |
0 | 1223 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1224 |
NetworkHandleLocalQueue(); |
211 | 1225 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1226 |
StateGameLoop(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1227 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1228 |
// Check if we are in sync! |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1229 |
if (_sync_frame != 0) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1230 |
if (_sync_frame == _frame_counter) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1231 |
#ifdef NETWORK_SEND_DOUBLE_SEED |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1232 |
if (_sync_seed_1 != _random_seeds[0][0] || _sync_seed_2 != _random_seeds[0][1]) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1233 |
#else |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1234 |
if (_sync_seed_1 != _random_seeds[0][0]) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1235 |
#endif |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1236 |
NetworkError(STR_NETWORK_ERR_DESYNC); |
8247
16e1c8db6f55
(svn r11811) -Fix: make compilation without networking work again (and thus move the debugdumpcommand stuff out of the network 'area').
rubidium
parents:
8214
diff
changeset
|
1237 |
DebugDumpCommands("ddc:serr:%d;%d\n", _date, _date_fract); |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
1238 |
DEBUG(net, 0, "Sync error detected!"); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1239 |
NetworkClientError(NETWORK_RECV_STATUS_DESYNC, DEREF_CLIENT(0)); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1240 |
return false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1241 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1242 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1243 |
// If this is the first time we have a sync-frame, we |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1244 |
// need to let the server know that we are ready and at the same |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1245 |
// frame as he is.. so we can start playing! |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1246 |
if (_network_first_time) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1247 |
_network_first_time = false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1248 |
SEND_COMMAND(PACKET_CLIENT_ACK)(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1249 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1250 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1251 |
_sync_frame = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1252 |
} else if (_sync_frame < _frame_counter) { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
1253 |
DEBUG(net, 1, "Missed frame for sync-test (%d / %d)", _sync_frame, _frame_counter); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1254 |
_sync_frame = 0; |
105 | 1255 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1256 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1257 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1258 |
return true; |
0 | 1259 |
} |
1260 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1261 |
// We have to do some UDP checking |
6247 | 1262 |
void NetworkUDPGameLoop() |
211 | 1263 |
{ |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
746
diff
changeset
|
1264 |
if (_network_udp_server) { |
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
|
1265 |
_udp_server_socket->ReceivePackets(); |
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
|
1266 |
_udp_master_socket->ReceivePackets(); |
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
|
1267 |
} else { |
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
|
1268 |
_udp_client_socket->ReceivePackets(); |
4000
4009d092b306
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3623
diff
changeset
|
1269 |
if (_network_udp_broadcast > 0) _network_udp_broadcast--; |
5897
893fe6a810dc
(svn r8520) -Fix/Feature: requery gameservers that did not respond to their first query.
rubidium
parents:
5872
diff
changeset
|
1270 |
NetworkGameListRequery(); |
0 | 1271 |
} |
1272 |
} |
|
1273 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1274 |
// The main loop called from ttd.c |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1275 |
// Here we also have to do StateGameLoop if needed! |
6247 | 1276 |
void NetworkGameLoop() |
211 | 1277 |
{ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1278 |
if (!_networking) return; |
105 | 1279 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1280 |
if (!NetworkReceive()) return; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1281 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1282 |
if (_network_server) { |
7187
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1283 |
#ifdef DEBUG_DUMP_COMMANDS |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1284 |
static FILE *f = FioFOpenFile("commands.log", "rb", SAVE_DIR); |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1285 |
static Date next_date = 0; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1286 |
static uint32 next_date_fract; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1287 |
static CommandPacket *cp = NULL; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1288 |
if (f == NULL && next_date == 0) { |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1289 |
printf("Cannot open commands.log\n"); |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1290 |
next_date = 1; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1291 |
} |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1292 |
|
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1293 |
while (f != NULL && !feof(f)) { |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1294 |
if (cp != NULL && _date == next_date && _date_fract == next_date_fract) { |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1295 |
_current_player = cp->player; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1296 |
_cmd_text = cp->text; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1297 |
DoCommandP(cp->tile, cp->p1, cp->p2, NULL, cp->cmd); |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1298 |
free(cp); |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1299 |
cp = NULL; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1300 |
} |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1301 |
|
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1302 |
if (cp != NULL) break; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1303 |
|
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1304 |
char buff[4096]; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1305 |
if (fgets(buff, lengthof(buff), f) == NULL) break; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1306 |
if (strncmp(buff, "ddc:cmd:", 8) != 0) continue; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1307 |
cp = MallocT<CommandPacket>(1); |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1308 |
int player; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1309 |
sscanf(&buff[8], "%d;%d;%d;%d;%d;%d;%d;%s", &next_date, &next_date_fract, &player, &cp->tile, &cp->p1, &cp->p2, &cp->cmd, cp->text); |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1310 |
cp->player = (Owner)player; |
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1311 |
} |
8247
16e1c8db6f55
(svn r11811) -Fix: make compilation without networking work again (and thus move the debugdumpcommand stuff out of the network 'area').
rubidium
parents:
8214
diff
changeset
|
1312 |
#endif /* DEBUG_DUMP_COMMANDS */ |
7187
7c9bf9e10d8b
(svn r10462) -Add: a command dumper/loader that could be enabled compile-time and server side only to aid debugging some desyncs, i.e. dump the stream of commands so it could be replayed in exactly the same way later. This should primarily be used to make desyncs more easily reproducable, so it can be properly debugged.
rubidium
parents:
6528
diff
changeset
|
1313 |
|
2235
7630c38913fd
(svn r2755) Fix: Fix a desync issue with autoreplace
ludde
parents:
2186
diff
changeset
|
1314 |
bool send_frame = false; |
7630c38913fd
(svn r2755) Fix: Fix a desync issue with autoreplace
ludde
parents:
2186
diff
changeset
|
1315 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1316 |
// We first increase the _frame_counter |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1317 |
_frame_counter++; |
2235
7630c38913fd
(svn r2755) Fix: Fix a desync issue with autoreplace
ludde
parents:
2186
diff
changeset
|
1318 |
// Update max-frame-counter |
7630c38913fd
(svn r2755) Fix: Fix a desync issue with autoreplace
ludde
parents:
2186
diff
changeset
|
1319 |
if (_frame_counter > _frame_counter_max) { |
7630c38913fd
(svn r2755) Fix: Fix a desync issue with autoreplace
ludde
parents:
2186
diff
changeset
|
1320 |
_frame_counter_max = _frame_counter + _network_frame_freq; |
7630c38913fd
(svn r2755) Fix: Fix a desync issue with autoreplace
ludde
parents:
2186
diff
changeset
|
1321 |
send_frame = true; |
7630c38913fd
(svn r2755) Fix: Fix a desync issue with autoreplace
ludde
parents:
2186
diff
changeset
|
1322 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1323 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1324 |
NetworkHandleLocalQueue(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1325 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1326 |
// Then we make the frame |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1327 |
StateGameLoop(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1328 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1329 |
_sync_seed_1 = _random_seeds[0][0]; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1330 |
#ifdef NETWORK_SEND_DOUBLE_SEED |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1331 |
_sync_seed_2 = _random_seeds[0][1]; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1332 |
#endif |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1333 |
|
2235
7630c38913fd
(svn r2755) Fix: Fix a desync issue with autoreplace
ludde
parents:
2186
diff
changeset
|
1334 |
NetworkServer_Tick(send_frame); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1335 |
} else { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1336 |
// Client |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1337 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1338 |
// Make sure we are at the frame were the server is (quick-frames) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1339 |
if (_frame_counter_server > _frame_counter) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1340 |
while (_frame_counter_server > _frame_counter) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1341 |
if (!NetworkDoClientLoop()) break; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1342 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1343 |
} else { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1344 |
// Else, keep on going till _frame_counter_max |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
1345 |
if (_frame_counter_max > _frame_counter) NetworkDoClientLoop(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1346 |
} |
0 | 1347 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1348 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1349 |
NetworkSend(); |
0 | 1350 |
} |
1351 |
||
6247 | 1352 |
static void NetworkGenerateUniqueId() |
602
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1353 |
{ |
8133
3ab8eaf85ca0
(svn r11695) -Codechange: Converted the md5 algorithm to OOP
skidd13
parents:
8131
diff
changeset
|
1354 |
Md5 checksum; |
3ab8eaf85ca0
(svn r11695) -Codechange: Converted the md5 algorithm to OOP
skidd13
parents:
8131
diff
changeset
|
1355 |
uint8 digest[16]; |
602
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1356 |
char hex_output[16*2 + 1]; |
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1357 |
char coding_string[NETWORK_NAME_LENGTH]; |
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1358 |
int di; |
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1359 |
|
607
1ae7deaa77d9
(svn r1031) -Fix: [Network] The unique-id was not as unique as I though it was..
truelight
parents:
602
diff
changeset
|
1360 |
snprintf(coding_string, sizeof(coding_string), "%d%s", (uint)Random(), "OpenTTD Unique ID"); |
602
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1361 |
|
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1362 |
/* Generate the MD5 hash */ |
8133
3ab8eaf85ca0
(svn r11695) -Codechange: Converted the md5 algorithm to OOP
skidd13
parents:
8131
diff
changeset
|
1363 |
checksum.Append((const uint8*)coding_string, strlen(coding_string)); |
3ab8eaf85ca0
(svn r11695) -Codechange: Converted the md5 algorithm to OOP
skidd13
parents:
8131
diff
changeset
|
1364 |
checksum.Finish(digest); |
602
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1365 |
|
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1366 |
for (di = 0; di < 16; ++di) |
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1367 |
sprintf(hex_output + di * 2, "%02x", digest[di]); |
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1368 |
|
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1369 |
/* _network_unique_id is our id */ |
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1370 |
snprintf(_network_unique_id, sizeof(_network_unique_id), "%s", hex_output); |
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1371 |
} |
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1372 |
|
5959
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1373 |
void NetworkStartDebugLog(const char *hostname, uint16 port) |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1374 |
{ |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1375 |
extern SOCKET _debug_socket; // Comes from debug.c |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1376 |
SOCKET s; |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1377 |
struct sockaddr_in sin; |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1378 |
|
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1379 |
DEBUG(net, 0, "Redirecting DEBUG() to %s:%d", hostname, port); |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1380 |
|
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1381 |
s = socket(AF_INET, SOCK_STREAM, 0); |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1382 |
if (s == INVALID_SOCKET) { |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1383 |
DEBUG(net, 0, "Failed to open socket for redirection DEBUG()"); |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1384 |
return; |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1385 |
} |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1386 |
|
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1387 |
if (!SetNoDelay(s)) DEBUG(net, 1, "Setting TCP_NODELAY failed"); |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1388 |
|
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1389 |
sin.sin_family = AF_INET; |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1390 |
sin.sin_addr.s_addr = NetworkResolveHost(hostname); |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1391 |
sin.sin_port = htons(port); |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1392 |
|
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1393 |
if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) != 0) { |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1394 |
DEBUG(net, 0, "Failed to redirection DEBUG() to %s:%d", hostname, port); |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1395 |
return; |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1396 |
} |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1397 |
|
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1398 |
if (!SetNonBlocking(s)) DEBUG(net, 0, "Setting non-blocking mode failed"); |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1399 |
_debug_socket = s; |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1400 |
|
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1401 |
DEBUG(net, 0, "DEBUG() is now redirected"); |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1402 |
} |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5916
diff
changeset
|
1403 |
|
5524
93460e0fed07
(svn r7830) -Codechange: let NetworkCoreInitialize return a bool, so we have to set _network_available only once.
rubidium
parents:
5523
diff
changeset
|
1404 |
/** This tries to launch the network for a given OS */ |
6247 | 1405 |
void NetworkStartUp() |
211 | 1406 |
{ |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
1407 |
DEBUG(net, 3, "[core] starting network..."); |
770
c2eacca29601
(svn r1236) MorphOS: added make release like in OSX (tokai)
bjarni
parents:
765
diff
changeset
|
1408 |
|
5524
93460e0fed07
(svn r7830) -Codechange: let NetworkCoreInitialize return a bool, so we have to set _network_available only once.
rubidium
parents:
5523
diff
changeset
|
1409 |
/* Network is available */ |
93460e0fed07
(svn r7830) -Codechange: let NetworkCoreInitialize return a bool, so we have to set _network_available only once.
rubidium
parents:
5523
diff
changeset
|
1410 |
_network_available = NetworkCoreInitialize();; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1411 |
_network_dedicated = false; |
2861
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2859
diff
changeset
|
1412 |
_network_last_advertise_frame = 0; |
e42d249af3cb
(svn r3409) - Change the server advertisement interval to use the frame counter instead
peter1138
parents:
2859
diff
changeset
|
1413 |
_network_need_advertise = true; |
764
7e1e17b7c7d4
(svn r1227) -Add: Ingame Server-list (select Internet, then Find Servers)
truelight
parents:
746
diff
changeset
|
1414 |
_network_advertise_retries = 0; |
105 | 1415 |
|
629
4bb1f0fb0109
(svn r1059) -Fix: [Console] Renamed 'set port' to 'set server_port'
truelight
parents:
619
diff
changeset
|
1416 |
/* Load the ip from the openttd.cfg */ |
4bb1f0fb0109
(svn r1059) -Fix: [Console] Renamed 'set port' to 'set server_port'
truelight
parents:
619
diff
changeset
|
1417 |
_network_server_bind_ip = inet_addr(_network_server_bind_ip_host); |
4bb1f0fb0109
(svn r1059) -Fix: [Console] Renamed 'set port' to 'set server_port'
truelight
parents:
619
diff
changeset
|
1418 |
/* And put the data back in it in case it was an invalid ip */ |
4bb1f0fb0109
(svn r1059) -Fix: [Console] Renamed 'set port' to 'set server_port'
truelight
parents:
619
diff
changeset
|
1419 |
snprintf(_network_server_bind_ip_host, sizeof(_network_server_bind_ip_host), "%s", inet_ntoa(*(struct in_addr *)&_network_server_bind_ip)); |
4bb1f0fb0109
(svn r1059) -Fix: [Console] Renamed 'set port' to 'set server_port'
truelight
parents:
619
diff
changeset
|
1420 |
|
602
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1421 |
/* Generate an unique id when there is none yet */ |
2879
365ecd52f2db
(svn r3427) - Feature: Allow seeing and setting the maximum amount of companies and spectators for a server. This can be changed/viewed during runtime as well in the console.
Darkvater
parents:
2861
diff
changeset
|
1422 |
if (_network_unique_id[0] == '\0') NetworkGenerateUniqueId(); |
602
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
598
diff
changeset
|
1423 |
|
4417
df176ef5fa73
(svn r6170) -Feature: save max_companies/clients/spectators in the config file.
Darkvater
parents:
4295
diff
changeset
|
1424 |
{ |
df176ef5fa73
(svn r6170) -Feature: save max_companies/clients/spectators in the config file.
Darkvater
parents:
4295
diff
changeset
|
1425 |
byte cl_max = _network_game_info.clients_max; |
df176ef5fa73
(svn r6170) -Feature: save max_companies/clients/spectators in the config file.
Darkvater
parents:
4295
diff
changeset
|
1426 |
byte cp_max = _network_game_info.companies_max; |
df176ef5fa73
(svn r6170) -Feature: save max_companies/clients/spectators in the config file.
Darkvater
parents:
4295
diff
changeset
|
1427 |
byte sp_max = _network_game_info.spectators_max; |
6528
3afd9c7a0a23
(svn r9716) -Add: server_lang in [network] section of openttd.cfg, so dedicated servers can have the little lang flag.
glx
parents:
6347
diff
changeset
|
1428 |
byte s_lang = _network_game_info.server_lang; |
4417
df176ef5fa73
(svn r6170) -Feature: save max_companies/clients/spectators in the config file.
Darkvater
parents:
4295
diff
changeset
|
1429 |
|
df176ef5fa73
(svn r6170) -Feature: save max_companies/clients/spectators in the config file.
Darkvater
parents:
4295
diff
changeset
|
1430 |
memset(&_network_game_info, 0, sizeof(_network_game_info)); |
df176ef5fa73
(svn r6170) -Feature: save max_companies/clients/spectators in the config file.
Darkvater
parents:
4295
diff
changeset
|
1431 |
_network_game_info.clients_max = cl_max; |
df176ef5fa73
(svn r6170) -Feature: save max_companies/clients/spectators in the config file.
Darkvater
parents:
4295
diff
changeset
|
1432 |
_network_game_info.companies_max = cp_max; |
df176ef5fa73
(svn r6170) -Feature: save max_companies/clients/spectators in the config file.
Darkvater
parents:
4295
diff
changeset
|
1433 |
_network_game_info.spectators_max = sp_max; |
6528
3afd9c7a0a23
(svn r9716) -Add: server_lang in [network] section of openttd.cfg, so dedicated servers can have the little lang flag.
glx
parents:
6347
diff
changeset
|
1434 |
_network_game_info.server_lang = s_lang; |
4417
df176ef5fa73
(svn r6170) -Feature: save max_companies/clients/spectators in the config file.
Darkvater
parents:
4295
diff
changeset
|
1435 |
} |
105 | 1436 |
|
211 | 1437 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1438 |
NetworkInitialize(); |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
1439 |
DEBUG(net, 3, "[core] network online, multiplayer available"); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1440 |
NetworkFindIPs(); |
211 | 1441 |
} |
1442 |
||
5524
93460e0fed07
(svn r7830) -Codechange: let NetworkCoreInitialize return a bool, so we have to set _network_available only once.
rubidium
parents:
5523
diff
changeset
|
1443 |
/** This shuts the network down */ |
6247 | 1444 |
void NetworkShutDown() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1445 |
{ |
4829
9a0a034d0f55
(svn r6753) -Codechange: Move some function declerations from functions.h into network.h
Darkvater
parents:
4826
diff
changeset
|
1446 |
NetworkDisconnect(); |
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
|
1447 |
NetworkUDPShutdown(); |
4829
9a0a034d0f55
(svn r6753) -Codechange: Move some function declerations from functions.h into network.h
Darkvater
parents:
4826
diff
changeset
|
1448 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5108
diff
changeset
|
1449 |
DEBUG(net, 3, "[core] shutting down network"); |
211 | 1450 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1451 |
_network_available = false; |
211 | 1452 |
|
5523
623a8856e35b
(svn r7829) -Codechange: move the network (core) initialization/shutdown functions into network/core, so the can be reused in the masterserver_updater.
rubidium
parents:
5521
diff
changeset
|
1453 |
NetworkCoreShutdown(); |
105 | 1454 |
} |
1455 |
||
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:
5976
diff
changeset
|
1456 |
/** |
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:
5976
diff
changeset
|
1457 |
* Checks whether the given version string is compatible with our version. |
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:
5976
diff
changeset
|
1458 |
* @param other the version string to compare to |
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:
5976
diff
changeset
|
1459 |
*/ |
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:
5976
diff
changeset
|
1460 |
bool IsNetworkCompatibleVersion(const char *other) |
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:
5976
diff
changeset
|
1461 |
{ |
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:
5976
diff
changeset
|
1462 |
extern const char _openttd_revision[]; |
7220
f44697e71145
(svn r10498) -Fix [FS#1008]: remove inconsistency between a warning and the actual behaviour.
rubidium
parents:
7187
diff
changeset
|
1463 |
return strncmp(_openttd_revision, other, NETWORK_REVISION_LENGTH - 1) == 0; |
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:
5976
diff
changeset
|
1464 |
} |
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:
5976
diff
changeset
|
1465 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1466 |
#endif /* ENABLE_NETWORK */ |