From 26b5e033ffde3d161382fc9addbfa99738379641 Mon Sep 17 00:00:00 2001 From: maximius Date: Sat, 17 Oct 2009 15:35:07 -0700 Subject: *Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand) *Fix a possible crash in Spell::DoAllEffectOnTarget --HG-- branch : trunk --- src/game/WorldSocket.cpp | 204 +---------------------------------------------- 1 file changed, 1 insertion(+), 203 deletions(-) (limited to 'src/game/WorldSocket.cpp') diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp index 1b63ec01421..16df744e8fa 100644 --- a/src/game/WorldSocket.cpp +++ b/src/game/WorldSocket.cpp @@ -17,7 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #include #include #include @@ -28,10 +27,8 @@ #include #include #include - #include "WorldSocket.h" #include "Common.h" - #include "Util.h" #include "World.h" #include "WorldPacket.h" @@ -45,13 +42,11 @@ #include "WorldSocketMgr.h" #include "Log.h" #include "WorldLog.h" - #if defined( __GNUC__ ) #pragma pack(1) #else #pragma pack(push,1) #endif - struct ServerPktHeader { /** @@ -67,38 +62,31 @@ struct ServerPktHeader } header[headerIndex++] = 0xFF &(size>>8); header[headerIndex++] = 0xFF &size; - header[headerIndex++] = 0xFF & cmd; header[headerIndex++] = 0xFF & (cmd>>8); } - uint8 getHeaderLength() { // cmd = 2 bytes, size= 2||3bytes return 2+(isLargePacket()?3:2); } - bool isLargePacket() { return size > 0x7FFF; } - const uint32 size; uint8 header[5]; }; - struct ClientPktHeader { uint16 size; uint32 cmd; }; - #if defined( __GNUC__ ) #pragma pack() #else #pragma pack(pop) #endif - WorldSocket::WorldSocket (void) : WorldHandler (), m_Session (0), @@ -114,60 +102,45 @@ m_LastPingTime (ACE_Time_Value::zero) { reference_counting_policy ().value (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); } - WorldSocket::~WorldSocket (void) { if (m_RecvWPct) delete m_RecvWPct; - if (m_OutBuffer) m_OutBuffer->release (); - closing_ = true; - peer ().close (); - WorldPacket* pct; while (m_PacketQueue.dequeue_head (pct) == 0) delete pct; } - bool WorldSocket::IsClosed (void) const { return closing_; } - void WorldSocket::CloseSocket (void) { { ACE_GUARD (LockType, Guard, m_OutBufferLock); - if (closing_) return; - closing_ = true; peer ().close_writer (); } - { ACE_GUARD (LockType, Guard, m_SessionLock); - m_Session = NULL; } } - const std::string& WorldSocket::GetRemoteAddress (void) const { return m_Address; } - int WorldSocket::SendPacket (const WorldPacket& pct) { ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, -1); - if (closing_) return -1; - // Dump outgoing packet. if (sWorldLog.LogWorld ()) { @@ -176,24 +149,19 @@ int WorldSocket::SendPacket (const WorldPacket& pct) pct.size (), LookupOpcodeName (pct.GetOpcode ()), pct.GetOpcode ()); - uint32 p = 0; while (p < pct.size ()) { for (uint32 j = 0; j < 16 && p < pct.size (); j++) sWorldLog.outLog ("%.2X ", const_cast(pct)[p++]); - sWorldLog.outLog ("\n"); } sWorldLog.outLog ("\n"); } - if (iSendPacket (pct) == -1) { WorldPacket* npct; - ACE_NEW_RETURN (npct, WorldPacket (pct), -1); - // NOTE maybe check of the size of the queue can be good ? // to make it bounded instead of unbounded if (m_PacketQueue.enqueue_tail (npct) == -1) @@ -203,86 +171,64 @@ int WorldSocket::SendPacket (const WorldPacket& pct) return -1; } } - return 0; } - long WorldSocket::AddReference (void) { return static_cast (add_reference ()); } - long WorldSocket::RemoveReference (void) { return static_cast (remove_reference ()); } - int WorldSocket::open (void *a) { ACE_UNUSED_ARG (a); - // Prevent double call to this func. if (m_OutBuffer) return -1; - // This will also prevent the socket from being Updated // while we are initializing it. m_OutActive = true; - // Hook for the manager. if (sWorldSocketMgr->OnSocketOpen (this) == -1) return -1; - // Allocate the buffer. ACE_NEW_RETURN (m_OutBuffer, ACE_Message_Block (m_OutBufferSize), -1); - // Store peer address. ACE_INET_Addr remote_addr; - if (peer ().get_remote_addr (remote_addr) == -1) { sLog.outError ("WorldSocket::open: peer ().get_remote_addr errno = %s", ACE_OS::strerror (errno)); return -1; } - m_Address = remote_addr.get_host_addr (); - // Send startup packet. WorldPacket packet (SMSG_AUTH_CHALLENGE, 4); packet << m_Seed; - if (SendPacket (packet) == -1) return -1; - // Register with ACE Reactor if (reactor ()->register_handler(this, ACE_Event_Handler::READ_MASK | ACE_Event_Handler::WRITE_MASK) == -1) { sLog.outError ("WorldSocket::open: unable to register client handler errno = %s", ACE_OS::strerror (errno)); return -1; } - // reactor takes care of the socket from now on remove_reference (); - return 0; } - int WorldSocket::close (int) { shutdown (); - closing_ = true; - remove_reference (); - return 0; } - int WorldSocket::handle_input (ACE_HANDLE) { if (closing_) return -1; - switch (handle_input_missing_data ()) { case -1 : @@ -292,16 +238,13 @@ int WorldSocket::handle_input (ACE_HANDLE) { return Update (); // interesting line ,isn't it ? } - DEBUG_LOG ("WorldSocket::handle_input: Peer error closing connection errno = %s", ACE_OS::strerror (errno)); - errno = ECONNRESET; return -1; } case 0: { DEBUG_LOG ("WorldSocket::handle_input: Peer has closed connection"); - errno = ECONNRESET; return -1; } @@ -310,118 +253,87 @@ int WorldSocket::handle_input (ACE_HANDLE) default: return Update (); // another interesting line ;) } - ACE_NOTREACHED(return -1); } - int WorldSocket::handle_output (ACE_HANDLE) { ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, -1); - if (closing_) return -1; - const size_t send_len = m_OutBuffer->length (); - if (send_len == 0) return cancel_wakeup_output (Guard); - #ifdef MSG_NOSIGNAL ssize_t n = peer ().send (m_OutBuffer->rd_ptr (), send_len, MSG_NOSIGNAL); #else ssize_t n = peer ().send (m_OutBuffer->rd_ptr (), send_len); #endif // MSG_NOSIGNAL - if (n == 0) return -1; else if (n == -1) { if (errno == EWOULDBLOCK || errno == EAGAIN) return schedule_wakeup_output (Guard); - return -1; } else if (n < send_len) //now n > 0 { m_OutBuffer->rd_ptr (static_cast (n)); - // move the data to the base of the buffer m_OutBuffer->crunch (); - return schedule_wakeup_output (Guard); } else //now n == send_len { m_OutBuffer->reset (); - if (!iFlushPacketQueue ()) return cancel_wakeup_output (Guard); else return schedule_wakeup_output (Guard); } - ACE_NOTREACHED (return 0); } - int WorldSocket::handle_close (ACE_HANDLE h, ACE_Reactor_Mask) { // Critical section { ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, -1); - closing_ = true; - if (h == ACE_INVALID_HANDLE) peer ().close_writer (); } - // Critical section { ACE_GUARD_RETURN (LockType, Guard, m_SessionLock, -1); - m_Session = NULL; } - return 0; } - int WorldSocket::Update (void) { if (closing_) return -1; - if (m_OutActive || m_OutBuffer->length () == 0) return 0; - return handle_output (get_handle ()); } - int WorldSocket::handle_input_header (void) { ACE_ASSERT (m_RecvWPct == NULL); - ACE_ASSERT (m_Header.length () == sizeof (ClientPktHeader)); - m_Crypt.DecryptRecv ((uint8*) m_Header.rd_ptr (), sizeof (ClientPktHeader)); - ClientPktHeader& header = *((ClientPktHeader*) m_Header.rd_ptr ()); - EndianConvertReverse(header.size); EndianConvert(header.cmd); - if ((header.size < 4) || (header.size > 10240) || (header.cmd > 10240)) { sLog.outError ("WorldSocket::handle_input_header: client sent malformed packet size = %d , cmd = %d", header.size, header.cmd); - errno = EINVAL; return -1; } - header.size -= 4; - ACE_NEW_RETURN (m_RecvWPct, WorldPacket ((uint16) header.cmd, header.size), -1); - if(header.size > 0) { m_RecvWPct->resize (header.size); @@ -431,37 +343,27 @@ int WorldSocket::handle_input_header (void) { ACE_ASSERT(m_RecvPct.space() == 0); } - return 0; } - int WorldSocket::handle_input_payload (void) { // set errno properly here on error !!! // now have a header and payload - ACE_ASSERT (m_RecvPct.space () == 0); ACE_ASSERT (m_Header.space () == 0); ACE_ASSERT (m_RecvWPct != NULL); - const int ret = ProcessIncoming (m_RecvWPct); - m_RecvPct.base (NULL, 0); m_RecvPct.reset (); m_RecvWPct = NULL; - m_Header.reset (); - if (ret == -1) errno = EINVAL; - return ret; } - int WorldSocket::handle_input_missing_data (void) { char buf [4096]; - ACE_Data_Block db ( sizeof (buf), ACE_Message_Block::MB_DATA, buf, @@ -469,21 +371,15 @@ int WorldSocket::handle_input_missing_data (void) 0, ACE_Message_Block::DONT_DELETE, 0); - ACE_Message_Block message_block(&db, ACE_Message_Block::DONT_DELETE, 0); - const size_t recv_size = message_block.space (); - const ssize_t n = peer ().recv (message_block.wr_ptr (), recv_size); - if (n <= 0) return n; - message_block.wr_ptr (n); - while (message_block.length () > 0) { if (m_Header.space () > 0) @@ -492,7 +388,6 @@ int WorldSocket::handle_input_missing_data (void) const size_t to_header = (message_block.length () > m_Header.space () ? m_Header.space () : message_block.length ()); m_Header.copy (message_block.rd_ptr (), to_header); message_block.rd_ptr (to_header); - if (m_Header.space () > 0) { // Couldn't receive the whole header this time. @@ -500,7 +395,6 @@ int WorldSocket::handle_input_missing_data (void) errno = EWOULDBLOCK; return -1; } - // We just received nice new header if (handle_input_header () == -1) { @@ -508,7 +402,6 @@ int WorldSocket::handle_input_missing_data (void) return -1; } } - // Its possible on some error situations that this happens // for example on closing when epoll receives more chunked data and stuff // hope this is not hack ,as proper m_RecvWPct is asserted around @@ -518,7 +411,6 @@ int WorldSocket::handle_input_missing_data (void) errno = EINVAL; return -1; } - // We have full read header, now check the data payload if (m_RecvPct.space () > 0) { @@ -526,7 +418,6 @@ int WorldSocket::handle_input_missing_data (void) const size_t to_data = (message_block.length () > m_RecvPct.space () ? m_RecvPct.space () : message_block.length ()); m_RecvPct.copy (message_block.rd_ptr (), to_data); message_block.rd_ptr (to_data); - if (m_RecvPct.space () > 0) { // Couldn't receive the whole data this time. @@ -535,7 +426,6 @@ int WorldSocket::handle_input_missing_data (void) return -1; } } - //just received fresh new payload if (handle_input_payload () == -1) { @@ -543,19 +433,14 @@ int WorldSocket::handle_input_missing_data (void) return -1; } } - return n == recv_size ? 1 : 2; } - int WorldSocket::cancel_wakeup_output (GuardType& g) { if (!m_OutActive) return 0; - m_OutActive = false; - g.release (); - if (reactor ()->cancel_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1) { @@ -563,41 +448,30 @@ int WorldSocket::cancel_wakeup_output (GuardType& g) sLog.outError ("WorldSocket::cancel_wakeup_output"); return -1; } - return 0; } - int WorldSocket::schedule_wakeup_output (GuardType& g) { if (m_OutActive) return 0; - m_OutActive = true; - g.release (); - if (reactor ()->schedule_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1) { sLog.outError ("WorldSocket::schedule_wakeup_output"); return -1; } - return 0; } - int WorldSocket::ProcessIncoming (WorldPacket* new_pct) { ACE_ASSERT (new_pct); - // manage memory ;) ACE_Auto_Ptr aptr (new_pct); - const ACE_UINT16 opcode = new_pct->GetOpcode (); - if (closing_) return -1; - // Dump received packet. if (sWorldLog.LogWorld ()) { @@ -606,18 +480,15 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) new_pct->size (), LookupOpcodeName (new_pct->GetOpcode ()), new_pct->GetOpcode ()); - uint32 p = 0; while (p < new_pct->size ()) { for (uint32 j = 0; j < 16 && p < new_pct->size (); j++) sWorldLog.outLog ("%.2X ", (*new_pct)[p++]); - sWorldLog.outLog ("\n"); } sWorldLog.outLog ("\n"); } - try { switch(opcode) { @@ -629,16 +500,13 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) sLog.outError ("WorldSocket::ProcessIncoming: Player send CMSG_AUTH_SESSION again"); return -1; } - return HandleAuthSession (*new_pct); case CMSG_KEEP_ALIVE: DEBUG_LOG ("CMSG_KEEP_ALIVE ,size: %d", new_pct->size ()); - return 0; default: { ACE_GUARD_RETURN (LockType, Guard, m_SessionLock, -1); - if (m_Session != NULL) { // OK ,give the packet to WorldSession @@ -665,13 +533,10 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct) sLog.outDebug("Dumping error causing packet:"); new_pct->hexlike(); } - return -1; } - ACE_NOTREACHED (return 0); } - int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) { // NOTE: ATM the socket is singlethread, have this in mind ... @@ -686,19 +551,15 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) Sha1Hash sha1; BigNumber v, s, g, N; WorldPacket packet, SendAddonPacked; - BigNumber K; - if(sWorld.IsClosed()) { packet.Initialize(SMSG_AUTH_RESPONSE, 1); packet << uint8(AUTH_REJECT); SendPacket (packet); - sLog.outError ("WorldSocket::HandleAuthSession: World closed, denying client (%s).", m_Session->GetRemoteAddress().c_str()); return -1; } - // Read the content of the packet recvPacket >> BuiltNumberClient; // for now no use recvPacket >> unk2; @@ -706,19 +567,16 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) recvPacket >> unk3; recvPacket >> clientSeed; recvPacket.read (digest, 20); - DEBUG_LOG ("WorldSocket::HandleAuthSession: client %u, unk2 %u, account %s, unk3 %u, clientseed %u", BuiltNumberClient, unk2, account.c_str (), unk3, clientSeed); - // Get the account information from the realmd database std::string safe_account = account; // Duplicate, else will screw the SHA hash verification below loginDatabase.escape_string (safe_account); // No SQL injection, username escaped. - QueryResult *result = loginDatabase.PQuery ("SELECT " "id, " //0 @@ -734,43 +592,32 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) "FROM account " "WHERE username = '%s'", safe_account.c_str ()); - // Stop if the account is not found if (!result) { packet.Initialize (SMSG_AUTH_RESPONSE, 1); packet << uint8 (AUTH_UNKNOWN_ACCOUNT); - SendPacket (packet); - sLog.outError ("WorldSocket::HandleAuthSession: Sent Auth Response (unknown account)."); return -1; } - Field* fields = result->Fetch (); - uint8 expansion = fields[7].GetUInt8(); uint32 world_expansion = sWorld.getConfig(CONFIG_EXPANSION); if(expansion > world_expansion) expansion = world_expansion; //expansion = ((sWorld.getConfig(CONFIG_EXPANSION) > fields[7].GetUInt8()) ? fields[7].GetUInt8() : sWorld.getConfig(CONFIG_EXPANSION)); - N.SetHexStr ("894B645E89E1535BBDAD5B8B290650530801B18EBFBF5E8FAB3C82872A3E9BB7"); g.SetDword (7); - v.SetHexStr(fields[5].GetString()); s.SetHexStr (fields[6].GetString ()); - const char* sStr = s.AsHexStr (); //Must be freed by OPENSSL_free() const char* vStr = v.AsHexStr (); //Must be freed by OPENSSL_free() - DEBUG_LOG ("WorldSocket::HandleAuthSession: (s,v) check s: %s v: %s", sStr, vStr); - OPENSSL_free ((void*) sStr); OPENSSL_free ((void*) vStr); - ///- Re-check ip locking (same check as in realmd). if (fields[4].GetUInt8 () == 1) // if ip is locked { @@ -779,49 +626,38 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) packet.Initialize (SMSG_AUTH_RESPONSE, 1); packet << uint8 (AUTH_FAILED); SendPacket (packet); - delete result; sLog.outBasic ("WorldSocket::HandleAuthSession: Sent Auth Response (Account IP differs)."); return -1; } } - id = fields[0].GetUInt32 (); security = fields[1].GetUInt16 (); /* if(security > SEC_ADMINISTRATOR) // prevent invalid security settings in DB security = SEC_ADMINISTRATOR; */ - K.SetHexStr (fields[2].GetString ()); - time_t mutetime = time_t (fields[8].GetUInt64 ()); - locale = LocaleConstant (fields[9].GetUInt8 ()); if (locale >= MAX_LOCALE) locale = LOCALE_enUS; - delete result; - // Re-check account ban (same check as in realmd) QueryResult *banresult = loginDatabase.PQuery ("SELECT 1 FROM account_banned WHERE id = %u AND active = 1 " "UNION " "SELECT 1 FROM ip_banned WHERE ip = '%s'", id, GetRemoteAddress().c_str()); - if (banresult) // if account banned { packet.Initialize (SMSG_AUTH_RESPONSE, 1); packet << uint8 (AUTH_BANNED); SendPacket (packet); - delete banresult; - sLog.outError ("WorldSocket::HandleAuthSession: Sent Auth Response (Account banned)."); return -1; } - // Check locked state for server sWorld.UpdateAllowedSecurity(); AccountTypes allowedAccountType = sWorld.GetPlayerSecurityLimit (); @@ -830,79 +666,58 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) { WorldPacket Packet (SMSG_AUTH_RESPONSE, 1); Packet << uint8 (AUTH_UNAVAILABLE); - SendPacket (packet); - sLog.outDetail ("WorldSocket::HandleAuthSession: User tries to login but his security level is not enough"); return -1; } - // Check that Key and account name are the same on client and server Sha1Hash sha; - uint32 t = 0; uint32 seed = m_Seed; - sha.UpdateData (account); sha.UpdateData ((uint8 *) & t, 4); sha.UpdateData ((uint8 *) & clientSeed, 4); sha.UpdateData ((uint8 *) & seed, 4); sha.UpdateBigNumbers (&K, NULL); sha.Finalize (); - if (memcmp (sha.GetDigest (), digest, 20)) { packet.Initialize (SMSG_AUTH_RESPONSE, 1); packet << uint8 (AUTH_FAILED); - SendPacket (packet); - sLog.outError ("WorldSocket::HandleAuthSession: Sent Auth Response (authentification failed)."); return -1; } - std::string address = GetRemoteAddress (); - DEBUG_LOG ("WorldSocket::HandleAuthSession: Client '%s' authenticated successfully from %s.", account.c_str (), address.c_str ()); - // Update the last_ip in the database // No SQL injection, username escaped. loginDatabase.escape_string (address); - loginDatabase.PExecute ("UPDATE account " "SET last_ip = '%s' " "WHERE username = '%s'", address.c_str (), safe_account.c_str ()); - // NOTE ATM the socket is single-threaded, have this in mind ... ACE_NEW_RETURN (m_Session, WorldSession (id, this, AccountTypes(security), expansion, mutetime, locale), -1); - m_Crypt.Init(&K); - m_Session->LoadGlobalAccountData(); m_Session->LoadTutorialsData(); m_Session->ReadAddonsInfo(recvPacket); - // In case needed sometime the second arg is in microseconds 1 000 000 = 1 sec ACE_OS::sleep (ACE_Time_Value (0, 10000)); - sWorld.AddSession (m_Session); - return 0; } - int WorldSocket::HandlePing (WorldPacket& recvPacket) { uint32 ping; uint32 latency; - // Get the ping packet content recvPacket >> ping; recvPacket >> latency; - if (m_LastPingTime == ACE_Time_Value::zero) m_LastPingTime = ACE_OS::gettimeofday (); // for 1st ping else @@ -911,23 +726,18 @@ int WorldSocket::HandlePing (WorldPacket& recvPacket) ACE_Time_Value diff_time (cur_time); diff_time -= m_LastPingTime; m_LastPingTime = cur_time; - if (diff_time < ACE_Time_Value (27)) { ++m_OverSpeedPings; - uint32 max_count = sWorld.getConfig (CONFIG_MAX_OVERSPEED_PINGS); - if (max_count && m_OverSpeedPings > max_count) { ACE_GUARD_RETURN (LockType, Guard, m_SessionLock, -1); - if (m_Session && m_Session->GetSecurity () == SEC_PLAYER) { sLog.outError ("WorldSocket::HandlePing: Player kicked for " "over-speed pings address = %s", GetRemoteAddress ().c_str ()); - return -1; } } @@ -935,11 +745,9 @@ int WorldSocket::HandlePing (WorldPacket& recvPacket) else m_OverSpeedPings = 0; } - // critical section { ACE_GUARD_RETURN (LockType, Guard, m_SessionLock, -1); - if (m_Session) m_Session->SetLatency (latency); else @@ -951,12 +759,10 @@ int WorldSocket::HandlePing (WorldPacket& recvPacket) return -1; } } - WorldPacket packet (SMSG_PONG, 4); packet << ping; return SendPacket (packet); } - int WorldSocket::iSendPacket (const WorldPacket& pct) { ServerPktHeader header(pct.size()+2, pct.GetOpcode()); @@ -965,25 +771,19 @@ int WorldSocket::iSendPacket (const WorldPacket& pct) errno = ENOBUFS; return -1; } - - + m_Crypt.EncryptSend ( header.header, header.getHeaderLength()); - if (m_OutBuffer->copy ((char*) header.header, header.getHeaderLength()) == -1) ACE_ASSERT (false); - if (!pct.empty ()) if (m_OutBuffer->copy ((char*) pct.contents (), pct.size ()) == -1) ACE_ASSERT (false); - return 0; } - bool WorldSocket::iFlushPacketQueue () { WorldPacket *pct; bool haveone = false; - while (m_PacketQueue.dequeue_head (pct) == 0) { if (iSendPacket (*pct) == -1) @@ -994,7 +794,6 @@ bool WorldSocket::iFlushPacketQueue () sLog.outError ("WorldSocket::iFlushPacketQueue m_PacketQueue->enqueue_head"); return false; } - break; } else @@ -1003,7 +802,6 @@ bool WorldSocket::iFlushPacketQueue () delete pct; } } - return haveone; } -- cgit v1.2.3