sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing compiler errors. Might still be broken, though.

Browse Source
This commit is contained in:
lotodore
2009-11-07 23:27:08 +00:00
parent e950d0cb15
commit f1c213b707
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+16 -12
View File
@@ -1053,7 +1053,22 @@ ClientStateWaitAuthChallenge::Exit(boost::shared_ptr<ClientThread> /*client*/)
void
ClientStateWaitAuthChallenge::InternalHandlePacket(boost::shared_ptr<ClientThread> client, boost::shared_ptr<NetPacket> tmpPacket)
{
if (tmpPacket->GetMsg()->present == PokerTHMessage_PR_authMessage)
if (tmpPacket->GetMsg()->present == PokerTHMessage_PR_announceMessage)
{
// Server has send announcement - check data.
AnnounceMessage_t *netAnnounce = &tmpPacket->GetMsg()->choice.announceMessage;
// Check current game version.
if (netAnnounce->latestGameVersion.major != POKERTH_VERSION_MAJOR
|| netAnnounce->latestGameVersion.minor != POKERTH_VERSION_MINOR)
{
client->GetCallback().SignalNetClientNotification(NTF_NET_NEW_RELEASE_AVAILABLE);
}
else if (POKERTH_BETA_REVISION && netAnnounce->latestBetaRevision != POKERTH_BETA_REVISION)
{
client->GetCallback().SignalNetClientNotification(NTF_NET_OUTDATED_BETA);
}
}
else if (tmpPacket->GetMsg()->present == PokerTHMessage_PR_authMessage)
{
// Check subtype.
AuthMessage_t *netAuth = &tmpPacket->GetMsg()->choice.authMessage;
@@ -1167,17 +1182,6 @@ ClientStateWaitSession::InternalHandlePacket(boost::shared_ptr<ClientThread> cli
{
// Everything is fine - we are in the lobby.
InitAckMessage_t *netInitAck = &tmpPacket->GetMsg()->choice.initAckMessage;
// Check current game version.
if (netInitAck->latestGameVersion.major != POKERTH_VERSION_MAJOR
|| netInitAck->latestGameVersion.minor != POKERTH_VERSION_MINOR)
{
client->GetCallback().SignalNetClientNotification(NTF_NET_NEW_RELEASE_AVAILABLE);
}
else if (POKERTH_BETA_REVISION && netInitAck->latestBetaRevision != POKERTH_BETA_REVISION)
{
client->GetCallback().SignalNetClientNotification(NTF_NET_OUTDATED_BETA);
}
client->SetGuiPlayerId(netInitAck->yourPlayerId);
client->SetSessionEstablished(true);
src/net/common/serverlobbythread.cpp
+13 -3
View File
@@ -216,6 +216,19 @@ ServerLobbyThread::AddConnection(boost::shared_ptr<tcp::socket> sock)
{
sessionData->SetClientAddr(ipAddress);
hasClientIp = true;
boost::shared_ptr<NetPacket> packet(new NetPacket(NetPacket::Alloc));
packet->GetMsg()->present = PokerTHMessage_PR_announceMessage;
AnnounceMessage_t *netAnnounce = &packet->GetMsg()->choice.announceMessage;
netAnnounce->protocolVersion.major = NET_VERSION_MAJOR;
netAnnounce->protocolVersion.minor = NET_VERSION_MINOR;
netAnnounce->latestGameVersion.major = POKERTH_VERSION_MAJOR;
netAnnounce->latestGameVersion.minor = POKERTH_VERSION_MINOR;
netAnnounce->latestBetaRevision = POKERTH_BETA_REVISION;
// TODO
netAnnounce->serverType = serverType_serverTypeLAN;
GetSender().Send(sessionData, packet);
sock->async_read_some(
boost::asio::buffer(sessionData->GetReceiveBuffer().recvBuf, RECV_BUF_SIZE),
boost::bind(
@@ -1327,9 +1340,6 @@ ServerLobbyThread::EstablishSession(SessionWrapper session)
boost::shared_ptr<NetPacket> ack(new NetPacket(NetPacket::Alloc));
ack->GetMsg()->present = PokerTHMessage_PR_initAckMessage;
InitAckMessage_t *netInitAck = &ack->GetMsg()->choice.initAckMessage;
netInitAck->latestGameVersion.major = POKERTH_VERSION_MAJOR;
netInitAck->latestGameVersion.minor = POKERTH_VERSION_MINOR;
netInitAck->latestBetaRevision = POKERTH_BETA_REVISION;
// initAckData.sessionId = session.sessionData->GetId(); // TODO: currently unused.
netInitAck->yourPlayerId = session.playerData->GetUniqueId();
GetSender().Send(session.sessionData, ack);