author | peter1138 |
Tue, 22 Jan 2008 07:27:06 +0000 | |
changeset 8374 | 7a1b6c89cb89 |
parent 8264 | b1e85998c7d3 |
child 8973 | 749e572f9378 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
4826
6a545d194528
(svn r6750) -Codechange: Juggle around some header includes as they're only used when
Darkvater
parents:
4512
diff
changeset
|
3 |
#ifdef ENABLE_NETWORK |
6a545d194528
(svn r6750) -Codechange: Juggle around some header includes as they're only used when
Darkvater
parents:
4512
diff
changeset
|
4 |
|
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
|
5 |
#include "../stdafx.h" |
7edfc643abbc
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5432
diff
changeset
|
6 |
#include "../debug.h" |
7266
b16e67e992b4
(svn r10587) -Codechange: move the string/dparam related stuff from variables.h to strings.h
rubidium
parents:
7222
diff
changeset
|
7 |
#include "../openttd.h" |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
8 |
#include "network_data.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
|
9 |
#include "core/tcp.h" |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
10 |
#include "network_client.h" |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
11 |
#include "network_gamelist.h" |
4512
823dfd4aa413
(svn r6297) -Codechange: Disentangle the query window mess a bit: Move the network game password handling somewhere were it belongs to
tron
parents:
4428
diff
changeset
|
12 |
#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
|
13 |
#include "../saveload.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 "../console.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
|
16 |
#include "../variables.h" |
7edfc643abbc
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5432
diff
changeset
|
17 |
#include "../ai/ai.h" |
8130
d2eb7d04f6e1
(svn r11691) -Codechange: move+rename helpers.hpp and only include it when it is really needed.
rubidium
parents:
8116
diff
changeset
|
18 |
#include "../core/alloc_func.hpp" |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6531
diff
changeset
|
19 |
#include "../fileio.h" |
7999
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
20 |
#include "../md5.h" |
8114
dd6d21dc99c1
(svn r11675) -Codechange: split the string types from the string functions.
rubidium
parents:
8106
diff
changeset
|
21 |
#include "../strings_func.h" |
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:
8130
diff
changeset
|
22 |
#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:
8140
diff
changeset
|
23 |
#include "../string_func.h" |
8254
1496654ca5e7
(svn r11818) -Codechange: split player.h into smaller pieces.
rubidium
parents:
8252
diff
changeset
|
24 |
#include "../player_func.h" |
1496654ca5e7
(svn r11818) -Codechange: split player.h into smaller pieces.
rubidium
parents:
8252
diff
changeset
|
25 |
#include "../player_base.h" |
1496654ca5e7
(svn r11818) -Codechange: split player.h into smaller pieces.
rubidium
parents:
8252
diff
changeset
|
26 |
#include "../player_gui.h" |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
27 |
|
8264
b1e85998c7d3
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8254
diff
changeset
|
28 |
#include "table/strings.h" |
b1e85998c7d3
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8254
diff
changeset
|
29 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
30 |
// This file handles all the client-commands |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
31 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
32 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
33 |
// So we don't make too much typos ;) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
34 |
#define MY_CLIENT DEREF_CLIENT(0) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
35 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
36 |
static uint32 last_ack_frame; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
37 |
|
7999
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
38 |
/** One bit of 'entropy' used to generate a salt for the company passwords. */ |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
39 |
static uint32 _password_game_seed; |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
40 |
/** The other bit of 'entropy' used to generate a salt for the company passwords. */ |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
41 |
static char _password_server_unique_id[NETWORK_UNIQUE_ID_LENGTH]; |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
42 |
|
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
43 |
/** Make sure the unique ID length is the same as a md5 hash. */ |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
44 |
assert_compile(NETWORK_UNIQUE_ID_LENGTH == 16 * 2 + 1); |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
45 |
|
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
46 |
/** |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
47 |
* Generates a hashed password for the company name. |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
48 |
* @param password the password to 'encrypt'. |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
49 |
* @return the hashed password. |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
50 |
*/ |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
51 |
static const char *GenerateCompanyPasswordHash(const char *password) |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
52 |
{ |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
53 |
if (StrEmpty(password)) return password; |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
54 |
|
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
55 |
char salted_password[NETWORK_UNIQUE_ID_LENGTH]; |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
56 |
|
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
57 |
memset(salted_password, 0, sizeof(salted_password)); |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
58 |
snprintf(salted_password, sizeof(salted_password), "%s", password); |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
59 |
/* Add the game seed and the server's unique ID as the salt. */ |
8252
69bfb7671f97
(svn r11816) -Fix: forgot clearing one byte, causing the passwords to differ slightly on different platforms.
rubidium
parents:
8214
diff
changeset
|
60 |
for (uint i = 0; i < NETWORK_UNIQUE_ID_LENGTH - 1; i++) salted_password[i] ^= _password_server_unique_id[i] ^ (_password_game_seed >> i); |
7999
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
61 |
|
8133
3ab8eaf85ca0
(svn r11695) -Codechange: Converted the md5 algorithm to OOP
skidd13
parents:
8131
diff
changeset
|
62 |
Md5 checksum; |
3ab8eaf85ca0
(svn r11695) -Codechange: Converted the md5 algorithm to OOP
skidd13
parents:
8131
diff
changeset
|
63 |
uint8 digest[16]; |
7999
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
64 |
static char hashed_password[NETWORK_UNIQUE_ID_LENGTH]; |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
65 |
|
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
66 |
/* Generate the MD5 hash */ |
8252
69bfb7671f97
(svn r11816) -Fix: forgot clearing one byte, causing the passwords to differ slightly on different platforms.
rubidium
parents:
8214
diff
changeset
|
67 |
checksum.Append((const uint8*)salted_password, sizeof(salted_password) - 1); |
8133
3ab8eaf85ca0
(svn r11695) -Codechange: Converted the md5 algorithm to OOP
skidd13
parents:
8131
diff
changeset
|
68 |
checksum.Finish(digest); |
7999
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
69 |
|
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
70 |
for (int di = 0; di < 16; di++) sprintf(hashed_password + di * 2, "%02x", digest[di]); |
8252
69bfb7671f97
(svn r11816) -Fix: forgot clearing one byte, causing the passwords to differ slightly on different platforms.
rubidium
parents:
8214
diff
changeset
|
71 |
hashed_password[lengthof(hashed_password) - 1] = '\0'; |
7999
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
72 |
|
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
73 |
return hashed_password; |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
74 |
} |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
75 |
|
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
76 |
/** |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
77 |
* Hash the current company password; used when the server 'player' sets his/her password. |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
78 |
*/ |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
79 |
void HashCurrentCompanyPassword() |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
80 |
{ |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
81 |
if (StrEmpty(_network_player_info[_local_player].password)) return; |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
82 |
|
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
83 |
_password_game_seed = _patches.generation_seed; |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
84 |
snprintf(_password_server_unique_id, sizeof(_password_server_unique_id), _network_unique_id); |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
85 |
|
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
86 |
const char *new_pw = GenerateCompanyPasswordHash(_network_player_info[_local_player].password); |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
87 |
snprintf(_network_player_info[_local_player].password, sizeof(_network_player_info[_local_player].password), new_pw); |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
88 |
} |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
89 |
|
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
90 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
91 |
// ********** |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
92 |
// Sending functions |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
93 |
// DEF_CLIENT_SEND_COMMAND has no parameters |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
94 |
// ********** |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
95 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
96 |
DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_COMPANY_INFO) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
97 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
98 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
99 |
// Packet: CLIENT_COMPANY_INFO |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
100 |
// Function: Request company-info (in detail) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
101 |
// Data: |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
102 |
// <none> |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
103 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
104 |
Packet *p; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
105 |
_network_join_status = NETWORK_JOIN_STATUS_GETTING_COMPANY_INFO; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
106 |
InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
107 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
108 |
p = NetworkSend_Init(PACKET_CLIENT_COMPANY_INFO); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
109 |
MY_CLIENT->Send_Packet(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
110 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
111 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
112 |
DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_JOIN) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
113 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
114 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
115 |
// Packet: CLIENT_JOIN |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
116 |
// Function: Try to join the server |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
117 |
// Data: |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
118 |
// String: OpenTTD Revision (norev000 if no revision) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
119 |
// String: Player Name (max NETWORK_NAME_LENGTH) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
120 |
// uint8: Play as Player id (1..MAX_PLAYERS) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
121 |
// uint8: Language ID |
602
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
571
diff
changeset
|
122 |
// String: Unique id to find the player back in server-listing |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
123 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
124 |
|
4840
a76d40e0aea4
(svn r6766) -Codechange: Move _openttd_revision[] into the functions that use it instead of global
Darkvater
parents:
4826
diff
changeset
|
125 |
extern const char _openttd_revision[]; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
126 |
Packet *p; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
127 |
_network_join_status = NETWORK_JOIN_STATUS_AUTHORIZING; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
128 |
InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
129 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
130 |
p = NetworkSend_Init(PACKET_CLIENT_JOIN); |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
131 |
p->Send_string(_openttd_revision); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
132 |
p->Send_string(_network_player_name); // Player name |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
133 |
p->Send_uint8 (_network_playas); // PlayAs |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
134 |
p->Send_uint8 (NETLANG_ANY); // Language |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
135 |
p->Send_string(_network_unique_id); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
136 |
MY_CLIENT->Send_Packet(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
137 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
138 |
|
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:
5703
diff
changeset
|
139 |
DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED) |
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:
5703
diff
changeset
|
140 |
{ |
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:
5703
diff
changeset
|
141 |
// |
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:
5703
diff
changeset
|
142 |
// Packet: CLIENT_NEWGRFS_CHECKED |
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:
5703
diff
changeset
|
143 |
// Function: Tell the server that we have the required GRFs |
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:
5703
diff
changeset
|
144 |
// Data: |
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:
5703
diff
changeset
|
145 |
// |
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:
5703
diff
changeset
|
146 |
|
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:
5703
diff
changeset
|
147 |
Packet *p = NetworkSend_Init(PACKET_CLIENT_NEWGRFS_CHECKED); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
148 |
MY_CLIENT->Send_Packet(p); |
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:
5703
diff
changeset
|
149 |
} |
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:
5703
diff
changeset
|
150 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
151 |
DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_PASSWORD)(NetworkPasswordType type, const char *password) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
152 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
153 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
154 |
// Packet: CLIENT_PASSWORD |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
155 |
// Function: Send a password to the server to authorize |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
156 |
// Data: |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
157 |
// uint8: NetworkPasswordType |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
158 |
// String: Password |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
159 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
160 |
Packet *p = NetworkSend_Init(PACKET_CLIENT_PASSWORD); |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
161 |
p->Send_uint8 (type); |
7999
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
162 |
p->Send_string(type == NETWORK_GAME_PASSWORD ? password : GenerateCompanyPasswordHash(password)); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
163 |
MY_CLIENT->Send_Packet(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
164 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
165 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
166 |
DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_GETMAP) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
167 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
168 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
169 |
// Packet: CLIENT_GETMAP |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
170 |
// Function: Request the map from the server |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
171 |
// Data: |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
172 |
// <none> |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
173 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
174 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
175 |
Packet *p = NetworkSend_Init(PACKET_CLIENT_GETMAP); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
176 |
MY_CLIENT->Send_Packet(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
177 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
178 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
179 |
DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_MAP_OK) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
180 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
181 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
182 |
// Packet: CLIENT_MAP_OK |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
183 |
// Function: Tell the server that we are done receiving/loading the map |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
184 |
// Data: |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
185 |
// <none> |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
186 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
187 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
188 |
Packet *p = NetworkSend_Init(PACKET_CLIENT_MAP_OK); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
189 |
MY_CLIENT->Send_Packet(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
190 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
191 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
192 |
DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_ACK) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
193 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
194 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
195 |
// Packet: CLIENT_ACK |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
196 |
// Function: Tell the server we are done with this frame |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
197 |
// Data: |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
198 |
// uint32: current FrameCounter of the client |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
199 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
200 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
201 |
Packet *p = NetworkSend_Init(PACKET_CLIENT_ACK); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
202 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
203 |
p->Send_uint32(_frame_counter); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
204 |
MY_CLIENT->Send_Packet(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
205 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
206 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
207 |
// Send a command packet to the server |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
208 |
DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_COMMAND)(CommandPacket *cp) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
209 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
210 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
211 |
// Packet: CLIENT_COMMAND |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
212 |
// Function: Send a DoCommand to the Server |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
213 |
// Data: |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
214 |
// uint8: PlayerID (0..MAX_PLAYERS-1) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
215 |
// uint32: CommandID (see command.h) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
216 |
// uint32: P1 (free variables used in DoCommand) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
217 |
// uint32: P2 |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
218 |
// uint32: Tile |
1820
d03c56850dc2
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1797
diff
changeset
|
219 |
// string: text |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
220 |
// uint8: CallBackID (see callback_table.c) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
221 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
222 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
223 |
Packet *p = NetworkSend_Init(PACKET_CLIENT_COMMAND); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
224 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
225 |
p->Send_uint8 (cp->player); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
226 |
p->Send_uint32(cp->cmd); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
227 |
p->Send_uint32(cp->p1); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
228 |
p->Send_uint32(cp->p2); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
229 |
p->Send_uint32((uint32)cp->tile); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
230 |
p->Send_string(cp->text); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
231 |
p->Send_uint8 (cp->callback); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
232 |
|
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
233 |
MY_CLIENT->Send_Packet(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
234 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
235 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
236 |
// Send a chat-packet over the network |
4906
935e6280c093
(svn r6876) -Codechange: Change the naming of _PLAYER in DESTTYPE_PLAYER/NETWORK_ACTION_CHAT_PLAYER
Darkvater
parents:
4880
diff
changeset
|
237 |
DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_CHAT)(NetworkAction action, DestType type, int dest, const char *msg) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
238 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
239 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
240 |
// Packet: CLIENT_CHAT |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
241 |
// Function: Send a chat-packet to the serve |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
242 |
// Data: |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
243 |
// uint8: ActionID (see network_data.h, NetworkAction) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
244 |
// uint8: Destination Type (see network_data.h, DestType); |
6531
4445b25832c4
(svn r9719) -Fix: in-game private messages did not work for clients with a Client ID > 255.
rubidium
parents:
6492
diff
changeset
|
245 |
// uint16: Destination Player |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
246 |
// String: Message (max MAX_TEXT_MSG_LEN) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
247 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
248 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
249 |
Packet *p = NetworkSend_Init(PACKET_CLIENT_CHAT); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
250 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
251 |
p->Send_uint8 (action); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
252 |
p->Send_uint8 (type); |
6531
4445b25832c4
(svn r9719) -Fix: in-game private messages did not work for clients with a Client ID > 255.
rubidium
parents:
6492
diff
changeset
|
253 |
p->Send_uint16(dest); |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
254 |
p->Send_string(msg); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
255 |
MY_CLIENT->Send_Packet(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
256 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
257 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
258 |
// Send an error-packet over the network |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
259 |
DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_ERROR)(NetworkErrorCode errorno) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
260 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
261 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
262 |
// Packet: CLIENT_ERROR |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
263 |
// Function: The client made an error and is quiting the game |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
264 |
// Data: |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
265 |
// uint8: ErrorID (see network_data.h, NetworkErrorCode) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
266 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
267 |
Packet *p = NetworkSend_Init(PACKET_CLIENT_ERROR); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
268 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
269 |
p->Send_uint8(errorno); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
270 |
MY_CLIENT->Send_Packet(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
271 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
272 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
273 |
DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_SET_PASSWORD)(const char *password) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
274 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
275 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
276 |
// Packet: PACKET_CLIENT_SET_PASSWORD |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
277 |
// Function: Set the password for the clients current company |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
278 |
// Data: |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
279 |
// String: Password |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
280 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
281 |
Packet *p = NetworkSend_Init(PACKET_CLIENT_SET_PASSWORD); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
282 |
|
7999
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
283 |
p->Send_string(GenerateCompanyPasswordHash(password)); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
284 |
MY_CLIENT->Send_Packet(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
285 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
286 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
287 |
DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_SET_NAME)(const char *name) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
288 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
289 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
290 |
// Packet: PACKET_CLIENT_SET_NAME |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
291 |
// Function: Gives the player a new name |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
292 |
// Data: |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
293 |
// String: Name |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
294 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
295 |
Packet *p = NetworkSend_Init(PACKET_CLIENT_SET_NAME); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
296 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
297 |
p->Send_string(name); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
298 |
MY_CLIENT->Send_Packet(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
299 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
300 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
301 |
// Send an quit-packet over the network |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
302 |
DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_QUIT)(const char *leavemsg) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
303 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
304 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
305 |
// Packet: CLIENT_QUIT |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
306 |
// Function: The client is quiting the game |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
307 |
// Data: |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
308 |
// String: leave-message |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
309 |
// |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
310 |
Packet *p = NetworkSend_Init(PACKET_CLIENT_QUIT); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
311 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
312 |
p->Send_string(leavemsg); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
313 |
MY_CLIENT->Send_Packet(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
314 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
315 |
|
1026
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
316 |
DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_RCON)(const char *pass, const char *command) |
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
317 |
{ |
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
318 |
Packet *p = NetworkSend_Init(PACKET_CLIENT_RCON); |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
319 |
p->Send_string(pass); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
320 |
p->Send_string(command); |
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
321 |
MY_CLIENT->Send_Packet(p); |
1026
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
322 |
} |
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
323 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
324 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
325 |
// ********** |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
326 |
// Receiving functions |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
327 |
// DEF_CLIENT_RECEIVE_COMMAND has parameter: Packet *p |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
328 |
// ********** |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
329 |
|
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6531
diff
changeset
|
330 |
extern bool SafeSaveOrLoad(const char *filename, int mode, int newgm, Subdirectory subdir); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
331 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
332 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_FULL) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
333 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
334 |
// We try to join a server which is full |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
335 |
_switch_mode_errorstr = STR_NETWORK_ERR_SERVER_FULL; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
336 |
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
337 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
338 |
return NETWORK_RECV_STATUS_SERVER_FULL; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
339 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
340 |
|
841
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
779
diff
changeset
|
341 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_BANNED) |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
779
diff
changeset
|
342 |
{ |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
779
diff
changeset
|
343 |
// We try to join a server where we are banned |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
779
diff
changeset
|
344 |
_switch_mode_errorstr = STR_NETWORK_ERR_SERVER_BANNED; |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
779
diff
changeset
|
345 |
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
779
diff
changeset
|
346 |
|
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
779
diff
changeset
|
347 |
return NETWORK_RECV_STATUS_SERVER_BANNED; |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
779
diff
changeset
|
348 |
} |
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
779
diff
changeset
|
349 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
350 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_COMPANY_INFO) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
351 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
352 |
byte company_info_version; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
353 |
int i; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
354 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
355 |
company_info_version = p->Recv_uint8(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
356 |
|
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
357 |
if (!MY_CLIENT->has_quit && company_info_version == NETWORK_COMPANY_INFO_VERSION) { |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
358 |
byte total; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
359 |
PlayerID current; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
360 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
361 |
total = p->Recv_uint8(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
362 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
363 |
// There is no data at all.. |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
364 |
if (total == 0) return NETWORK_RECV_STATUS_CLOSE_QUERY; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
365 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
366 |
current = (Owner)p->Recv_uint8(); |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
367 |
if (!IsValidPlayer(current)) return NETWORK_RECV_STATUS_CLOSE_QUERY; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
368 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
369 |
p->Recv_string(_network_player_info[current].company_name, sizeof(_network_player_info[current].company_name)); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
370 |
_network_player_info[current].inaugurated_year = p->Recv_uint32(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
371 |
_network_player_info[current].company_value = p->Recv_uint64(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
372 |
_network_player_info[current].money = p->Recv_uint64(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
373 |
_network_player_info[current].income = p->Recv_uint64(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
374 |
_network_player_info[current].performance = p->Recv_uint16(); |
5918
f06b73812d5f
(svn r8546) -Codechange: add a seperate (wrapper) functions to send/receive booleans.
rubidium
parents:
5902
diff
changeset
|
375 |
_network_player_info[current].use_password = p->Recv_bool(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
376 |
for (i = 0; i < NETWORK_VEHICLE_TYPES; i++) |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
377 |
_network_player_info[current].num_vehicle[i] = p->Recv_uint16(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
378 |
for (i = 0; i < NETWORK_STATION_TYPES; i++) |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
379 |
_network_player_info[current].num_station[i] = p->Recv_uint16(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
380 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
381 |
p->Recv_string(_network_player_info[current].players, sizeof(_network_player_info[current].players)); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
382 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
383 |
InvalidateWindow(WC_NETWORK_WINDOW, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
384 |
|
734
f4ad2f5805fd
(svn r1186) -Fix: [Network] You can now join a company on a server where a company
truelight
parents:
722
diff
changeset
|
385 |
return NETWORK_RECV_STATUS_OKAY; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
386 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
387 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
388 |
return NETWORK_RECV_STATUS_CLOSE_QUERY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
389 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
390 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
391 |
// This packet contains info about the client (playas and name) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
392 |
// as client we save this in NetworkClientInfo, linked via 'index' |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
393 |
// which is always an unique number on a server. |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
394 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CLIENT_INFO) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
395 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
396 |
NetworkClientInfo *ci; |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
397 |
uint16 index = p->Recv_uint16(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
398 |
PlayerID playas = (Owner)p->Recv_uint8(); |
662
22708a1cbba9
(svn r1096) -Fix: [Network] PlayAs is now registered correctly
truelight
parents:
659
diff
changeset
|
399 |
char name[NETWORK_NAME_LENGTH]; |
7807
b10fc6c5d081
(svn r11357) -Fix: NetworkUniqueID could be 80 chars, while the max size we generate is 32. So reduce the size a bit. Pointed out by dihedral, so give him a big hug ;)
truelight
parents:
7266
diff
changeset
|
400 |
char unique_id[NETWORK_UNIQUE_ID_LENGTH]; |
662
22708a1cbba9
(svn r1096) -Fix: [Network] PlayAs is now registered correctly
truelight
parents:
659
diff
changeset
|
401 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
402 |
p->Recv_string(name, sizeof(name)); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
403 |
p->Recv_string(unique_id, sizeof(unique_id)); |
903
a301a264e0fc
(svn r1389) -Add: [Network] Added packet protection. No longer a client or server
truelight
parents:
841
diff
changeset
|
404 |
|
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
405 |
if (MY_CLIENT->has_quit) return NETWORK_RECV_STATUS_CONN_LOST; |
662
22708a1cbba9
(svn r1096) -Fix: [Network] PlayAs is now registered correctly
truelight
parents:
659
diff
changeset
|
406 |
|
22708a1cbba9
(svn r1096) -Fix: [Network] PlayAs is now registered correctly
truelight
parents:
659
diff
changeset
|
407 |
/* Do we receive a change of data? Most likely we changed playas */ |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
408 |
if (index == _network_own_client_index) _network_playas = playas; |
2684
4df784e4be66
(svn r3226) -Fix: GPMI implementation had minor glitches
truelight
parents:
2373
diff
changeset
|
409 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
410 |
ci = NetworkFindClientInfoFromIndex(index); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
411 |
if (ci != NULL) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
412 |
if (playas == ci->client_playas && strcmp(name, ci->client_name) != 0) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
413 |
// Client name changed, display the change |
2373
e073ec69bf56
(svn r2899) -Fix: Several format string vulnerabilities and buffer overflows in the network code
tron
parents:
2293
diff
changeset
|
414 |
NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", name); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
415 |
} else if (playas != ci->client_playas) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
416 |
// The player changed from client-player.. |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
417 |
// Do not display that for now |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
418 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
419 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
420 |
ci->client_playas = playas; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
421 |
ttd_strlcpy(ci->client_name, name, sizeof(ci->client_name)); |
662
22708a1cbba9
(svn r1096) -Fix: [Network] PlayAs is now registered correctly
truelight
parents:
659
diff
changeset
|
422 |
|
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
423 |
InvalidateWindow(WC_CLIENT_LIST, 0); |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
424 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
425 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
426 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
427 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
428 |
// We don't have this index yet, find an empty index, and put the data there |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
429 |
ci = NetworkFindClientInfoFromIndex(NETWORK_EMPTY_INDEX); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
430 |
if (ci != NULL) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
431 |
ci->client_index = index; |
662
22708a1cbba9
(svn r1096) -Fix: [Network] PlayAs is now registered correctly
truelight
parents:
659
diff
changeset
|
432 |
ci->client_playas = playas; |
22708a1cbba9
(svn r1096) -Fix: [Network] PlayAs is now registered correctly
truelight
parents:
659
diff
changeset
|
433 |
|
22708a1cbba9
(svn r1096) -Fix: [Network] PlayAs is now registered correctly
truelight
parents:
659
diff
changeset
|
434 |
ttd_strlcpy(ci->client_name, name, sizeof(ci->client_name)); |
22708a1cbba9
(svn r1096) -Fix: [Network] PlayAs is now registered correctly
truelight
parents:
659
diff
changeset
|
435 |
ttd_strlcpy(ci->unique_id, unique_id, sizeof(ci->unique_id)); |
22708a1cbba9
(svn r1096) -Fix: [Network] PlayAs is now registered correctly
truelight
parents:
659
diff
changeset
|
436 |
|
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
437 |
InvalidateWindow(WC_CLIENT_LIST, 0); |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
438 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
439 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
440 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
441 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
442 |
// Here the program should never ever come..... |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
443 |
return NETWORK_RECV_STATUS_MALFORMED_PACKET; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
444 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
445 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
446 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_ERROR) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
447 |
{ |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
448 |
NetworkErrorCode error = (NetworkErrorCode)p->Recv_uint8(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
449 |
|
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:
2817
diff
changeset
|
450 |
switch (error) { |
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:
2817
diff
changeset
|
451 |
/* We made an error in the protocol, and our connection is closed.... */ |
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:
2817
diff
changeset
|
452 |
case NETWORK_ERROR_NOT_AUTHORIZED: |
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:
2817
diff
changeset
|
453 |
case NETWORK_ERROR_NOT_EXPECTED: |
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:
2817
diff
changeset
|
454 |
case NETWORK_ERROR_PLAYER_MISMATCH: |
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:
2817
diff
changeset
|
455 |
_switch_mode_errorstr = STR_NETWORK_ERR_SERVER_ERROR; |
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:
2817
diff
changeset
|
456 |
break; |
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:
2817
diff
changeset
|
457 |
case NETWORK_ERROR_FULL: |
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:
2817
diff
changeset
|
458 |
_switch_mode_errorstr = STR_NETWORK_ERR_SERVER_FULL; |
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:
2817
diff
changeset
|
459 |
break; |
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:
2817
diff
changeset
|
460 |
case NETWORK_ERROR_WRONG_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:
2817
diff
changeset
|
461 |
_switch_mode_errorstr = STR_NETWORK_ERR_WRONG_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:
2817
diff
changeset
|
462 |
break; |
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:
2817
diff
changeset
|
463 |
case NETWORK_ERROR_WRONG_PASSWORD: |
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:
2817
diff
changeset
|
464 |
_switch_mode_errorstr = STR_NETWORK_ERR_WRONG_PASSWORD; |
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:
2817
diff
changeset
|
465 |
break; |
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:
2817
diff
changeset
|
466 |
case NETWORK_ERROR_KICKED: |
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:
2817
diff
changeset
|
467 |
_switch_mode_errorstr = STR_NETWORK_ERR_KICKED; |
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:
2817
diff
changeset
|
468 |
break; |
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:
2817
diff
changeset
|
469 |
case NETWORK_ERROR_CHEATER: |
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:
2817
diff
changeset
|
470 |
_switch_mode_errorstr = STR_NETWORK_ERR_CHEATER; |
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:
2817
diff
changeset
|
471 |
break; |
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:
2817
diff
changeset
|
472 |
default: |
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:
2817
diff
changeset
|
473 |
_switch_mode_errorstr = STR_NETWORK_ERR_LOSTCONNECTION; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
474 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
475 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
476 |
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
477 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
478 |
return NETWORK_RECV_STATUS_SERVER_ERROR; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
479 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
480 |
|
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:
5703
diff
changeset
|
481 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHECK_NEWGRFS) |
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:
5703
diff
changeset
|
482 |
{ |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
483 |
uint grf_count = p->Recv_uint8(); |
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:
5703
diff
changeset
|
484 |
NetworkRecvStatus ret = NETWORK_RECV_STATUS_OKAY; |
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:
5703
diff
changeset
|
485 |
|
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:
5703
diff
changeset
|
486 |
/* Check all GRFs */ |
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:
5703
diff
changeset
|
487 |
for (; grf_count > 0; grf_count--) { |
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:
5703
diff
changeset
|
488 |
GRFConfig c; |
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:
5703
diff
changeset
|
489 |
MY_CLIENT->Recv_GRFIdentifier(p, &c); |
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:
5703
diff
changeset
|
490 |
|
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:
5703
diff
changeset
|
491 |
/* Check whether we know this GRF */ |
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:
5703
diff
changeset
|
492 |
const GRFConfig *f = FindGRFConfig(c.grfid, c.md5sum); |
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:
5703
diff
changeset
|
493 |
if (f == NULL) { |
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:
5703
diff
changeset
|
494 |
/* We do not know this GRF, bail out of initialization */ |
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:
5703
diff
changeset
|
495 |
char buf[sizeof(c.md5sum) * 2 + 1]; |
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:
5703
diff
changeset
|
496 |
md5sumToString(buf, lastof(buf), c.md5sum); |
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:
5703
diff
changeset
|
497 |
DEBUG(grf, 0, "NewGRF %08X not found; checksum %s", BSWAP32(c.grfid), buf); |
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:
5703
diff
changeset
|
498 |
ret = NETWORK_RECV_STATUS_NEWGRF_MISMATCH; |
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:
5703
diff
changeset
|
499 |
} |
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:
5703
diff
changeset
|
500 |
} |
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:
5703
diff
changeset
|
501 |
|
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:
5703
diff
changeset
|
502 |
if (ret == NETWORK_RECV_STATUS_OKAY) { |
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:
5703
diff
changeset
|
503 |
/* Start receiving the map */ |
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:
5703
diff
changeset
|
504 |
SEND_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED)(); |
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:
5703
diff
changeset
|
505 |
} else { |
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:
5703
diff
changeset
|
506 |
/* NewGRF mismatch, bail out */ |
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:
5703
diff
changeset
|
507 |
_switch_mode_errorstr = STR_NETWORK_ERR_NEWGRF_MISMATCH; |
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:
5703
diff
changeset
|
508 |
} |
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:
5703
diff
changeset
|
509 |
return ret; |
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:
5703
diff
changeset
|
510 |
} |
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:
5703
diff
changeset
|
511 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
512 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_NEED_PASSWORD) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
513 |
{ |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
514 |
NetworkPasswordType type = (NetworkPasswordType)p->Recv_uint8(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
515 |
|
4512
823dfd4aa413
(svn r6297) -Codechange: Disentangle the query window mess a bit: Move the network game password handling somewhere were it belongs to
tron
parents:
4428
diff
changeset
|
516 |
switch (type) { |
7999
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
517 |
case NETWORK_COMPANY_PASSWORD: |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
518 |
/* Initialize the password hash salting variables. */ |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
519 |
_password_game_seed = p->Recv_uint32(); |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
520 |
p->Recv_string(_password_server_unique_id, sizeof(_password_server_unique_id)); |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
521 |
if (MY_CLIENT->has_quit) return NETWORK_RECV_STATUS_MALFORMED_PACKET; |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
522 |
|
4512
823dfd4aa413
(svn r6297) -Codechange: Disentangle the query window mess a bit: Move the network game password handling somewhere were it belongs to
tron
parents:
4428
diff
changeset
|
523 |
case NETWORK_GAME_PASSWORD: |
823dfd4aa413
(svn r6297) -Codechange: Disentangle the query window mess a bit: Move the network game password handling somewhere were it belongs to
tron
parents:
4428
diff
changeset
|
524 |
ShowNetworkNeedPassword(type); |
823dfd4aa413
(svn r6297) -Codechange: Disentangle the query window mess a bit: Move the network game password handling somewhere were it belongs to
tron
parents:
4428
diff
changeset
|
525 |
return NETWORK_RECV_STATUS_OKAY; |
823dfd4aa413
(svn r6297) -Codechange: Disentangle the query window mess a bit: Move the network game password handling somewhere were it belongs to
tron
parents:
4428
diff
changeset
|
526 |
|
823dfd4aa413
(svn r6297) -Codechange: Disentangle the query window mess a bit: Move the network game password handling somewhere were it belongs to
tron
parents:
4428
diff
changeset
|
527 |
default: return NETWORK_RECV_STATUS_MALFORMED_PACKET; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
528 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
529 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
530 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
531 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_WELCOME) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
532 |
{ |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
533 |
_network_own_client_index = p->Recv_uint16(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
534 |
|
7999
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
535 |
/* Initialize the password hash salting variables, even if they were previously. */ |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
536 |
_password_game_seed = p->Recv_uint32(); |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
537 |
p->Recv_string(_password_server_unique_id, sizeof(_password_server_unique_id)); |
bb3a1508fd71
(svn r11557) -Codechange: send and store the passwords a little more secure to/in the servers.
rubidium
parents:
7807
diff
changeset
|
538 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
539 |
// Start receiving the map |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
540 |
SEND_COMMAND(PACKET_CLIENT_GETMAP)(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
541 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
542 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
543 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
544 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_WAIT) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
545 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
546 |
_network_join_status = NETWORK_JOIN_STATUS_WAITING; |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
547 |
_network_join_waiting = p->Recv_uint8(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
548 |
InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
549 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
550 |
// We are put on hold for receiving the map.. we need GUI for this ;) |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5376
diff
changeset
|
551 |
DEBUG(net, 1, "The server is currently busy sending the map to someone else, please wait..." ); |
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5376
diff
changeset
|
552 |
DEBUG(net, 1, "There are %d clients in front of you", _network_join_waiting); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
553 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
554 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
555 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
556 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
557 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
558 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
559 |
static FILE *file_pointer; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
560 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
561 |
byte maptype; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
562 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
563 |
maptype = p->Recv_uint8(); |
903
a301a264e0fc
(svn r1389) -Add: [Network] Added packet protection. No longer a client or server
truelight
parents:
841
diff
changeset
|
564 |
|
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
565 |
if (MY_CLIENT->has_quit) return NETWORK_RECV_STATUS_CONN_LOST; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
566 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
567 |
// First packet, init some stuff |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
568 |
if (maptype == MAP_PACKET_START) { |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6531
diff
changeset
|
569 |
file_pointer = FioFOpenFile("network_client.tmp", "wb", AUTOSAVE_DIR);; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
570 |
if (file_pointer == NULL) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
571 |
_switch_mode_errorstr = STR_NETWORK_ERR_SAVEGAMEERROR; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
572 |
return NETWORK_RECV_STATUS_SAVEGAME; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
573 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
574 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
575 |
_frame_counter = _frame_counter_server = _frame_counter_max = p->Recv_uint32(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
576 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
577 |
_network_join_kbytes = 0; |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
578 |
_network_join_kbytes_total = p->Recv_uint32() / 1024; |
5703
755268acddb6
(svn r8167) -Fix (FS#556): a network client crashes, due to a division by zero, when the connection gets lost at the right moment or when the packet is malformed (server sends size 0 for the map).
rubidium
parents:
5624
diff
changeset
|
579 |
|
755268acddb6
(svn r8167) -Fix (FS#556): a network client crashes, due to a division by zero, when the connection gets lost at the right moment or when the packet is malformed (server sends size 0 for the map).
rubidium
parents:
5624
diff
changeset
|
580 |
/* If the network connection has been closed due to loss of connection |
755268acddb6
(svn r8167) -Fix (FS#556): a network client crashes, due to a division by zero, when the connection gets lost at the right moment or when the packet is malformed (server sends size 0 for the map).
rubidium
parents:
5624
diff
changeset
|
581 |
* or when _network_join_kbytes_total is 0, the join status window will |
755268acddb6
(svn r8167) -Fix (FS#556): a network client crashes, due to a division by zero, when the connection gets lost at the right moment or when the packet is malformed (server sends size 0 for the map).
rubidium
parents:
5624
diff
changeset
|
582 |
* do a division by zero. When the connection is lost, we just return |
755268acddb6
(svn r8167) -Fix (FS#556): a network client crashes, due to a division by zero, when the connection gets lost at the right moment or when the packet is malformed (server sends size 0 for the map).
rubidium
parents:
5624
diff
changeset
|
583 |
* that. If kbytes_total is 0, the packet must be malformed as a |
755268acddb6
(svn r8167) -Fix (FS#556): a network client crashes, due to a division by zero, when the connection gets lost at the right moment or when the packet is malformed (server sends size 0 for the map).
rubidium
parents:
5624
diff
changeset
|
584 |
* savegame less than 1 kilobyte is practically impossible. */ |
755268acddb6
(svn r8167) -Fix (FS#556): a network client crashes, due to a division by zero, when the connection gets lost at the right moment or when the packet is malformed (server sends size 0 for the map).
rubidium
parents:
5624
diff
changeset
|
585 |
if (MY_CLIENT->has_quit) return NETWORK_RECV_STATUS_CONN_LOST; |
755268acddb6
(svn r8167) -Fix (FS#556): a network client crashes, due to a division by zero, when the connection gets lost at the right moment or when the packet is malformed (server sends size 0 for the map).
rubidium
parents:
5624
diff
changeset
|
586 |
if (_network_join_kbytes_total == 0) return NETWORK_RECV_STATUS_MALFORMED_PACKET; |
755268acddb6
(svn r8167) -Fix (FS#556): a network client crashes, due to a division by zero, when the connection gets lost at the right moment or when the packet is malformed (server sends size 0 for the map).
rubidium
parents:
5624
diff
changeset
|
587 |
|
755268acddb6
(svn r8167) -Fix (FS#556): a network client crashes, due to a division by zero, when the connection gets lost at the right moment or when the packet is malformed (server sends size 0 for the map).
rubidium
parents:
5624
diff
changeset
|
588 |
_network_join_status = NETWORK_JOIN_STATUS_DOWNLOADING; |
6492
286a52449b54
(svn r9673) -Cleanup: remove spaces before tabs and replace non-indenting tabs with spaces.
rubidium
parents:
6247
diff
changeset
|
589 |
InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
590 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
591 |
// The first packet does not contain any more data |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
592 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
593 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
594 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
595 |
if (maptype == MAP_PACKET_NORMAL) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
596 |
// We are still receiving data, put it to the file |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
597 |
fwrite(p->buffer + p->pos, 1, p->size - p->pos, file_pointer); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
598 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
599 |
_network_join_kbytes = ftell(file_pointer) / 1024; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
600 |
InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
601 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
602 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
603 |
// Check if this was the last packet |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
604 |
if (maptype == MAP_PACKET_END) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
605 |
fclose(file_pointer); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
606 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
607 |
_network_join_status = NETWORK_JOIN_STATUS_PROCESSING; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
608 |
InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
609 |
|
5413 | 610 |
/* The map is done downloading, load it */ |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6531
diff
changeset
|
611 |
if (!SafeSaveOrLoad("network_client.tmp", SL_LOAD, GM_NORMAL, AUTOSAVE_DIR)) { |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
612 |
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
613 |
_switch_mode_errorstr = STR_NETWORK_ERR_SAVEGAMEERROR; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
614 |
return NETWORK_RECV_STATUS_SAVEGAME; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
615 |
} |
5432
5940d6a253c5
(svn r7638) -Codechange: Remove special window ShowJoinStatusWindowAfterJoin and shuffle around
Darkvater
parents:
5413
diff
changeset
|
616 |
/* If the savegame has successfully loaded, ALL windows have been removed, |
5940d6a253c5
(svn r7638) -Codechange: Remove special window ShowJoinStatusWindowAfterJoin and shuffle around
Darkvater
parents:
5413
diff
changeset
|
617 |
* only toolbar/statusbar and gamefield are visible */ |
1500
a66721629bc0
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1317
diff
changeset
|
618 |
|
a66721629bc0
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1317
diff
changeset
|
619 |
_opt_ptr = &_opt; // during a network game you are always in-game |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
620 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
621 |
// Say we received the map and loaded it correctly! |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
622 |
SEND_COMMAND(PACKET_CLIENT_MAP_OK)(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
623 |
|
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
624 |
/* New company/spectator (invalid player) or company we want to join is not active |
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
625 |
* Switch local player to spectator and await the server's judgement */ |
4878
4d4f76a898fd
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4861
diff
changeset
|
626 |
if (_network_playas == PLAYER_NEW_COMPANY || !IsValidPlayer(_network_playas) || |
4d4f76a898fd
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4861
diff
changeset
|
627 |
!GetPlayer(_network_playas)->is_active) { |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
628 |
|
5376
204acb84473f
(svn r7561) -Fix (FS#431): core and (patches) GUI were not in-sync with respect to autorenew settings. This is only a temporary fix, as the definite fix needs to move the autorenew settings to a per-company settings window.
rubidium
parents:
5296
diff
changeset
|
629 |
SetLocalPlayer(PLAYER_SPECTATOR); |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
630 |
|
5432
5940d6a253c5
(svn r7638) -Codechange: Remove special window ShowJoinStatusWindowAfterJoin and shuffle around
Darkvater
parents:
5413
diff
changeset
|
631 |
if (_network_playas != PLAYER_SPECTATOR) { |
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1500
diff
changeset
|
632 |
/* We have arrived and ready to start playing; send a command to make a new player; |
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1500
diff
changeset
|
633 |
* the server will give us a client-id and let us in */ |
5432
5940d6a253c5
(svn r7638) -Codechange: Remove special window ShowJoinStatusWindowAfterJoin and shuffle around
Darkvater
parents:
5413
diff
changeset
|
634 |
_network_join_status = NETWORK_JOIN_STATUS_REGISTERING; |
5940d6a253c5
(svn r7638) -Codechange: Remove special window ShowJoinStatusWindowAfterJoin and shuffle around
Darkvater
parents:
5413
diff
changeset
|
635 |
ShowJoinStatusWindow(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
636 |
NetworkSend_Command(0, 0, 0, CMD_PLAYER_CTRL, NULL); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
637 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
638 |
} else { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
639 |
// take control over an existing company |
5376
204acb84473f
(svn r7561) -Fix (FS#431): core and (patches) GUI were not in-sync with respect to autorenew settings. This is only a temporary fix, as the definite fix needs to move the autorenew settings to a per-company settings window.
rubidium
parents:
5296
diff
changeset
|
640 |
SetLocalPlayer(_network_playas); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
641 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
642 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
643 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
644 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
645 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
646 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
647 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_FRAME) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
648 |
{ |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
649 |
_frame_counter_server = p->Recv_uint32(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
650 |
_frame_counter_max = p->Recv_uint32(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
651 |
#ifdef ENABLE_NETWORK_SYNC_EVERY_FRAME |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
652 |
// Test if the server supports this option |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
653 |
// and if we are at the frame the server is |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
654 |
if (p->pos < p->size) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
655 |
_sync_frame = _frame_counter_server; |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
656 |
_sync_seed_1 = p->Recv_uint32(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
657 |
#ifdef NETWORK_SEND_DOUBLE_SEED |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
658 |
_sync_seed_2 = p->Recv_uint32(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
659 |
#endif |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
660 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
661 |
#endif |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5376
diff
changeset
|
662 |
DEBUG(net, 5, "Received FRAME %d", _frame_counter_server); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
663 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
664 |
// Let the server know that we received this frame correctly |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
665 |
// We do this only once per day, to save some bandwidth ;) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
666 |
if (!_network_first_time && last_ack_frame < _frame_counter) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
667 |
last_ack_frame = _frame_counter + DAY_TICKS; |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5376
diff
changeset
|
668 |
DEBUG(net, 4, "Sent ACK at %d", _frame_counter); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
669 |
SEND_COMMAND(PACKET_CLIENT_ACK)(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
670 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
671 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
672 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
673 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
674 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
675 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_SYNC) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
676 |
{ |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
677 |
_sync_frame = p->Recv_uint32(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
678 |
_sync_seed_1 = p->Recv_uint32(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
679 |
#ifdef NETWORK_SEND_DOUBLE_SEED |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
680 |
_sync_seed_2 = p->Recv_uint32(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
681 |
#endif |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
682 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
683 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
684 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
685 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
686 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_COMMAND) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
687 |
{ |
5609
dc6a58930ba4
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5587
diff
changeset
|
688 |
CommandPacket *cp = MallocT<CommandPacket>(1); |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
689 |
cp->player = (PlayerID)p->Recv_uint8(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
690 |
cp->cmd = p->Recv_uint32(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
691 |
cp->p1 = p->Recv_uint32(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
692 |
cp->p2 = p->Recv_uint32(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
693 |
cp->tile = p->Recv_uint32(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
694 |
p->Recv_string(cp->text, sizeof(cp->text)); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
695 |
cp->callback = p->Recv_uint8(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
696 |
cp->frame = p->Recv_uint32(); |
7222
d46753675bf7
(svn r10501) -Fix [FS#1015]: error dialog was sometimes shown on all clients when a command failed instead of only the client that actually did the command.
rubidium
parents:
7060
diff
changeset
|
697 |
cp->my_cmd = p->Recv_bool(); |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
698 |
cp->next = NULL; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
699 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
700 |
// The server did send us this command.. |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
701 |
// queue it in our own queue, so we can handle it in the upcoming frame! |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
702 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
703 |
if (_local_command_queue == NULL) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
704 |
_local_command_queue = cp; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
705 |
} else { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
706 |
// Find last packet |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
707 |
CommandPacket *c = _local_command_queue; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
708 |
while (c->next != NULL) c = c->next; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
709 |
c->next = cp; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
710 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
711 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
712 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
713 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
714 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
715 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
716 |
{ |
4946
9c6fe6ede9d2
(svn r6934) -Cleanup: Some minor cleanup for network_client and removing 'stupid' comment
Darkvater
parents:
4945
diff
changeset
|
717 |
char name[NETWORK_NAME_LENGTH], msg[MAX_TEXT_MSG_LEN]; |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
718 |
const NetworkClientInfo *ci = NULL, *ci_to; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
719 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
720 |
NetworkAction action = (NetworkAction)p->Recv_uint8(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
721 |
uint16 index = p->Recv_uint16(); |
5918
f06b73812d5f
(svn r8546) -Codechange: add a seperate (wrapper) functions to send/receive booleans.
rubidium
parents:
5902
diff
changeset
|
722 |
bool self_send = p->Recv_bool(); |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
723 |
p->Recv_string(msg, MAX_TEXT_MSG_LEN); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
724 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
725 |
ci_to = NetworkFindClientInfoFromIndex(index); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
726 |
if (ci_to == NULL) return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
727 |
|
4946
9c6fe6ede9d2
(svn r6934) -Cleanup: Some minor cleanup for network_client and removing 'stupid' comment
Darkvater
parents:
4945
diff
changeset
|
728 |
/* Did we initiate the action locally? */ |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
729 |
if (self_send) { |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
730 |
switch (action) { |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
731 |
case NETWORK_ACTION_CHAT_CLIENT: |
4946
9c6fe6ede9d2
(svn r6934) -Cleanup: Some minor cleanup for network_client and removing 'stupid' comment
Darkvater
parents:
4945
diff
changeset
|
732 |
/* For speaking to client we need the client-name */ |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
733 |
snprintf(name, sizeof(name), "%s", ci_to->client_name); |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
734 |
ci = NetworkFindClientInfoFromIndex(_network_own_client_index); |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
735 |
break; |
4945
d20e68851e70
(svn r6933) -Feature: Allow spectators to speak to eachother (team)
Darkvater
parents:
4912
diff
changeset
|
736 |
|
d20e68851e70
(svn r6933) -Feature: Allow spectators to speak to eachother (team)
Darkvater
parents:
4912
diff
changeset
|
737 |
/* For speaking to company or giving money, we need the player-name */ |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
738 |
case NETWORK_ACTION_GIVE_MONEY: |
4945
d20e68851e70
(svn r6933) -Feature: Allow spectators to speak to eachother (team)
Darkvater
parents:
4912
diff
changeset
|
739 |
if (!IsValidPlayer(ci_to->client_playas)) return NETWORK_RECV_STATUS_OKAY; |
d20e68851e70
(svn r6933) -Feature: Allow spectators to speak to eachother (team)
Darkvater
parents:
4912
diff
changeset
|
740 |
/* fallthrough */ |
d20e68851e70
(svn r6933) -Feature: Allow spectators to speak to eachother (team)
Darkvater
parents:
4912
diff
changeset
|
741 |
case NETWORK_ACTION_CHAT_COMPANY: { |
7060
4b811c8460cf
(svn r10325) -Fix (r10323): Missed 3 company name references
peter1138
parents:
6929
diff
changeset
|
742 |
StringID str = IsValidPlayer(ci_to->client_playas) ? STR_COMPANY_NAME : STR_NETWORK_SPECTATORS; |
4b811c8460cf
(svn r10325) -Fix (r10323): Missed 3 company name references
peter1138
parents:
6929
diff
changeset
|
743 |
SetDParam(0, ci_to->client_playas); |
4878
4d4f76a898fd
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4861
diff
changeset
|
744 |
|
4945
d20e68851e70
(svn r6933) -Feature: Allow spectators to speak to eachother (team)
Darkvater
parents:
4912
diff
changeset
|
745 |
GetString(name, str, lastof(name)); |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
746 |
ci = NetworkFindClientInfoFromIndex(_network_own_client_index); |
4945
d20e68851e70
(svn r6933) -Feature: Allow spectators to speak to eachother (team)
Darkvater
parents:
4912
diff
changeset
|
747 |
} break; |
4946
9c6fe6ede9d2
(svn r6934) -Cleanup: Some minor cleanup for network_client and removing 'stupid' comment
Darkvater
parents:
4945
diff
changeset
|
748 |
|
9c6fe6ede9d2
(svn r6934) -Cleanup: Some minor cleanup for network_client and removing 'stupid' comment
Darkvater
parents:
4945
diff
changeset
|
749 |
default: NOT_REACHED(); break; |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
750 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
751 |
} else { |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
752 |
/* Display message from somebody else */ |
602
f0afb4018788
(svn r1026) -Add: [Network] Added unique id, so in network, each client has an
truelight
parents:
571
diff
changeset
|
753 |
snprintf(name, sizeof(name), "%s", ci_to->client_name); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
754 |
ci = ci_to; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
755 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
756 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
757 |
if (ci != NULL) |
4878
4d4f76a898fd
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4861
diff
changeset
|
758 |
NetworkTextMessage(action, GetDrawStringPlayerColor(ci->client_playas), self_send, name, "%s", msg); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
759 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
760 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
761 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
762 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_ERROR_QUIT) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
763 |
{ |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
764 |
char str[100]; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
765 |
uint16 index; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
766 |
NetworkClientInfo *ci; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
767 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
768 |
index = p->Recv_uint16(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
769 |
GetNetworkErrorMsg(str, (NetworkErrorCode)p->Recv_uint8(), lastof(str)); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
770 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
771 |
ci = NetworkFindClientInfoFromIndex(index); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
772 |
if (ci != NULL) { |
2373
e073ec69bf56
(svn r2899) -Fix: Several format string vulnerabilities and buffer overflows in the network code
tron
parents:
2293
diff
changeset
|
773 |
NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, "%s", str); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
774 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
775 |
// The client is gone, give the NetworkClientInfo free |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
776 |
ci->client_index = NETWORK_EMPTY_INDEX; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
777 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
778 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
779 |
InvalidateWindow(WC_CLIENT_LIST, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
780 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
781 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
782 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
783 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
784 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_QUIT) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
785 |
{ |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
786 |
char str[100]; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
787 |
uint16 index; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
788 |
NetworkClientInfo *ci; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
789 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
790 |
index = p->Recv_uint16(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
791 |
p->Recv_string(str, lengthof(str)); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
792 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
793 |
ci = NetworkFindClientInfoFromIndex(index); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
794 |
if (ci != NULL) { |
2373
e073ec69bf56
(svn r2899) -Fix: Several format string vulnerabilities and buffer overflows in the network code
tron
parents:
2293
diff
changeset
|
795 |
NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, "%s", str); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
796 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
797 |
// The client is gone, give the NetworkClientInfo free |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
798 |
ci->client_index = NETWORK_EMPTY_INDEX; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
799 |
} else { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5376
diff
changeset
|
800 |
DEBUG(net, 0, "Unknown client (%d) is leaving the game", index); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
801 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
802 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
803 |
InvalidateWindow(WC_CLIENT_LIST, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
804 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
805 |
// If we come here it means we could not locate the client.. strange :s |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
806 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
807 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
808 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
809 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_JOIN) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
810 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
811 |
uint16 index; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
812 |
NetworkClientInfo *ci; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
813 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
814 |
index = p->Recv_uint16(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
815 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
816 |
ci = NetworkFindClientInfoFromIndex(index); |
722
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
817 |
if (ci != NULL) |
f420fa9bd521
(svn r1174) -Fix: [Network] All strings can now be translated (no more hardcoded strings)
truelight
parents:
717
diff
changeset
|
818 |
NetworkTextMessage(NETWORK_ACTION_JOIN, 1, false, ci->client_name, ""); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
819 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
820 |
InvalidateWindow(WC_CLIENT_LIST, 0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
821 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
822 |
return NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
823 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
824 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
825 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_SHUTDOWN) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
826 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
827 |
_switch_mode_errorstr = STR_NETWORK_SERVER_SHUTDOWN; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
828 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
829 |
return NETWORK_RECV_STATUS_SERVER_ERROR; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
830 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
831 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
832 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_NEWGAME) |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
833 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
834 |
// To trottle the reconnects a bit, every clients waits |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
835 |
// his _local_player value before reconnecting |
4848
45f848b46222
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4840
diff
changeset
|
836 |
// PLAYER_SPECTATOR is currently 255, so to avoid long wait periods |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
837 |
// set the max to 10. |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
838 |
_network_reconnect = min(_local_player + 1, 10); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
839 |
_switch_mode_errorstr = STR_NETWORK_SERVER_REBOOT; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
840 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
841 |
return NETWORK_RECV_STATUS_SERVER_ERROR; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
842 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
843 |
|
1026
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
844 |
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_RCON) |
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
845 |
{ |
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
846 |
char rcon_out[NETWORK_RCONCOMMAND_LENGTH]; |
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
847 |
uint16 color_code; |
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
848 |
|
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
849 |
color_code = p->Recv_uint16(); |
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
850 |
p->Recv_string(rcon_out, sizeof(rcon_out)); |
1026
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
851 |
|
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
852 |
IConsolePrint(color_code, rcon_out); |
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
853 |
|
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
854 |
return NETWORK_RECV_STATUS_OKAY; |
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
855 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
856 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
857 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
858 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
859 |
// The layout for the receive-functions by the client |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
860 |
typedef NetworkRecvStatus NetworkClientPacket(Packet *p); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
861 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
862 |
// This array matches PacketType. At an incoming |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
863 |
// packet it is matches against this array |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
864 |
// and that way the right function to handle that |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
865 |
// packet is found. |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
866 |
static NetworkClientPacket* const _network_client_packet[] = { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
867 |
RECEIVE_COMMAND(PACKET_SERVER_FULL), |
841
4874b9ce2765
(svn r1322) -Add: banning system (mostly tnx to guru3)
truelight
parents:
779
diff
changeset
|
868 |
RECEIVE_COMMAND(PACKET_SERVER_BANNED), |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
869 |
NULL, /*PACKET_CLIENT_JOIN,*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
870 |
RECEIVE_COMMAND(PACKET_SERVER_ERROR), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
871 |
NULL, /*PACKET_CLIENT_COMPANY_INFO,*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
872 |
RECEIVE_COMMAND(PACKET_SERVER_COMPANY_INFO), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
873 |
RECEIVE_COMMAND(PACKET_SERVER_CLIENT_INFO), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
874 |
RECEIVE_COMMAND(PACKET_SERVER_NEED_PASSWORD), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
875 |
NULL, /*PACKET_CLIENT_PASSWORD,*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
876 |
RECEIVE_COMMAND(PACKET_SERVER_WELCOME), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
877 |
NULL, /*PACKET_CLIENT_GETMAP,*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
878 |
RECEIVE_COMMAND(PACKET_SERVER_WAIT), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
879 |
RECEIVE_COMMAND(PACKET_SERVER_MAP), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
880 |
NULL, /*PACKET_CLIENT_MAP_OK,*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
881 |
RECEIVE_COMMAND(PACKET_SERVER_JOIN), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
882 |
RECEIVE_COMMAND(PACKET_SERVER_FRAME), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
883 |
RECEIVE_COMMAND(PACKET_SERVER_SYNC), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
884 |
NULL, /*PACKET_CLIENT_ACK,*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
885 |
NULL, /*PACKET_CLIENT_COMMAND,*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
886 |
RECEIVE_COMMAND(PACKET_SERVER_COMMAND), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
887 |
NULL, /*PACKET_CLIENT_CHAT,*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
888 |
RECEIVE_COMMAND(PACKET_SERVER_CHAT), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
889 |
NULL, /*PACKET_CLIENT_SET_PASSWORD,*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
890 |
NULL, /*PACKET_CLIENT_SET_NAME,*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
891 |
NULL, /*PACKET_CLIENT_QUIT,*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
892 |
NULL, /*PACKET_CLIENT_ERROR,*/ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
893 |
RECEIVE_COMMAND(PACKET_SERVER_QUIT), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
894 |
RECEIVE_COMMAND(PACKET_SERVER_ERROR_QUIT), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
895 |
RECEIVE_COMMAND(PACKET_SERVER_SHUTDOWN), |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
896 |
RECEIVE_COMMAND(PACKET_SERVER_NEWGAME), |
1026
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
897 |
RECEIVE_COMMAND(PACKET_SERVER_RCON), |
02cc18821508
(svn r1527) -Add: RCon (Remote Connection). A server can set:
truelight
parents:
1013
diff
changeset
|
898 |
NULL, /*PACKET_CLIENT_RCON,*/ |
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:
5703
diff
changeset
|
899 |
RECEIVE_COMMAND(PACKET_SERVER_CHECK_NEWGRFS), |
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:
5703
diff
changeset
|
900 |
NULL, /*PACKET_CLIENT_NEWGRFS_CHECKED,*/ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
901 |
}; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
902 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
903 |
// If this fails, check the array above with network_data.h |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
904 |
assert_compile(lengthof(_network_client_packet) == PACKET_END); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
905 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
906 |
// Is called after a client is connected to the server |
6247 | 907 |
void NetworkClient_Connected() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
908 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
909 |
// Set the frame-counter to 0 so nothing happens till we are ready |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
910 |
_frame_counter = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
911 |
_frame_counter_server = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
912 |
last_ack_frame = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
913 |
// Request the game-info |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
914 |
SEND_COMMAND(PACKET_CLIENT_JOIN)(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
915 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
916 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
917 |
// Reads the packets from the socket-stream, if available |
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:
5609
diff
changeset
|
918 |
NetworkRecvStatus NetworkClient_ReadPackets(NetworkTCPSocketHandler *cs) |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
919 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
920 |
Packet *p; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
921 |
NetworkRecvStatus res = NETWORK_RECV_STATUS_OKAY; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
922 |
|
5902
a9508c166390
(svn r8525) -Codechange: make NetworkSend_Packet(s) and NetworkRecv_Packet functions of NetworkTCPSocketHandler.
rubidium
parents:
5900
diff
changeset
|
923 |
while (res == NETWORK_RECV_STATUS_OKAY && (p = cs->Recv_Packet(&res)) != NULL) { |
5900
135d10dd7219
(svn r8523) -Codechange: move all the Network(Recv|Send)_(uintXX|string) functions to Packet.
rubidium
parents:
5898
diff
changeset
|
924 |
byte type = p->Recv_uint8(); |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
925 |
if (type < PACKET_END && _network_client_packet[type] != NULL && !MY_CLIENT->has_quit) { |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
926 |
res = _network_client_packet[type](p); |
2026 | 927 |
} else { |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
928 |
res = NETWORK_RECV_STATUS_MALFORMED_PACKET; |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5376
diff
changeset
|
929 |
DEBUG(net, 0, "[client] received invalid packet type %d", type); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
930 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
931 |
|
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:
5872
diff
changeset
|
932 |
delete p; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
933 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
934 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
935 |
return res; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
936 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
937 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
diff
changeset
|
938 |
#endif /* ENABLE_NETWORK */ |