Changeset 4193 for trunk/rms

Timestamp:

08/23/05 16:57:02 (3 years ago)

Author:

phatfil

Message:

fix event tag handling.

Location:

trunk/rms/src

Files:

• rms.cpp (modified) (6 diffs)
• rms.h (modified) (3 diffs)

trunk/rms/src/rms.cpp

@@ -180 +180 @@
 
   // Register with the daemon, we only want the update user signal
-  m_nPipe = _licqDaemon->RegisterPlugin(SIGNAL_UPDATExUSER);
+  m_nPipe = _licqDaemon->RegisterPlugin(SIGNAL_ALL);
   licqDaemon = _licqDaemon;
   
@@ -397 +397 @@
     }
   case SIGNAL_UPDATExLIST:
+    break;
   case SIGNAL_LOGON:
+    break;
+  case SIGNAL_EVENTxID:
+    AddEventTag(s->Id(), s->PPID(), s->Argument());
+    break;
   default:
     break;
     
-  case SIGNAL_EVENTxID:
-    //XXX Catch this
-    break;
   }
   delete s;
 }
 
+/*---------------------------------------------------------------------------
+ * CLicqRMS::AddEventTag
+ *-------------------------------------------------------------------------*/
+void CLicqRMS::AddEventTag(const char *_szId, unsigned long _nPPID, unsigned long _nEventTag)
+{
+  ClientList ::iterator iter;
+  for (iter = clients.begin(); iter != clients.end(); iter++)
+  {
+    (*iter)->AddEventTag(_szId, _nPPID, _nEventTag);
+  }
+}
 
 /*---------------------------------------------------------------------------
@@ -461 +474 @@
   data_line_pos = 0;
   m_bNotify = false;
+  m_szEventId = 0;
+  m_nEventPPID = 0;
 }
 
@@ -473 +488 @@
   if (m_szCheckId)
     free(m_szCheckId);
+}
+
+/*---------------------------------------------------------------------------
+ * CRMSClient::AddEventTag
+ *-------------------------------------------------------------------------*/
+void CRMSClient::AddEventTag(const char *_szId, unsigned long _nPPID, unsigned long _nEventTag)
+{
+  if (m_szEventId && m_nEventPPID &&
+       !strcmp(m_szEventId, _szId) && m_nEventPPID == _nPPID)
+  {
+    fprintf(fs, "%d [%ld] Sending message to %s.\n", CODE_COMMANDxSTART,
+       _nEventTag, _szId);
+    tags.push_back(_nEventTag);
+    free(m_szEventId);
+    m_szEventId = 0;
+    m_nEventPPID = 0;
+  }
 }
 
@@ -1038 +1070 @@
 int CRMSClient::Process_MESSAGE()
 {
+  if (m_nEventPPID || m_szEventId)
+  {
+    //client is trying to send another message before we've received
+    //the event tag for a previous one
+    fprintf(fs, "%d Error, cannot send concurrent messages\n", CODE_INVALIDxCOMMAND);
+    return -1;
+  }
   fprintf(fs, "%d Enter message, terminate with a . on a line by itself:\n",
      CODE_ENTERxTEXT);
@@ -1057 +1096 @@
     false, ICQ_TCPxMSG_NORMAL);
 
-  fprintf(fs, "%d [%ld] Sending message to %s.\n", CODE_COMMANDxSTART,
-     tag, m_szId);
   m_nState = STATE_COMMAND;
 
   if (m_nPPID == LICQ_PPID)
+  {
+    fprintf(fs, "%d [%ld] Sending message to %s.\n", CODE_COMMANDxSTART,
+       tag, m_szId);
     tags.push_back(tag);
-    
+  }
+  else
+  {
+    m_nEventPPID = m_nPPID;
+    m_szEventId = strdup(m_szId);
+  }
   return fflush(fs);
 }

trunk/rms/src/rms.h

@@ -51 +51 @@
   void ProcessServer();
   void ProcessLog();
+  void AddEventTag(const char *, unsigned long, unsigned long);
 
 friend class CRMSClient;
@@ -104 +105 @@
   char m_szLine[MAX_LINE_LENGTH + 1];
   unsigned short m_nTextPos;
+  char *m_szEventId;
+  unsigned long m_nEventPPID;
 
   int StateMachine();
@@ -112 +115 @@
   void ParseUser(const char *);
   int ChangeStatus(unsigned long, unsigned long, const char *);
+  void AddEventTag(const char *, unsigned long, unsigned long);
   
   int Process_MESSAGE_text();