Changeset 6402

Timestamp:

07/03/2008 05:54:19 AM (12 months ago)

Author:

flynd

Message:

More uin calls removed or rewritten.

Location:

trunk/licq

Files:

• include/licq_icqd.h (modified) (7 diffs)
• include/licq_packets.h (modified) (1 diff)
• src/icqd-chat.cpp (modified) (4 diffs)
• src/icqd-filetransfer.cpp (modified) (10 diffs)
• src/icqd-srv.cpp (modified) (9 diffs)
• src/icqd-tcp.cpp (modified) (70 diffs)
• src/icqd-threads.cpp (modified) (5 diffs)
• src/icqd.cpp (modified) (5 diffs)
• src/icqpacket.cpp (modified) (6 diffs)
• src/oscarservice.cpp (modified) (1 diff)

trunk/licq/include/licq_icqd.h

@@ -243 +243 @@
      unsigned short nLevel, bool bMultipleRecipients = false,
      CICQColor *pColor = NULL);
-
-  unsigned long ProtoSendContactList(const char *szId, unsigned long nPPID,
-     UinList &uins, bool bOnline, unsigned short nLevel,
-     bool bMultipleRecipients = false, CICQColor *pColor = NULL);
 
   unsigned long ProtoFetchAutoResponseServer(const char *szId, unsigned long nPPID);
@@ -551 +547 @@
   void CancelEvent(unsigned long );
   void CancelEvent(ICQEvent *);
