Changeset 6405

Timestamp:

07/03/2008 10:13:49 PM (12 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);
-      delete [] szFields;   
+              CEventAuthRequest *e = new CEventAuthRequest(id, LICQ_PPID,
+                  szFields[0], szFields[1], szFields[2], szFields[3],
+                  szFields[5], ICQ_CMDxRCV_SYSxMSGxOFFLINE, nTimeSent, 0);
+              delete [] szFields;
       eEvent = e;
       break;
@@ -4838 +4859 @@
     case ICQ_CMDxSUB_AUTHxREFUSED:  // system message: authorization refused
         {
-          gLog.Info(tr("%sOffline authorization refused by %lu.\n"), L_SBLANKxSTR, nUin);
+              gLog.Info(tr("%sOffline authorization refused by %s.\n"), L_SBLANKxSTR, id);
 
           // Translating string with Translation Table
           gTranslator.ServerToClient(szMessage);
 
-          CEventAuthRefused *e = new CEventAuthRefused(nUin, szMessage, ICQ_CMDxRCV_SYSxMSGxOFFLINE,
-                               nTimeSent, 0);
+              CEventAuthRefused* e = new CEventAuthRefused(id, LICQ_PPID,
+                  szMessage, ICQ_CMDxRCV_SYSxMSGxOFFLINE, nTimeSent, 0);
       eEvent = e;
       break;
@@ -4850 +4871 @@
     case ICQ_CMDxSUB_AUTHxGRANTED:  // system message: authorized
         {
-          gLog.Info(tr("%sOffline authorization granted by %lu.\n"), L_SBLANKxSTR, nUin);
+              gLog.Info(tr("%sOffline authorization granted by %s.\n"), L_SBLANKxSTR, id);
 
           // translating string with Translation Table
           gTranslator.ServerToClient (szMessage);
 
-          ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
+              ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
           if (u)
           {
@@ -4862 +4883 @@
           }
 
-          CEventAuthGranted *e = new CEventAuthGranted(nUin, szMessage, ICQ_CMDxRCV_SYSxMSGxOFFLINE,
-                                                       nTimeSent, 0);
+              CEventAuthGranted* e = new CEventAuthGranted(id, LICQ_PPID,
+                  szMessage, ICQ_CMDxRCV_SYSxMSGxOFFLINE, nTimeSent, 0);
       eEvent = e;
       break;
@@ -4885 +4906 @@
     case ICQ_CMDxSUB_ADDEDxTOxLIST:  // system message: added to a contact list
         {
-          gLog.Info(tr("%sUser %lu added you to their contact list (offline).\n"), L_SBLANKxSTR, nUin);
+              gLog.Info(tr("%sUser %s added you to their contact list (offline).\n"), L_SBLANKxSTR, id);
 
           char **szFields = new char *[6]; // alias, first name, last name, email, auth, comment
@@ -4905 +4926 @@
           gTranslator.ServerToClient (szFields[2]);  // last name
 
-          CEventAdded *e = new CEventAdded(nUin, szFields[0], szFields[1],
-                                           szFields[2], szFields[3],
-                                           ICQ_CMDxRCV_SYSxMSGxOFFLINE, nTimeSent, 0);
-      delete [] szFields;   
+              CEventAdded* e = new CEventAdded(id, LICQ_PPID, szFields[0],
+                  szFields[1], szFields[2], szFields[3],
+                  ICQ_CMDxRCV_SYSxMSGxOFFLINE, nTimeSent, 0);
+              delete [] szFields;
       eEvent = e;
       break;
@@ -5010 +5031 @@
                        nTypeMsg, packet.print(buf));
           delete [] buf;
-          CEventUnknownSysMsg *e = new CEventUnknownSysMsg(nTypeMsg, ICQ_CMDxRCV_SYSxMSGxOFFLINE,
-                                                           nUin, szMessage, nTimeSent, 0);
+              CEventUnknownSysMsg* e = new CEventUnknownSysMsg(nTypeMsg,
+                  ICQ_CMDxRCV_SYSxMSGxOFFLINE, id, LICQ_PPID, szMessage, nTimeSent, 0);
 
               ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
@@ -5026 +5047 @@
       case ICQ_CMDxSUB_CONTACTxLIST:
       {
-            // Lock the user to add the message to their queue
-            ICQUser* u = gUserManager.FetchUser(nUin, LOCK_W);
-            if (u == NULL)
-            {
-              if (Ignore(IGNORE_NEWUSERS))
-              {
-            gLog.Info(tr("%sOffline %s from new user (%lu), ignoring.\n"), L_SBLANKxSTR, szType, nUin);
-        if (szType) free(szType);
-            RejectEvent(nUin, eEvent);
-            break;
-              }
-              gLog.Info(tr("%sOffline %s from new user (%lu).\n"), L_SBLANKxSTR, szType, nUin);
-              AddUserToList(nUin);
-              u = gUserManager.FetchUser(nUin, LOCK_W);
-            }
-            else
-              gLog.Info(tr("%sOffline %s through server from %s (%lu).\n"), L_SBLANKxSTR,
-                        szType, u->GetAlias(), nUin);
+                // Lock the user to add the message to their queue
+                ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
+                if (u == NULL)
+                {
+                  if (Ignore(IGNORE_NEWUSERS))
+                  {
+                    gLog.Info(tr("%sOffline %s from new user (%s), ignoring.\n"),
+                        L_SBLANKxSTR, szType, id);
+                    if (szType) free(szType);
+                      RejectEvent(id, eEvent);
+                    break;
+                  }
+                  gLog.Info(tr("%sOffline %s from new user (%s).\n"), L_SBLANKxSTR, szType, id);
+                  AddUserToList(id, LICQ_PPID);
+                  u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
+                }
+                else
+                  gLog.Info(tr("%sOffline %s through server from %s (%s).\n"),
+                      L_SBLANKxSTR, szType, u->GetAlias(), id);
 
             if (szType) free(szType);
@@ -5059 +5081 @@
       case ICQ_CMDxSUB_EMAILxPAGER:
       {
-            ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+                ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
             bool bIgnore = false;
             if (u)
@@ -5087 +5109 @@
       case ICQ_CMDxSUB_SMS:
       {
-        CEventSms *eSms = (CEventSms *)eEvent; 
-        unsigned long nUinSms = FindUinByCellular(eSms->Number());
-        
-        if (nUinSms != 0)
-        {
-          ICQUser* u = gUserManager.FetchUser(nUinSms, LOCK_W);
-          gLog.Info(tr("%sOffline SMS from %s - %s (%lu).\n"), L_SBLANKxSTR, eSms->Number(), u->GetAlias(), nUin);
+                CEventSms* eSms = (CEventSms *)eEvent;
+                string idSms = FindUserByCellular(eSms->Number());
+
+                if (!idSms.empty())
+                {
+                  ICQUser* u = gUserManager.FetchUser(idSms.c_str(), LICQ_PPID, LOCK_W);
+                  gLog.Info(tr("%sOffline SMS from %s - %s (%s).\n"), L_SBLANKxSTR,
+                      eSms->Number(), u->GetAlias(), id);
           if (AddUserEvent(u, eEvent))
             m_xOnEventManager.Do(ON_EVENT_SMS, u);
@@ -5563 +5586 @@
             icqRequestMetaInfo(szUin);
 
-          e->m_pSearchAck = new CSearchAck(nUin);
+          e->m_pSearchAck = new CSearchAck(szUin, LICQ_PPID);
         }
         else

trunk/licq/src/icqd-tcp.cpp

@@ -895 +895 @@
                                          unsigned short nLevel, bool bServer)
 {
-  return icqMultiPartyChatRequest(nUin, szReason, NULL, 0, nLevel, bServer);
+  char id[16];
+  snprintf(id, 16, "%lu", nUin);
+  return icqMultiPartyChatRequest(id, szReason, NULL, 0, nLevel, bServer);
+}
+
+unsigned long CICQDaemon::icqChatRequest(const char* id, const char *szReason,
+                                         unsigned short nLevel, bool bServer)
+{
+  return icqMultiPartyChatRequest(id, szReason, NULL, 0, nLevel, bServer);
 }
 
@@ -903 +911 @@
    unsigned short nLevel, bool bServer)
 {
-  if (nUin == gUserManager.icqOwnerUin())
+  char id[16];
+  snprintf(id, 16, "%lu", nUin);
+  return icqMultiPartyChatRequest(id, reason, szChatUsers, nPort, nLevel, bServer);
+}
+
+unsigned long CICQDaemon::icqMultiPartyChatRequest(const char* id,
+   const char *reason, const char *szChatUsers, unsigned short nPort,
+   unsigned short nLevel, bool bServer)
+{
+  if (gUserManager.FindOwner(id, LICQ_PPID) != NULL)
     return 0;
 
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
   if (u == NULL) return 0;
   char *szReasonDos = gTranslator.NToRN(reason);
@@ -969 +986 @@
 void CICQDaemon::icqChatRequestCancel(unsigned long nUin, unsigned short nSequence)
 {
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+  char id[16];
+  snprintf(id, 16, "%lu", nUin);
+  icqChatRequestCancel(id, nSequence);
+}
+
+void CICQDaemon::icqChatRequestCancel(const char* id, unsigned short nSequence)
+{
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
   if (u == NULL) return;
   gLog.Info(tr("%sCancelling chat request with %s (#%hu).\n"), L_TCPxSTR, 
@@ -983 +1007 @@
     unsigned short nSequence, const unsigned long nMsgID[2], bool bDirect)
 {
+  char id[16];
+  snprintf(id, 16, "%lu", nUin);
+  icqChatRequestRefuse(id, szReason, nSequence, nMsgID, bDirect);
+}
+
+void CICQDaemon::icqChatRequestRefuse(const char* id, const char *szReason,
+    unsigned short nSequence, const unsigned long nMsgID[2], bool bDirect)
+{
   // add to history ??
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
   if (u == NULL) return;
   gLog.Info(tr("%sRefusing chat request with %s (#%hu).\n"), 
@@ -1015 +1047 @@
     const unsigned long nMsgID[2], bool bDirect)
 {
+  char id[16];
+  snprintf(id, 16, "%lu", nUin);
+  icqChatRequestAccept(id, nPort, szClients, nSequence, nMsgID, bDirect);
+}
+
+void CICQDaemon::icqChatRequestAccept(const char* id, unsigned short nPort,
+    const char* szClients, unsigned short nSequence,
+    const unsigned long nMsgID[2], bool bDirect)
+{
   // basically a fancy tcp ack packet which is sent late
   // add to history ??
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
   if (u == NULL) return;
   gLog.Info(tr("%sAccepting chat request with %s (#%hu).\n"), 

trunk/licq/src/icqd-threads.cpp

@@ -735 +735 @@
         {
           INetSocket *s = gSocketManager.FetchSocket(nCurrentSocket);
-          if (s != NULL && s->Owner() == gUserManager.icqOwnerUin() &&
+          if (s != NULL && s->OwnerId() == gUserManager.OwnerId(LICQ_PPID) &&
               d->m_nTCPSrvSocketDesc == -1)
           {
@@ -892 +892 @@
             if (tcp->RecvBufferFull())
             {
-              if (tcp->Owner() == 0)
+              if (tcp->OwnerPPID() != LICQ_PPID)
                 r = d->ProcessTcpHandshake(tcp);
               else

trunk/licq/src/icqd.cpp

@@ -2223 +2223 @@
 
   if (e->m_nSubCommand == ICQ_CMDxSUB_CHAT)
-    icqChatRequestCancel(e->m_nDestinationUin, e->m_nSequence);
+    icqChatRequestCancel(e->Id(), e->m_nSequence);
   else if (e->m_nSubCommand == ICQ_CMDxSUB_FILE)
     icqFileTransferCancel(e->Id(), e->m_nSequence);

trunk/licq/src/icqpacket.cpp

@@ -2665 +2665 @@
 
 //----RequestAuth------------------------------------------------------------
-CPU_RequestAuth::CPU_RequestAuth(unsigned long _nUin, const char *_szMsg)
+CPU_RequestAuth::CPU_RequestAuth(const char* szUin, const char *_szMsg)
   : CPU_CommonFamily(ICQ_SNACxFAM_LIST, ICQ_SNACxLIST_AUTHxREQ)
 {
-  char szUin[13];
-  int nUinLen = snprintf(szUin, 12, "%lu", _nUin);
-  szUin[12] = '\0';
+  int nUinLen = strlen(szUin);
   int nMsgLen = strlen(_szMsg);
 

trunk/licq/src/message.cpp

@@ -1154 +1154 @@
 //=====CEventUnknownSysMsg=====================================================
 CEventUnknownSysMsg::CEventUnknownSysMsg(unsigned short _nSubCommand,
-                             unsigned short _nCommand, unsigned long _nUin,
+    unsigned short _nCommand, const char* idString, unsigned long ppid,
                              const char *_szMsg,
                              time_t _tTime, unsigned long _nFlags)
@@ -1160 +1160 @@
 {
   m_szMsg = _szMsg == NULL ? strdup("") : strdup(_szMsg);
-  m_nUin = _nUin;
+  m_szId = m_szId == NULL ? NULL : strdup(m_szId);
+  m_nPPID = ppid;
 }
 
@@ -1167 +1168 @@
   delete [] m_szText;
   m_szText = new char [strlen(m_szMsg) + 128];
-  sprintf(m_szText, "Unknown system message (0x%04X) from %lu:\n%s\n",
-          m_nSubCommand, m_nUin, m_szMsg);
+  sprintf(m_szText, "Unknown system message (0x%04X) from %s:\n%s\n",
+      m_nSubCommand, m_szId, m_szMsg);
 }
 
@@ -1175 +1176 @@
 {
   free(m_szMsg);
+  free(m_szId);
 }
 
 CEventUnknownSysMsg* CEventUnknownSysMsg::Copy() const
 {
-#if 0
   CEventUnknownSysMsg *e = new CEventUnknownSysMsg(m_nSubCommand,
       m_nCommand, m_szId, m_nPPID, m_szMsg, m_tTime, m_nFlags);
-#else
-  CEventUnknownSysMsg *e = new CEventUnknownSysMsg(m_nSubCommand,
-       m_nCommand, m_nUin, m_szMsg, m_tTime, m_nFlags);
-#endif
   e->CopyBase(this);
   return e;
@@ -1196 +1193 @@
           _nDir == D_RECEIVER ? 'R' : 'S',
           m_nCommand, (unsigned short)(m_nFlags >> 16), m_tTime);
-  nPos += sprintf(&szOut[nPos], ":%lu\n", m_nUin);
+  nPos += sprintf(&szOut[nPos], ":%s\n", m_szId);
   AddStrWithColons(&szOut[nPos], m_szMsg);
   AddToHistory_Flush(u, _nPPID, szOut);