Changeset 6371

Timestamp:

07/01/08 05:57:40 (3 months ago)

Author:

flynd

Message:

Added partial support for id instead of uin in file transfer class.

Location:

trunk/licq

Files:

• include/licq_filetransfer.h (modified) (2 diffs)
• src/icqd-filetransfer.cpp (modified) (5 diffs)

trunk/licq/include/licq_filetransfer.h

@@ -213 +213 @@
   direction Direction() { return m_nDirection; }
   unsigned long Uin() { return m_nUin; }
+  const char* Id() const { return myId; }
 
   // Available after FT_STARTxBATCH
@@ -269 +270 @@
   unsigned long m_nUin;
   unsigned short m_nSession, m_nSpeed, m_nState;
+  char myId[16];
 
   char m_szLocalName[64], m_szRemoteName[64];

trunk/licq/src/icqd-filetransfer.cpp

@@ -28 +28 @@
 #include "licq_icqd.h"
 #include "licq_translate.h"
+#include "licq_user.h"
 #include "support.h"
 
@@ -200 +201 @@
 
   m_nUin = nUin;
+  sprintf(myId, "%lu", m_nUin);
   m_nSession = rand();
   licqDaemon = d;
 
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   strncpy(m_szLocalName, o->GetAlias(), sizeof(m_szLocalName) - 1);
   m_szLocalName[sizeof(m_szLocalName) - 1] = '\0';
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 
   m_nCurrentFile = m_nBatchFiles = 0;
@@ -338 +340 @@
 bool CFileTransferManager::ConnectToFileServer(unsigned short nPort)
 {
-  ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_R);
+  ICQUser *u = gUserManager.FetchUser(myId, LICQ_PPID, LOCK_R);
   if (u == NULL)
     return false;
@@ -352 +354 @@
     bSuccess = licqDaemon->OpenConnectionToUser(m_nUin, &ftSock, nPort);
    }
- 
+
   bool bResult = false;
   if (!bSuccess)
   {
-    ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
     unsigned long nIp = bSendIntIp ? o->IntIp() : o->Ip();
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
 
     // try reverse connect
@@ -388 +390 @@
 
   // Send handshake packet:
-  ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_R);
+  ICQUser *u = gUserManager.FetchUser(myId, LICQ_PPID, LOCK_R);
   unsigned short nVersion = u->ConnectionVersion();
   gUserManager.DropUser(u);