Changeset 6405 for trunk/licq/src/icqd-chat.cpp

Timestamp:

07/03/08 22:13:49 (5 months ago)

Author:

flynd

Message:

More UIN removed.

Files:

• trunk/licq/src/icqd-chat.cpp (modified) (23 diffs)

trunk/licq/src/icqd-chat.cpp

@@ -124 +124 @@
 {
   m_nVersion = u->Version();
-  m_nUin = u->Uin();
   m_szId = strdup(u->IdString());
+  m_nUin = strtoul(m_szId, NULL, 10);
   m_nPPID = u->PPID();
   m_nIp = u->Ip();
@@ -793 +793 @@
   bool bTryDirect = true;
   bool bResult = false;
-  ICQUser *temp_user = gUserManager.FetchUser(u->uin, LOCK_R);
+  ICQUser* temp_user = gUserManager.FetchUser(u->szId, u->nPPID, LOCK_R);
   if (temp_user != NULL)
   {
@@ -883 +883 @@
   u->m_pClient = new CChatClient();
   u->m_pClient->m_nVersion = s->Version();
-  u->m_pClient->m_nUin = s->Owner();
   u->m_pClient->m_szId = strdup(s->OwnerId());
+  u->m_pClient->m_nUin = strtoul(u->m_pClient->m_szId, NULL, 10);
   u->m_pClient->m_nPPID = s->OwnerPPID();
   u->m_pClient->m_nIp = s->RemoteIp();
@@ -1090 +1090 @@
 
       CPChat_ColorFont pin(u->sock.RecvBuffer());
-      u->uin = pin.Uin();
       u->szId = strdup(pin.Id());
+      u->uin = strtoul(u->szId, NULL, 10);
       u->nPPID = pin.PPID();
 //      m_nSession = pin.Session();
@@ -1462 +1462 @@
         unsigned long nUin = u->chatQueue[0] | (u->chatQueue[1] << 8) |
           (u->chatQueue[2] << 16) | (u->chatQueue[3] << 24);
+        char id[16];
+        snprintf(id, 16, "%lu", nUin);
 
         // Deque all the characters
@@ -1471 +1473 @@
         for (iter = chatUsers.begin(); iter != chatUsers.end(); ++iter)
         {
-          if((*iter)->Uin() == nUin)
+          if (strcmp((*iter)->Id(), id) == 0)
             break;
         }
@@ -1478 +1480 @@
 
         CBuffer bye(4);
-        SendBuffer(&bye, CHAT_DISCONNECTIONxKICKED, nUin, true);
+        SendBuffer(&bye, CHAT_DISCONNECTIONxKICKED, id, true);
 
         CloseClient(*iter);
@@ -1749 +1751 @@
           unsigned long nUin = u->chatQueue[0] | (u->chatQueue[1] << 8) |
             (u->chatQueue[2] << 16) | (u->chatQueue[3] << 24);
+          char id[16];
+          snprintf(id, 16, "%lu", nUin);
 
           // Find the user and say bye-bye to him
@@ -1754 +1758 @@
           for (iter = chatUsers.begin(); iter != chatUsers.end(); ++iter)
           {
-            if((*iter)->Uin() == nUin)
+            if (strcmp((*iter)->Id(), id) == 0)
              break;
           }
@@ -1761 +1765 @@
 
           CBuffer bye(4);
-          SendBuffer(&bye, CHAT_DISCONNECTIONxKICKED, nUin, true);
+          SendBuffer(&bye, CHAT_DISCONNECTIONxKICKED, id, true);
 
           CloseClient(*iter);
@@ -1864 +1868 @@
 //-----CChatManager::SendBuffer----------------------------------------------
 void CChatManager::SendBuffer(CBuffer *b, unsigned char cmd,
-                              unsigned long _nUin,
-                              bool bNotIter)
+    const char* id, bool bNotIter)
 {
   ChatUserList::iterator iter;
@@ -1871 +1874 @@
   bool ok = false;
 
-  if (_nUin != 0)
+  if (id != NULL)
   {
     for (u_iter = chatUsers.begin(); u_iter != chatUsers.end(); ++u_iter)
     {
-      if ((*u_iter)->Uin() == _nUin)
+      if (strcmp((*u_iter)->Id(), id) == 0)
         break;
     }
@@ -1888 +1891 @@
 
     // Send it to every user
-    if (_nUin == 0)
+    if (id == NULL)
     {
       for (iter = chatUsers.begin(); iter != chatUsers.end(); ++iter)
@@ -2022 +2025 @@
 
 
-void CChatManager::SendKick(unsigned long _nUin)
-{
+void CChatManager::SendKick(const char* id)
+{
+  unsigned long _nUin = strtoul(id, NULL, 10);
+
   // Take care of the vote stuff now
   // The user we are kicking automatically is a no vote
@@ -2038 +2043 @@
   CBuffer buf(4);
   buf.PackUnsignedLong(_nUin);
-  SendBuffer(&buf, CHAT_KICK, _nUin, true);
-}
-
-
-void CChatManager::SendKickNoVote(unsigned long _nUin)
-{
+  SendBuffer(&buf, CHAT_KICK, id, true);
+}
+
+
+void CChatManager::SendKickNoVote(const char *id)
+{
+  unsigned long _nUin = strtoul(id, NULL, 10);
+
   // Tell everyone that this user has been kicked
   CBuffer buf_TellAll(6);
@@ -2049 +2056 @@
   buf_TellAll.PackChar(0x02);
   buf_TellAll.PackChar(0x01);
-  SendBuffer(&buf_TellAll, CHAT_KICKxPASS, _nUin, true);
+  SendBuffer(&buf_TellAll, CHAT_KICKxPASS, id, true);
 
   // They don't know if there was a vote or not, they just see they've been kicked
@@ -2055 +2062 @@
   buf.PackChar(0x02);
   buf.PackChar(0x01);
-  SendBuffer(&buf, CHAT_KICKxYOU, _nUin, false);
+  SendBuffer(&buf, CHAT_KICKxYOU, id, false);
 
   // And close the connection to the kicked user
@@ -2061 +2068 @@
   for (iter = chatUsers.begin(); iter != chatUsers.end(); ++iter)
   {
-    if((*iter)->Uin() == _nUin)
+    if(strcmp((*iter)->Id(), id) == 0)
       break;
   }
@@ -2068 +2075 @@
 
   CBuffer bye(4);
-  SendBuffer(&bye, CHAT_DISCONNECTIONxKICKED, _nUin, false);
+  SendBuffer(&bye, CHAT_DISCONNECTIONxKICKED, id, false);
 
   CloseClient(*iter);
@@ -2247 +2254 @@
 void CChatManager::FinishKickVote(VoteInfoList::iterator iter, bool bPassed)
 {
+  char voteId[16];
+  snprintf(voteId, 16, "%lu", (*iter)->nUin);
+
   // Find the person we are kicking in the ChatUserList
   ChatUserList::iterator userIter;
   for (userIter = chatUsers.begin(); userIter != chatUsers.end(); ++userIter)
   {
-    if ((*userIter)->Uin() == (*iter)->nUin)
+    if (strcmp((*userIter)->Id(), voteId) == 0)
       break;
   }
@@ -2271 +2281 @@
 
   if (bPassed)
-    SendBuffer(&buf, CHAT_KICKxPASS, (*iter)->nUin, true);
+    SendBuffer(&buf, CHAT_KICKxPASS, voteId, true);
   else
-    SendBuffer(&buf, CHAT_KICKxFAIL, (*iter)->nUin, true);
+    SendBuffer(&buf, CHAT_KICKxFAIL, voteId, true);
 
   // Send the person a notice if they were kicked
   if (bPassed)
   {
-    SendBuffer(&buf, CHAT_KICKxYOU, (*iter)->nUin, false);
+    SendBuffer(&buf, CHAT_KICKxYOU, voteId, false);
     CloseClient(*userIter);
   }
@@ -2321 +2331 @@
     if (sz[0] != '\0') nPos += sprintf(&sz[nPos], ", ");
     if ((*iter)->Name()[0] == '\0')
-      nPos += sprintf(&sz[nPos], "%lu", (*iter)->Uin());
+      nPos += sprintf(&sz[nPos], "%s", (*iter)->Id());
     else
       nPos += sprintf(&sz[nPos], "%s", (*iter)->Name());
@@ -2501 +2511 @@
 
   bool bSendIntIp = false;
-  ICQUser *temp_user = gUserManager.FetchUser(rc->u->Uin(), LOCK_R);
+  ICQUser* temp_user = gUserManager.FetchUser(rc->u->Id(), rc->u->PPID(), LOCK_R);
   if (temp_user != NULL)
   {