Changeset 6 for trunk/src/game/WorldSession.cpp

Timestamp:

11/19/08 13:22:12 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)
* Updated to 6721 and 676
* Fixed TrinityScript? logo
* Version updated to 0.2.6721.676

Original author: Neo2003
Date: 2008-10-04 06:17:19-05:00

Files:

• trunk/src/game/WorldSession.cpp (modified) (11 diffs)

trunk/src/game/WorldSession.cpp

@@ -21 +21 @@
 */
 
+#include "WorldSocket.h"
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
@@ -43 +44 @@
 WorldSession::WorldSession(uint32 id, WorldSocket *sock, uint32 sec, bool tbc, time_t mute_time, LocaleConstant locale) :
 LookingForGroup_auto_join(false), LookingForGroup_auto_add(false), m_muteTime(mute_time),
-_player(NULL), _socket(sock),_security(sec), _accountId(id), m_isTBC(tbc),
+_player(NULL), m_Socket(sock),_security(sec), _accountId(id), m_isTBC(tbc),
 m_sessionDbcLocale(sWorld.GetAvailableDbcLocale(locale)), m_sessionDbLocaleIndex(objmgr.GetIndexForLocale(locale)),
 _logoutTime(0), m_playerLoading(false), m_playerLogout(false), m_playerRecentlyLogout(false), m_latency(0)
 {
+   if (sock)
+     {
+       m_Address = sock->GetRemoteAddress ();
+       sock->AddReference ();
+     }
 }
 
@@ -57 +63 @@
 
     /// - If have unclosed socket, close it
-    if(_socket)
-        _socket->CloseSocket();
-
-    _socket = NULL;
+  if (m_Socket)
+    {
+      m_Socket->CloseSocket ();   
+      m_Socket->RemoveReference ();
+      m_Socket = NULL;
+    }
 
     ///- empty incoming packet queue
@@ -68 +76 @@
         delete packet;
     }
+    
+    sWorld.RemoveQueuedPlayer(this);
 }
 
@@ -82 +92 @@
 }
 
-/// Set the WorldSocket associated with this session
-void WorldSession::SetSocket(WorldSocket *sock)
-{
-    _socket = sock;
-}
-
 /// Send a packet to the client
 void WorldSession::SendPacket(WorldPacket const* packet)
 {
-    if (!_socket)
+    if (!m_Socket)
         return;
     #ifdef MANGOS_DEBUG
@@ -125 +129 @@
         sendLastPacketBytes = packet->wpos();               // wpos is real written size
     }
-    #endif                                                  // !MANGOS_DEBUG
-
-    _socket->SendPacket(packet);
+#endif                                                  // !MANGOS_DEBUG
+
+  if (m_Socket->SendPacket (*packet) == -1)
+    {
+      m_Socket->CloseSocket ();
+    }
 }
 
 /// Add an incoming packet to the queue
-void WorldSession::QueuePacket(WorldPacket& packet)
-{
-    WorldPacket *pck = new WorldPacket(packet);
-    _recvQueue.add(pck);
+void WorldSession::QueuePacket(WorldPacket* new_packet)
+{
+    _recvQueue.add(new_packet);
 }
 
@@ -149 +155 @@
 bool WorldSession::Update(uint32 /*diff*/)
 {
+  if (m_Socket)
+    if (m_Socket->IsClosed ())
+      { 
+        m_Socket->RemoveReference ();
+        m_Socket = NULL;
+      }
+  
     WorldPacket *packet;
 
@@ -211 +224 @@
     ///- If necessary, log the player out
     time_t currTime = time(NULL);
-    if (!_socket || (ShouldLogOut(currTime) && !m_playerLoading))
+    if (!m_Socket || (ShouldLogOut(currTime) && !m_playerLoading))
         LogoutPlayer(true);
 
-    if (!_socket)
+    if (!m_Socket)
         return false;                                       //Will remove this session from the world session map
 
@@ -344 +357 @@
         // remove player from the group if he is:
         // a) in group; b) not in raid group; c) logging out normally (not being kicked or disconnected)
-        if(_player->GetGroup() && !_player->GetGroup()->isRaidGroup() && _socket)
+        if(_player->GetGroup() && !_player->GetGroup()->isRaidGroup() && m_Socket)
             _player->RemoveFromGroup();
 
@@ -386 +399 @@
 void WorldSession::KickPlayer()
 {
-    if(!_socket)
-        return;
-
-    // player will be logout and session will removed in next update tick
-    _socket->CloseSocket();
-    _socket = NULL;
+  if (m_Socket)
+    {
+      m_Socket->CloseSocket ();
+    }
 }
 
@@ -462 +473 @@
         recvPacket.GetOpcode());
 }
+
+void WorldSession::SendAuthWaitQue(uint32 position)
+ {
+     if(position == 0)
+     {
+         WorldPacket packet( SMSG_AUTH_RESPONSE, 1 );
+         packet << uint8( AUTH_OK );
+         SendPacket(&packet);
+     }
+     else
+     {
+         WorldPacket packet( SMSG_AUTH_RESPONSE, 5 );
+         packet << uint8( AUTH_WAIT_QUEUE );
+         packet << uint32 (position);
+         SendPacket(&packet);
+     }
+ }
+ 
+