Index: /trunk/src/game/WorldSocket.cpp =================================================================== --- /trunk/src/game/WorldSocket.cpp (revision 6) +++ /trunk/src/game/WorldSocket.cpp (revision 16) @@ -19,4 +19,5 @@ #include "Common.h" #include "WorldSocket.h" + #include #include @@ -68,7 +69,4 @@ #endif -// used when testing to alow login without password and encryption -// #define _NETCODE_FAKE_AUTH - WorldSocket::WorldSocket (void) : WorldHandler (), @@ -159,5 +157,5 @@ { for (uint32 j = 0; j < 16 && p < pct.size (); j++) - sWorldLog.Log ("%.2X ", const_cast(pct)[p++]); + sWorldLog.Log ("%.2X ", const_cast (pct)[p++]); sWorldLog.Log ("\n"); @@ -312,6 +310,6 @@ if (send_len == 0) return this->cancel_wakeup_output (Guard); - -// TODO SO_NOSIGPIPE on platforms that support it + + // TODO SO_NOSIGPIPE on platforms that support it #ifdef MSG_NOSIGNAL ssize_t n = this->peer ().send (m_OutBuffer->rd_ptr (), send_len, MSG_NOSIGNAL); @@ -319,5 +317,5 @@ ssize_t n = this->peer ().send (m_OutBuffer->rd_ptr (), send_len); #endif // MSG_NOSIGNAL - + if (n == 0) return -1; @@ -426,13 +424,13 @@ ACE_NEW_RETURN (m_RecvWPct, WorldPacket ((uint16) header.cmd, header.size), -1); - if(header.size > 0) - { - m_RecvWPct->resize (header.size); - m_RecvPct.base ((char*) m_RecvWPct->contents (), m_RecvWPct->size ()); - } + if (header.size > 0) + { + m_RecvWPct->resize (header.size); + m_RecvPct.base ((char*) m_RecvWPct->contents (), m_RecvWPct->size ()); + } else - { - ACE_ASSERT(m_RecvPct.space() == 0); - } + { + ACE_ASSERT (m_RecvPct.space () == 0); + } @@ -599,5 +597,5 @@ { ACE_ASSERT (new_pct); - + // manage memory ;) ACE_Auto_Ptr aptr (new_pct); @@ -713,14 +711,4 @@ account.c_str (), clientSeed); - -#if defined _NETCODE_FAKE_AUTH - bool dontchechtheacc = false; - uint8 digest_fake[sizeof (digest)]; - memset ((void*) digest_fake, '\0', sizeof (digest_fake)); - if (memcmp ((void*) digest, (void*) digest_fake, sizeof (digest_fake)) == 0) - { - dontchechtheacc = true; - } -#endif //_NETCODE_FAKE_AUTH // Get the account information from the realmd database @@ -786,5 +774,6 @@ const char* vold = fields[6].GetString (); - DEBUG_LOG ("WorldSocket::HandleAuthSession: (s,v) check s: %s v_old: %s v_new: %s", + DEBUG_LOG ("WorldSocket::HandleAuthSession: " + "(s,v) check s: %s v_old: %s v_new: %s", sStr, vold, @@ -798,23 +787,16 @@ safe_account.c_str ()); -#if defined _NETCODE_FAKE_AUTH - if (!dontchechtheacc) - { -#endif - if (!vold || strcmp (vStr, vold)) - { - packet.Initialize (SMSG_AUTH_RESPONSE, 1); - packet << uint8 (AUTH_UNKNOWN_ACCOUNT); - SendPacket (packet); - delete result; - OPENSSL_free ((void*) sStr); - OPENSSL_free ((void*) vStr); - - sLog.outError ("WorldSocket::HandleAuthSession: User not logged."); - return -1; - } -#if defined _NETCODE_FAKE_AUTH - } -#endif + if (!vold || strcmp (vStr, vold)) + { + packet.Initialize (SMSG_AUTH_RESPONSE, 1); + packet << uint8 (AUTH_UNKNOWN_ACCOUNT); + SendPacket (packet); + delete result; + OPENSSL_free ((void*) sStr); + OPENSSL_free ((void*) vStr); + + sLog.outBasic ("WorldSocket::HandleAuthSession: User not logged."); + return -1; + } OPENSSL_free ((void*) sStr); @@ -831,5 +813,5 @@ delete result; - sLog.outError ("WorldSocket::HandleAuthSession: Sent Auth Response (Account IP differs)."); + sLog.outBasic ("WorldSocket::HandleAuthSession: Sent Auth Response (Account IP differs)."); return -1; } @@ -848,70 +830,63 @@ delete result; -#if defined _NETCODE_FAKE_AUTH - if (!dontchechtheacc) - { -#endif - // Re-check account ban (same check as in realmd) - QueryResult *banresult = - loginDatabase.PQuery ("SELECT " - "bandate, " - "unbandate " - "FROM account_banned " - "WHERE id = '%u' " - "AND active = 1", - id); - - 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 - AccountTypes allowedAccountType = sWorld.GetPlayerSecurityLimit (); - - if (allowedAccountType > SEC_PLAYER && security < allowedAccountType) - { - WorldPacket Packet (SMSG_AUTH_RESPONSE, 1); - Packet << uint8 (AUTH_UNAVAILABLE); - - SendPacket (packet); - - sLog.outBasic ("WorldSocket::HandleAuthSession: User tryes 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; - } -#if defined _NETCODE_FAKE_AUTH - } -#endif + // Re-check account ban (same check as in realmd) + QueryResult *banresult = + loginDatabase.PQuery ("SELECT " + "bandate, " + "unbandate " + "FROM account_banned " + "WHERE id = '%u' " + "AND active = 1", + id); + + if (banresult) // if account banned + { + packet.Initialize (SMSG_AUTH_RESPONSE, 1); + packet << uint8 (AUTH_BANNED); + SendPacket (packet); + + delete banresult; + + sLog.outBasic ("WorldSocket::HandleAuthSession: Sent Auth Response (Account banned)."); + return -1; + } + + // Check locked state for server + AccountTypes allowedAccountType = sWorld.GetPlayerSecurityLimit (); + + if (allowedAccountType > SEC_PLAYER && security < allowedAccountType) + { + WorldPacket Packet (SMSG_AUTH_RESPONSE, 1); + Packet << uint8 (AUTH_UNAVAILABLE); + + SendPacket (packet); + + sLog.outBasic ("WorldSocket::HandleAuthSession: User tryes 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.outBasic ("WorldSocket::HandleAuthSession: Sent Auth Response (authentification failed)."); + return -1; + } std::string address = this->GetRemoteAddress (); @@ -935,13 +910,6 @@ ACE_NEW_RETURN (m_Session, WorldSession (id, this, security, tbc, mutetime, locale), -1); -#if defined _NETCODE_FAKE_AUTH - if (!dontchechtheacc) - { -#endif - this->m_Crypt.SetKey (&K); - this->m_Crypt.Init (); -#if defined _NETCODE_FAKE_AUTH - } -#endif + m_Crypt.SetKey (&K); + m_Crypt.Init (); // In case needed sometime the second arg is in microseconds 1 000 000 = 1 sec @@ -1044,6 +1012,6 @@ header.cmd = ACE_SWAP_WORD (header.cmd) #endif - - header.size = (uint16) pct.size () + 2; + + header.size = (uint16) pct.size () + 2; header.size = ACE_HTONS (header.size); Index: /trunk/configure.ac =================================================================== --- /trunk/configure.ac (revision 8) +++ /trunk/configure.ac (revision 16) @@ -19,5 +19,5 @@ # Turn on all warnings and error messages, and enforce GNU # standards for the package. -AM_INIT_AUTOMAKE([-Wall -Werror]) +AM_INIT_AUTOMAKE([-Wall -Werror gnu]) AM_MAINTAINER_MODE @@ -25,5 +25,5 @@ # configuration is being performed in the top-level directory. # The idea is to prevent this ,because some maintainers tend -# to break "off src dir" builds. +# to break parallel build trees (a.k.a. VPATH builds). if test "$srcdir" = "." && test "$enable_maintainer_mode" != "yes"; then AC_MSG_ERROR( @@ -31,6 +31,7 @@ Please configure and build in a directory other than the top-level source directory. This is needed because a lot - of maintainers tend to break "off src dir" builds. This - is kinda real ensurance they wont do it. + of maintainers tend to break parallel build trees + (a.k.a. VPATH builds). This is kinda real ensurance they + will not do it (by enforcing everybody to do VPATH builds). For example, try the following from the top-level source @@ -45,6 +46,6 @@ start a build in that directory. - If however you realy want to build in src dir, - then use --enable-maintainer-mode switch. + If however you realy want to disable this error, + use --enable-maintainer-mode switch. ]) fi