Changeset 3482 for branches/protocol_plugin_1_3_0

Timestamp:

05/02/03 10:13:43 (6 years ago)

Author:

emostar

Message:

Removing user support

Location:

branches/protocol_plugin_1_3_0/licq

Files:

• include/licq_icqd.h (modified) (2 diffs)
• src/icqd-srv.cpp (modified) (1 diff)
• src/icqd.cpp (modified) (1 diff)

branches/protocol_plugin_1_3_0/licq/include/licq_icqd.h

@@ -238 +238 @@
   void icqAddGroup(const char *);
   void icqRemoveUser(unsigned long _nUin);
+  void icqRemoveUser(const char *);
   void icqRemoveGroup(const char *);
   void icqChangeGroup(unsigned long _nUin, unsigned short _nNewGroup,
@@ -297 +298 @@
   void AddUserToList(ICQUser *);
   void RemoveUserFromList(unsigned long _nUin);
-
+  void RemoveUserFromList(const char *szId, unsigned long nPPID);
+  
   // SMS
   unsigned long icqSendSms(const char *szNumber, const char *szMessage,

branches/protocol_plugin_1_3_0/licq/src/icqd-srv.cpp

@@ -293 +293 @@
   else
     PushProtoSignal(new CRemoveUserSignal(_szId), _nPPID);
+}
+
+void CICQDaemon::icqRemoveUser(const char *_szId)
+{
+  // Remove from the SSList and update groups
+  if (UseServerContactList())
+  {
+    CSrvPacketTcp *pStart = new CPU_GenericFamily(ICQ_SNACxFAM_LIST,
+      ICQ_SNACxLIST_ROSTxEDITxSTART);
+    SendEvent_Server(pStart);
+
+    ICQUser *u = gUserManager.FetchUser(_szId, LICQ_PPID, LOCK_W);
+    unsigned short nGSID = u->GetGSID();
+    unsigned short nSID = u->GetSID();
+    u->SetGSID(0);
+    gUserManager.DropUser(u);
+
+    pthread_mutex_lock(&mutex_modifyserverusers);
+    m_lszModifyServerUsers.push_back(strdup(_szId));
+    pthread_mutex_unlock(&mutex_modifyserverusers);
+
+    CSrvPacketTcp *pRemove = new CPU_RemoveFromServerList(_szId, nGSID, nSID, ICQ_ROSTxNORMAL);
+    SendExpectEvent_Server(0, pRemove, NULL);
+  }
+
+  // Tell server they are no longer with us.
+  CSrvPacketTcp *p = new CPU_GenericUinList(_szId, ICQ_SNACxFAM_BUDDY, ICQ_SNACxBDY_REMOVExFROMxLIST);
+  gLog.Info("%sAlerting server to remove user (#%ld)...\n", L_SRVxSTR,
+            p->Sequence());
+  SendExpectEvent_Server(_szId, LICQ_PPID, p, NULL);
 }
 

branches/protocol_plugin_1_3_0/licq/src/icqd.cpp

@@ -1009 +1009 @@
 }
 
+void CICQDaemon::RemoveUserFromList(const char *szId, unsigned long nPPID)
+{
+  if (nPPID == LICQ_PPID && m_nTCPSrvSocketDesc != -1) icqRemoveUser(szId);
+  
+  gUserManager.RemoveUser(szId, nPPID);
+  SaveUserList();
+  
+  PushPluginSignal(new CICQSignal(SIGNAL_UPDATExLIST, LIST_REMOVE, szId,
+    nPPID));
+}
 
 //-----ChangeUserStatus-------------------------------------------------------