Changeset 6405 for trunk/licq

Timestamp:

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

Author:

flynd

Message:

More UIN removed.

Location:

trunk/licq

Files:

• include/licq_chat.h (modified) (2 diffs)
• include/licq_icqd.h (modified) (4 diffs)
• include/licq_message.h (modified) (2 diffs)
• include/licq_packets.h (modified) (1 diff)
• src/fifo.cpp (modified) (4 diffs)
• src/history.cpp (modified) (9 diffs)
• src/icqd-chat.cpp (modified) (23 diffs)
• src/icqd-srv.cpp (modified) (19 diffs)
• src/icqd-tcp.cpp (modified) (5 diffs)
• src/icqd-threads.cpp (modified) (2 diffs)
• src/icqd.cpp (modified) (1 diff)
• src/icqpacket.cpp (modified) (1 diff)
• src/message.cpp (modified) (5 diffs)

trunk/licq/include/licq_chat.h

@@ -599 +599 @@
   void SendBackspace();
   void SendCharacter(char);
-  void SendKick(unsigned long);
-  void SendKickNoVote(unsigned long);
+  void SendKick(const char* id);
+  void SendKickNoVote(const char* id);
   void SendVoteYes(unsigned long);
   void SendVoteNo(unsigned long);
@@ -659 +659 @@
 
   void SendBuffer(CBuffer *, unsigned char,
-                  unsigned long _nUin = 0,
-                  bool bNotIter = true);
+      const char* id = NULL, bool bNotIter = true);
   bool SendBufferToClient(CBuffer *, unsigned char, CChatUser *);
   void SendBuffer_Raw(CBuffer *);

trunk/licq/include/licq_icqd.h

@@ -350 +350 @@
   unsigned long icqFetchAutoResponse(const char *_szId, unsigned long _nPPID, bool bServer = false);
   // Chat Request
+  unsigned long icqChatRequest(const char* id, const char *szReason,
+     unsigned short nLevel, bool bServer);
   unsigned long icqChatRequest(unsigned long nUin, const char *szReason,
+     unsigned short nLevel, bool bServer);
+  unsigned long icqMultiPartyChatRequest(const char* id,
+     const char *szReason, const char *szChatUsers, unsigned short nPort,
      unsigned short nLevel, bool bServer);
   unsigned long icqMultiPartyChatRequest(unsigned long nUin,
      const char *szReason, const char *szChatUsers, unsigned short nPort,
      unsigned short nLevel, bool bServer);
+  void icqChatRequestRefuse(const char* id, const char* szReason,
+      unsigned short nSequence, const unsigned long nMsgID[], bool bDirect);
   void icqChatRequestRefuse(unsigned long nUin, const char *szReason,
       unsigned short nSequence, const unsigned long nMsgID[], bool bDirect);
+  void icqChatRequestAccept(const char* id, unsigned short nPort,
+      const char* szClients, unsigned short nSequence,
+      const unsigned long nMsgID[], bool bDirect);
   void icqChatRequestAccept(unsigned long nUin, unsigned short nPort,
       const char* szClients, unsigned short nSequence,
       const unsigned long nMsgID[], bool bDirect);
+  void icqChatRequestCancel(const char* id, unsigned short nSequence);
   void icqChatRequestCancel(unsigned long nUin, unsigned short nSequence);
   // File Transfer
@@ -468 +479 @@
   unsigned long icqAuthorizeRefuse(unsigned long nUin, const char *szMessage);
   unsigned long icqAuthorizeRefuse(const char *szId, const char *szMessage);
+  void icqRequestAuth(const char* id, const char *_szMessage);
   void icqRequestAuth(unsigned long _nUin, const char *_szMessage);
   void icqAlertUser(unsigned long _nUin);
@@ -594 +606 @@
 
   // SMS
+  unsigned long icqSendSms(const char* id, unsigned long ppid,
+      const char* number, const char* message);
   unsigned long icqSendSms(const char *szNumber, const char *szMessage,
                            unsigned long nUin);