-  bool OpenConnectionToUser(unsigned long nUin, TCPSocket *sock,
+  bool OpenConnectionToUser(const char* id, TCPSocket *sock,
      unsigned short nPort);
   bool OpenConnectionToUser(const char *szAlias, unsigned long nIp,
@@ -677 +673 @@
      unsigned long nMsgID2, unsigned short nSequence,
      TCPSocket *pSock);
-  bool WaitForReverseConnection(unsigned short id, unsigned long uin);
+  bool WaitForReverseConnection(unsigned short id, const char* userId);
 
 protected:
@@ -841 +837 @@
   void ProcessFifo(char *);
 
-  static bool Handshake_Send(TCPSocket *, unsigned long, unsigned short,
+  static bool Handshake_Send(TCPSocket *, const char* id, unsigned short,
                              unsigned short, bool = true, unsigned long = 0);
   static bool Handshake_SendConfirm_v7(TCPSocket *);
@@ -848 +844 @@
   int ConnectToServer(const char* server, unsigned short port);
   int ConnectToLoginServer();
-  int ConnectToUser(unsigned long, unsigned char);
-  int ReverseConnectToUser(unsigned long nUin, unsigned long nIp,
+  int ConnectToUser(const char* id, unsigned char channel);
+  int ReverseConnectToUser(const char* id, unsigned long nIp,
      unsigned short nPort, unsigned short nVersion, unsigned short nFailedPort,
      unsigned long nId, unsigned long nMsgID1, unsigned long nMsgID2);
-  int RequestReverseConnection(unsigned long, unsigned long, unsigned long,
+  int RequestReverseConnection(const char* id, unsigned long, unsigned long,
                                unsigned short, unsigned short);
 
@@ -898 +894 @@
 {
 public:
-  CReverseConnectToUserData(unsigned long uin, unsigned long id,
+  CReverseConnectToUserData(const char* idString, unsigned long id,
       unsigned long data, unsigned long ip, unsigned short port,
       unsigned short version, unsigned short failedport, unsigned long msgid1,
@@ -904 +900 @@
   ~CReverseConnectToUserData();
 
-  unsigned long nUin;
+  std::string myIdString;
   unsigned long nId;
   unsigned long nData;

trunk/licq/include/licq_packets.h

@@ -727 +727 @@
 {
 public:
-  CPU_ReverseConnectFailed(unsigned long nUin, unsigned long nMsgID1,
+  CPU_ReverseConnectFailed(const char* id, unsigned long nMsgID1,
                            unsigned long nMsgID2, unsigned short nFailedPort,
                            unsigned short nOurPort, unsigned long nConnectID);

trunk/licq/src/icqd-chat.cpp

@@ -816 +816 @@
 
     // try reverse connect
-    int nId = licqDaemon->RequestReverseConnection(c->m_nUin, c->m_nSession,
+    int nId = licqDaemon->RequestReverseConnection(c->m_szId, c->m_nSession,
                                                  nIp, LocalPort(), c->m_nPort);
     if (nId != -1)
@@ -854 +854 @@
 
   // Send handshake packet:
-  if (!CICQDaemon::Handshake_Send(&u->sock, c->m_nUin, LocalPort(),
+  if (!CICQDaemon::Handshake_Send(&u->sock, c->m_szId, LocalPort(),
      VersionToUse(c->m_nVersion), false))
     return false;
@@ -985 +985 @@
                          iter != licqDaemon->m_lReverseConnect.end();  ++iter)
         {
-          if ((*iter)->nUin == u->uin)
+          if ((*iter)->myIdString == u->Id())
           {
             bFound = true;
@@ -2464 +2464 @@
   pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
   gLog.Info("%sChat: Waiting for reverse connection.\n", L_TCPxSTR);
-  bool bConnected = d->WaitForReverseConnection(rc->nId, rc->u->Uin());
+  bool bConnected = d->WaitForReverseConnection(rc->nId, rc->u->Id());
   pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
 

trunk/licq/src/icqd-filetransfer.cpp

@@ -17 +17 @@
 #include <sys/types.h>
 #include <fcntl.h>
+#include <string>
 #include <string.h>
 #include <sys/time.h>
@@ -43 +44 @@
 const unsigned short FT_STATE_CONFIRMINGxFILE = 8;
 
+using std::string;
 
 
@@ -352 +354 @@
   {
     gLog.Info("%sFile Transfer: Connecting to server.\n", L_TCPxSTR);
-    bSuccess = licqDaemon->OpenConnectionToUser(m_nUin, &ftSock, nPort);
+    bSuccess = licqDaemon->OpenConnectionToUser(myId, &ftSock, nPort);
    }
 
@@ -363 +365 @@
 
     // try reverse connect
-    int nId = licqDaemon->RequestReverseConnection(m_nUin, 0, nIp, LocalPort(),
+    int nId = licqDaemon->RequestReverseConnection(myId, 0, nIp, LocalPort(),
                                                                         nPort);
 
@@ -393 +395 @@
   unsigned short nVersion = u->ConnectionVersion();
   gUserManager.DropUser(u);
-  if (!CICQDaemon::Handshake_Send(&ftSock, m_nUin, LocalPort(), nVersion, false))
+  if (!CICQDaemon::Handshake_Send(&ftSock, myId, LocalPort(), nVersion, false))
     return false;
 
@@ -481 +483 @@
                           iter != licqDaemon->m_lReverseConnect.end();  ++iter)
         {
-          if ((*iter)->nId == nId && (*iter)->nUin == m_nUin)
+          if ((*iter)->nId == nId && (*iter)->myIdString == myId)
           {
             bFound = true;
@@ -1255 +1257 @@
 
   CICQDaemon *d;
-  unsigned long nUin;
   unsigned short nPort;
   struct SFileReverseConnectInfo *rc = (struct SFileReverseConnectInfo *)arg;
@@ -1265 +1266 @@
   pthread_cleanup_pop(0);
   d = rc->m->licqDaemon;
-  nUin = rc->m->Uin();
+  string id = rc->m->Id();
   nPort = rc->m->m_nPort;
   pthread_mutex_unlock(cancel_mutex);
@@ -1271 +1272 @@
   pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
   gLog.Info("%sFile Transfer: Waiting for reverse connection.\n", L_TCPxSTR);
-  bool bConnected = d->WaitForReverseConnection(rc->nId, nUin);
+  bool bConnected = d->WaitForReverseConnection(rc->nId, id.c_str());
   pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
 
@@ -1297 +1298 @@
                                                                     L_TCPxSTR);
   TCPSocket s;
-  bConnected = d->OpenConnectionToUser(nUin, &s, nPort);
+  bConnected = d->OpenConnectionToUser(id.c_str(), &s, nPort);
   pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
 

trunk/licq/src/icqd-srv.cpp

@@ -2083 +2083 @@
 int CICQDaemon::ConnectToServer(const char* server, unsigned short port)
 {
-  SrvSocket *s = new SrvSocket(gUserManager.icqOwnerUin());
+  SrvSocket* s = new SrvSocket(gUserManager.OwnerId(LICQ_PPID).c_str(), LICQ_PPID);
 
   if (m_bProxyEnabled)
@@ -2179 +2179 @@
     ParseDigits(szParsedNumber2, szCellular, 15);
     if (!strcmp(szParsedNumber1, szParsedNumber2))
-      nUin = pUser->Uin();
+      nUin = strtoul(pUser->IdString(), NULL, 10);
   }
   FOR_EACH_USER_END
@@ -3115 +3115 @@
         if ((*iter)->nId == nSubSequence)
         {
-          ICQUser *u = gUserManager.FetchUser((*iter)->nUin, LOCK_R);
+          ICQUser* u = gUserManager.FetchUser((*iter)->myIdString.c_str(), LICQ_PPID, LOCK_R);
           if (u == NULL)
-            gLog.Warn("%sReverse connection from %lu failed.\n", L_WARNxSTR,
-                      (*iter)->nUin);
+            gLog.Warn("%sReverse connection from %s failed.\n", L_WARNxSTR,
+                (*iter)->myIdString.c_str());
           else
           {
@@ -3298 +3298 @@
           nPort = nPort2;
 
+        char id[16];
+        snprintf(id, 15, "%lu", nUin);
+
         pthread_t t;
         CReverseConnectToUserData *data = new CReverseConnectToUserData(
-                               nUin, nId, ICQ_CHNxUNKNOWN, nIp, nPort,
+            id, nId, ICQ_CHNxUNKNOWN, nIp, nPort,
                                nVersion, nFailedPort, nMsgID[0], nMsgID[1]);
         pthread_create(&t, NULL, &ReverseConnectToUser_tep, data);
@@ -3908 +3911 @@
         nFormat = packet.UnpackUnsignedShortBE();
         nUin = packet.UnpackUinString();
-
-        u = gUserManager.FetchUser(nUin, LOCK_W);
+      char id[16];
+      snprintf(id, 15, "%lu", nUin);
+
+      u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
         if (u == NULL)
         {
@@ -3923 +3928 @@
                                            ++iter)
     {
-      if ((*iter)->nId == nMsgID && (*iter)->nUin == nUin)
-      {
+        if ((*iter)->nId == nMsgID && (*iter)->myIdString == id)
+        {
         gLog.Warn("%sReverse connection from %s failed.\n", L_WARNxSTR,
                   u->GetAlias());
@@ -6579 +6584 @@
 }
 
-int CICQDaemon::RequestReverseConnection(unsigned long nUin,
+int CICQDaemon::RequestReverseConnection(const char* id,
                                          unsigned long nData,
                                          unsigned long nLocalIP,
@@ -6585 +6590 @@
                                          unsigned short nRemotePort)
 {
-  if (nUin == gUserManager.icqOwnerUin())
+  if (gUserManager.FindOwner(id, LICQ_PPID) != NULL)
     return -1;
 
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
   if (u == NULL) return -1;
 
@@ -6598 +6603 @@
   pthread_mutex_lock(&mutex_reverseconnect);
 
-  m_lReverseConnect.push_back(
-            new CReverseConnectToUserData(nUin, nId, nData, nLocalIP,
-                                          nLocalPort, ICQ_VERSION_TCP,
-                                          nRemotePort, 0, nId));
+  m_lReverseConnect.push_back(new CReverseConnectToUserData(id, nId, nData,
+      nLocalIP, nLocalPort, ICQ_VERSION_TCP, nRemotePort, 0, nId));
   pthread_mutex_unlock(&mutex_reverseconnect);
 

trunk/licq/src/icqd-tcp.cpp

@@ -1213 +1213 @@
  * Shake hands on the given socket with the given user.
  *-------------------------------------------------------------------------*/
-bool CICQDaemon::Handshake_Send(TCPSocket *s, unsigned long nUin,
+bool CICQDaemon::Handshake_Send(TCPSocket *s, const char* id,
    unsigned short nPort, unsigned short nVersion, bool bConfirm,
    unsigned long nId)
 {
   s->SetVersion(nVersion);
-  s->SetOwner(nUin);
+  s->SetOwner(id, LICQ_PPID);
+
+  unsigned long nUin = strtoul(id, NULL, 10);
 
   switch (nVersion)
@@ -1359 +1361 @@
  * to the global socket manager and to the user.
  *----------------------------------------------------------------------------*/
-int CICQDaemon::ConnectToUser(unsigned long nUin, unsigned char nChannel)
-{
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
+int CICQDaemon::ConnectToUser(const char* id, unsigned char nChannel)
+{
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
   if (u == NULL) return -1;
 
@@ -1370 +1372 @@
   {
     gUserManager.DropUser(u);
-    gLog.Warn(tr("%sConnection attempted to already connected user (%ld).\n"),
-       L_WARNxSTR, nUin);
+    gLog.Warn(tr("%sConnection attempted to already connected user (%s).\n"),
+       L_WARNxSTR, id);
     return sd;
   }
@@ -1387 +1389 @@
     struct timeval tv = { 2, 0 };
     if (select(0, NULL, NULL, NULL, &tv) == -1 && errno == EINTR) return -1;
-    u = gUserManager.FetchUser(nUin, LOCK_W);
+    u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
     if (u == NULL) return -1;
   }
@@ -1395 +1397 @@
   if (sd != -1) return sd;
 
-  TCPSocket *s = new TCPSocket(nUin);
-  if (!OpenConnectionToUser(nUin, s, nPort))
-  {
-    u = gUserManager.FetchUser(nUin, LOCK_W);
+  TCPSocket* s = new TCPSocket(id, LICQ_PPID);
+  if (!OpenConnectionToUser(id, s, nPort))
+  {
+    u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
     if (u != NULL) u->SetConnectionInProgress(false);
     gUserManager.DropUser(u);
@@ -1405 +1407 @@
   }
   s->SetChannel(nChannel);
-  
-  gLog.Info(tr("%sShaking hands with %s (%ld) [v%d].\n"), L_TCPxSTR,
-     szAlias, nUin, nVersion);
+
+  gLog.Info(tr("%sShaking hands with %s (%s) [v%d].\n"), L_TCPxSTR,
+     szAlias, id, nVersion);
   nPort = s->LocalPort();
 
-  if (!Handshake_Send(s, nUin, 0, nVersion))
-  {
-    u = gUserManager.FetchUser(nUin, LOCK_W);
+  if (!Handshake_Send(s, id, 0, nVersion))
+  {
+    u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
     if (u != NULL) u->SetConnectionInProgress(false);
     gUserManager.DropUser(u);
@@ -1422 +1424 @@
 
   // Set the socket descriptor in the user
-  u = gUserManager.FetchUser(nUin, LOCK_W);
+  u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
   if (u == NULL) return -1;
   u->SetSocketDesc(s);
@@ -1445 +1447 @@
  * Connects a socket to a given user on a given port.
  *----------------------------------------------------------------------------*/
-bool CICQDaemon::OpenConnectionToUser(unsigned long nUin, TCPSocket *sock,
+bool CICQDaemon::OpenConnectionToUser(const char* id, TCPSocket *sock,
                                       unsigned short nPort)
 {
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
   if (u == NULL) return false;
 
@@ -1532 +1534 @@
  * to the global socket manager and to the user.
  *----------------------------------------------------------------------------*/
-int CICQDaemon::ReverseConnectToUser(unsigned long nUin, unsigned long nIp,
+int CICQDaemon::ReverseConnectToUser(const char* id, unsigned long nIp,
    unsigned short nPort, unsigned short nVersion, unsigned short nFailedPort,
    unsigned long nId, unsigned long nMsgID1, unsigned long nMsgID2)
@@ -1551 +1553 @@
   }
 
-  TCPSocket *s = new TCPSocket(nUin);
+  TCPSocket* s = new TCPSocket(id, LICQ_PPID);
   char buf[32];
 
-  gLog.Info(tr("%sReverse connecting to %lu at %s:%d.\n"), L_TCPxSTR, nUin,
+  gLog.Info(tr("%sReverse connecting to %s at %s:%d.\n"), L_TCPxSTR, id,
             ip_ntoa(nIp, buf), nPort);
 
@@ -1563 +1565 @@
   {
     char buf[128];
-    gLog.Warn(tr("%sReverse connect to %lu failed:\n%s%s.\n"), L_WARNxSTR,
-              nUin, L_BLANKxSTR, s->ErrorStr(buf, 128));
-              
-    CPU_ReverseConnectFailed *p = new CPU_ReverseConnectFailed(nUin, nMsgID1,
-                                                     nMsgID2, nPort,
-                                                     nFailedPort, nId);
+    gLog.Warn(tr("%sReverse connect to %s failed:\n%s%s.\n"), L_WARNxSTR,
+        id, L_BLANKxSTR, s->ErrorStr(buf, 128));
+
+    CPU_ReverseConnectFailed* p = new CPU_ReverseConnectFailed(id, nMsgID1,
+        nMsgID2, nPort, nFailedPort, nId);
     SendEvent_Server(p);
     return -1;
   }
 
-  gLog.Info(tr("%sReverse shaking hands with %lu.\n"), L_TCPxSTR, nUin);
+  gLog.Info(tr("%sReverse shaking hands with %s.\n"), L_TCPxSTR, id);
   bool bConfirm = ftm == NULL && cm == NULL;
 
@@ -1579 +1580 @@
   nVersion = VersionToUse(nVersion);
 
-  if (!Handshake_Send(s, nUin, 0, nVersion, bConfirm, nId))
+  if (!Handshake_Send(s, id, 0, nVersion, bConfirm, nId))
   {
     delete s;
@@ -1605 +1606 @@
   {
     // Set the socket descriptor in the user if this user is on our list
-    ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
+    ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
     if (u != NULL)
     {
@@ -1625 +1626 @@
 bool CICQDaemon::ProcessTcpPacket(TCPSocket *pSock)
 {
-  unsigned long nUin, senderIp, localIp,
+  unsigned long senderIp, localIp,
                 senderPort, junkLong, nPort, nPortReversed;
   unsigned short version, command, junkShort, newCommand, messageLen,
@@ -1632 +1633 @@
   bool errorOccured = false;
   char *message = 0;
+  char id[16] = "";
 
   // only used for v7,v8
@@ -1647 +1649 @@
     case 3:
     {
+      unsigned long nUin;
       packet >> nUin
              >> version
@@ -1655 +1658 @@
              >> messageLen   // length of incoming message
       ;
+      snprintf(id, 15, "%lu", nUin);
       break;
     }
@@ -1667 +1671 @@
         return false;
       }
+      unsigned long nUin;
       packet >> nUin
              >> version
@@ -1676 +1681 @@
              >> messageLen   // length of incoming message
       ;
+      snprintf(id, 15, "%lu", nUin);
       break;
     }
     case 6:
     {
-      nUin = pSock->Owner();
+      strncpy(id, pSock->OwnerId(), 15); id[15] = '\0';
       if (!Decrypt_Client(&packet, 6))
       {
@@ -1703 +1709 @@
     case 8:
     {
-      nUin = pSock->Owner();
+      strncpy(id, pSock->OwnerId(), 15); id[15] = '\0';
       if (!Decrypt_Client(&packet, nInVersion))
       {
@@ -1725 +1731 @@
         msgFlags = packet.UnpackUnsignedShort();
         packet >> messageLen;
-        
+
         // Stupid AOL
-        ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+        ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
         if (u && (u->LicqVersion() == 0 || u->LicqVersion() >= 1022))
         {
@@ -1751 +1757 @@
 
   // Some simple validation of the packet
-  if (nUin == 0 || command == 0)
+  if (id[0] == '\0' || command == 0)
   {
     char *buf;
-    gLog.Unknown("%sInvalid TCP packet (uin: %08lx, cmd: %04x):\n%s\n",
-                 L_UNKNOWNxSTR, nUin, command, packet.print(buf));
+    gLog.Unknown("%sInvalid TCP packet (uin: %s, cmd: %04x):\n%s\n",
+        L_UNKNOWNxSTR, id, command, packet.print(buf));
     delete [] buf;
     return false;
   }
 
-  if (nUin == gUserManager.icqOwnerUin() || nUin != pSock->Owner())
+  if (gUserManager.FindOwner(id, LICQ_PPID) != NULL || strcmp(id, pSock->OwnerId()) != 0)
   {
     char *buf;
-    if (nUin == gUserManager.icqOwnerUin())
+    if (gUserManager.FindOwner(id, LICQ_PPID) != NULL)
       gLog.Warn(tr("%sTCP message from self (probable spoof):\n%s\n"), L_WARNxSTR, packet.print(buf));
     else
-      gLog.Warn(tr("%sTCP message from invalid UIN (%ld, expect %ld):\n%s\n"),
-                L_WARNxSTR, nUin, pSock->Owner(), packet.print(buf));
+      gLog.Warn(tr("%sTCP message from invalid UIN (%s, expect %s):\n%s\n"),
+          L_WARNxSTR, id, pSock->OwnerId(), packet.print(buf));
     delete [] buf;
     return false;
@@ -1779 +1785 @@
   // find which user was sent
   bool bNewUser = false;
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
   if (u == NULL)
   {
-    u = new ICQUser(nUin);
+    u = new ICQUser(id, LICQ_PPID);
     u->SetSocketDesc(pSock);
     bNewUser = true;
@@ -1923 +1929 @@
                 nMask |= licqVersion;
                 if (licqChar == 'L')
-                    gLog.Info(tr("%sMessage from %s (%ld) [Licq %s].\n"), L_TCPxSTR, u->GetAlias(),
-             nUin, CUserEvent::LicqVersionToString(licqVersion));
-                else
-                    gLog.Info(tr("%sMessage from %s (%ld).\n"), L_TCPxSTR, u->GetAlias(), nUin);
+            gLog.Info(tr("%sMessage from %s (%s) [Licq %s].\n"), L_TCPxSTR,
+                u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+      else
+            gLog.Info(tr("%sMessage from %s (%s).\n"), L_TCPxSTR, u->GetAlias(), id);
 
         CPT_AckGeneral p(newCommand, theSequence, true, bAccept, u);
@@ -1951 +1957 @@
             // FIXME should either refuse the event or have a special auto response
             // for rejected events instead of pretending to accept the user
-            RejectEvent(nUin, e);
+              RejectEvent(id, e);
             break;
           }
@@ -1982 +1988 @@
         packet >> licqChar >> licqVersion;
         if (licqChar == 'L')
-          gLog.Info(tr("%s%s (%ld) requested auto response [Licq %s].\n"), L_TCPxSTR,
-             u->GetAlias(), nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%s%s (%ld) requested auto response.\n"), L_TCPxSTR, u->GetAlias(), nUin);
+            gLog.Info(tr("%s%s (%s) requested auto response [Licq %s].\n"), L_TCPxSTR,
+                u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%s%s (%s) requested auto response.\n"), L_TCPxSTR, u->GetAlias(), id);
 
         CPT_AckGeneral p(newCommand, theSequence, true, false, u);
@@ -1993 +1999 @@
         u->SetLastCheckedAutoResponse();
 
-        PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_EVENTS, nUin));
+          PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_EVENTS, id, LICQ_PPID));
         break;
       }
@@ -2021 +2027 @@
         nMask |= licqVersion;
         if (licqChar == 'L')
-          gLog.Info(tr("%sURL from %s (%ld) [Licq %s].\n"), L_TCPxSTR, u->GetAlias(),
-            nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%sURL from %s (%ld).\n"), L_TCPxSTR, u->GetAlias(), nUin);
+            gLog.Info(tr("%sURL from %s (%s) [Licq %s].\n"), L_TCPxSTR, u->GetAlias(),
+                id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%sURL from %s (%s).\n"), L_TCPxSTR, u->GetAlias(), id);
 
         CEventUrl *e = CEventUrl::Parse(message, ICQ_CMDxTCP_START, TIME_NOW, nMask);
@@ -2054 +2060 @@
           if (Ignore(IGNORE_NEWUSERS))
           {
-            RejectEvent(nUin, e);
+              RejectEvent(id, e);
             break;
           }
@@ -2090 +2096 @@
         nMask |= licqVersion;
         if (licqChar == 'L')
-          gLog.Info(tr("%sContact list from %s (%ld) [Licq %s].\n"), L_TCPxSTR,
-             u->GetAlias(), nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%sContact list from %s (%ld).\n"), L_TCPxSTR, u->GetAlias(),
-             nUin);
+            gLog.Info(tr("%sContact list from %s (%s) [Licq %s].\n"), L_TCPxSTR,
+               u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%sContact list from %s (%s).\n"), L_TCPxSTR,
+                u->GetAlias(), id);
 
         CEventContactList *e = CEventContactList::Parse(message, ICQ_CMDxTCP_START, TIME_NOW, nMask);
@@ -2124 +2130 @@
           if (Ignore(IGNORE_NEWUSERS))
           {
-            RejectEvent(nUin, e);
+              RejectEvent(id, e);
             break;
           }
@@ -2157 +2163 @@
 
         if (licqChar == 'L')
-          gLog.Info(tr("%sChat request from %s (%ld) [Licq %s].\n"), L_TCPxSTR,
-             u->GetAlias(), nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%sChat request from %s (%ld).\n"), L_TCPxSTR, u->GetAlias(),
-             nUin);
+            gLog.Info(tr("%sChat request from %s (%s) [Licq %s].\n"), L_TCPxSTR,
+               u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%sChat request from %s (%s).\n"), L_TCPxSTR,
+                u->GetAlias(), id);
 
         // translating string with translation table
@@ -2173 +2179 @@
           if (Ignore(IGNORE_NEWUSERS))
           {
-            RejectEvent(nUin, e);
+              RejectEvent(id, e);
             break;
           }
@@ -2211 +2217 @@
 
         if (licqChar == 'L')
-          gLog.Info(tr("%sFile transfer request from %s (%ld) [Licq %s].\n"),
-             L_TCPxSTR, u->GetAlias(), nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%sFile transfer request from %s (%ld).\n"), L_TCPxSTR,
-             u->GetAlias(), nUin);
+            gLog.Info(tr("%sFile transfer request from %s (%s) [Licq %s].\n"),
+                L_TCPxSTR, u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%sFile transfer request from %s (%s).\n"), L_TCPxSTR,
+                u->GetAlias(), id);
 
         ConstFileList filelist;
@@ -2230 +2236 @@
           if (Ignore(IGNORE_NEWUSERS))
           {
-            RejectEvent(nUin, e);
+              RejectEvent(id, e);
             break;
           }
@@ -2297 +2303 @@
                     packet.incDataPosRead(2); // reversed port (BE)
 
-                    gLog.Info(tr("%sFile transfer request from %s (%ld).\n"), L_TCPxSTR,
-                                        u->GetAlias(), nUin);
+              gLog.Info(tr("%sFile transfer request from %s (%s).\n"),
+                  L_TCPxSTR, u->GetAlias(), id);
 
                     ConstFileList filelist;
@@ -2311 +2317 @@
                         if (Ignore(IGNORE_NEWUSERS))
                         {
-                            RejectEvent(nUin, e);
+                  RejectEvent(id, e);
                             break;
                         }
@@ -2332 +2338 @@
                         nPort = nPortReversed;
 
-                    gLog.Info(tr("%sChat request from %s (%ld).\n"), L_TCPxSTR,
-                                        u->GetAlias(), nUin);
-                    
+              gLog.Info(tr("%sChat request from %s (%s).\n"), L_TCPxSTR,
+                  u->GetAlias(), id);
+
                     // translating string with translation table
                     gTranslator.ServerToClient(szMessage);
@@ -2343 +2349 @@
                         if (Ignore(IGNORE_NEWUSERS))
                         {
-                            RejectEvent(nUin, e);
+                  RejectEvent(id, e);
                             break;
                         }
@@ -2356 +2362 @@
                 case ICQ_CMDxSUB_URL:
                 {
-                    gLog.Info(tr("%sURL from %s (%ld).\n"), L_TCPxSTR, u->GetAlias(), nUin);
+              gLog.Info(tr("%sURL from %s (%s).\n"), L_TCPxSTR, u->GetAlias(), id);
                     CEventUrl *e = CEventUrl::Parse(szMessage, ICQ_CMDxTCP_START,
                                                                                     TIME_NOW, nMask);
@@ -2373 +2379 @@
                         if (Ignore(IGNORE_NEWUSERS))
                         {
-                            RejectEvent(nUin, e);
+                  RejectEvent(id, e);
                             break;
                         }
@@ -2386 +2392 @@
                 case ICQ_CMDxSUB_CONTACTxLIST:
                 {
-                    gLog.Info(tr("%sContact list from %s (%ld).\n"), L_TCPxSTR,
-                                        u->GetAlias(), nUin);
+              gLog.Info(tr("%sContact list from %s (%s).\n"), L_TCPxSTR,
+                  u->GetAlias(), id);
                     CEventContactList *e = CEventContactList::Parse(szMessage,
                                                                                                                     ICQ_CMDxTCP_START,
@@ -2405 +2411 @@
                         if (Ignore(IGNORE_NEWUSERS))
                         {
-                            RejectEvent(nUin, e);
+                  RejectEvent(id, e);
                             break;
                         }
@@ -2424 +2430 @@
       case ICQ_CMDxSUB_SECURExOLD:
       {
-        gLog.Info(tr("%sReceived old-style key request from %s (%ld) but we do not support it.\n"),
-           L_TCPxSTR, u->GetAlias(), nUin);
+          gLog.Info(tr("%sReceived old-style key request from %s (%s) but we do not support it.\n"),
+              L_TCPxSTR, u->GetAlias(), id);
         // Send the nack back
         CPT_AckOldSecureChannel p(theSequence, u);
@@ -2449 +2455 @@
 
         if (licqChar == 'L')
-          gLog.Info(tr("%sSecure channel request from %s (%ld) [Licq %s].\n"),
-           L_TCPxSTR, u->GetAlias(), nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%sSecure channel request from %s (%ld).\n"), L_TCPxSTR,
-           u->GetAlias(), nUin);
+            gLog.Info(tr("%sSecure channel request from %s (%s) [Licq %s].\n"),
+                L_TCPxSTR, u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%sSecure channel request from %s (%s).\n"), L_TCPxSTR,
+                u->GetAlias(), id);
 
         CPT_AckOpenSecureChannel p(theSequence, true, u);
@@ -2475 +2481 @@
 
         u->SetSendServer(false);
-        PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, nUin, 1));
-
-        gLog.Info(tr("%sSecure channel established with %s (%ld).\n"),
-         L_SSLxSTR, u->GetAlias(), nUin);
+          PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, id, LICQ_PPID, 1));
+
+          gLog.Info(tr("%sSecure channel established with %s (%s).\n"),
+              L_SSLxSTR, u->GetAlias(), id);
 
         break;
 
 #else // We do not support OpenSSL
-       gLog.Info(tr("%sReceived secure channel request from %s (%ld) but we do not support OpenSSL.\n"),
-           L_TCPxSTR, u->GetAlias(), nUin);
+          gLog.Info(tr("%sReceived secure channel request from %s (%s) but we do not support OpenSSL.\n"),
+              L_TCPxSTR, u->GetAlias(), id);
         // Send the nack back
         CPT_AckOpenSecureChannel p(theSequence, false, u);
@@ -2510 +2516 @@
 
         if (licqChar == 'L')
-          gLog.Info(tr("%sSecure channel closed by %s (%ld) [Licq %s].\n"),
-           L_TCPxSTR, u->GetAlias(), nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%sSecure channel closed by %s (%ld).\n"), L_TCPxSTR,
-           u->GetAlias(), nUin);
+            gLog.Info(tr("%sSecure channel closed by %s (%s) [Licq %s].\n"),
+                L_TCPxSTR, u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%sSecure channel closed by %s (%s).\n"), L_TCPxSTR,
+                u->GetAlias(), id);
 
         // send ack
@@ -2522 +2528 @@
         pSock->SecureStop();
         u->SetSecure(false);
-        PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, nUin, 0));
+          PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, id, LICQ_PPID, 0));
         break;
 
 #else // We do not support OpenSSL
-        gLog.Info(tr("%sReceived secure channel close from %s (%ld) but we do not support OpenSSL.\n"),
-           L_TCPxSTR, u->GetAlias(), nUin);
+          gLog.Info(tr("%sReceived secure channel close from %s (%s) but we do not support OpenSSL.\n"),
+              L_TCPxSTR, u->GetAlias(), id);
         // Send the nack back
         CPT_AckCloseSecureChannel p(theSequence, u);
@@ -2736 +2742 @@
         if (licqChar == 'L') sprintf(l, " [Licq %s]",
          CUserEvent::LicqVersionToString(licqVersion));
-        gLog.Info(tr("%sSecure channel response from %s (%ld)%s.\n"), L_TCPxSTR,
-         u->GetAlias(), nUin, l);
+          gLog.Info(tr("%sSecure channel response from %s (%s)%s.\n"), L_TCPxSTR,
+              u->GetAlias(), id, l);
 
         ICQEvent *e = NULL;
@@ -2744 +2750 @@
         if (message[0] == '\0')
         {
-          gLog.Info(tr("%s%s (%ld) does not support OpenSSL.\n"), L_TCPxSTR,
-             u->GetAlias(), nUin);
+            gLog.Info(tr("%s%s (%s) does not support OpenSSL.\n"), L_TCPxSTR,
+                u->GetAlias(), id);
           u->SetSecure(false);
-          PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, nUin, 0));
+            PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, id, LICQ_PPID, 0));
           // find the event, fail it
           e = DoneEvent(sockfd, theSequence, EVENT_FAILED);
@@ -2759 +2765 @@
           if (e == NULL)
           {
-            gLog.Warn(tr("%sSecure channel response from %s (%ld) when no request in progress.\n"),
-               L_WARNxSTR, u->GetAlias(), nUin);
+              gLog.Warn(tr("%sSecure channel response from %s (%s) when no request in progress.\n"),
+                  L_WARNxSTR, u->GetAlias(), id);
             // Close the connection as we are in trouble
             u->SetSecure(false);
             gUserManager.DropUser(u);
-            PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, nUin, 0));
+              PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, id, LICQ_PPID, 0));
             return false;
           }
@@ -2775 +2781 @@
           else
           {
-            gLog.Info(tr("%sSecure channel established with %s (%ld).\n"), L_SSLxSTR,
-               u->GetAlias(), nUin);
+              gLog.Info(tr("%sSecure channel established with %s (%s).\n"),
+                  L_SSLxSTR, u->GetAlias(), id);
             u->SetSecure(true);
-            PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, nUin, 1));
+              PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, id, LICQ_PPID, 1));
           }
         }
@@ -2808 +2814 @@
         char l[32] = "";
         if (licqChar == 'L') sprintf(l, " [Licq %s]", CUserEvent::LicqVersionToString(licqVersion));
-        gLog.Info(tr("%sSecure channel with %s (%ld) closed %s.\n"), L_TCPxSTR,
-         u->GetAlias(), nUin, l);
+          gLog.Info(tr("%sSecure channel with %s (%s) closed %s.\n"), L_TCPxSTR,
+              u->GetAlias(), id, l);
 
         // Find the event, succeed it
@@ -2826 +2832 @@
         u->SetSecure(false);
         gUserManager.DropUser(u);
-        PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, nUin, 0));
+          PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, id, LICQ_PPID, 0));
 
         // finish up
@@ -2932 +2938 @@
       case ICQ_CMDxSUB_CHAT:
       {
-        gLog.Info(tr("%sChat request from %s (%ld) cancelled.\n"), L_TCPxSTR,
-                 u->GetAlias(), nUin);
+          gLog.Info(tr("%sChat request from %s (%s) cancelled.\n"), L_TCPxSTR,
+              u->GetAlias(), id);
         if (nInVersion <= 4)
         {
@@ -2958 +2964 @@
       case ICQ_CMDxSUB_FILE:
       {
-        gLog.Info(tr("%sFile transfer request from %s (%ld) cancelled.\n"),
-                 L_TCPxSTR, u->GetAlias(), nUin);
+          gLog.Info(tr("%sFile transfer request from %s (%s) cancelled.\n"),
+              L_TCPxSTR, u->GetAlias(), id);
         if (nInVersion <= 4)
         {
@@ -3727 +3733 @@
   unsigned long nUin = 0;
   unsigned short nVersion = 0;
+  char id[16];
 
   switch (VersionToUse(nVersionMajor))
@@ -3736 +3743 @@
       CPacketTcp_Handshake_v7 p_in(&b);
       nUin = p_in.SourceUin();
-
-      ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+      snprintf(id, 16, "%lu", nUin);
+
+      ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
       if (u == NULL && !bChat)
       {
@@ -3749 +3757 @@
       {
         char ipbuf[32];
-        gLog.Warn("%sSpoofed connection from %s as uin %lu.\n", L_WARNxSTR,
-                  s->RemoteIpStr(ipbuf), nUin);
+        gLog.Warn("%sSpoofed connection from %s as uin %s.\n", L_WARNxSTR,
+            s->RemoteIpStr(ipbuf), id);
         return false;
       }
@@ -3802 +3810 @@
               return false;
             }
-            if ((*iter)->nId == p_in.Id() && (*iter)->nUin == nUin)
+            if ((*iter)->nId == p_in.Id() && (*iter)->myIdString == id)
             {
               s->SetChannel((*iter)->nData);
@@ -3829 +3837 @@
       CPacketTcp_Handshake_v6 p_in(&b);
       nUin = p_in.SourceUin();
-
-      ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+      snprintf(id, 16, "%lu", nUin);
+
+      ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
       if (u == NULL)
       {
@@ -3842 +3851 @@
       {
         char ipbuf[32];
-        gLog.Warn("%sSpoofed connection from %s as uin %lu.\n", L_WARNxSTR,
-                  s->RemoteIpStr(ipbuf), nUin);
+        gLog.Warn("%sSpoofed connection from %s as uin %s.\n", L_WARNxSTR,
+            s->RemoteIpStr(ipbuf), id);
         return false;
       }
@@ -3876 +3885 @@
       {
         // For v6 there is no connection id, so just use uin
-        if ((*iter)->nUin == nUin)
+        if ((*iter)->myIdString == id)
         {
           (*iter)->bSuccess = true;
@@ -3893 +3902 @@
       b.UnpackUnsignedLong(); // port number
       nUin = b.UnpackUnsignedLong();
+      snprintf(id, 16, "%lu", nUin);
       nVersion = VersionToUse(nVersionMajor);
 
-      ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+      ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
       if (u == NULL)
       {
@@ -3911 +3921 @@
         char ipbuf[32];
         return false;
-        gLog.Warn("%sConnection from %s as %lu possible spoof.\n", L_WARNxSTR,
-                  s->RemoteIpStr(ipbuf), nUin);
+        gLog.Warn("%sConnection from %s as %s possible spoof.\n", L_WARNxSTR,
+            s->RemoteIpStr(ipbuf), id);
         return false;
       }
-      
+
       pthread_mutex_lock(&mutex_reverseconnect);
       std::list<CReverseConnectToUserData *>::iterator iter;
@@ -3922 +3932 @@
       {
         // For v4 there is no connection id, so just use uin
-        if ((*iter)->nUin == nUin)
+        if ((*iter)->myIdString == id)
         {
           (*iter)->bSuccess = true;
@@ -3940 +3950 @@
       b.UnpackUnsignedLong(); // port number
       nUin = b.UnpackUnsignedLong();
+      snprintf(id, 16, "%lu", nUin);
       nVersion = 2;
-      
-      ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+
+      ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
       if (u == NULL)
       {
@@ -3958 +3969 @@
         char ipbuf[32];
         return false;
-        gLog.Warn("%sConnection from %s as %lu possible spoof.\n", L_WARNxSTR,
-                  s->RemoteIpStr(ipbuf), nUin);
+        gLog.Warn("%sConnection from %s as %s possible spoof.\n", L_WARNxSTR,
+            s->RemoteIpStr(ipbuf), id);
         return false;
       }
@@ -3969 +3980 @@
       {
         // For v2 there is no connection id, so just use uin
-        if ((*iter)->nUin == nUin)
+        if ((*iter)->myIdString == id)
         {
           (*iter)->bSuccess = true;
@@ -3991 +4002 @@
   }
 
-  char szUin[13];
-  snprintf(szUin, 12, "%lu", nUin);
-  s->SetOwner(szUin, LICQ_PPID);
+  s->SetOwner(id, LICQ_PPID);
   s->SetVersion(nVersion);
 

trunk/licq/src/icqd-threads.cpp

@@ -384 +384 @@
   if (e->m_nSocketDesc == -1)
   {
-    unsigned long nDestinationUin = e->m_nDestinationUin;
+    string id = e->Id();
+    unsigned long ppid = e->PPID();
     unsigned char nChannel = e->Channel();
     pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-   
-    ICQUser *u = gUserManager.FetchUser(nDestinationUin, LOCK_R);
+
+    ICQUser* u = gUserManager.FetchUser(id.c_str(), ppid, LOCK_R);
     if (u == NULL)
     {
@@ -416 +417 @@
     if (!bSendIntIp && nVersion > 6 && nMode != MODE_DIRECT)
     {
-      int nId = d->RequestReverseConnection(nDestinationUin, nChannel, nIP,
-                                            nLocalPort, nRemotePort);
+      int nId = d->RequestReverseConnection(id.c_str(), nChannel, nIP, nLocalPort, nRemotePort);
       if (nId != -1)
       {
-        d->WaitForReverseConnection(nId, nDestinationUin);
-        u = gUserManager.FetchUser(nDestinationUin, LOCK_R);
+        d->WaitForReverseConnection(nId, id.c_str());
+        u = gUserManager.FetchUser(id.c_str(), LICQ_PPID, LOCK_R);
         if (u == NULL)
         {
@@ -445 +445 @@
         pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
 
-        socket = d->ConnectToUser(nDestinationUin, nChannel);
+        socket = d->ConnectToUser(id.c_str(), nChannel);
       }
     }
     else
     {
-      socket = d->ConnectToUser(nDestinationUin, nChannel);
+      socket = d->ConnectToUser(id.c_str(), nChannel);
 
       // if we failed, try through server
@@ -459 +459 @@
         pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
 
-        int nId = d->RequestReverseConnection(nDestinationUin, nChannel, nIP,
+        int nId = d->RequestReverseConnection(id.c_str(), nChannel, nIP,
                                               nLocalPort, nRemotePort);
         if (nId != -1)
         {
-          d->WaitForReverseConnection(nId, nDestinationUin);
-          u = gUserManager.FetchUser(nDestinationUin, LOCK_R);
+          d->WaitForReverseConnection(nId, id.c_str());
+          u = gUserManager.FetchUser(id.c_str(), LICQ_PPID, LOCK_R);
           if (u == NULL)
           {
@@ -604 +604 @@
   CReverseConnectToUserData *p = (CReverseConnectToUserData *)v;
 
-  gLicqDaemon->ReverseConnectToUser(p->nUin, p->nIp, p->nPort, p->nVersion,
-    p->nFailedPort, p->nId, p->nMsgID1, p->nMsgID2);
+  gLicqDaemon->ReverseConnectToUser(p->myIdString.c_str(), p->nIp, p->nPort,
+      p->nVersion, p->nFailedPort, p->nId, p->nMsgID1, p->nMsgID2);
 
   delete p;

trunk/licq/src/icqd.cpp

@@ -2722 +2722 @@
 }
 
-bool CICQDaemon::WaitForReverseConnection(unsigned short id, unsigned long uin)
+bool CICQDaemon::WaitForReverseConnection(unsigned short id, const char* userId)
 {
   bool bSuccess = false;
@@ -2731 +2731 @@
     ++iter)
   {
-    if ((*iter)->nId == id && (*iter)->nUin == uin)
+    if ((*iter)->nId == id && (*iter)->myIdString == userId)
       break;
   }
@@ -2757 +2757 @@
         goto done;
       }
-      if ((*iter)->nId == id && (*iter)->nUin == uin)
+      if ((*iter)->nId == id && (*iter)->myIdString == userId)
       {
         if ((*iter)->bFinished)
@@ -2775 +2775 @@
     ++iter)
   {
-    if ((*iter)->nId == id && (*iter)->nUin == uin)
+    if ((*iter)->nId == id && (*iter)->myIdString == userId)
     {
       delete *iter;
@@ -2788 +2788 @@
 }
 
-CReverseConnectToUserData::CReverseConnectToUserData(unsigned long uin, unsigned long id,
+CReverseConnectToUserData::CReverseConnectToUserData(const char* idString, unsigned long id,
       unsigned long data, unsigned long ip, unsigned short port,
       unsigned short version, unsigned short failedport, unsigned long msgid1,
       unsigned long msgid2) :
-  nUin(uin), nId(id), nData(data), nIp(ip), nPort(port),
+  myIdString(idString), nId(id), nData(data), nIp(ip), nPort(port),
   nFailedPort(failedport), nVersion(version), nMsgID1(msgid1),
   nMsgID2(msgid2), bSuccess(false), bFinished(false)

trunk/licq/src/icqpacket.cpp

@@ -1761 +1761 @@
   CPU_Type2Message::InitBuffer();
 
-  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
-
-  buffer->PackUnsignedLong(o->Uin());
+  buffer->PackUnsignedLong(gUserManager.icqOwnerUin());
   buffer->PackUnsignedLong(nLocalIP);
   buffer->PackUnsignedLong(nLocalPort);
@@ -1774 +1772 @@
   buffer->PackUnsignedLong(m_nSubSequence);
 //  buffer->PackUnsignedLongBE(0x00030000);
-  gUserManager.DropOwner(o);
-}
-
-CPU_ReverseConnectFailed::CPU_ReverseConnectFailed(unsigned long nUin,
+}
+
+CPU_ReverseConnectFailed::CPU_ReverseConnectFailed(const char* szUin,
                                                    unsigned long nMsgID1,
                                                    unsigned long nMsgID2,
@@ -1785 +1782 @@
   : CPU_CommonFamily(ICQ_SNACxFAM_MESSAGE, ICQ_SNACxMSG_SERVERxREPLYxMSG)
 {
-  char szUin[13];
-  int nUinLen = snprintf(szUin, 12, "%lu", nUin);
+  int nUinLen = strlen(szUin);
 
   m_nSize += 8 + 2 + 1 + nUinLen + 2 + 4 + 4 + 4 + 2 + 4;
 
   InitBuffer();
-
-  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
 
   buffer->PackUnsignedLongBE(nMsgID1);
@@ -1800 +1794 @@
   buffer->Pack(szUin, nUinLen);
   buffer->PackUnsignedShortBE(0x0003);
-  buffer->PackUnsignedLong(o->Uin());
+  buffer->PackUnsignedLong(gUserManager.icqOwnerUin());
   buffer->PackUnsignedLong(nFailedPort);
   buffer->PackUnsignedLong(nOurPort);
   buffer->PackUnsignedShort(ICQ_VERSION_TCP);
   buffer->PackUnsignedLong(nConnectID);
-
-  gUserManager.DropOwner(o);
 }
 
@@ -4432 +4424 @@
   buffer->PackUnsignedLong(nLocalPort == 0 ? s_nLocalPort : nLocalPort);
 
-  ICQUser *u = gUserManager.FetchUser(nDestinationUin, LOCK_R);
+  char id[16];
+  snprintf(id, 16, "%lu", nDestinationUin);
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
   if (u)
   {
@@ -4489 +4483 @@
   buffer->PackUnsignedLong(nLocalPort == 0 ? s_nLocalPort : nLocalPort);
 
-  ICQUser *u = gUserManager.FetchUser(nDestinationUin, LOCK_R);
+  char id[16];
+  snprintf(id, 16, "%lu", nDestinationUin);
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
   if (u)
   {

trunk/licq/src/oscarservice.cpp

@@ -447 +447 @@
 
   ChangeStatus(STATUS_CONNECTED);
-  SrvSocket *s = new SrvSocket(gUserManager.icqOwnerUin());
+  SrvSocket* s = new SrvSocket(gUserManager.OwnerId(LICQ_PPID).c_str(), LICQ_PPID);
   gLog.Info(tr("%sConnecting to separate server for service 0x%02X.\n"),
             L_SRVxSTR, myFam);