Changeset 4175 for trunk/console

Timestamp:

07/23/05 10:10:15 (3 years ago)

Author:

emostar

Message:

Modified patch by Philip Nelson to compile one again.
Modified by me to actually receive files in the console plugin finally!

Location:

trunk/console/src

Files:

• console.cpp (modified) (8 diffs)
• console.h (modified) (2 diffs)
• event_data.h (modified) (1 diff)

trunk/console/src/console.cpp

@@ -354 +354 @@
         if (FD_ISSET((*iter)->Pipe(), &fdSet))
         {
-          ProcessFile(iter);
+          if (!ProcessFile(*iter))
+          {
+            delete *iter;
+#undef erase
+            m_lFileStat.erase(iter);
+          }
+
           break;
         }
@@ -644 +650 @@
  * CLicqConsole::ProcessFile
  *-------------------------------------------------------------------------*/
-void CLicqConsole::ProcessFile(list<CFileTransferManager *>::iterator iter)
+bool CLicqConsole::ProcessFile(CFileTransferManager *ftman)
 {
   char buf[32];
   bool bCloseFT = false;
-  read((*iter)->Pipe(), buf, 32);
+  read(ftman->Pipe(), buf, 32);
 
   CFileTransferEvent *e = NULL;
 
-  while ((e = (*iter)->PopFileTransferEvent()) != NULL)
+  while ((e = ftman->PopFileTransferEvent()) != NULL)
   {
     switch(e->Command())
@@ -703 +709 @@
       bCloseFT = true;
       break;
+
+    case FT_CONFIRMxFILE:
+      ftman->StartReceivingFile(const_cast<char *>(ftman->FileName()));
+      break;
     }
 
     if (bCloseFT)
     {
-      (*iter)->CloseFileTransfer();
-      delete *iter;
-#undef erase
-      m_lFileStat.erase(iter);
+      ftman->CloseFileTransfer();
       delete e;
-      return;
+      return false;
     }
 
     delete e;
   }
+
+  return true;
 }
 
@@ -1596 +1605 @@
     // Do we want to accept the file transfer?
     if (e->SubCommand() == ICQ_CMDxSUB_FILE)
-      //FIXME
-      //FileChatOffer(e->Sequence(), u->Uin());
+      FileChatOffer(e, szId, nPPID);
 
     delete e;
@@ -3040 +3048 @@
  * CLicqConsole::FileChatOffer
  *-------------------------------------------------------------------------*/
-void CLicqConsole::FileChatOffer(unsigned long _nSequence, const char *_szId, unsigned long _nPPID)
-{
+void CLicqConsole::FileChatOffer(CUserEvent *e, const char *_szId, unsigned long _nPPID)
+{
+  CEventFile *f = (CEventFile *)e;
   // Get y or n
   winMain->fProcessInput = &CLicqConsole::InputFileChatOffer;
   winMain->state = STATE_QUERY;
-  winMain->data = new DataFileChatOffer(_nSequence, _szId, _nPPID);
+  winMain->data = new DataFileChatOffer(f, _szId, _nPPID);
   winMain->wprintf("%C%ADo you wish to accept this request? (y/N) %C%Z",
                    m_cColorQuery->nColor, m_cColorQuery->nAttr, 8, A_BOLD);
@@ -3060 +3069 @@
   DataFileChatOffer *data = (DataFileChatOffer *)winMain->data;
   char *sz;
+  CEventFile *f = data->f;
 
   switch(winMain->state)
@@ -3077 +3087 @@
           m_lFileStat.push_back(ftman);
 
+          // Now watch the file pipe
+          FD_SET(ftman->Pipe(), &fdSet);
+
+
           // Accept the file
           const char *home = getenv("HOME");
           ftman->ReceiveFiles(home);
-          // XXX hack
-          unsigned long dummy[2] = { 0, 0};
           licqDaemon->icqFileTransferAccept(strtoul(data->szId, (char **)NULL, 10), ftman->LocalPort(),
-                                            data->nSequence, dummy, true);
+                                            f->Sequence(), f->MessageID(), f->IsDirect(),
+                                            f->FileDescription(), f->Filename(), f->FileSize());
           winMain->fProcessInput = &CLicqConsole::InputCommand;
 
@@ -3115 +3128 @@
       unsigned long dummy[2] = { 0, 0 };
       licqDaemon->icqFileTransferRefuse(strtoul(data->szId, (char **)NULL, 10), data->szReason,
-                                        data->nSequence, dummy, true);
+                                        f->Sequence(), dummy, true);
 
       // We are done now

trunk/console/src/console.h

@@ -109 +109 @@
   void ProcessStdin();
   void ProcessLog();
-  void ProcessFile(list<CFileTransferManager *>::iterator iter);
+  bool ProcessFile(CFileTransferManager *);
   char *CurrentGroupName();
   void SwitchToCon(unsigned short nCon);
@@ -202 +202 @@
 
   void Beep() { printf("\a"); fflush(stdout); }
-  void FileChatOffer(unsigned long, const char *, unsigned long);
+  void FileChatOffer(CUserEvent *, const char *, unsigned long);
   void RegistrationWizard();
   void InputRegistrationWizard(int cIn);

trunk/console/src/event_data.h

@@ -115 +115 @@
 {
 public:
-  DataFileChatOffer(unsigned long _nSeq, const char *i, unsigned long n) : CData(i, n)
-    { szReason[0] = '\0'; nSequence = _nSeq; }
+  DataFileChatOffer(CEventFile *_f, const char *i, unsigned long n) : CData(i, n)
+    { szReason[0] = '\0'; f = _f; }
+  CEventFile *f;
   char szReason[256];
-  unsigned long nSequence;
 };