@@ -805 +819 @@
   void RejectEvent(const char* id, CUserEvent* e);
   ICQUser *FindUserForInfoUpdate(const char *szId, ICQEvent *e, const char *);
+  std::string FindUserByCellular(const char* cellular);
   unsigned long FindUinByCellular(const char *_szCellular);
 

trunk/licq/include/licq_message.h

@@ -477 +477 @@
 {
 public:
-#if 0
   CEventUnknownSysMsg(unsigned short _nSubCommand,
                 unsigned short _nCommand, const char *_szId, unsigned long _nPPID,
                 const char *_szMsg,
                 time_t _tTime, unsigned long _nFlags);
-#endif
-  CEventUnknownSysMsg(unsigned short _nSubCommand,
-                unsigned short _nCommand, unsigned long _nUin,
-                const char *_szMsg,
-                time_t _tTime, unsigned long _nFlags);
   ~CEventUnknownSysMsg();
   virtual CEventUnknownSysMsg* Copy() const;
@@ -492 +486 @@
 protected:
   void CreateDescription() const;
-   unsigned long m_nUin;
    char *m_szMsg;
-#if 0
    char *m_szId;
    unsigned long m_nPPID;
+};
+
 #endif
-};
-
-#endif

trunk/licq/include/licq_packets.h

@@ -944 +944 @@
 {
 public:
-  CPU_RequestAuth(unsigned long, const char *);
+  CPU_RequestAuth(const char* id, const char *);
 };
 

trunk/licq/src/fifo.cpp

@@ -28 +28 @@
 #include <cstring>
 #include <cctype>
+#include <string>
 #include <sys/types.h>
 #include <unistd.h>
@@ -57 +58 @@
 #include "licq_icqd.h"
 
+using std::string;
 
 #define ReportMissingParams(cmdname) \
@@ -469 +471 @@
       if (u != NULL)
       {
-        const char *szNumber = u->GetCellularNumber();
-        if (strlen(szNumber))
-          d->icqSendSms(szNumber, argv[2], u->Uin() );
+        string number = u->GetCellularNumber();
+        gUserManager.DropUser(u);
+        if (!number.empty())
+          d->icqSendSms(szId, nPPID, number.c_str(), argv[2]);
         else
           gLog.Error("%sUnable to send SMS to %s, no SMS number found.\n",
                      L_ERRORxSTR, szId);
-
-        gUserManager.DropUser(u);
       }
     }
@@ -501 +502 @@
   }
 
-  ICQOwner* owner = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
-  d->icqSendSms(argv[1], argv[2], owner->Uin());
-  gUserManager.DropOwner(owner);
+  string id = gUserManager.OwnerId(LICQ_PPID);
+  d->icqSendSms(id.c_str(), LICQ_PPID, argv[1], argv[2]);
   return 0;
 }

trunk/licq/src/history.cpp

@@ -17 +17 @@
 #include <sys/types.h>
 #include <fcntl.h>
+#include <string>
 
 // Localization
@@ -39 +40 @@
 
 #define MAX_HISTORY_MSG_SIZE 8192
+
+using std::string;
 
 CUserHistory::CUserHistory()
