Changeset 6402 for trunk/licq/src/icqd-filetransfer.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-filetransfer.cpp (modified) (10 diffs)

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