aboutsummaryrefslogtreecommitdiff
path: root/src/game/ChannelHandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/ChannelHandler.cpp')
-rw-r--r--src/game/ChannelHandler.cpp68
1 files changed, 0 insertions, 68 deletions
diff --git a/src/game/ChannelHandler.cpp b/src/game/ChannelHandler.cpp
index e3c10afe81f..abf73e0e274 100644
--- a/src/game/ChannelHandler.cpp
+++ b/src/game/ChannelHandler.cpp
@@ -27,8 +27,6 @@
void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
- //recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 4+1+1+1);
uint32 channel_id;
uint8 unknown1, unknown2;
@@ -40,9 +38,6 @@ void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
if(channelname.empty())
return;
- // recheck
- CHECK_PACKET_SIZE(recvPacket, 4+1+1+(channelname.size()+1)+1);
-
recvPacket >> pass;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
{
@@ -56,7 +51,6 @@ void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 4+1);
uint32 unk;
std::string channelname;
@@ -78,8 +72,6 @@ void WorldSession::HandleChannelList(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1);
-
std::string channelname;
recvPacket >> channelname;
@@ -92,14 +84,9 @@ void WorldSession::HandleChannelPassword(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1+1);
-
std::string channelname, pass;
recvPacket >> channelname;
- // recheck
- CHECK_PACKET_SIZE(recvPacket, (channelname.size()+1)+1);
-
recvPacket >> pass;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
@@ -111,14 +98,9 @@ void WorldSession::HandleChannelSetOwner(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1+1);
-
std::string channelname, newp;
recvPacket >> channelname;
- // recheck
- CHECK_PACKET_SIZE(recvPacket, (channelname.size()+1)+1);
-
recvPacket >> newp;
if(!normalizePlayerName(newp))
@@ -133,8 +115,6 @@ void WorldSession::HandleChannelOwner(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1);
-
std::string channelname;
recvPacket >> channelname;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
@@ -146,14 +126,9 @@ void WorldSession::HandleChannelModerator(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1+1);
-
std::string channelname, otp;
recvPacket >> channelname;
- // recheck
- CHECK_PACKET_SIZE(recvPacket, (channelname.size()+1)+1);
-
recvPacket >> otp;
if(!normalizePlayerName(otp))
@@ -168,14 +143,9 @@ void WorldSession::HandleChannelUnmoderator(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1+1);
-
std::string channelname, otp;
recvPacket >> channelname;
- // recheck
- CHECK_PACKET_SIZE(recvPacket, (channelname.size()+1)+1);
-
recvPacket >> otp;
if(!normalizePlayerName(otp))
@@ -190,14 +160,9 @@ void WorldSession::HandleChannelMute(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1+1);
-
std::string channelname, otp;
recvPacket >> channelname;
- // recheck
- CHECK_PACKET_SIZE(recvPacket, (channelname.size()+1)+1);
-
recvPacket >> otp;
if(!normalizePlayerName(otp))
@@ -212,14 +177,10 @@ void WorldSession::HandleChannelUnmute(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1+1);
std::string channelname, otp;
recvPacket >> channelname;
- // recheck
- CHECK_PACKET_SIZE(recvPacket, (channelname.size()+1)+1);
-
recvPacket >> otp;
if(!normalizePlayerName(otp))
@@ -234,14 +195,9 @@ void WorldSession::HandleChannelInvite(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1+1);
-
std::string channelname, otp;
recvPacket >> channelname;
- // recheck
- CHECK_PACKET_SIZE(recvPacket, (channelname.size()+1)+1);
-
recvPacket >> otp;
if(!normalizePlayerName(otp))
@@ -256,14 +212,9 @@ void WorldSession::HandleChannelKick(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1+1);
-
std::string channelname, otp;
recvPacket >> channelname;
- // recheck
- CHECK_PACKET_SIZE(recvPacket, (channelname.size()+1)+1);
-
recvPacket >> otp;
if(!normalizePlayerName(otp))
return;
@@ -277,14 +228,9 @@ void WorldSession::HandleChannelBan(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1+1);
-
std::string channelname, otp;
recvPacket >> channelname;
- // recheck
- CHECK_PACKET_SIZE(recvPacket, (channelname.size()+1)+1);
-
recvPacket >> otp;
if(!normalizePlayerName(otp))
@@ -299,14 +245,10 @@ void WorldSession::HandleChannelUnban(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1+1);
std::string channelname, otp;
recvPacket >> channelname;
- // recheck
- CHECK_PACKET_SIZE(recvPacket, (channelname.size()+1)+1);
-
recvPacket >> otp;
if(!normalizePlayerName(otp))
@@ -321,8 +263,6 @@ void WorldSession::HandleChannelAnnouncements(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1);
-
std::string channelname;
recvPacket >> channelname;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
@@ -334,8 +274,6 @@ void WorldSession::HandleChannelModerate(WorldPacket& recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1);
-
std::string channelname;
recvPacket >> channelname;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
@@ -347,8 +285,6 @@ void WorldSession::HandleChannelDisplayListQuery(WorldPacket &recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1);
-
std::string channelname;
recvPacket >> channelname;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
@@ -360,8 +296,6 @@ void WorldSession::HandleGetChannelMemberCount(WorldPacket &recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1);
-
std::string channelname;
recvPacket >> channelname;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
@@ -381,8 +315,6 @@ void WorldSession::HandleSetChannelWatch(WorldPacket &recvPacket)
{
sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
//recvPacket.hexlike();
- CHECK_PACKET_SIZE(recvPacket, 1);
-
std::string channelname;
recvPacket >> channelname;
/*if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))