sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network/ENet: Fix compilation and warnings

This commit is contained in:
Lynix 2017-01-27 17:19:49 +01:00
parent 0e03aae6dc
commit 664e3a33ec
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Nazara/Network/ENetHost.cpp
View File

@ -4,7 +4,6 @@
#include <Nazara/Core/OffsetOf.hpp> #include <Nazara/Core/OffsetOf.hpp>
#include <Nazara/Network/ENetPeer.hpp> #include <Nazara/Network/ENetPeer.hpp>
#include <Nazara/Network/NetPacket.hpp> #include <Nazara/Network/NetPacket.hpp>
#include <iostream>
#include <Nazara/Network/Debug.hpp> #include <Nazara/Network/Debug.hpp>
#define ENET_TIME_OVERFLOW 86400000 #define ENET_TIME_OVERFLOW 86400000
@ -145,7 +144,7 @@ namespace Nz
{ {
std::vector<HostnameInfo> results = IpAddress::ResolveHostname(protocol, hostName, service, error); std::vector<HostnameInfo> results = IpAddress::ResolveHostname(protocol, hostName, service, error);
if (results.empty()) if (results.empty())
return false; return nullptr;
IpAddress hostnameAddress; IpAddress hostnameAddress;
for (const HostnameInfo& result : results) for (const HostnameInfo& result : results)
@ -558,7 +557,7 @@ namespace Nz
return true; return true;
} }
ENetPeer* ENetHost::HandleConnect(ENetProtocolHeader* header, ENetProtocol* command) ENetPeer* ENetHost::HandleConnect(ENetProtocolHeader* /*header*/, ENetProtocol* command)
{ {
UInt32 channelCount = NetToHost(command->connect.channelCount); UInt32 channelCount = NetToHost(command->connect.channelCount);
@ -853,7 +852,7 @@ namespace Nz
return commandError(); return commandError();
} }
bool ENetHost::HandlePing(ENetPeer* peer, const ENetProtocol* command) bool ENetHost::HandlePing(ENetPeer* peer, const ENetProtocol* /*command*/)
{ {
if (peer->m_state != ENetPeerState::Connected && peer->m_state != ENetPeerState::DisconnectLater) if (peer->m_state != ENetPeerState::Connected && peer->m_state != ENetPeerState::DisconnectLater)
return false; return false;
@ -1071,7 +1070,7 @@ namespace Nz
bool ENetHost::HandleSendUnsequenced(ENetPeer* peer, const ENetProtocol* command, UInt8** currentData) bool ENetHost::HandleSendUnsequenced(ENetPeer* peer, const ENetProtocol* command, UInt8** currentData)
{ {
if (command->header.channelID >= peer->m_channels.size() || peer->m_state != ENetPeerState::Connected && peer->m_state != ENetPeerState::DisconnectLater) if (command->header.channelID >= peer->m_channels.size() || (peer->m_state != ENetPeerState::Connected && peer->m_state != ENetPeerState::DisconnectLater))
return false; return false;
std::size_t dataLength = NetToHost(command->sendUnsequenced.dataLength); std::size_t dataLength = NetToHost(command->sendUnsequenced.dataLength);
@ -1230,8 +1229,6 @@ namespace Nz
void ENetHost::SendAcknowledgements(ENetPeer* peer) void ENetHost::SendAcknowledgements(ENetPeer* peer)
{ {
std::cout << "SendAcknowledgements " << peer->m_acknowledgements.size() << std::endl;
auto currentAcknowledgement = peer->m_acknowledgements.begin(); auto currentAcknowledgement = peer->m_acknowledgements.begin();
while (currentAcknowledgement != peer->m_acknowledgements.end()) while (currentAcknowledgement != peer->m_acknowledgements.end())
{ {

6
src/Nazara/Network/ENetPeer.cpp
View File

@ -30,11 +30,11 @@ namespace Nz
} }
ENetPeer::ENetPeer(ENetHost* host, UInt16 peerId) : ENetPeer::ENetPeer(ENetHost* host, UInt16 peerId) :
m_packetPool(sizeof(ENetPacket)),
m_host(host), m_host(host),
m_incomingPeerID(peerId), m_packetPool(sizeof(ENetPacket)),
m_incomingSessionID(0xFF), m_incomingSessionID(0xFF),
m_outgoingSessionID(0xFF) m_outgoingSessionID(0xFF),
m_incomingPeerID(peerId)
{ {
Reset(); Reset();
} }