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

Support report bad avatar function on server side.

Browse Source
This commit is contained in:
lotodore
2010-12-24 16:46:49 +00:00
parent 710affb1e5
commit 36445a00e7
8 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/servergamestate.cpp
+24
View File
@@ -307,6 +307,30 @@ AbstractServerGameStateReceiving::ProcessPacket(boost::shared_ptr<ServerGame> se
else if (packet->GetMsg()->present == PokerTHMessage_PR_reportAvatarMessage)
{
ReportAvatarMessage_t *netReport = &packet->GetMsg()->choice.reportAvatarMessage;
boost::shared_ptr<PlayerData> tmpPlayer = server->GetPlayerDataByUniqueId(netReport->reportedPlayerId);
MD5Buf tmpMD5;
memcpy(tmpMD5.GetData(), netReport->reportedAvatar.buf, MD5_DATA_SIZE);
if (tmpPlayer && tmpPlayer->GetDBId() && tmpPlayer->GetAvatarMD5() == tmpMD5)
{
DB_id myDBid = session.playerData->GetDBId();
// Do not use the "game" database object, but the global one.
server->GetLobbyThread().GetDatabase()->AsyncReportAvatar(
session.playerData->GetUniqueId(),
tmpPlayer->GetUniqueId(),
tmpPlayer->GetDBId(),
tmpPlayer->GetAvatarMD5().ToString(),
myDBid != 0 ? &myDBid : NULL
);
}
else
{
boost::shared_ptr<NetPacket> packet(new NetPacket(NetPacket::Alloc));
packet->GetMsg()->present = PokerTHMessage_PR_reportAvatarAckMessage;
ReportAvatarAckMessage_t *netReportAck = &packet->GetMsg()->choice.reportAvatarAckMessage;
netReportAck->reportedPlayerId = netReport->reportedPlayerId;
netReportAck->reportResult = reportResult_avatarReportInvalid;
server->GetLobbyThread().GetSender().Send(session.sessionData, packet);
}
}
else
{
src/net/common/serverlobbythread.cpp
+28 -1
View File
@@ -157,6 +157,16 @@ public:
LOG_ERROR("DB create game failed for request " << requestId);
}
virtual void ReportAvatarSuccess(unsigned requestId, unsigned replyId)
{
m_server.SendReportAvatarResult(requestId, replyId, true);
}
virtual void ReportAvatarFailed(unsigned requestId, unsigned replyId)
{
m_server.SendReportAvatarResult(requestId, replyId, false);
}
private:
ServerLobbyThread &m_server;
};
@@ -1623,6 +1633,23 @@ ServerLobbyThread::UserInvalid(unsigned playerId)
SessionError(m_sessionManager.GetSessionByUniquePlayerId(playerId, true), ERR_NET_INVALID_PASSWORD);
}
void
ServerLobbyThread::SendReportAvatarResult(unsigned byPlayerId, unsigned reportedPlayerId, bool success)
{
SessionWrapper session = m_sessionManager.GetSessionByUniquePlayerId(byPlayerId);
if (!session.sessionData)
session = m_gameSessionManager.GetSessionByUniquePlayerId(byPlayerId);
if (session.sessionData)
{
boost::shared_ptr<NetPacket> packet(new NetPacket(NetPacket::Alloc));
packet->GetMsg()->present = PokerTHMessage_PR_reportAvatarAckMessage;
ReportAvatarAckMessage_t *netReportAck = &packet->GetMsg()->choice.reportAvatarAckMessage;
netReportAck->reportedPlayerId = reportedPlayerId;
netReportAck->reportResult = success ? reportResult_avatarReportAccepted : reportResult_avatarReportInvalid;
GetSender().Send(session.sessionData, packet);
}
}
void
ServerLobbyThread::UserBlocked(unsigned playerId)
{
@@ -1632,7 +1659,7 @@ ServerLobbyThread::UserBlocked(unsigned playerId)
void
ServerLobbyThread::RequestPlayerAvatar(SessionWrapper session)
{
if (!session.playerData.get())
if (!session.playerData)
throw ServerException(__FILE__, __LINE__, ERR_NET_INVALID_SESSION, 0);
// Ask the client to send its avatar.
boost::shared_ptr<NetPacket> packet(new NetPacket(NetPacket::Alloc));
src/net/serverlobbythread.h
+1
View File
@@ -149,6 +149,7 @@ protected:
void UserValid(unsigned playerId, const DBPlayerData &dbPlayerData);
void UserInvalid(unsigned playerId);
void UserBlocked(unsigned playerId);
void SendReportAvatarResult(unsigned byPlayerId, unsigned reportedPlayerId, bool success);
void RequestPlayerAvatar(SessionWrapper session);
void TimerRemoveGame(const boost::system::error_code &ec);
void TimerRemovePlayer(const boost::system::error_code &ec);