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