@@ -250 +253 @@
     {
       GET_VALID_LINE_OR_BREAK;
-      unsigned long nUin = atol(&szResult[1]);
+        char* id = strdup(&szResult[1]);
       GET_VALID_LINE_OR_BREAK;
       char *szAlias = strdup(&szResult[1]);
@@ -260 +263 @@
       char *szEmail = strdup(&szResult[1]);
       GET_VALID_LINES;
-      e = new CEventAuthRequest(nUin, szAlias, szFName, szLName, szEmail, szMsg,
-                            nCommand, tTime, nFlags);
+        e = new CEventAuthRequest(id, LICQ_PPID, szAlias, szFName, szLName,
+            szEmail, szMsg, nCommand, tTime, nFlags);
+        free(id);
       free(szAlias);
       free(szFName);
@@ -271 +275 @@
     {
       GET_VALID_LINE_OR_BREAK;
-      unsigned long nUin = atol(&szResult[1]);
-      GET_VALID_LINES;
-      e = new CEventAuthGranted(nUin, szMsg, nCommand, tTime, nFlags);
+        char* id = strdup(&szResult[1]);
+      GET_VALID_LINES;
+        e = new CEventAuthGranted(id, LICQ_PPID, szMsg, nCommand, tTime, nFlags);
+        free(id);
       break;
     }
@@ -279 +284 @@
     {
       GET_VALID_LINE_OR_BREAK;
-      unsigned long nUin = atol(&szResult[1]);
-      GET_VALID_LINES;
-      e = new CEventAuthRefused(nUin, szMsg, nCommand, tTime, nFlags);
+        char* id = strdup(&szResult[1]);
+      GET_VALID_LINES;
+        e = new CEventAuthRefused(id, LICQ_PPID, szMsg, nCommand, tTime, nFlags);
+        free(id);
       break;
     }
@@ -287 +293 @@
     {
       GET_VALID_LINE_OR_BREAK;
-      unsigned long nUin = atol(&szResult[1]);
+        char* id = strdup(&szResult[1]);
       GET_VALID_LINE_OR_BREAK;
       char *szAlias = strdup(&szResult[1]);
@@ -296 +302 @@
       GET_VALID_LINE_OR_BREAK;
       char *szEmail = strdup(&szResult[1]);
-      e = new CEventAdded(nUin, szAlias, szFName, szLName, szEmail,
+        e = new CEventAdded(id, LICQ_PPID, szAlias, szFName, szLName, szEmail,
                             nCommand, tTime, nFlags);
+        free(id);
       free(szAlias);
       free(szFName);
@@ -334 +341 @@
       ContactList vc;
       bool b = true;
-      unsigned long nUin = 0;
+      string id;
       while (true)
       {
         GET_VALID_LINE_OR_BREAK;
         if (b)
-          nUin = atol(&szResult[1]);
-        else if (nUin != 0)
-          vc.push_back(new CContact(nUin, &szResult[1]));
+          id = &szResult[1];
+        else if (!id.empty())
+          vc.push_back(new CContact(id.c_str(), LICQ_PPID, &szResult[1]));
         b = !b;
       }

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)
   {

trunk/licq/src/icqd-srv.cpp

@@ -1068 +1068 @@
 void CICQDaemon::icqRequestAuth(unsigned long _nUin, const char *_szMessage)
 {
-  CSrvPacketTcp *p = new CPU_RequestAuth(_nUin, _szMessage);
+  char id[16];
+  snprintf(id, 16, "%lu", _nUin);
+  icqRequestAuth(id, _szMessage);
+}
+
+void CICQDaemon::icqRequestAuth(const char* id, const char *_szMessage)
+{
+  CSrvPacketTcp* p = new CPU_RequestAuth(id, _szMessage);
   SendEvent_Server(p);
 }
@@ -1726 +1733 @@
                      unsigned long nUin)
 {
-  CEventSms *ue = new CEventSms(szNumber, szMessage, ICQ_CMDxSND_THRUxSERVER, TIME_NOW, INT_VERSION);
-  CPU_SendSms *p = new CPU_SendSms(szNumber, szMessage);
+  char id[16];
+  snprintf(id, 16, "%lu", nUin);
+  return icqSendSms(id, LICQ_PPID, szNumber, szMessage);
+}
+
+unsigned long CICQDaemon::icqSendSms(const char* id, unsigned long ppid,
+    const char* number, const char* message)
+{
+  CEventSms* ue = new CEventSms(number, message, ICQ_CMDxSND_THRUxSERVER, TIME_NOW, INT_VERSION);
+  CPU_SendSms* p = new CPU_SendSms(number, message);
   gLog.Info(tr("%sSending SMS through server (#%hu/#%d)...\n"), L_SRVxSTR,
-            p->Sequence(), p->SubSequence());
-  ICQEvent *e = SendExpectEvent_Server(nUin, p, ue);
+      p->Sequence(), p->SubSequence());
+  ICQEvent* e = SendExpectEvent_Server(id, ppid, p, ue);
   if (e != NULL)
     return e->EventId();
@@ -2171 +2186 @@
 unsigned long CICQDaemon::FindUinByCellular(const char *szCellular)
 {
+  return strtoul(FindUserByCellular(szCellular).c_str(), NULL, 10);
+}
+
+string CICQDaemon::FindUserByCellular(const char *szCellular)
+{
   char szParsedNumber1[16], szParsedNumber2[16];
-  unsigned long nUin = 0;
-  
+  string id;
+
   FOR_EACH_USER_START(LOCK_R)
   {
@@ -2179 +2199 @@
     ParseDigits(szParsedNumber2, szCellular, 15);
     if (!strcmp(szParsedNumber1, szParsedNumber2))
-      nUin = strtoul(pUser->IdString(), NULL, 10);
+      id = pUser->IdString();
   }
   FOR_EACH_USER_END
 
-  return nUin;
+  return id;
 }
 
@@ -3773 +3793 @@
           delete [] buf;
           //TODO
-          CEventUnknownSysMsg *e = new CEventUnknownSysMsg(nTypeMsg, ICQ_CMDxRCV_SYSxMSGxONLINE,
-                                                           strtoul(szId, (char **)NULL, 10), 
-                                                           szMessage, nTimeSent, 0);
+              CEventUnknownSysMsg* e = new CEventUnknownSysMsg(nTypeMsg, ICQ_CMDxRCV_SYSxMSGxONLINE,
+                  szId, LICQ_PPID, szMessage, nTimeSent, 0);
 
           ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
@@ -3856 +3875 @@
         CEventSms *eSms = (CEventSms *)eEvent;
       //TODO
-        unsigned long nUinSms = FindUinByCellular(eSms->Number());
-
-        if (nUinSms != 0)
-        {
+      string idSms = FindUserByCellular(eSms->Number());
+
+      if (!idSms.empty())
+      {
         //TODO
-          ICQUser* u = gUserManager.FetchUser(nUinSms, LOCK_W);
-          gLog.Info(tr("%sSMS from %s - %s (%lu).\n"), L_SBLANKxSTR, eSms->Number(), 
-                  u->GetAlias(), nUinSms);
+        ICQUser* u = gUserManager.FetchUser(idSms.c_str(), LICQ_PPID, LOCK_W);
+        gLog.Info(tr("%sSMS from %s - %s (%s).\n"), L_SBLANKxSTR, eSms->Number(),
+            u->GetAlias(), idSms.c_str());
           if (AddUserEvent(u, eEvent))
             m_xOnEventManager.Do(ON_EVENT_SMS, u);
@@ -4753 +4772 @@
       unsigned long nUin;
       unsigned long nTimeSent;
-      
+
       nUin = msg.UnpackUnsignedLong();
+          char id[16];
+          snprintf(id, 16, "%lu", nUin);
 
       sendTM.tm_year = msg.UnpackUnsignedShort() - 1900;
@@ -4808 +4829 @@
     case ICQ_CMDxSUB_AUTHxREQUEST:
     {
-      gLog.Info(tr("%sOffline authorization request from %lu.\n"), L_SBLANKxSTR, nUin);
-      
+              gLog.Info(tr("%sOffline authorization request from %s.\n"), L_SBLANKxSTR, id);
+
       char **szFields = new char *[6];  // alias, first name, last name, email, auth, comment
           
@@ -4829 +4850 @@
           gTranslator.ServerToClient (szFields[5]);  // comment
 
-          CEventAuthRequest *e = new CEventAuthRequest(nUin, szFields[0], szFields[1],
-                                                       szFields[2], szFields[3], szFields[5],
-                                                       ICQ_CMDxRCV_SYSxMSGxOFFLINE, nTimeSent, 0);