Merge pull request #7677 from Techjar/netplay-peer-init-fix
NetPlay: Fix server peer initialization hang
This commit is contained in:
commit
d75e9b2d5d
|
@ -148,6 +148,20 @@ NetPlayServer::NetPlayServer(const u16 port, const bool forward_port,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static PlayerId* PeerPlayerId(ENetPeer* peer)
|
||||||
|
{
|
||||||
|
return static_cast<PlayerId*>(peer->data);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ClearPeerPlayerId(ENetPeer* peer)
|
||||||
|
{
|
||||||
|
if (peer->data)
|
||||||
|
{
|
||||||
|
delete PeerPlayerId(peer);
|
||||||
|
peer->data = nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// called from ---NETPLAY--- thread
|
// called from ---NETPLAY--- thread
|
||||||
void NetPlayServer::ThreadFunc()
|
void NetPlayServer::ThreadFunc()
|
||||||
{
|
{
|
||||||
|
@ -195,26 +209,10 @@ void NetPlayServer::ThreadFunc()
|
||||||
{
|
{
|
||||||
case ENET_EVENT_TYPE_CONNECT:
|
case ENET_EVENT_TYPE_CONNECT:
|
||||||
{
|
{
|
||||||
ENetPeer* accept_peer = netEvent.peer;
|
// Actual client initialization is deferred to the receive event, so here
|
||||||
unsigned int error;
|
// we'll just log the new connection.
|
||||||
{
|
INFO_LOG(NETPLAY, "Peer connected from: %x:%u", netEvent.peer->address.host,
|
||||||
std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
|
netEvent.peer->address.port);
|
||||||
error = OnConnect(accept_peer);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error)
|
|
||||||
{
|
|
||||||
sf::Packet spac;
|
|
||||||
spac << (MessageId)error;
|
|
||||||
// don't need to lock, this client isn't in the client map
|
|
||||||
Send(accept_peer, spac);
|
|
||||||
if (netEvent.peer->data)
|
|
||||||
{
|
|
||||||
delete (PlayerId*)netEvent.peer->data;
|
|
||||||
netEvent.peer->data = nullptr;
|
|
||||||
}
|
|
||||||
enet_peer_disconnect_later(accept_peer, 0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ENET_EVENT_TYPE_RECEIVE:
|
case ENET_EVENT_TYPE_RECEIVE:
|
||||||
|
@ -222,7 +220,29 @@ void NetPlayServer::ThreadFunc()
|
||||||
sf::Packet rpac;
|
sf::Packet rpac;
|
||||||
rpac.append(netEvent.packet->data, netEvent.packet->dataLength);
|
rpac.append(netEvent.packet->data, netEvent.packet->dataLength);
|
||||||
|
|
||||||
auto it = m_players.find(*(PlayerId*)netEvent.peer->data);
|
if (!netEvent.peer->data)
|
||||||
|
{
|
||||||
|
// uninitialized client, we'll assume this is their initialization packet
|
||||||
|
unsigned int error;
|
||||||
|
{
|
||||||
|
std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
|
||||||
|
error = OnConnect(netEvent.peer, rpac);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error)
|
||||||
|
{
|
||||||
|
sf::Packet spac;
|
||||||
|
spac << static_cast<MessageId>(error);
|
||||||
|
// don't need to lock, this client isn't in the client map
|
||||||
|
Send(netEvent.peer, spac);
|
||||||
|
|
||||||
|
ClearPeerPlayerId(netEvent.peer);
|
||||||
|
enet_peer_disconnect_later(netEvent.peer, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
auto it = m_players.find(*PeerPlayerId(netEvent.peer));
|
||||||
Client& client = it->second;
|
Client& client = it->second;
|
||||||
if (OnData(rpac, client) != 0)
|
if (OnData(rpac, client) != 0)
|
||||||
{
|
{
|
||||||
|
@ -230,10 +250,7 @@ void NetPlayServer::ThreadFunc()
|
||||||
std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
|
std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
|
||||||
OnDisconnect(client);
|
OnDisconnect(client);
|
||||||
|
|
||||||
if (netEvent.peer->data)
|
ClearPeerPlayerId(netEvent.peer);
|
||||||
{
|
|
||||||
delete (PlayerId*)netEvent.peer->data;
|
|
||||||
netEvent.peer->data = nullptr;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
enet_packet_destroy(netEvent.packet);
|
enet_packet_destroy(netEvent.packet);
|
||||||
|
@ -244,17 +261,13 @@ void NetPlayServer::ThreadFunc()
|
||||||
std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
|
std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
|
||||||
if (!netEvent.peer->data)
|
if (!netEvent.peer->data)
|
||||||
break;
|
break;
|
||||||
auto it = m_players.find(*(PlayerId*)netEvent.peer->data);
|
auto it = m_players.find(*PeerPlayerId(netEvent.peer));
|
||||||
if (it != m_players.end())
|
if (it != m_players.end())
|
||||||
{
|
{
|
||||||
Client& client = it->second;
|
Client& client = it->second;
|
||||||
OnDisconnect(client);
|
OnDisconnect(client);
|
||||||
|
|
||||||
if (netEvent.peer->data)
|
ClearPeerPlayerId(netEvent.peer);
|
||||||
{
|
|
||||||
delete (PlayerId*)netEvent.peer->data;
|
|
||||||
netEvent.peer->data = nullptr;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -267,23 +280,14 @@ void NetPlayServer::ThreadFunc()
|
||||||
// close listening socket and client sockets
|
// close listening socket and client sockets
|
||||||
for (auto& player_entry : m_players)
|
for (auto& player_entry : m_players)
|
||||||
{
|
{
|
||||||
delete (PlayerId*)player_entry.second.socket->data;
|
ClearPeerPlayerId(player_entry.second.socket);
|
||||||
player_entry.second.socket->data = nullptr;
|
|
||||||
enet_peer_disconnect(player_entry.second.socket, 0);
|
enet_peer_disconnect(player_entry.second.socket, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// called from ---NETPLAY--- thread
|
// called from ---NETPLAY--- thread
|
||||||
unsigned int NetPlayServer::OnConnect(ENetPeer* socket)
|
unsigned int NetPlayServer::OnConnect(ENetPeer* socket, sf::Packet& rpac)
|
||||||
{
|
{
|
||||||
sf::Packet rpac;
|
|
||||||
ENetPacket* epack;
|
|
||||||
do
|
|
||||||
{
|
|
||||||
epack = enet_peer_receive(socket, nullptr);
|
|
||||||
} while (epack == nullptr);
|
|
||||||
rpac.append(epack->data, epack->dataLength);
|
|
||||||
|
|
||||||
// give new client first available id
|
// give new client first available id
|
||||||
PlayerId pid = 1;
|
PlayerId pid = 1;
|
||||||
for (auto i = m_players.begin(); i != m_players.end(); ++i)
|
for (auto i = m_players.begin(); i != m_players.end(); ++i)
|
||||||
|
@ -320,7 +324,6 @@ unsigned int NetPlayServer::OnConnect(ENetPeer* socket)
|
||||||
rpac >> player.revision;
|
rpac >> player.revision;
|
||||||
rpac >> player.name;
|
rpac >> player.name;
|
||||||
|
|
||||||
enet_packet_destroy(epack);
|
|
||||||
// try to automatically assign new user a pad
|
// try to automatically assign new user a pad
|
||||||
for (PadMapping& mapping : m_pad_map)
|
for (PadMapping& mapping : m_pad_map)
|
||||||
{
|
{
|
||||||
|
@ -402,7 +405,7 @@ unsigned int NetPlayServer::OnConnect(ENetPeer* socket)
|
||||||
// add client to the player list
|
// add client to the player list
|
||||||
{
|
{
|
||||||
std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
|
std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
|
||||||
m_players.emplace(*(PlayerId*)player.socket->data, std::move(player));
|
m_players.emplace(*PeerPlayerId(player.socket), std::move(player));
|
||||||
UpdatePadMapping(); // sync pad mappings with everyone
|
UpdatePadMapping(); // sync pad mappings with everyone
|
||||||
UpdateWiimoteMapping();
|
UpdateWiimoteMapping();
|
||||||
}
|
}
|
||||||
|
|
|
@ -125,7 +125,7 @@ private:
|
||||||
void SendToClients(const sf::Packet& packet, PlayerId skip_pid = 0,
|
void SendToClients(const sf::Packet& packet, PlayerId skip_pid = 0,
|
||||||
u8 channel_id = DEFAULT_CHANNEL);
|
u8 channel_id = DEFAULT_CHANNEL);
|
||||||
void Send(ENetPeer* socket, const sf::Packet& packet, u8 channel_id = DEFAULT_CHANNEL);
|
void Send(ENetPeer* socket, const sf::Packet& packet, u8 channel_id = DEFAULT_CHANNEL);
|
||||||
unsigned int OnConnect(ENetPeer* socket);
|
unsigned int OnConnect(ENetPeer* socket, sf::Packet& rpac);
|
||||||
unsigned int OnDisconnect(const Client& player);
|
unsigned int OnDisconnect(const Client& player);
|
||||||
unsigned int OnData(sf::Packet& packet, Client& player);
|
unsigned int OnData(sf::Packet& packet, Client& player);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue