author | signde |
Sat, 11 Sep 2004 19:34:11 +0000 | |
changeset 206 | 7f8c26d8526b |
parent 193 | 0a7025304867 |
child 208 | f3998d4089f0 |
permissions | -rw-r--r-- |
0 | 1 |
#include "stdafx.h" |
2 |
#include "ttd.h" |
|
105 | 3 |
#include "gui.h" |
0 | 4 |
#include "command.h" |
5 |
#include "player.h" |
|
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
6 |
#include "console.h" |
0 | 7 |
|
8 |
#if defined(WIN32) |
|
9 |
# include <windows.h> |
|
10 |
# include <winsock.h> |
|
11 |
||
12 |
# pragma comment (lib, "ws2_32.lib") |
|
13 |
# define ENABLE_NETWORK |
|
14 |
# define GET_LAST_ERROR() WSAGetLastError() |
|
15 |
# define EWOULDBLOCK WSAEWOULDBLOCK |
|
16 |
#endif |
|
17 |
||
18 |
#if defined(UNIX) |
|
19 |
// Make compatible with WIN32 names |
|
20 |
# define SOCKET int |
|
21 |
# define INVALID_SOCKET -1 |
|
22 |
// we need different defines for MorphOS and AmigaOS |
|
23 |
#if !defined(__MORPHOS__) && !defined(__AMIGA__) |
|
24 |
# define ioctlsocket ioctl |
|
25 |
# define closesocket close |
|
26 |
# define GET_LAST_ERROR() errno |
|
27 |
#endif |
|
28 |
// Need this for FIONREAD on solaris |
|
29 |
# define BSD_COMP |
|
30 |
# include <unistd.h> |
|
31 |
# include <sys/ioctl.h> |
|
32 |
||
33 |
// Socket stuff |
|
34 |
# include <sys/socket.h> |
|
35 |
# include <netinet/in.h> |
|
36 |
# include <arpa/inet.h> |
|
37 |
# include <errno.h> |
|
38 |
# include <sys/time.h> |
|
39 |
// NetDB |
|
40 |
# include <netdb.h> |
|
41 |
||
42 |
# ifndef TCP_NODELAY |
|
43 |
# define TCP_NODELAY 0x0001 |
|
44 |
# endif |
|
45 |
||
46 |
#endif |
|
47 |
||
48 |
||
49 |
#if defined(__MORPHOS__) || defined(__AMIGA__) |
|
50 |
# include <exec/types.h> |
|
51 |
# include <proto/exec.h> // required for Open/CloseLibrary() |
|
52 |
# if defined(__MORPHOS__) |
|
53 |
# include <sys/filio.h> // FION#? defines |
|
54 |
# else // __AMIGA__ |
|
55 |
# include <proto/socket.h> |
|
56 |
# endif |
|
57 |
||
58 |
// make source compatible with bsdsocket.library functions |
|
59 |
# define closesocket(s) CloseSocket(s) |
|
60 |
# define GET_LAST_ERROR() Errno() |
|
61 |
# define ioctlsocket(s,request,status) IoctlSocket((LONG)s,(ULONG)request,(char*)status) |
|
62 |
||
63 |
struct Library *SocketBase = NULL; |
|
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
64 |
|
173
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
65 |
#if !defined(__MORPHOS__) |
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
66 |
// usleep() implementation |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
67 |
#include <devices/timer.h> |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
68 |
#include <dos/dos.h> |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
69 |
|
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
70 |
struct Device *TimerBase = NULL; |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
71 |
struct MsgPort *TimerPort = NULL; |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
72 |
struct timerequest *TimerRequest = NULL; |
173
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
73 |
#endif |
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
74 |
|
0 | 75 |
#endif /* __MORPHOS__ || __AMIGA__ */ |
76 |
||
77 |
||
78 |
#define SEND_MTU 1460 |
|
79 |
||
80 |
#if defined(ENABLE_NETWORK) |
|
81 |
||
206 | 82 |
enum { |
83 |
PACKET_TYPE_WELCOME = 0, |
|
84 |
PACKET_TYPE_READY, |
|
85 |
PACKET_TYPE_ACK, |
|
86 |
PACKET_TYPE_SYNC, |
|
87 |
PACKET_TYPE_XMIT, |
|
88 |
PACKET_TYPE_COMMAND, |
|
89 |
}; |
|
90 |
||
0 | 91 |
// sent from client -> server whenever the client wants to exec a command. |
92 |
// send from server -> client when another player execs a command. |
|
93 |
typedef struct CommandPacket { |
|
94 |
byte packet_length; |
|
95 |
byte packet_type; |
|
96 |
uint16 cmd; |
|
97 |
uint32 p1,p2; |
|
98 |
TileIndex tile; |
|
99 |
byte player;// player id, this is checked by the server. |
|
100 |
byte when; // offset from the current max_frame value minus 1. this is set by the server. |
|
101 |
uint32 dp[8]; |
|
102 |
} CommandPacket; |
|
103 |
||
104 |
#define COMMAND_PACKET_BASE_SIZE (sizeof(CommandPacket) - 8 * sizeof(uint32)) |
|
105 |
||
106 |
// sent from server -> client periodically to tell the client about the current tick in the server |
|
107 |
// and how far the client may progress. |
|
108 |
typedef struct SyncPacket { |
|
109 |
byte packet_length; |
|
110 |
byte packet_type; |
|
111 |
byte frames; // how many more frames may the client execute? this is relative to the old value of max. |
|
112 |
byte server; // where is the server currently executing? this is negatively relative to the old value of max. |
|
113 |
uint32 random_seed_1; // current random state at server. used to detect out of sync. |
|
114 |
uint32 random_seed_2; |
|
115 |
} SyncPacket; |
|
116 |
||
117 |
// sent from server -> client as an acknowledgement that the server received the command. |
|
118 |
// the command will be executed at the current value of "max". |
|
119 |
typedef struct AckPacket { |
|
120 |
byte packet_length; |
|
121 |
byte packet_type; |
|
206 | 122 |
byte when; |
0 | 123 |
} AckPacket; |
124 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
125 |
typedef struct ReadyPacket { |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
126 |
byte packet_length; |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
127 |
byte packet_type; |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
128 |
} ReadyPacket; |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
129 |
|
0 | 130 |
typedef struct FilePacketHdr { |
131 |
byte packet_length; |
|
132 |
byte packet_type; |
|
133 |
} FilePacketHdr; |
|
134 |
||
135 |
// sent from server to client when the client has joined. |
|
136 |
typedef struct WelcomePacket { |
|
137 |
byte packet_length; |
|
138 |
byte packet_type; |
|
206 | 139 |
uint32 player_seeds[MAX_PLAYERS][2]; |
140 |
uint32 frames_max; |
|
141 |
uint32 frames_srv; |
|
142 |
uint32 frames_cnt; |
|
0 | 143 |
} WelcomePacket; |
144 |
||
145 |
typedef struct Packet Packet; |
|
146 |
struct Packet { |
|
147 |
Packet *next; // this one has to be the first element. |
|
148 |
uint siz; |
|
149 |
byte buf[SEND_MTU]; // packet payload |
|
150 |
}; |
|
151 |
||
152 |
typedef struct ClientState { |
|
153 |
int socket; |
|
154 |
bool inactive; // disable sending of commands/syncs to client |
|
155 |
bool writable; |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
156 |
bool ready; |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
157 |
uint timeout; |
0 | 158 |
uint xmitpos; |
159 |
||
160 |
uint eaten; |
|
161 |
Packet *head, **last; |
|
162 |
||
163 |
uint buflen; // receive buffer len |
|
206 | 164 |
byte buf[1024]; // receive buffer |
0 | 165 |
} ClientState; |
166 |
||
167 |
||
168 |
typedef struct QueuedCommand QueuedCommand; |
|
169 |
struct QueuedCommand { |
|
170 |
QueuedCommand *next; |
|
171 |
CommandPacket cp; |
|
172 |
CommandCallback *callback; |
|
173 |
uint32 cmd; |
|
206 | 174 |
uint32 frame; |
0 | 175 |
}; |
176 |
||
177 |
typedef struct CommandQueue CommandQueue; |
|
178 |
struct CommandQueue { |
|
179 |
QueuedCommand *head, **last; |
|
180 |
}; |
|
181 |
||
182 |
#define MAX_CLIENTS (MAX_PLAYERS + 1) |
|
183 |
||
184 |
// packets waiting to be executed, for each of the players. |
|
185 |
// this list is sorted in frame order, so the item on the front will be executed first. |
|
186 |
static CommandQueue _command_queue; |
|
187 |
||
188 |
// in the client, this is the list of commands that have not yet been acked. |
|
189 |
// when it is acked, it will be moved to the appropriate position at the end of the player queue. |
|
190 |
static CommandQueue _ack_queue; |
|
191 |
||
192 |
static ClientState _clients[MAX_CLIENTS]; |
|
193 |
static int _num_clients; |
|
194 |
||
195 |
// keep a history of the 16 most recent seeds to be able to capture out of sync errors. |
|
196 |
static uint32 _my_seed_list[16][2]; |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
197 |
static bool _network_ready_sent; |
187
f790a76cc828
(svn r188) -Fix: network fixes for players with higher latency (sign_de)
darkvater
parents:
185
diff
changeset
|
198 |
static uint16 _network_ready_ahead = 1; |
f790a76cc828
(svn r188) -Fix: network fixes for players with higher latency (sign_de)
darkvater
parents:
185
diff
changeset
|
199 |
static uint16 _network_client_timeout; |
0 | 200 |
|
201 |
typedef struct FutureSeeds { |
|
206 | 202 |
uint32 frame; |
0 | 203 |
uint32 seed[2]; |
204 |
} FutureSeeds; |
|
205 |
||
206 |
// remember some future seeds that the server sent to us. |
|
207 |
static FutureSeeds _future_seed[8]; |
|
175
d6cccece959a
(svn r176) -Fix: network_gui const and warnings fixes (Tron)
darkvater
parents:
173
diff
changeset
|
208 |
static uint _num_future_seed; |
0 | 209 |
|
105 | 210 |
static SOCKET _listensocket; // tcp socket |
0 | 211 |
|
105 | 212 |
static SOCKET _udp_client_socket; // udp server socket |
213 |
static SOCKET _udp_server_socket; // udp client socket |
|
0 | 214 |
|
215 |
typedef struct UDPPacket { |
|
216 |
byte command_code; |
|
217 |
byte data_len; |
|
218 |
byte command_check; |
|
219 |
byte data[255]; |
|
220 |
} UDPPacket; |
|
221 |
||
222 |
enum { |
|
223 |
NET_UDPCMD_SERVERSEARCH = 1, |
|
224 |
NET_UDPCMD_SERVERACTIVE, |
|
105 | 225 |
NET_UDPCMD_GETSERVERINFO, |
226 |
NET_UDPCMD_SERVERINFO, |
|
0 | 227 |
}; |
228 |
||
105 | 229 |
void NetworkUDPSend(bool client, struct sockaddr_in recv,struct UDPPacket packet); |
206 | 230 |
static void CloseClient(ClientState *cs); |
231 |
void NetworkSendWelcome(ClientState *cs, bool direct); |
|
0 | 232 |
|
105 | 233 |
uint32 _network_ip_list[10]; // network ip list |
0 | 234 |
|
235 |
// this is set to point to the savegame |
|
236 |
static byte *_transmit_file; |
|
237 |
static size_t _transmit_file_size; |
|
238 |
||
239 |
static FILE *_recv_file; |
|
240 |
||
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
241 |
typedef struct NetworkGameInfo { |
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
242 |
char server_name[40]; // name of the game |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
243 |
char server_revision[8]; // server game version |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
244 |
byte server_lang; // langid |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
245 |
byte players_max; // max players allowed on server |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
246 |
byte players_on; // current count of players on server |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
247 |
uint16 game_date; // current date |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
248 |
char game_password[10]; // should fit ... 10 chars |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
249 |
char map_name[40]; // map which is played ["random" for a randomized map] |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
250 |
uint map_width; // map width / 8 |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
251 |
uint map_height; // map height / 8 |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
252 |
byte map_set; // graphical set |
105 | 253 |
} NetworkGameInfo; |
254 |
||
255 |
typedef struct NetworkGameList { |
|
256 |
NetworkGameInfo item; |
|
257 |
uint32 ip; |
|
258 |
uint16 port; |
|
259 |
char * _next; |
|
260 |
} NetworkGameList; |
|
261 |
||
262 |
static NetworkGameInfo _network_game; |
|
263 |
static NetworkGameList * _network_game_list = NULL; |
|
264 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
265 |
|
105 | 266 |
/* multi os compatible sleep function */ |
267 |
void CSleep(int milliseconds) { |
|
268 |
#if defined(WIN32) |
|
269 |
Sleep(milliseconds); |
|
270 |
#endif |
|
271 |
#if defined(UNIX) |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
272 |
#if !defined(__BEOS__) && !defined(__MORPHOS__) && !defined(__AMIGAOS__) |
105 | 273 |
usleep(milliseconds*1000); |
274 |
#endif |
|
275 |
#ifdef __BEOS__ |
|
276 |
snooze(milliseconds*1000); |
|
277 |
#endif |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
278 |
#if defined(__MORPHOS__) |
173
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
279 |
usleep(milliseconds*1000); |
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
280 |
#endif |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
281 |
#if defined(__AMIGAOS__) && !defined(__MORPHOS__) |
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
282 |
{ |
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
283 |
ULONG signals; |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
284 |
ULONG TimerSigBit = 1 << TimerPort->mp_SigBit; |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
285 |
|
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
286 |
// send IORequest |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
287 |
TimerRequest->tr_node.io_Command = TR_ADDREQUEST; |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
288 |
TimerRequest->tr_time.tv_secs = (milliseconds * 1000) / 1000000; |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
289 |
TimerRequest->tr_time.tv_micro = (milliseconds * 1000) % 1000000; |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
290 |
SendIO((struct IORequest *)TimerRequest); |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
291 |
|
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
292 |
if ( !((signals = Wait(TimerSigBit|SIGBREAKF_CTRL_C)) & TimerSigBit) ) { |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
293 |
AbortIO((struct IORequest *)TimerRequest); |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
294 |
} |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
295 |
WaitIO((struct IORequest *)TimerRequest); |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
296 |
} |
173
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
297 |
#endif // __AMIGAOS__ && !__MORPHOS__ |
105 | 298 |
#endif |
299 |
} |
|
300 |
||
0 | 301 |
////////////////////////////////////////////////////////////////////// |
302 |
||
105 | 303 |
// ****************************** // |
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
304 |
// * Network Error Handlers * // |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
305 |
// ****************************** // |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
306 |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
307 |
static void NetworkHandleSaveGameError() |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
308 |
{ |
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
309 |
_networking_sync = false; |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
310 |
_networking_queuing = true; |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
311 |
_switch_mode = SM_MENU; |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
312 |
_switch_mode_errorstr = STR_NETWORK_ERR_SAVEGAMEERROR; |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
313 |
} |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
314 |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
315 |
static void NetworkHandleConnectionLost() |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
316 |
{ |
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
317 |
_networking_sync = false; |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
318 |
_networking_queuing = true; |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
319 |
_switch_mode = SM_MENU; |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
320 |
_switch_mode_errorstr = STR_NETWORK_ERR_LOSTCONNECTION; |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
321 |
} |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
322 |
static void NetworkHandleDeSync() |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
323 |
{ |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
324 |
DEBUG(net, 0) ("[NET] Fatal ERROR: network sync error at frame %i", _frame_counter); |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
325 |
{ |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
326 |
int i; |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
327 |
for (i=15; i>=0; i--) DEBUG(net,0) ("[NET] frame %i: [0]=%i, [1]=%i",_frame_counter-(i+1),_my_seed_list[i][0],_my_seed_list[i][1]); |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
328 |
for (i=0; i<8; i++) DEBUG(net,0) ("[NET] frame %i: [0]=%i, [1]=%i",_frame_counter+i,_future_seed[i].seed[0],_future_seed[i].seed[1]); |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
329 |
} |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
330 |
_networking_sync = false; |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
331 |
_networking_queuing = true; |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
332 |
_switch_mode = SM_MENU; |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
333 |
_switch_mode_errorstr = STR_NETWORK_ERR_DESYNC; |
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
334 |
} |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
335 |
|
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
336 |
// ****************************** // |
105 | 337 |
// * TCP Packets and Handlers * // |
338 |
// ****************************** // |
|
339 |
||
0 | 340 |
static QueuedCommand *AllocQueuedCommand(CommandQueue *nq) |
341 |
{ |
|
342 |
QueuedCommand *qp = (QueuedCommand*)calloc(sizeof(QueuedCommand), 1); |
|
343 |
assert(qp); |
|
344 |
*nq->last = qp; |
|
345 |
nq->last = &qp->next; |
|
346 |
return qp; |
|
347 |
} |
|
348 |
||
206 | 349 |
static void QueueClear(CommandQueue *nq) { |
350 |
QueuedCommand *qp; |
|
351 |
while ((qp=nq->head)) { |
|
352 |
// unlink it. |
|
353 |
if (!(nq->head = qp->next)) nq->last = &nq->head; |
|
354 |
free(qp); |
|
355 |
} |
|
356 |
nq->last = &nq->head; |
|
357 |
} |
|
358 |
||
0 | 359 |
// go through the player queues for each player and see if there are any pending commands |
360 |
// that should be executed this frame. if there are, execute them. |
|
361 |
void NetworkProcessCommands() |
|
362 |
{ |
|
363 |
CommandQueue *nq; |
|
364 |
QueuedCommand *qp; |
|
365 |
||
366 |
// queue mode ? |
|
367 |
if (_networking_queuing) |
|
368 |
return; |
|
369 |
||
370 |
nq = &_command_queue; |
|
371 |
while ( (qp=nq->head) && (!_networking_sync || qp->frame <= _frame_counter)) { |
|
372 |
// unlink it. |
|
373 |
if (!(nq->head = qp->next)) nq->last = &nq->head; |
|
374 |
||
375 |
if (qp->frame < _frame_counter && _networking_sync) { |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
376 |
DEBUG(net,0) ("error: !qp->cp.frame < _frame_counter, %d < %d\n", qp->frame, _frame_counter); |
0 | 377 |
} |
378 |
||
379 |
// run the command |
|
380 |
_current_player = qp->cp.player; |
|
381 |
memcpy(_decode_parameters, qp->cp.dp, (qp->cp.packet_length - COMMAND_PACKET_BASE_SIZE)); |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
382 |
|
0 | 383 |
DoCommandP(qp->cp.tile, qp->cp.p1, qp->cp.p2, qp->callback, qp->cmd | CMD_DONT_NETWORK); |
384 |
free(qp); |
|
385 |
} |
|
386 |
||
387 |
if (!_networking_server) { |
|
388 |
// remember the random seed so we can check if we're out of sync. |
|
389 |
_my_seed_list[_frame_counter & 15][0] = _sync_seed_1; |
|
390 |
_my_seed_list[_frame_counter & 15][1] = _sync_seed_2; |
|
391 |
||
392 |
while (_num_future_seed) { |
|
393 |
assert(_future_seed[0].frame >= _frame_counter); |
|
394 |
if (_future_seed[0].frame != _frame_counter) break; |
|
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
395 |
if (_future_seed[0].seed[0] != _sync_seed_1 ||_future_seed[0].seed[1] != _sync_seed_2) NetworkHandleDeSync(); |
0 | 396 |
memcpy_overlapping(_future_seed, _future_seed + 1, --_num_future_seed * sizeof(FutureSeeds)); |
397 |
} |
|
398 |
} |
|
399 |
} |
|
400 |
||
401 |
// send a packet to a client |
|
402 |
static void SendBytes(ClientState *cs, void *bytes, uint len) |
|
403 |
{ |
|
404 |
byte *b = (byte*)bytes; |
|
405 |
uint n; |
|
406 |
Packet *p; |
|
407 |
||
408 |
assert(len != 0); |
|
409 |
||
410 |
// see if there's space in the last packet? |
|
411 |
if (!cs->head || (p = (Packet*)cs->last, p->siz == sizeof(p->buf))) |
|
412 |
p = NULL; |
|
413 |
||
414 |
do { |
|
415 |
if (!p) { |
|
416 |
// need to allocate a new packet buffer. |
|
417 |
p = (Packet*)malloc(sizeof(Packet)); |
|
418 |
||
419 |
// insert at the end of the linked list. |
|
420 |
*cs->last = p; |
|
421 |
cs->last = &p->next; |
|
422 |
p->next = NULL; |
|
423 |
p->siz = 0; |
|
424 |
} |
|
425 |
||
426 |
// copy bytes to packet. |
|
427 |
n = minu(sizeof(p->buf) - p->siz, len); |
|
428 |
memcpy(p->buf + p->siz, b, n); |
|
429 |
p->siz += n; |
|
430 |
b += n; |
|
431 |
p = NULL; |
|
432 |
} while (len -= n); |
|
433 |
} |
|
434 |
||
206 | 435 |
// send data direct to a client |
436 |
static void SendDirectBytes(ClientState *cs, void *bytes, uint len) |
|
437 |
{ |
|
438 |
char *buf = (char*)bytes; |
|
439 |
uint n; |
|
440 |
||
441 |
n = send(cs->socket, buf, len, 0); |
|
442 |
if (n == -1) { |
|
443 |
int err = GET_LAST_ERROR(); |
|
444 |
DEBUG(net, 0) ("[NET] send() failed with error %d", err); |
|
445 |
CloseClient(cs); |
|
446 |
} |
|
447 |
} |
|
448 |
||
0 | 449 |
// client: |
450 |
// add it to the client's ack queue, and send the command to the server |
|
451 |
// server: |
|
452 |
// add it to the server's player queue, and send it to all clients. |
|
453 |
void NetworkSendCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback) |
|
454 |
{ |
|
455 |
int nump; |
|
456 |
QueuedCommand *qp; |
|
457 |
ClientState *cs; |
|
458 |
||
459 |
qp = AllocQueuedCommand(_networking_server ? &_command_queue : &_ack_queue); |
|
206 | 460 |
qp->cp.packet_type = PACKET_TYPE_COMMAND; |
0 | 461 |
qp->cp.tile = tile; |
462 |
qp->cp.p1 = p1; |
|
463 |
qp->cp.p2 = p2; |
|
464 |
qp->cp.cmd = (uint16)cmd; |
|
465 |
qp->cp.player = _local_player; |
|
466 |
qp->cp.when = 0; |
|
467 |
qp->cmd = cmd; |
|
468 |
qp->callback = callback; |
|
469 |
||
470 |
// so the server knows when to execute it. |
|
206 | 471 |
qp->frame = _frame_counter + 5; |
0 | 472 |
|
473 |
// calculate the amount of extra bytes. |
|
474 |
nump = 8; |
|
475 |
while ( nump != 0 && ((uint32*)_decode_parameters)[nump-1] == 0) nump--; |
|
476 |
qp->cp.packet_length = COMMAND_PACKET_BASE_SIZE + nump * sizeof(uint32); |
|
477 |
if (nump != 0) memcpy(qp->cp.dp, _decode_parameters, nump * sizeof(uint32)); |
|
478 |
||
479 |
#if defined(TTD_BIG_ENDIAN) |
|
480 |
// need to convert the command to little endian before sending it. |
|
481 |
{ |
|
482 |
CommandPacket cp; |
|
483 |
cp = qp->cp; |
|
484 |
cp.cmd = TO_LE16(cp.cmd); |
|
485 |
cp.tile = TO_LE16(cp.tile); |
|
486 |
cp.p1 = TO_LE32(cp.p1); |
|
487 |
cp.p2 = TO_LE32(cp.p2); |
|
488 |
for(cs=_clients; cs->socket != INVALID_SOCKET; cs++) if (!cs->inactive) SendBytes(cs, &cp, cp.packet_length); |
|
489 |
} |
|
490 |
#else |
|
491 |
// send it to the peers |
|
492 |
for(cs=_clients; cs->socket != INVALID_SOCKET; cs++) if (!cs->inactive) SendBytes(cs, &qp->cp, qp->cp.packet_length); |
|
493 |
||
494 |
#endif |
|
495 |
} |
|
496 |
||
497 |
// client: |
|
498 |
// server sends a command from another player that we should execute. |
|
499 |
// put it in the command queue. |
|
500 |
// |
|
501 |
// server: |
|
502 |
// client sends a command that it wants to execute. |
|
503 |
// fill the when field so the client knows when to execute it. |
|
504 |
// put it in the appropriate player queue. |
|
505 |
// send it to all other clients. |
|
506 |
// send an ack packet to the actual client. |
|
507 |
||
508 |
static void HandleCommandPacket(ClientState *cs, CommandPacket *np) |
|
509 |
{ |
|
510 |
QueuedCommand *qp; |
|
511 |
ClientState *c; |
|
512 |
AckPacket ap; |
|
206 | 513 |
int i; |
0 | 514 |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
515 |
DEBUG(net, 2) ("[NET] cmd size %d", np->packet_length); |
0 | 516 |
|
517 |
assert(np->packet_length >= COMMAND_PACKET_BASE_SIZE); |
|
518 |
||
519 |
// put it into the command queue |
|
520 |
qp = AllocQueuedCommand(&_command_queue); |
|
521 |
qp->cp = *np; |
|
522 |
||
206 | 523 |
i = _frame_counter_max - (_frame_counter + 3); |
524 |
||
525 |
if (i<0) { |
|
526 |
qp->frame = _frame_counter_max ; |
|
527 |
} else { |
|
528 |
qp->frame = _frame_counter + 3; |
|
529 |
} |
|
0 | 530 |
|
531 |
qp->callback = NULL; |
|
532 |
||
533 |
// extra params |
|
534 |
memcpy(&qp->cp.dp, np->dp, np->packet_length - COMMAND_PACKET_BASE_SIZE); |
|
535 |
||
206 | 536 |
ap.packet_type = PACKET_TYPE_ACK; |
537 |
ap.when = _frame_counter_max-(qp->frame); |
|
538 |
ap.packet_length = sizeof(AckPacket); |
|
0 | 539 |
|
540 |
// send it to the peers |
|
541 |
if (_networking_server) { |
|
542 |
for(c=_clients; c->socket != INVALID_SOCKET; c++) { |
|
543 |
if (c == cs) { |
|
206 | 544 |
SendDirectBytes(c, &ap, ap.packet_length); |
0 | 545 |
} else { |
546 |
if (!cs->inactive) SendBytes(c, &qp->cp, qp->cp.packet_length); |
|
547 |
} |
|
548 |
} |
|
549 |
} |
|
550 |
||
551 |
// convert from little endian to big endian? |
|
552 |
#if defined(TTD_BIG_ENDIAN) |
|
553 |
qp->cp.cmd = TO_LE16(qp->cp.cmd); |
|
554 |
qp->cp.tile = TO_LE16(qp->cp.tile); |
|
555 |
qp->cp.p1 = TO_LE32(qp->cp.p1); |
|
556 |
qp->cp.p2 = TO_LE32(qp->cp.p2); |
|
557 |
#endif |
|
558 |
||
559 |
qp->cmd = qp->cp.cmd; |
|
560 |
} |
|
561 |
||
562 |
// sent from server -> client periodically to tell the client about the current tick in the server |
|
563 |
// and how far the client may progress. |
|
564 |
static void HandleSyncPacket(SyncPacket *sp) |
|
565 |
{ |
|
566 |
uint32 s1,s2; |
|
567 |
||
568 |
_frame_counter_srv = _frame_counter_max - sp->server; |
|
569 |
_frame_counter_max += sp->frames; |
|
570 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
571 |
// reset network ready packet state |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
572 |
_network_ready_sent = false; |
0 | 573 |
|
574 |
// queueing only? |
|
575 |
if (_networking_queuing || _frame_counter == 0) |
|
576 |
return; |
|
577 |
||
578 |
s1 = TO_LE32(sp->random_seed_1); |
|
579 |
s2 = TO_LE32(sp->random_seed_2); |
|
580 |
||
206 | 581 |
DEBUG(net, 3) ("[NET] sync seeds: frame=%i 1=%i 2=%i",_frame_counter, sp->random_seed_1, sp->random_seed_2); |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
582 |
|
0 | 583 |
if (_frame_counter_srv <= _frame_counter) { |
584 |
// we are ahead of the server check if the seed is in our list. |
|
585 |
if (_frame_counter_srv + 16 > _frame_counter) { |
|
586 |
// the random seed exists in our array check it. |
|
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
587 |
if (s1 != _my_seed_list[_frame_counter_srv & 0xF][0] || s2 != _my_seed_list[_frame_counter_srv & 0xF][1]) NetworkHandleDeSync(); |
0 | 588 |
} |
589 |
} else { |
|
590 |
// the server's frame has not been executed yet. store the server's seed in a list. |
|
591 |
if (_num_future_seed < lengthof(_future_seed)) { |
|
592 |
_future_seed[_num_future_seed].frame = _frame_counter_srv; |
|
593 |
_future_seed[_num_future_seed].seed[0] = s1; |
|
594 |
_future_seed[_num_future_seed].seed[1] = s2; |
|
595 |
_num_future_seed++; |
|
596 |
} |
|
597 |
} |
|
598 |
} |
|
599 |
||
600 |
// sent from server -> client as an acknowledgement that the server received the command. |
|
601 |
// the command will be executed at the current value of "max". |
|
206 | 602 |
static void HandleAckPacket(AckPacket * ap) |
0 | 603 |
{ |
604 |
QueuedCommand *q; |
|
605 |
// move a packet from the ack queue to the end of this player's queue. |
|
606 |
q = _ack_queue.head; |
|
607 |
assert(q); |
|
608 |
if (!(_ack_queue.head = q->next)) _ack_queue.last = &_ack_queue.head; |
|
609 |
q->next = NULL; |
|
206 | 610 |
q->frame = (_frame_counter_max - (ap->when)); |
0 | 611 |
|
612 |
*_command_queue.last = q; |
|
613 |
_command_queue.last = &q->next; |
|
614 |
||
206 | 615 |
DEBUG(net, 2) ("[NET] ack [frame=%i]",q->frame); |
0 | 616 |
} |
617 |
||
618 |
static void HandleFilePacket(FilePacketHdr *fp) |
|
619 |
{ |
|
620 |
int n = fp->packet_length - sizeof(FilePacketHdr); |
|
621 |
if (n == 0) { |
|
622 |
assert(_networking_queuing); |
|
623 |
assert(!_networking_sync); |
|
624 |
// eof |
|
625 |
if (_recv_file) { fclose(_recv_file); _recv_file = NULL; } |
|
626 |
||
627 |
// attempt loading the game. |
|
628 |
_game_mode = GM_NORMAL; |
|
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
629 |
if (SaveOrLoad("networkc.tmp", SL_LOAD) != SL_OK) { |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
630 |
NetworkCoreDisconnect(); |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
631 |
NetworkHandleSaveGameError(); |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
632 |
return; |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
633 |
} |
0 | 634 |
// sync to server. |
635 |
_networking_queuing = false; |
|
105 | 636 |
NetworkStartSync(false); |
0 | 637 |
|
638 |
if (_network_playas == 0) { |
|
639 |
// send a command to make a new player |
|
640 |
_local_player = 0; |
|
641 |
NetworkSendCommand(0, 0, 0, CMD_PLAYER_CTRL, NULL); |
|
1 | 642 |
_local_player = OWNER_SPECTATOR; |
0 | 643 |
} else { |
644 |
// take control over an existing company |
|
645 |
if (DEREF_PLAYER(_network_playas-1)->is_active) |
|
646 |
_local_player = _network_playas-1; |
|
647 |
else |
|
1 | 648 |
_local_player = OWNER_SPECTATOR; |
0 | 649 |
} |
650 |
||
651 |
} else { |
|
652 |
if(!_recv_file) { |
|
653 |
_recv_file = fopen("networkc.tmp", "wb"); |
|
654 |
if (!_recv_file) error("can't open savefile"); |
|
655 |
} |
|
656 |
fwrite( (char*)fp + sizeof(*fp), n, 1, _recv_file); |
|
657 |
} |
|
658 |
} |
|
659 |
||
206 | 660 |
static void HandleWelcomePacket(WelcomePacket *wp) { |
661 |
int i; |
|
662 |
for (i=0; i<MAX_PLAYERS; i++) { |
|
663 |
_player_seeds[i][0]=wp->player_seeds[i][0]; |
|
664 |
_player_seeds[i][1]=wp->player_seeds[i][1]; |
|
665 |
} |
|
666 |
if (wp->frames_srv != 0) { |
|
667 |
_frame_counter_max = wp->frames_max; |
|
668 |
_frame_counter_srv = wp->frames_srv; |
|
669 |
} |
|
670 |
if (wp->frames_cnt != 0) { |
|
671 |
_frame_counter = wp->frames_cnt; |
|
672 |
} |
|
673 |
} |
|
674 |
||
675 |
static void HandleReadyPacket(ReadyPacket *rp, ClientState *cs) |
|
676 |
{ |
|
677 |
cs->ready=true; |
|
678 |
cs->timeout=_network_client_timeout; |
|
679 |
} |
|
680 |
||
681 |
||
0 | 682 |
static void CloseClient(ClientState *cs) |
683 |
{ |
|
684 |
Packet *p, *next; |
|
685 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
686 |
DEBUG(net, 1) ("[NET][TCP] closed client connection"); |
0 | 687 |
|
688 |
assert(cs->socket != INVALID_SOCKET); |
|
689 |
||
690 |
closesocket(cs->socket); |
|
691 |
||
692 |
// free buffers |
|
693 |
for(p = cs->head; p; p=next) { |
|
694 |
next = p->next; |
|
695 |
free(p); |
|
696 |
} |
|
697 |
||
698 |
// copy up structs... |
|
699 |
while ((cs+1)->socket != INVALID_SOCKET) { |
|
700 |
*cs = *(cs+1); |
|
701 |
cs++; |
|
702 |
} |
|
703 |
cs->socket = INVALID_SOCKET; |
|
704 |
||
105 | 705 |
if (_networking_server) _network_game.players_on--; |
706 |
||
0 | 707 |
_num_clients--; |
708 |
} |
|
709 |
||
710 |
#define NETWORK_BUFFER_SIZE 4096 |
|
711 |
static bool ReadPackets(ClientState *cs) |
|
712 |
{ |
|
713 |
byte network_buffer[NETWORK_BUFFER_SIZE]; |
|
714 |
uint pos,size; |
|
715 |
unsigned long recv_bytes; |
|
716 |
||
717 |
size = cs->buflen; |
|
718 |
||
719 |
for(;;) { |
|
720 |
if (size != 0) memcpy(network_buffer, cs->buf, size); |
|
721 |
||
722 |
recv_bytes = recv(cs->socket, (char*)network_buffer + size, sizeof(network_buffer) - size, 0); |
|
723 |
if ( recv_bytes == (unsigned long)-1) { |
|
724 |
int err = GET_LAST_ERROR(); |
|
725 |
if (err == EWOULDBLOCK) break; |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
726 |
DEBUG(net, 0) ("[NET] recv() failed with error %d", err); |
0 | 727 |
CloseClient(cs); |
728 |
return false; |
|
729 |
} |
|
730 |
// no more bytes for now? |
|
731 |
if (recv_bytes == 0) |
|
732 |
break; |
|
733 |
||
734 |
size += recv_bytes; // number of bytes read. |
|
735 |
pos = 0; |
|
736 |
while (size >= 2) { |
|
737 |
byte *packet = network_buffer + pos; |
|
738 |
// whole packet not there yet? |
|
739 |
if (size < packet[0]) break; |
|
740 |
size -= packet[0]; |
|
741 |
pos += packet[0]; |
|
742 |
switch(packet[1]) { |
|
206 | 743 |
case PACKET_TYPE_WELCOME: |
744 |
HandleWelcomePacket((WelcomePacket *)packet); |
|
745 |
break; |
|
746 |
case PACKET_TYPE_COMMAND: |
|
0 | 747 |
HandleCommandPacket(cs, (CommandPacket*)packet); |
748 |
break; |
|
206 | 749 |
case PACKET_TYPE_SYNC: |
0 | 750 |
assert(_networking_sync || _networking_queuing); |
751 |
assert(!_networking_server); |
|
752 |
HandleSyncPacket((SyncPacket*)packet); |
|
753 |
break; |
|
206 | 754 |
case PACKET_TYPE_ACK: |
0 | 755 |
assert(!_networking_server); |
206 | 756 |
HandleAckPacket((AckPacket*)packet); |
0 | 757 |
break; |
206 | 758 |
case PACKET_TYPE_XMIT: |
0 | 759 |
HandleFilePacket((FilePacketHdr*)packet); |
760 |
break; |
|
206 | 761 |
case PACKET_TYPE_READY: |
762 |
HandleReadyPacket((ReadyPacket*)packet, cs); |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
763 |
break; |
0 | 764 |
default: |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
765 |
DEBUG (net,0) ("net: unknown packet type"); |
0 | 766 |
} |
767 |
} |
|
768 |
||
175
d6cccece959a
(svn r176) -Fix: network_gui const and warnings fixes (Tron)
darkvater
parents:
173
diff
changeset
|
769 |
assert(size < sizeof(cs->buf)); |
0 | 770 |
|
771 |
memcpy(cs->buf, network_buffer + pos, size); |
|
772 |
} |
|
773 |
||
774 |
cs->buflen = size; |
|
775 |
||
776 |
return true; |
|
777 |
} |
|
778 |
||
779 |
||
780 |
static bool SendPackets(ClientState *cs) |
|
781 |
{ |
|
782 |
Packet *p; |
|
783 |
int n; |
|
784 |
uint nskip = cs->eaten, nsent = nskip; |
|
785 |
||
786 |
// try sending as much as possible. |
|
787 |
for(p=cs->head; p ;p = p->next) { |
|
788 |
if (p->siz) { |
|
789 |
assert(nskip < p->siz); |
|
790 |
||
791 |
n = send(cs->socket, p->buf + nskip, p->siz - nskip, 0); |
|
792 |
if (n == -1) { |
|
793 |
int err = GET_LAST_ERROR(); |
|
794 |
if (err == EWOULDBLOCK) break; |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
795 |
DEBUG(net, 0) ("[NET] send() failed with error %d", err); |
0 | 796 |
CloseClient(cs); |
797 |
return false; |
|
798 |
} |
|
799 |
nsent += n; |
|
800 |
// send was not able to send it all? then we assume that the os buffer is full and break. |
|
801 |
if (nskip + n != p->siz) |
|
802 |
break; |
|
803 |
nskip = 0; |
|
804 |
} |
|
805 |
} |
|
806 |
||
807 |
// nsent bytes in the linked list are not invalid. free as many buffers as possible. |
|
808 |
// don't actually free the last buffer. |
|
809 |
while (nsent) { |
|
810 |
p = cs->head; |
|
811 |
assert(p->siz != 0); |
|
812 |
||
813 |
// some bytes of the packet are still unsent. |
|
814 |
if ( (int)(nsent - p->siz) < 0) |
|
815 |
break; |
|
816 |
nsent -= p->siz; |
|
817 |
p->siz = 0; |
|
818 |
if (p->next) { |
|
819 |
cs->head = p->next; |
|
820 |
free(p); |
|
821 |
} |
|
822 |
} |
|
823 |
||
824 |
cs->eaten = nsent; |
|
825 |
||
826 |
return true; |
|
827 |
} |
|
828 |
||
829 |
// transmit the file.. |
|
830 |
static void SendXmit(ClientState *cs) |
|
831 |
{ |
|
832 |
uint pos, n; |
|
833 |
FilePacketHdr hdr; |
|
834 |
int p; |
|
835 |
||
836 |
// if too many unsent bytes left in buffer, don't send more. |
|
837 |
if (cs->head && cs->head->next) |
|
838 |
return; |
|
839 |
||
840 |
pos = cs->xmitpos - 1; |
|
841 |
||
842 |
p = 20; |
|
843 |
do { |
|
844 |
// compute size of data to xmit |
|
845 |
n = minu(_transmit_file_size - pos, 248); |
|
846 |
||
847 |
hdr.packet_length = n + sizeof(hdr); |
|
206 | 848 |
hdr.packet_type = PACKET_TYPE_XMIT; |
0 | 849 |
SendBytes(cs, &hdr, sizeof(hdr)); |
850 |
||
851 |
if (n == 0) { |
|
852 |
pos = -1; // eof |
|
853 |
break; |
|
854 |
} |
|
855 |
SendBytes(cs, _transmit_file + pos, n); |
|
856 |
pos += n; |
|
857 |
} while (--p); |
|
858 |
||
859 |
cs->xmitpos = pos + 1; |
|
860 |
||
206 | 861 |
if (cs->xmitpos == 0) { |
862 |
NetworkSendWelcome(cs,false); |
|
863 |
} |
|
864 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
865 |
DEBUG(net, 2) ("[NET] client xmit at %d", pos + 1); |
0 | 866 |
} |
867 |
||
868 |
static ClientState *AllocClient(SOCKET s) |
|
869 |
{ |
|
870 |
ClientState *cs; |
|
871 |
||
872 |
if (_num_clients == MAX_CLIENTS) |
|
873 |
return NULL; |
|
874 |
||
105 | 875 |
if (_networking_server) _network_game.players_on++; |
876 |
||
0 | 877 |
cs = &_clients[_num_clients++]; |
878 |
memset(cs, 0, sizeof(*cs)); |
|
879 |
cs->last = &cs->head; |
|
880 |
cs->socket = s; |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
881 |
cs->timeout = _network_client_timeout; |
0 | 882 |
return cs; |
883 |
} |
|
884 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
885 |
void NetworkSendReadyPacket() |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
886 |
{ |
206 | 887 |
if ((!_network_ready_sent) && (_frame_counter + _network_ready_ahead >= _frame_counter_max)) { |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
888 |
ReadyPacket *rp = malloc(sizeof(rp)); |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
889 |
ClientState *c = _clients; |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
890 |
|
206 | 891 |
rp->packet_type = PACKET_TYPE_READY; |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
892 |
rp->packet_length = sizeof(rp); |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
893 |
SendBytes(c, rp, sizeof(rp)); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
894 |
_network_ready_sent = true; |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
895 |
} |
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
896 |
} |
0 | 897 |
|
206 | 898 |
void NetworkSendSyncPackets() |
899 |
{ |
|
900 |
ClientState *cs; |
|
901 |
uint32 new_max; |
|
902 |
SyncPacket sp; |
|
903 |
||
904 |
new_max = _frame_counter + (int)_network_sync_freq; |
|
905 |
||
906 |
DEBUG(net,3) ("net: serv: sync frame=%i,max=%i, seed1=%i, seed2=%i",new_max,_sync_seed_1,_sync_seed_2); |
|
907 |
||
908 |
sp.packet_length = sizeof(sp); |
|
909 |
sp.packet_type = PACKET_TYPE_SYNC; |
|
910 |
sp.frames = new_max - _frame_counter_max; |
|
911 |
sp.server = _frame_counter_max - _frame_counter; |
|
912 |
sp.random_seed_1 = TO_LE32(_sync_seed_1); |
|
913 |
sp.random_seed_2 = TO_LE32(_sync_seed_2); |
|
914 |
_frame_counter_max = new_max; |
|
915 |
||
916 |
// send it to all the clients and mark them unready |
|
917 |
for(cs=_clients;cs->socket != INVALID_SOCKET; cs++) { |
|
918 |
cs->ready=false; |
|
919 |
SendBytes(cs, &sp, sizeof(sp)); |
|
920 |
} |
|
921 |
||
922 |
} |
|
923 |
||
924 |
void NetworkSendWelcome(ClientState *cs, bool direct) { |
|
925 |
WelcomePacket wp; |
|
926 |
int i; |
|
927 |
wp.packet_type = PACKET_TYPE_WELCOME; |
|
928 |
wp.packet_length = sizeof(WelcomePacket); |
|
929 |
for (i=0; i<MAX_PLAYERS; i++) { |
|
930 |
wp.player_seeds[i][0]=_player_seeds[i][0]; |
|
931 |
wp.player_seeds[i][1]=_player_seeds[i][1]; |
|
932 |
} |
|
933 |
if (direct) { |
|
934 |
wp.frames_max=0; |
|
935 |
wp.frames_srv=0; |
|
936 |
wp.frames_cnt=_frame_counter; |
|
937 |
SendDirectBytes(cs,(void *)&wp,wp.packet_length); |
|
938 |
} else { |
|
939 |
wp.frames_max=_frame_counter_max; |
|
940 |
wp.frames_srv=_frame_counter_srv; |
|
941 |
wp.frames_cnt=0; |
|
942 |
SendBytes(cs,(void *)&wp,wp.packet_length); |
|
943 |
} |
|
944 |
} |
|
945 |
||
0 | 946 |
static void NetworkAcceptClients() |
947 |
{ |
|
948 |
struct sockaddr_in sin; |
|
949 |
SOCKET s; |
|
950 |
ClientState *cs; |
|
951 |
#ifndef __MORPHOS__ |
|
952 |
int sin_len; |
|
953 |
#else |
|
954 |
LONG sin_len; // for some reason we need a 'LONG' under MorphOS |
|
955 |
#endif |
|
956 |
||
957 |
assert(_listensocket != INVALID_SOCKET); |
|
958 |
||
959 |
for(;;) { |
|
960 |
sin_len = sizeof(sin); |
|
961 |
s = accept(_listensocket, (struct sockaddr*)&sin, &sin_len); |
|
962 |
if (s == INVALID_SOCKET) return; |
|
963 |
||
964 |
// set nonblocking mode for client socket |
|
965 |
{ unsigned long blocking = 1; ioctlsocket(s, FIONBIO, &blocking); } |
|
966 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
967 |
DEBUG(net, 1) ("[NET] got client from %s", inet_ntoa(sin.sin_addr)); |
0 | 968 |
|
969 |
// set nodelay |
|
970 |
{int b = 1; setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (const char*)&b, sizeof(b));} |
|
971 |
||
972 |
cs = AllocClient(s); |
|
973 |
if (cs == NULL) { |
|
974 |
// no more clients allowed? |
|
975 |
closesocket(s); |
|
976 |
continue; |
|
977 |
} |
|
978 |
||
979 |
if (_networking_sync) { |
|
980 |
// a new client has connected. it needs a snapshot. |
|
981 |
cs->inactive = true; |
|
982 |
} |
|
983 |
} |
|
984 |
||
985 |
// when a new client has joined. it needs different information depending on if it's at the game menu or in an active game. |
|
986 |
// Game menu: |
|
987 |
// - list of players already in the game (name, company name, face, color) |
|
988 |
// - list of game settings and patch settings |
|
989 |
// Active game: |
|
990 |
// - the state of the world (includes player name, company name, player face, player color) |
|
991 |
// - list of the patch settings |
|
992 |
||
993 |
// Networking can be in several "states". |
|
994 |
// * not sync - games don't need to be in sync, and frame counter is not synced. for example intro screen. all commands are executed immediately. |
|
995 |
// * sync - games are in sync |
|
996 |
} |
|
997 |
||
998 |
||
999 |
static void SendQueuedCommandsToNewClient(ClientState *cs) |
|
1000 |
{ |
|
1001 |
// send the commands in the server queue to the new client. |
|
1002 |
QueuedCommand *qp; |
|
1003 |
SyncPacket sp; |
|
206 | 1004 |
uint32 frame; |
0 | 1005 |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1006 |
DEBUG(net, 2) ("[NET] sending queued commands to client"); |
0 | 1007 |
|
1008 |
sp.packet_length = sizeof(sp); |
|
206 | 1009 |
sp.packet_type = PACKET_TYPE_SYNC; |
0 | 1010 |
sp.random_seed_1 = sp.random_seed_2 = 0; |
1011 |
sp.server = 0; |
|
1012 |
||
1013 |
frame = _frame_counter; |
|
1014 |
||
1015 |
for(qp=_command_queue.head; qp; qp = qp->next) { |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1016 |
DEBUG(net, 4) ("[NET] sending cmd to be executed at %d (old %d)", qp->frame, frame); |
0 | 1017 |
if (qp->frame > frame) { |
1018 |
assert(qp->frame <= _frame_counter_max); |
|
1019 |
sp.frames = qp->frame - frame; |
|
1020 |
frame = qp->frame; |
|
1021 |
SendBytes(cs, &sp, sizeof(sp)); |
|
1022 |
} |
|
1023 |
SendBytes(cs, &qp->cp, qp->cp.packet_length); |
|
1024 |
} |
|
1025 |
||
1026 |
if (frame < _frame_counter_max) { |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1027 |
DEBUG(net, 4) ("[NET] sending queued sync %d (%d)", _frame_counter_max, frame); |
0 | 1028 |
sp.frames = _frame_counter_max - frame; |
1029 |
SendBytes(cs, &sp, sizeof(sp)); |
|
1030 |
} |
|
1031 |
||
1032 |
} |
|
1033 |
||
206 | 1034 |
|
1035 |
bool NetworkCheckClientReady() { |
|
1036 |
bool ready_all = true; |
|
1037 |
uint16 count = 0; |
|
1038 |
ClientState *cs; |
|
1039 |
||
1040 |
for(cs=_clients;cs->socket != INVALID_SOCKET; cs++) { |
|
1041 |
count++; |
|
1042 |
ready_all = ready_all && (cs->ready || cs->inactive || (cs->xmitpos>0)); |
|
1043 |
if (!cs->ready) cs->timeout-=1; |
|
1044 |
if (cs->timeout == 0) { |
|
1045 |
SET_DPARAM16(0,count); |
|
1046 |
ShowErrorMessage(-1,STR_NETWORK_ERR_TIMEOUT,0,0); |
|
1047 |
CloseClient(cs); |
|
1048 |
} |
|
1049 |
} |
|
1050 |
return ready_all; |
|
1051 |
} |
|
1052 |
||
105 | 1053 |
// ************************** // |
1054 |
// * TCP Networking * // |
|
1055 |
// ************************** // |
|
1056 |
||
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1057 |
unsigned long NetworkResolveHost(const char *hostname) { |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1058 |
struct hostent* remotehost; |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1059 |
|
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1060 |
if ((hostname[0]<0x30) || (hostname[0]>0x39)) { |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1061 |
// seems to be an hostname [first character is no number] |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1062 |
remotehost = gethostbyname(hostname); |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1063 |
if (remotehost == NULL) { |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1064 |
DEBUG(net, 1) ("[NET][IP] cannot resolve %s", hostname); |
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1065 |
return 0; |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1066 |
} else { |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1067 |
DEBUG(net, 1) ("[NET][IP] resolved %s to %s",hostname, inet_ntoa(*(struct in_addr *) remotehost->h_addr_list[0])); |
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1068 |
return inet_addr(inet_ntoa(*(struct in_addr *) remotehost->h_addr_list[0])); |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1069 |
} |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1070 |
} else { |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1071 |
// seems to be an ip [first character is a number] |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1072 |
return inet_addr(hostname); |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1073 |
} |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1074 |
|
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1075 |
} |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1076 |
|
105 | 1077 |
bool NetworkConnect(const char *hostname, int port) |
1078 |
{ |
|
1079 |
SOCKET s; |
|
1080 |
struct sockaddr_in sin; |
|
1081 |
int b; |
|
1082 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1083 |
DEBUG(net, 1) ("[NET][TCP] Connecting to %s %d", hostname, port); |
105 | 1084 |
|
1085 |
s = socket(AF_INET, SOCK_STREAM, 0); |
|
1086 |
if (s == INVALID_SOCKET) error("socket() failed"); |
|
1087 |
||
1088 |
b = 1; |
|
1089 |
setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (const char*)&b, sizeof(b)); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1090 |
|
105 | 1091 |
sin.sin_family = AF_INET; |
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1092 |
sin.sin_addr.s_addr = NetworkResolveHost(hostname); |
105 | 1093 |
sin.sin_port = htons(port); |
1094 |
||
1095 |
if (connect(s, (struct sockaddr*) &sin, sizeof(sin)) != 0) { |
|
1096 |
NetworkClose(true); |
|
1097 |
return false; |
|
1098 |
} |
|
1099 |
||
1100 |
// set nonblocking mode for socket.. |
|
1101 |
{ unsigned long blocking = 1; ioctlsocket(s, FIONBIO, &blocking); } |
|
1102 |
||
1103 |
// in client mode, only the first client field is used. it's pointing to the server. |
|
1104 |
AllocClient(s); |
|
1105 |
||
1106 |
// queue packets.. because we're waiting for the savegame. |
|
1107 |
_networking_queuing = true; |
|
1108 |
_frame_counter_max = 0; |
|
1109 |
||
1110 |
return true; |
|
1111 |
} |
|
1112 |
||
1113 |
void NetworkListen() |
|
1114 |
{ |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1115 |
|
105 | 1116 |
SOCKET ls; |
1117 |
struct sockaddr_in sin; |
|
1118 |
int port; |
|
1119 |
||
1120 |
port = _network_server_port; |
|
1121 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1122 |
DEBUG(net, 1) ("[NET][TCP] listening on port %d", port); |
105 | 1123 |
|
1124 |
ls = socket(AF_INET, SOCK_STREAM, 0); |
|
1125 |
if (ls == INVALID_SOCKET) |
|
1126 |
error("socket() on listen socket failed"); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1127 |
|
105 | 1128 |
// reuse the socket |
1129 |
{ |
|
1130 |
int reuse = 1; if (setsockopt(ls, SOL_SOCKET, SO_REUSEADDR, (const char*)&reuse, sizeof(reuse)) == -1) |
|
1131 |
error("setsockopt() on listen socket failed"); |
|
1132 |
} |
|
1133 |
||
1134 |
// set nonblocking mode for socket |
|
1135 |
{ unsigned long blocking = 1; ioctlsocket(ls, FIONBIO, &blocking); } |
|
1136 |
||
1137 |
sin.sin_family = AF_INET; |
|
1138 |
sin.sin_addr.s_addr = 0; |
|
1139 |
sin.sin_port = htons(port); |
|
1140 |
||
1141 |
if (bind(ls, (struct sockaddr*)&sin, sizeof(sin)) != 0) |
|
1142 |
error("bind() failed"); |
|
1143 |
||
1144 |
if (listen(ls, 1) != 0) |
|
1145 |
error("listen() failed"); |
|
1146 |
||
1147 |
_listensocket = ls; |
|
1148 |
} |
|
1149 |
||
0 | 1150 |
void NetworkReceive() |
1151 |
{ |
|
1152 |
ClientState *cs; |
|
1153 |
int n; |
|
1154 |
fd_set read_fd, write_fd; |
|
1155 |
struct timeval tv; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1156 |
|
0 | 1157 |
FD_ZERO(&read_fd); |
1158 |
FD_ZERO(&write_fd); |
|
1159 |
||
1160 |
for(cs=_clients;cs->socket != INVALID_SOCKET; cs++) { |
|
1161 |
FD_SET(cs->socket, &read_fd); |
|
1162 |
FD_SET(cs->socket, &write_fd); |
|
1163 |
} |
|
1164 |
||
1165 |
// take care of listener port |
|
1166 |
if (_networking_server) { |
|
1167 |
FD_SET(_listensocket, &read_fd); |
|
1168 |
} |
|
1169 |
||
1170 |
tv.tv_sec = tv.tv_usec = 0; // don't block at all. |
|
1171 |
#if !defined(__MORPHOS__) && !defined(__AMIGA__) |
|
1172 |
n = select(FD_SETSIZE, &read_fd, &write_fd, NULL, &tv); |
|
1173 |
#else |
|
1174 |
n = WaitSelect(FD_SETSIZE, &read_fd, &write_fd, NULL, &tv, NULL); |
|
1175 |
#endif |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1176 |
if ((n == -1) && (!_networking_server)) NetworkHandleConnectionLost(); |
0 | 1177 |
|
1178 |
// accept clients.. |
|
1179 |
if (_networking_server && FD_ISSET(_listensocket, &read_fd)) |
|
1180 |
NetworkAcceptClients(); |
|
1181 |
||
1182 |
// read stuff from clients |
|
1183 |
for(cs=_clients;cs->socket != INVALID_SOCKET; cs++) { |
|
1184 |
cs->writable = !!FD_ISSET(cs->socket, &write_fd); |
|
1185 |
if (FD_ISSET(cs->socket, &read_fd)) { |
|
1186 |
if (!ReadPackets(cs)) |
|
1187 |
cs--; |
|
1188 |
} |
|
1189 |
} |
|
1190 |
||
1191 |
// if we're a server, and any client needs a snapshot, create a snapshot and send all commands from the server queue to the client. |
|
1192 |
if (_networking_server && _transmit_file == NULL) { |
|
1193 |
bool didsave = false; |
|
1194 |
||
1195 |
for(cs=_clients;cs->socket != INVALID_SOCKET; cs++) { |
|
1196 |
if (cs->inactive) { |
|
1197 |
cs->inactive = false; |
|
1198 |
// found a client waiting for a snapshot. make a snapshot. |
|
1199 |
if (!didsave) { |
|
1200 |
char filename[256]; |
|
1201 |
sprintf(filename, "%snetwork.tmp", _path.autosave_dir); |
|
1202 |
didsave = true; |
|
1203 |
if (SaveOrLoad(filename, SL_SAVE) != SL_OK) error("network savedump failed"); |
|
1204 |
_transmit_file = ReadFileToMem(filename, &_transmit_file_size, 500000); |
|
1205 |
if (_transmit_file == NULL) error("network savedump failed to load"); |
|
1206 |
} |
|
1207 |
// and start sending the file.. |
|
1208 |
cs->xmitpos = 1; |
|
1209 |
||
1210 |
// send queue of commands to client. |
|
1211 |
SendQueuedCommandsToNewClient(cs); |
|
206 | 1212 |
|
1213 |
NetworkSendWelcome(cs, true); |
|
0 | 1214 |
} |
1215 |
} |
|
1216 |
} |
|
1217 |
} |
|
1218 |
||
1219 |
void NetworkSend() |
|
1220 |
{ |
|
1221 |
ClientState *cs; |
|
1222 |
void *free_xmit; |
|
1223 |
||
1224 |
free_xmit = _transmit_file; |
|
1225 |
||
1226 |
// send stuff to all clients |
|
1227 |
for(cs=_clients;cs->socket != INVALID_SOCKET; cs++) { |
|
1228 |
if (cs->xmitpos) { |
|
1229 |
if (cs->writable) |
|
1230 |
SendXmit(cs); |
|
1231 |
free_xmit = NULL; |
|
1232 |
} |
|
1233 |
if (cs->writable) { |
|
1234 |
if (!SendPackets(cs)) cs--; |
|
1235 |
} |
|
1236 |
} |
|
1237 |
||
1238 |
// no clients left that xmit the file, free it. |
|
1239 |
if (free_xmit) { |
|
1240 |
_transmit_file = NULL; |
|
1241 |
free(free_xmit); |
|
1242 |
} |
|
1243 |
} |
|
1244 |
||
1245 |
||
105 | 1246 |
void NetworkInitialize() |
0 | 1247 |
{ |
1248 |
ClientState *cs; |
|
1 | 1249 |
|
206 | 1250 |
QueueClear(&_command_queue); |
1251 |
QueueClear(&_ack_queue); |
|
0 | 1252 |
_command_queue.last = &_command_queue.head; |
1253 |
||
1254 |
// invalidate all clients |
|
1255 |
for(cs=_clients; cs != &_clients[MAX_CLIENTS]; cs++) |
|
1256 |
cs->socket = INVALID_SOCKET; |
|
105 | 1257 |
|
1258 |
} |
|
1259 |
||
1260 |
void NetworkClose(bool client) { |
|
1261 |
||
1262 |
ClientState *cs; |
|
1263 |
// invalidate all clients |
|
1264 |
||
1265 |
for(cs=_clients; cs != &_clients[MAX_CLIENTS]; cs++) if (cs->socket != INVALID_SOCKET) { |
|
1266 |
CloseClient(cs); |
|
1267 |
} |
|
1268 |
||
1269 |
if (!client) { |
|
1270 |
// if in servermode --> close listener |
|
1271 |
closesocket(_listensocket); |
|
1272 |
_listensocket= INVALID_SOCKET; |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1273 |
DEBUG(net, 1) ("[NET][TCP] closed listener on port %i", _network_server_port); |
105 | 1274 |
} |
0 | 1275 |
} |
1276 |
||
1277 |
void NetworkShutdown() |
|
1278 |
{ |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1279 |
_networking_server = false; |
169
4081f1d1f393
(svn r170) -Fix: [1022902] network fix .. console fix bug [1018523]. Fixes some variable initialization errors and a console.h warning (sign_de)
darkvater
parents:
144
diff
changeset
|
1280 |
_networking = false; |
4081f1d1f393
(svn r170) -Fix: [1022902] network fix .. console fix bug [1018523]. Fixes some variable initialization errors and a console.h warning (sign_de)
darkvater
parents:
144
diff
changeset
|
1281 |
_networking_sync = false; |
4081f1d1f393
(svn r170) -Fix: [1022902] network fix .. console fix bug [1018523]. Fixes some variable initialization errors and a console.h warning (sign_de)
darkvater
parents:
144
diff
changeset
|
1282 |
_frame_counter = 0; |
4081f1d1f393
(svn r170) -Fix: [1022902] network fix .. console fix bug [1018523]. Fixes some variable initialization errors and a console.h warning (sign_de)
darkvater
parents:
144
diff
changeset
|
1283 |
_frame_counter_max = 0; |
4081f1d1f393
(svn r170) -Fix: [1022902] network fix .. console fix bug [1018523]. Fixes some variable initialization errors and a console.h warning (sign_de)
darkvater
parents:
144
diff
changeset
|
1284 |
_frame_counter_srv = 0; |
0 | 1285 |
} |
1286 |
||
1287 |
// switch to synced mode. |
|
105 | 1288 |
void NetworkStartSync(bool fcreset) |
0 | 1289 |
{ |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1290 |
DEBUG(net, 3) ("[NET][SYNC] switching to synced game mode"); |
0 | 1291 |
_networking_sync = true; |
1292 |
_frame_counter = 0; |
|
105 | 1293 |
if (fcreset) { |
1294 |
_frame_counter_max = 0; |
|
1295 |
_frame_counter_srv = 0; |
|
1296 |
} |
|
0 | 1297 |
_num_future_seed = 0; |
1298 |
_sync_seed_1 = _sync_seed_2 = 0; |
|
1299 |
memset(_my_seed_list, 0, sizeof(_my_seed_list)); |
|
105 | 1300 |
|
0 | 1301 |
} |
1302 |
||
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1303 |
// ********************************* // |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1304 |
// * Network Core Console Commands * // |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1305 |
// ********************************* // |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1306 |
|
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1307 |
static _iconsole_var * NetworkConsoleCmdConnect(byte argc, byte* argv[], byte argt[]) { |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1308 |
if (argc<2) return NULL; |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1309 |
if (argc==2) { |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1310 |
IConsolePrintF(_iconsole_color_default, "connecting to %s",argv[1]); |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1311 |
NetworkCoreConnectGame(argv[1],_network_server_port); |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1312 |
} else if (argc==3) { |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1313 |
IConsolePrintF(_iconsole_color_default, "connecting to %s on port %s",argv[1],argv[2]); |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1314 |
NetworkCoreConnectGame(argv[1],atoi(argv[2])); |
187
f790a76cc828
(svn r188) -Fix: network fixes for players with higher latency (sign_de)
darkvater
parents:
185
diff
changeset
|
1315 |
} else if (argc==4) { |
f790a76cc828
(svn r188) -Fix: network fixes for players with higher latency (sign_de)
darkvater
parents:
185
diff
changeset
|
1316 |
IConsolePrintF(_iconsole_color_default, "connecting to %s on port %s as player %s",argv[1],argv[2],argv[3]); |
f790a76cc828
(svn r188) -Fix: network fixes for players with higher latency (sign_de)
darkvater
parents:
185
diff
changeset
|
1317 |
_network_playas = atoi(argv[3]); |
f790a76cc828
(svn r188) -Fix: network fixes for players with higher latency (sign_de)
darkvater
parents:
185
diff
changeset
|
1318 |
NetworkCoreConnectGame(argv[1],atoi(argv[2])); |
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1319 |
} |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1320 |
return NULL; |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1321 |
} |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1322 |
|
0 | 1323 |
// ************************** // |
1324 |
// * UDP Network Extensions * // |
|
1325 |
// ************************** // |
|
1326 |
||
105 | 1327 |
void NetworkUDPListen(bool client) |
0 | 1328 |
{ |
1329 |
SOCKET udp; |
|
1330 |
struct sockaddr_in sin; |
|
105 | 1331 |
int port; |
0 | 1332 |
|
105 | 1333 |
if (client) { port = _network_client_port; } else { port = _network_server_port; }; |
1334 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1335 |
DEBUG(net, 1) ("[NET][UDP] listening on port %i", port); |
0 | 1336 |
|
1337 |
udp = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1338 |
|
105 | 1339 |
// this disables network |
1340 |
_network_available = !(udp == INVALID_SOCKET); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1341 |
|
0 | 1342 |
// set nonblocking mode for socket |
1343 |
{ unsigned long blocking = 1; ioctlsocket(udp, FIONBIO, &blocking); } |
|
1344 |
||
1345 |
sin.sin_family = AF_INET; |
|
1346 |
sin.sin_addr.s_addr = 0; |
|
1347 |
sin.sin_port = htons(port); |
|
1348 |
||
1349 |
if (bind(udp, (struct sockaddr*)&sin, sizeof(sin)) != 0) |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1350 |
DEBUG(net, 1) ("[NET][UDP] error: bind failed on port %i", port); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1351 |
|
0 | 1352 |
|
1353 |
// enable broadcasting |
|
1354 |
{ unsigned long val=1; setsockopt(udp, SOL_SOCKET, SO_BROADCAST, (char *) &val , sizeof(val)); } |
|
105 | 1355 |
// allow reusing |
1356 |
{ unsigned long val=1; setsockopt(udp, SOL_SOCKET, SO_REUSEADDR, (char *) &val , sizeof(val)); } |
|
1357 |
||
1358 |
if (client) { _udp_client_socket = udp; } else { _udp_server_socket = udp; } ; |
|
0 | 1359 |
|
1360 |
} |
|
1361 |
||
105 | 1362 |
void NetworkUDPClose(bool client) { |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1363 |
if (client) { |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1364 |
DEBUG(net, 1) ("[NET][UDP] closed listener on port %i", _network_client_port); |
105 | 1365 |
closesocket(_udp_client_socket); |
1366 |
_udp_client_socket = INVALID_SOCKET; |
|
1367 |
} else { |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1368 |
DEBUG(net, 1) ("[NET][UDP] closed listener on port %i", _network_server_port); |
105 | 1369 |
closesocket(_udp_server_socket); |
1370 |
_udp_server_socket = INVALID_SOCKET; |
|
1371 |
}; |
|
1372 |
} |
|
1373 |
||
1374 |
void NetworkUDPReceive(bool client) { |
|
0 | 1375 |
struct sockaddr_in client_addr; |
173
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
1376 |
#ifndef __MORPHOS__ |
0 | 1377 |
int client_len; |
173
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
1378 |
#else |
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
1379 |
LONG client_len; // for some reason we need a 'LONG' under MorphOS |
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
1380 |
#endif |
0 | 1381 |
int nbytes; |
1382 |
struct UDPPacket packet; |
|
1383 |
int packet_len; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1384 |
|
105 | 1385 |
SOCKET udp; |
1386 |
if (client) udp=_udp_client_socket; else udp=_udp_server_socket; |
|
1387 |
||
0 | 1388 |
packet_len = sizeof(packet); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1389 |
client_len = sizeof(client_addr); |
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1390 |
|
105 | 1391 |
nbytes = recvfrom(udp, (char *) &packet, packet_len , 0, (struct sockaddr *) &client_addr, &client_len); |
0 | 1392 |
if (nbytes>0) { |
1393 |
if (packet.command_code==packet.command_check) switch (packet.command_code) { |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1394 |
|
105 | 1395 |
case NET_UDPCMD_SERVERSEARCH: |
1396 |
if (!client) { |
|
1397 |
packet.command_check=packet.command_code=NET_UDPCMD_SERVERINFO; |
|
1398 |
memcpy(&packet.data,&_network_game,sizeof(_network_game)); |
|
1399 |
packet.data_len=sizeof(_network_game); |
|
1400 |
NetworkUDPSend(client,client_addr, packet); |
|
1401 |
} |
|
1402 |
break; |
|
1403 |
case NET_UDPCMD_GETSERVERINFO: |
|
1404 |
if (!client) { |
|
1405 |
packet.command_check=packet.command_code=NET_UDPCMD_SERVERINFO; |
|
1406 |
memcpy(&packet.data,&_network_game,sizeof(_network_game)); |
|
1407 |
packet.data_len=sizeof(_network_game); |
|
1408 |
NetworkUDPSend(client,client_addr, packet); |
|
0 | 1409 |
} |
1410 |
break; |
|
105 | 1411 |
case NET_UDPCMD_SERVERINFO: |
1412 |
if (client) { |
|
1413 |
NetworkGameList * item; |
|
1414 |
||
1415 |
item = (NetworkGameList *) NetworkGameListAdd(); |
|
1416 |
item -> ip = inet_addr(inet_ntoa(client_addr.sin_addr)); |
|
1417 |
item -> port = ntohs(client_addr.sin_port); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1418 |
|
105 | 1419 |
memcpy(item,&packet.data,packet.data_len); |
1420 |
} |
|
1421 |
break; |
|
0 | 1422 |
} |
1423 |
} |
|
1424 |
} |
|
1425 |
||
81 | 1426 |
|
0 | 1427 |
|
105 | 1428 |
void NetworkUDPBroadCast(bool client, struct UDPPacket packet) { |
0 | 1429 |
int i=0, res; |
1430 |
struct sockaddr_in out_addr; |
|
1431 |
uint32 bcaddr; |
|
1432 |
byte * bcptr; |
|
105 | 1433 |
|
1434 |
SOCKET udp; |
|
1435 |
if (client) udp=_udp_client_socket; else udp=_udp_server_socket; |
|
1436 |
||
0 | 1437 |
while (_network_ip_list[i]!=0) { |
1438 |
bcaddr=_network_ip_list[i]; |
|
1439 |
out_addr.sin_family = AF_INET; |
|
105 | 1440 |
if (client) { out_addr.sin_port = htons(_network_server_port); } else { out_addr.sin_port = htons(_network_client_port); }; |
0 | 1441 |
bcptr = (byte *) &bcaddr; |
1442 |
bcptr[3]=255; |
|
1443 |
out_addr.sin_addr.s_addr = bcaddr; |
|
105 | 1444 |
res=sendto(udp,(char *) &packet,sizeof(packet),0,(struct sockaddr *) &out_addr,sizeof(out_addr)); |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1445 |
if (res==-1) DEBUG(net, 1)("udp: broadcast error: %i",GET_LAST_ERROR()); |
0 | 1446 |
i++; |
1447 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1448 |
|
0 | 1449 |
} |
1450 |
||
105 | 1451 |
void NetworkUDPSend(bool client, struct sockaddr_in recv,struct UDPPacket packet) { |
1452 |
||
1453 |
SOCKET udp; |
|
1454 |
if (client) udp=_udp_client_socket; else udp=_udp_server_socket; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1455 |
|
105 | 1456 |
sendto(udp,(char *) &packet,sizeof(packet),0,(struct sockaddr *) &recv,sizeof(recv)); |
0 | 1457 |
} |
1458 |
||
105 | 1459 |
|
175
d6cccece959a
(svn r176) -Fix: network_gui const and warnings fixes (Tron)
darkvater
parents:
173
diff
changeset
|
1460 |
bool NetworkUDPSearchGame(const byte ** _network_detected_serverip, unsigned short * _network_detected_serverport) { |
0 | 1461 |
struct UDPPacket packet; |
1462 |
int timeout=3000; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1463 |
|
105 | 1464 |
NetworkGameListClear(); |
1465 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1466 |
DEBUG(net, 0) ("[NET][UDP] searching server"); |
105 | 1467 |
*_network_detected_serverip = "255.255.255.255"; |
1468 |
*_network_detected_serverport = 0; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1469 |
|
0 | 1470 |
packet.command_check=packet.command_code=NET_UDPCMD_SERVERSEARCH; |
1471 |
packet.data_len=0; |
|
105 | 1472 |
NetworkUDPBroadCast(true, packet); |
0 | 1473 |
while (timeout>=0) { |
1474 |
CSleep(100); |
|
1475 |
timeout-=100; |
|
105 | 1476 |
NetworkUDPReceive(true); |
1477 |
||
1478 |
if (_network_game_count>0) { |
|
1479 |
NetworkGameList * item; |
|
1480 |
item = (NetworkGameList *) NetworkGameListItem(0); |
|
1481 |
*_network_detected_serverip=inet_ntoa(*(struct in_addr *) &item->ip); |
|
1482 |
*_network_detected_serverport=item->port; |
|
1483 |
timeout=-1; |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1484 |
DEBUG(net, 0) ("[NET][UDP] server found on %s", *_network_detected_serverip); |
105 | 1485 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1486 |
|
0 | 1487 |
} |
105 | 1488 |
|
175
d6cccece959a
(svn r176) -Fix: network_gui const and warnings fixes (Tron)
darkvater
parents:
173
diff
changeset
|
1489 |
return (*_network_detected_serverport>0); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1490 |
|
0 | 1491 |
} |
1492 |
||
1493 |
||
105 | 1494 |
// *************************** // |
1495 |
// * New Network Core System * // |
|
1496 |
// *************************** // |
|
1497 |
||
1498 |
void NetworkIPListInit() { |
|
1499 |
struct hostent* he = NULL; |
|
1500 |
char hostname[250]; |
|
1501 |
uint32 bcaddr; |
|
1502 |
int i=0; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1503 |
|
105 | 1504 |
gethostname(hostname,250); |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1505 |
DEBUG(net, 2) ("[NET][IP] init for host %s", hostname); |
105 | 1506 |
he=gethostbyname((char *) hostname); |
110
a22a6b07904b
(svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n)
truelight
parents:
106
diff
changeset
|
1507 |
|
a22a6b07904b
(svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n)
truelight
parents:
106
diff
changeset
|
1508 |
if (he == NULL) { |
a22a6b07904b
(svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n)
truelight
parents:
106
diff
changeset
|
1509 |
he = gethostbyname("localhost"); |
a22a6b07904b
(svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n)
truelight
parents:
106
diff
changeset
|
1510 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1511 |
|
110
a22a6b07904b
(svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n)
truelight
parents:
106
diff
changeset
|
1512 |
if (he == NULL) { |
a22a6b07904b
(svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n)
truelight
parents:
106
diff
changeset
|
1513 |
bcaddr = inet_addr("127.0.0.1"); |
a22a6b07904b
(svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n)
truelight
parents:
106
diff
changeset
|
1514 |
he = gethostbyaddr(inet_ntoa(*(struct in_addr *) &bcaddr), sizeof(bcaddr), AF_INET); |
105 | 1515 |
} |
1516 |
||
1517 |
if (he == NULL) { |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1518 |
DEBUG(net, 2) ("[NET][IP] cannot resolve %s", hostname); |
105 | 1519 |
} else { |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1520 |
while(he->h_addr_list[i]) { |
105 | 1521 |
bcaddr = inet_addr(inet_ntoa(*(struct in_addr *) he->h_addr_list[i])); |
1522 |
_network_ip_list[i]=bcaddr; |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1523 |
DEBUG(net, 2) ("[NET][IP] add %s",inet_ntoa(*(struct in_addr *) he->h_addr_list[i])); |
105 | 1524 |
i++; |
1525 |
} |
|
1526 |
||
1527 |
} |
|
1528 |
_network_ip_list[i]=0; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1529 |
|
105 | 1530 |
} |
1531 |
||
1532 |
/* *************************************************** */ |
|
1533 |
||
1534 |
void NetworkCoreInit() { |
|
1535 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1536 |
DEBUG(net, 3) ("[NET][Core] init()"); |
105 | 1537 |
_network_available=true; |
206 | 1538 |
_network_client_timeout=300; |
105 | 1539 |
|
1540 |
// [win32] winsock startup |
|
1541 |
||
1542 |
#if defined(WIN32) |
|
1543 |
{ |
|
1544 |
WSADATA wsa; |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1545 |
DEBUG(net, 3) ("[NET][Core] using windows socket library"); |
105 | 1546 |
if (WSAStartup(MAKEWORD(2,0), &wsa) != 0) { |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1547 |
DEBUG(net, 3) ("[NET][Core] error: WSAStartup failed"); |
105 | 1548 |
_network_available=false; |
1549 |
} |
|
1550 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1551 |
#else |
105 | 1552 |
|
1553 |
// [morphos/amigaos] bsd-socket startup |
|
1554 |
||
1555 |
#if defined(__MORPHOS__) || defined(__AMIGA__) |
|
1556 |
{ |
|
1557 |
DEBUG(misc,3) ("[NET][Core] using bsd socket library"); |
|
1558 |
if (!(SocketBase = OpenLibrary("bsdsocket.library", 4))) { |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1559 |
DEBUG(net, 3) ("[NET][Core] Couldn't open bsdsocket.library version 4."); |
105 | 1560 |
_network_available=false; |
1561 |
} |
|
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1562 |
|
173
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
1563 |
#if !defined(__MORPHOS__) |
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
1564 |
// for usleep() implementation (only required for legacy AmigaOS builds) |
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1565 |
if ( (TimerPort = CreateMsgPort()) ) { |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1566 |
if ( (TimerRequest = (struct timerequest *) CreateIORequest(TimerPort, sizeof(struct timerequest))) ) { |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1567 |
if ( OpenDevice("timer.device", UNIT_MICROHZ, (struct IORequest *) TimerRequest, 0) == 0 ) { |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1568 |
if ( !(TimerBase = TimerRequest->tr_node.io_Device) ) { |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1569 |
// free ressources... |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1570 |
DEBUG(net, 3) ("[NET][Core] Couldn't initialize timer."); |
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1571 |
_network_available=false; |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1572 |
} |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1573 |
} |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1574 |
} |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1575 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1576 |
#endif |
173
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
1577 |
|
105 | 1578 |
} |
1579 |
#else |
|
1580 |
||
1581 |
// [linux/macos] unix-socket startup |
|
1582 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1583 |
DEBUG(net, 3) ("[NET][Core] using unix socket library"); |
105 | 1584 |
|
1585 |
#endif |
|
1586 |
||
1587 |
#endif |
|
1588 |
||
1589 |
||
1590 |
if (_network_available) { |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1591 |
DEBUG(net, 3) ("[NET][Core] OK: multiplayer available"); |
105 | 1592 |
// initiate network ip list |
1593 |
NetworkIPListInit(); |
|
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1594 |
IConsoleCmdRegister("connect",NetworkConsoleCmdConnect); |
187
f790a76cc828
(svn r188) -Fix: network fixes for players with higher latency (sign_de)
darkvater
parents:
185
diff
changeset
|
1595 |
IConsoleVarRegister("net_client_timeout",&_network_client_timeout,ICONSOLE_VAR_UINT16); |
f790a76cc828
(svn r188) -Fix: network fixes for players with higher latency (sign_de)
darkvater
parents:
185
diff
changeset
|
1596 |
IConsoleVarRegister("net_ready_ahead",&_network_ready_ahead,ICONSOLE_VAR_UINT16); |
188
30f27b5c1ee5
(svn r189) -Fix: [1024750] Fix: network.c - timeout error. When one client timed out, all clients were disconnected (sign_de)
darkvater
parents:
187
diff
changeset
|
1597 |
IConsoleVarRegister("net_sync_freq",&_network_sync_freq,ICONSOLE_VAR_UINT16); |
105 | 1598 |
} else { |
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1599 |
DEBUG(net, 3) ("[NET][Core] FAILED: multiplayer not available"); |
105 | 1600 |
} |
1601 |
} |
|
1602 |
||
1603 |
/* *************************************************** */ |
|
1604 |
||
1605 |
void NetworkCoreShutdown() { |
|
1606 |
||
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1607 |
DEBUG(net, 3) ("[NET][Core] shutdown()"); |
105 | 1608 |
|
1609 |
#if defined(__MORPHOS__) || defined(__AMIGA__) |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1610 |
{ |
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1611 |
// free allocated ressources |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1612 |
#if !defined(__MORPHOS__) |
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1613 |
if (TimerBase) { CloseDevice((struct IORequest *) TimerRequest); } |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1614 |
if (TimerRequest) { DeleteIORequest(TimerRequest); } |
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1615 |
if (TimerPort) { DeleteMsgPort(TimerPort); } |
173
df7c566d219f
(svn r174) -Network: [ 023268] small network.c changes/cleanups (MorphOS/AmigaOS) and one compiler warning fix (MorphOS) (tokai)
darkvater
parents:
172
diff
changeset
|
1616 |
#endif |
144
6b42494d405e
(svn r145) -Fix: [1016921] Network Name Resolution for not only connecting with IP. (sign_de)
darkvater
parents:
110
diff
changeset
|
1617 |
|
105 | 1618 |
if (SocketBase) { |
1619 |
CloseLibrary(SocketBase); |
|
1620 |
} |
|
1621 |
} |
|
1622 |
#endif |
|
1623 |
||
1624 |
||
1625 |
#if defined(WIN32) |
|
1626 |
{ |
|
1627 |
WSACleanup(); |
|
1628 |
} |
|
1629 |
#endif |
|
1630 |
||
1631 |
} |
|
1632 |
||
1633 |
/* *************************************************** */ |
|
1634 |
||
175
d6cccece959a
(svn r176) -Fix: network_gui const and warnings fixes (Tron)
darkvater
parents:
173
diff
changeset
|
1635 |
bool NetworkCoreConnectGame(const byte* b, unsigned short port) |
105 | 1636 |
{ |
1637 |
if (!_network_available) return false; |
|
1638 |
||
175
d6cccece959a
(svn r176) -Fix: network_gui const and warnings fixes (Tron)
darkvater
parents:
173
diff
changeset
|
1639 |
if (strcmp(b,"auto")==0) { |
105 | 1640 |
// do autodetect |
1641 |
NetworkUDPSearchGame(&b, &port); |
|
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
1642 |
} |
105 | 1643 |
|
1644 |
if (port==0) { |
|
1645 |
// autodetection failed |
|
1646 |
if (_networking_override) NetworkLobbyShutdown(); |
|
1647 |
ShowErrorMessage(-1, STR_NETWORK_ERR_NOSERVER, 0, 0); |
|
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
1648 |
_switch_mode_errorstr = STR_NETWORK_ERR_NOSERVER; |
105 | 1649 |
return false; |
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
1650 |
} |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
1651 |
|
105 | 1652 |
NetworkInitialize(); |
1653 |
_networking = NetworkConnect(b, port); |
|
1654 |
if (_networking) { |
|
1655 |
NetworkLobbyShutdown(); |
|
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
1656 |
} else { |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1657 |
if (_networking_override) |
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
1658 |
NetworkLobbyShutdown(); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1659 |
|
105 | 1660 |
ShowErrorMessage(-1, STR_NETWORK_ERR_NOCONNECTION,0,0); |
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
1661 |
_switch_mode_errorstr = STR_NETWORK_ERR_NOCONNECTION; |
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
169
diff
changeset
|
1662 |
} |
105 | 1663 |
return _networking; |
1664 |
} |
|
1665 |
||
1666 |
/* *************************************************** */ |
|
1667 |
||
1668 |
bool NetworkCoreStartGame() |
|
1669 |
{ |
|
1670 |
if (!_network_available) return false; |
|
1671 |
NetworkLobbyShutdown(); |
|
1672 |
NetworkInitialize(); |
|
1673 |
NetworkListen(); |
|
1674 |
NetworkUDPListen(false); |
|
1675 |
_networking_server = true; |
|
1676 |
_networking = true; |
|
1677 |
NetworkGameFillDefaults(); // clears the network game info |
|
1678 |
_network_game.players_on++; // the serverplayer is online |
|
1679 |
return true; |
|
1680 |
} |
|
1681 |
||
1682 |
/* *************************************************** */ |
|
1683 |
||
1684 |
void NetworkCoreDisconnect() |
|
1685 |
{ |
|
1686 |
/* terminate server */ |
|
1687 |
if (_networking_server) { |
|
1688 |
NetworkUDPClose(false); |
|
1689 |
NetworkClose(false); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1690 |
} |
105 | 1691 |
|
1692 |
/* terminate client connection */ |
|
1693 |
else if (_networking) { |
|
1694 |
NetworkClose(true); |
|
1695 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1696 |
|
105 | 1697 |
NetworkShutdown(); |
1698 |
} |
|
1699 |
||
1700 |
/* *************************************************** */ |
|
1701 |
||
1702 |
void NetworkCoreLoop(bool incomming) { |
|
1703 |
||
1704 |
||
1705 |
if (incomming) { |
|
1706 |
||
1707 |
// incomming |
|
1708 |
||
1709 |
if ( _udp_client_socket != INVALID_SOCKET ) NetworkUDPReceive(true); |
|
1710 |
if ( _udp_server_socket != INVALID_SOCKET ) NetworkUDPReceive(false); |
|
1711 |
||
1712 |
if (_networking) { |
|
1713 |
NetworkReceive(); |
|
1714 |
} |
|
1715 |
||
1716 |
} else { |
|
1717 |
||
206 | 1718 |
if ( _udp_client_socket != INVALID_SOCKET ) NetworkUDPReceive(true); |
1719 |
if ( _udp_server_socket != INVALID_SOCKET ) NetworkUDPReceive(false); |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1720 |
|
105 | 1721 |
if (_networking) { |
1722 |
NetworkSend(); |
|
1723 |
} |
|
1724 |
||
1725 |
} |
|
1726 |
||
1727 |
} |
|
1728 |
||
1729 |
void NetworkLobbyInit() { |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1730 |
DEBUG(net, 3) ("[NET][Lobby] init()"); |
105 | 1731 |
NetworkUDPListen(true); |
1732 |
} |
|
1733 |
||
1734 |
void NetworkLobbyShutdown() { |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1735 |
DEBUG(net, 3) ("[NET][Lobby] shutdown()"); |
105 | 1736 |
NetworkUDPClose(true); |
1737 |
} |
|
1738 |
||
1739 |
||
1740 |
// ******************************** // |
|
1741 |
// * Network Game List Extensions * // |
|
1742 |
// ******************************** // |
|
1743 |
||
1744 |
void NetworkGameListClear() { |
|
1745 |
NetworkGameList * item; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1746 |
NetworkGameList * next; |
105 | 1747 |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1748 |
DEBUG(net, 4) ("[NET][G-List] cleared server list"); |
105 | 1749 |
|
1750 |
item = _network_game_list; |
|
1751 |
while (item != NULL) { |
|
1752 |
next = (NetworkGameList *) item -> _next; |
|
1753 |
free (item); |
|
1754 |
item = next; |
|
1755 |
} |
|
1756 |
_network_game_list=NULL; |
|
1757 |
_network_game_count=0; |
|
1758 |
} |
|
1759 |
||
1760 |
char * NetworkGameListAdd() { |
|
1761 |
NetworkGameList * item; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1762 |
NetworkGameList * before; |
105 | 1763 |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1764 |
DEBUG(net, 4) ("[NET][G-List] added server to list"); |
105 | 1765 |
|
1766 |
item = _network_game_list; |
|
1767 |
before = item; |
|
1768 |
while (item != NULL) { |
|
1769 |
before = item; |
|
1770 |
item = (NetworkGameList *) item -> _next; |
|
1771 |
} |
|
1772 |
item = malloc(sizeof(NetworkGameList)); |
|
1773 |
item -> _next = NULL; |
|
1774 |
if (before == NULL) { |
|
1775 |
_network_game_list = item; |
|
1776 |
} else { |
|
1777 |
before -> _next = (char *) item; |
|
1778 |
} |
|
1779 |
_network_game_count++; |
|
1780 |
return (char *) item; |
|
1781 |
} |
|
1782 |
||
1783 |
void NetworkGameListFromLAN() { |
|
1784 |
struct UDPPacket packet; |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1785 |
DEBUG(net, 2) ("[NET][G-List] searching server over lan"); |
105 | 1786 |
NetworkGameListClear(); |
1787 |
packet.command_check=packet.command_code=NET_UDPCMD_SERVERSEARCH; |
|
1788 |
packet.data_len=0; |
|
1789 |
NetworkUDPBroadCast(true,packet); |
|
1790 |
} |
|
1791 |
||
1792 |
void NetworkGameListFromInternet() { |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1793 |
DEBUG(net, 2) ("[NET][G-List] searching servers over internet"); |
105 | 1794 |
NetworkGameListClear(); |
1795 |
||
1796 |
// **TODO** masterserver communication [internet protocol list] |
|
1797 |
||
1798 |
} |
|
1799 |
||
1800 |
char * NetworkGameListItem(uint16 index) { |
|
1801 |
NetworkGameList * item; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1802 |
NetworkGameList * next; |
105 | 1803 |
uint16 cnt = 0; |
1804 |
||
1805 |
item = _network_game_list; |
|
1806 |
||
1807 |
while ((item != NULL) && (cnt != index)) { |
|
1808 |
next = (NetworkGameList *) item -> _next; |
|
1809 |
item = next; |
|
1810 |
cnt++; |
|
1811 |
} |
|
1812 |
||
1813 |
return (char *) item; |
|
1814 |
} |
|
1815 |
||
1816 |
// *************************** // |
|
1817 |
// * Network Game Extensions * // |
|
1818 |
// *************************** // |
|
1819 |
||
1820 |
void NetworkGameFillDefaults() { |
|
1821 |
NetworkGameInfo * game = &_network_game; |
|
1822 |
#if defined(WITH_REV) |
|
1823 |
extern char _openttd_revision[]; |
|
1824 |
#endif |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1825 |
|
185
646403e35006
(svn r186) -Add: debug 'net' for network debug (sign_de)
truelight
parents:
177
diff
changeset
|
1826 |
DEBUG(net, 4) ("[NET][G-Info] setting defaults"); |
105 | 1827 |
|
1828 |
ttd_strlcpy(game->server_name,"OpenTTD Game",13); |
|
1829 |
game->game_password[0]='\0'; |
|
1830 |
game->map_name[0]='\0'; |
|
1831 |
#if defined(WITH_REV) |
|
1832 |
ttd_strlcpy(game->server_revision,_openttd_revision,strlen(_openttd_revision)); |
|
1833 |
#else |
|
1834 |
ttd_strlcpy(game->server_revision,"norev000",strlen("norev000")); |
|
1835 |
#endif |
|
1836 |
game->game_date=0; |
|
1837 |
||
1838 |
game->map_height=0; |
|
1839 |
game->map_width=0; |
|
1840 |
game->map_set=0; |
|
1841 |
||
1842 |
game->players_max=8; |
|
1843 |
game->players_on=0; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
188
diff
changeset
|
1844 |
|
105 | 1845 |
game->server_lang=_dynlang.curr; |
1846 |
} |
|
1847 |
||
1848 |
void NetworkGameChangeDate(uint16 newdate) { |
|
1849 |
if (_networking_server) { |
|
1850 |
_network_game.game_date = newdate; |
|
1851 |
} |
|
1852 |
} |
|
1853 |
||
8
9ab81ef450f2
(svn r9) Fixed a couple of warnings and minor coding issues
dominik
parents:
1
diff
changeset
|
1854 |
#else // not ENABLE_NETWORK |
0 | 1855 |
|
1856 |
// stubs |
|
105 | 1857 |
void NetworkInitialize() {} |
0 | 1858 |
void NetworkShutdown() {} |
105 | 1859 |
void NetworkListen() {} |
0 | 1860 |
void NetworkConnect(const char *hostname, int port) {} |
1861 |
void NetworkReceive() {} |
|
1862 |
void NetworkSend() {} |
|
1863 |
void NetworkSendCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback) {} |
|
1864 |
void NetworkProcessCommands() {} |
|
106
51354fbb3e8a
(svn r107) Small fix for compiling without networking
dominik
parents:
105
diff
changeset
|
1865 |
void NetworkStartSync(bool fcreset) {} |
105 | 1866 |
void NetworkCoreInit() { _network_available=false; }; |
1867 |
void NetworkCoreShutdown() {}; |
|
1868 |
void NetworkCoreDisconnect() {}; |
|
1869 |
void NetworkCoreLoop(bool incomming) {}; |
|
177
71fec20dd4a8
(svn r178) -Fix: small network fix if network is not enabled
darkvater
parents:
175
diff
changeset
|
1870 |
bool NetworkCoreConnectGame(const byte* b, unsigned short port) {return false;}; |
106
51354fbb3e8a
(svn r107) Small fix for compiling without networking
dominik
parents:
105
diff
changeset
|
1871 |
bool NetworkCoreStartGame() {return false;}; |
105 | 1872 |
void NetworkLobbyShutdown() {}; |
1873 |
void NetworkLobbyInit() {}; |
|
1874 |
void NetworkGameListClear() {}; |
|
1875 |
char * NetworkGameListAdd() {return NULL;}; |
|
1876 |
void NetworkGameListFromLAN() {}; |
|
1877 |
void NetworkGameListFromInternet() {}; |
|
1878 |
void NetworkGameFillDefaults() {}; |
|
1879 |
char * NetworkGameListItem(uint16 index) {return NULL;}; |
|
1880 |
void NetworkGameChangeDate(uint16 newdate) {}; |
|
1881 |
||
1882 |
#endif |