Changeset 6402 for trunk/licq/src/icqd-srv.cpp

Timestamp:

07/03/08 05:54:19 (5 months ago)

Author:

flynd

Message:

More uin calls removed or rewritten.

Files:

• trunk/licq/src/icqd-srv.cpp (modified) (9 diffs)

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