Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[*] Improved network stability

Browse source
This commit is contained in:
cybermind 2015-03-02 18:00:35 +05:00
parent b18139827c
commit eb4dbbeba2
5 changed files with 50 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/include/net_message.h
View file

@ -437,14 +437,16 @@ public:
{
Cycle = 0;
memset(Type, 0, sizeof(Type));
OrigPlayer = 255;
}
size_t Serialize(unsigned char *buf) const;
size_t Deserialize(const unsigned char *buf);
static size_t Size() { return 1 + 1 * MaxNetworkCommands; }
static size_t Size() { return 1 + 1 + 1 * MaxNetworkCommands; }
uint8_t Type[MaxNetworkCommands]; /// Commands in packet
uint8_t Cycle; /// Destination game cycle
uint8_t OrigPlayer; /// Host address
};
/**

1
src/include/netconnect.h
View file

@ -93,6 +93,7 @@ extern int HostsCount; /// Number of hosts.
extern CNetworkHost Hosts[PlayerMax]; /// Host, port, and number of all players.
extern int NetConnectRunning; /// Network menu: Setup mode active
extern int NetConnectType; /// Network menu: Setup mode active
extern int NetLocalHostsSlot; /// Network menu: Slot # in Hosts array of local client
extern int NetLocalPlayerNumber; /// Player number of local client

4
src/network/net_message.cpp
View file

@ -717,8 +717,9 @@ size_t CNetworkPacketHeader::Serialize(unsigned char *p) const
p += serialize8(p, this->Type[i]);
}
p += serialize8(p, this->Cycle);
p += serialize8(p, this->OrigPlayer);
}
return MaxNetworkCommands + 1;
return MaxNetworkCommands + 1 + 1;
}
size_t CNetworkPacketHeader::Deserialize(const unsigned char *buf)
@ -729,6 +730,7 @@ size_t CNetworkPacketHeader::Deserialize(const unsigned char *buf)
p += deserialize8(p, &this->Type[i]);
}
p += deserialize8(p, &this->Cycle);
p += deserialize8(p, &this->OrigPlayer);
return p - buf;
}

3
src/network/netconnect.cpp
View file

@ -81,6 +81,7 @@ int HostsCount; /// Number of hosts.
CNetworkHost Hosts[PlayerMax]; /// Host and ports of all players.
int NetConnectRunning = 0; /// Network menu: Setup mode active
int NetConnectType = 0; /// Network menu: Setup mode active
int NetLocalHostsSlot; /// Network menu: Slot # in Hosts array of local client
int NetLocalPlayerNumber; /// Player number of local client
@ -1458,6 +1459,7 @@ void NetworkProcessServerRequest()
void NetworkInitClientConnect()
{
NetConnectRunning = 2;
NetConnectType = 2;
for (int i = 0; i < PlayerMax; ++i) {
Hosts[i].Clear();
@ -1755,6 +1757,7 @@ void NetworkDetachFromServer()
void NetworkInitServerConnect(int openslots)
{
NetConnectRunning = 1;
NetConnectType = 1;
for (int i = 0; i < PlayerMax; ++i) {
Hosts[i].Clear();

54
src/network/network.cpp
View file

@ -279,7 +279,7 @@ CNetworkParameter::CNetworkParameter()
{
localHost = "127.0.0.1";
localPort = defaultPort;
gameCyclesPerUpdate = 5;
gameCyclesPerUpdate = 1;
NetworkLag = 10;
timeoutInS = 45;
}
@ -295,6 +295,7 @@ bool NetworkInSync = true; /// Network is in sync
CUDPSocket NetworkFildes; /// Network file descriptor
static unsigned long NetworkLastFrame[PlayerMax]; /// Last frame received packet
static unsigned long NetworkLastCycle[PlayerMax]; /// Last cycle received packet
static int NetworkSyncSeeds[256]; /// Network sync seeds.
static int NetworkSyncHashs[256]; /// Network sync hashs.
@ -302,6 +303,7 @@ static CNetworkCommandQueue NetworkIn[256][PlayerMax][MaxNetworkCommands]; /// P
static std::deque<CNetworkCommandQueue> CommandsIn; /// Network command input queue
static std::deque<CNetworkCommandQueue> MsgCommandsIn; /// Network message input queue
#ifdef DEBUG
class CNetworkStat
{
@ -345,15 +347,23 @@ static int PlayerQuit[PlayerMax]; /// Player quit
** @param packet Packet to send.
** @param numcommands Number of commands.
*/
static void NetworkBroadcast(const CNetworkPacket &packet, int numcommands)
static void NetworkBroadcast(const CNetworkPacket &packet, int numcommands, int player = 255)
{
const unsigned int size = packet.Size(numcommands);
unsigned char *buf = new unsigned char[size];
packet.Serialize(buf, numcommands);
// Send to all clients.
for (int i = 0; i < HostsCount; ++i) {
const CHost host(Hosts[i].Host, Hosts[i].Port);
if (NetConnectType == 1) { // server
for (int i = 0; i < HostsCount; ++i) {
const CHost host(Hosts[i].Host, Hosts[i].Port);
if (Hosts[i].PlyNr == player) {
continue;
}
NetworkFildes.Send(host, buf, size);
}
} else { // client
const CHost host(Hosts[HostsCount - 1].Host, Hosts[HostsCount - 1].Port);
NetworkFildes.Send(host, buf, size);
}
delete[] buf;
@ -371,6 +381,7 @@ static void NetworkSendPacket(const CNetworkCommandQueue(&ncq)[MaxNetworkCommand
// Build packet of up to MaxNetworkCommands messages.
int numcommands = 0;
packet.Header.Cycle = ncq[0].Time & 0xFF;
packet.Header.OrigPlayer = ThisPlayer->Index;
int i;
for (i = 0; i < MaxNetworkCommands && ncq[i].Type != MessageNone; ++i) {
packet.Header.Type[i] = ncq[i].Type;
@ -494,6 +505,7 @@ void NetworkOnStartGame()
memset(NetworkSyncHashs, 0, sizeof(NetworkSyncHashs));
memset(PlayerQuit, 0, sizeof(PlayerQuit));
memset(NetworkLastFrame, 0, sizeof(NetworkLastFrame));
memset(NetworkLastCycle, 0, sizeof(NetworkLastCycle));
}
//----------------------------------------------------------------------------
@ -673,6 +685,7 @@ static bool IsNetworkCommandReady(unsigned long gameNetCycle)
return false;
}
}
return true;
}
@ -757,23 +770,36 @@ static bool IsAValidCommand(const CNetworkPacket &packet, int index, const int p
static void NetworkParseInGameEvent(const unsigned char *buf, int len, const CHost &host)
{
const int index = FindHostIndexBy(host);
if (index == -1 || PlayerQuit[Hosts[index].PlyNr]) {
#ifdef DEBUG
const std::string hostStr = host.toString();
DebugPrint("Not a host in play: %s\n" _C_ hostStr.c_str());
#endif
return;
}
const int player = Hosts[index].PlyNr;
CNetworkPacket packet;
int commands;
packet.Deserialize(buf, len, &commands);
int player = packet.Header.OrigPlayer;
if (player == 255) {
const int index = FindHostIndexBy(host);
if (index == -1 || PlayerQuit[Hosts[index].PlyNr]) {
#ifdef DEBUG
const std::string hostStr = host.toString();
DebugPrint("Not a host in play: %s\n" _C_ hostStr.c_str());
#endif
return;
}
player = Hosts[index].PlyNr;
}
if (NetConnectType == 1) {
if (player != 255) {
NetworkBroadcast(packet, commands, player);
}
if (NetworkLastCycle[player] > 10 && (int)(packet.Header.Cycle - NetworkLastCycle[player]) > (int)CNetworkParameter::Instance.NetworkLag) {
NetworkInSync = false;
return;
}
}
if (commands < 0) {
DebugPrint("Bad packet read\n");
return;
}
NetworkLastCycle[player] = packet.Header.Cycle;
// Parse the packet commands.
for (int i = 0; i != commands; ++i) {
// Handle some messages.