Changeset 3473 for branches/protocol_plugin_1_3_0

Timestamp:

05/01/03 14:14:19 (6 years ago)

Author:

emostar

Message:

Exporting AIM users to the server side list works

Location:

branches/protocol_plugin_1_3_0/licq/src

Files:

• icqd-srv.cpp (modified) (8 diffs)
• icqpacket.cpp (modified) (7 diffs)

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

@@ -128 +128 @@
 
   // Export users on a per group basis for the update group packet to work
-  UinList doneUin;
+  UserStringList doneUsers;
   for (unsigned int j = 1; j <= g->size(); j++)
   {
-    UinList uins;
-    FOR_EACH_USER_START(LOCK_R)
+    UserStringList users;
+    FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_R)
     {
       if (pUser->GetInGroup(GROUPS_USER, j) && pUser->GetSID() == 0 &&
           !pUser->IgnoreList())
       {
-        UinList::const_iterator p = std::find(doneUin.begin(), doneUin.end(),
-          pUser->Uin());
-
-        if (p == doneUin.end())
-        {
-          uins.push_back(pUser->Uin());
-          doneUin.push_back(pUser->Uin());
+        UserStringList::const_iterator p = std::find(doneUsers.begin(), doneUsers.end(),
+          pUser->IdString());
+
+        if (p == doneUsers.end())
+        {
+          users.push_back(strdup(pUser->IdString()));
+          doneUsers.push_back(strdup(pUser->IdString()));
 
           pthread_mutex_lock(&mutex_modifyserverusers);
-          m_lszModifyServerUsers.push_back(strdup(pUser->UinString()));
+          m_lszModifyServerUsers.push_back(strdup(pUser->IdString()));
           pthread_mutex_unlock(&mutex_modifyserverusers);
         }
       }
     }
-    FOR_EACH_USER_END
-
-    if (uins.size())
-      icqExportUsers(uins, ICQ_ROSTxNORMAL);
-  }
+    FOR_EACH_PROTO_USER_END
+
+    if (users.size())
+      icqExportUsers(users, ICQ_ROSTxNORMAL);
+  }
+  
+  UserStringList::iterator it;
+  for (it = doneUsers.begin(); it != doneUsers.end(); it++)
+    free(*it);
 
   // Export visible/invisible/ignore list
-  UinList visibleUins, invisibleUins, ignoredUins;
-  FOR_EACH_USER_START(LOCK_R)
+  UserStringList visibleUsers, invisibleUsers, ignoredUsers;
+  FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_R)
   {
     if (pUser->IgnoreList() && pUser->GetSID() == 0)
     {
-      ignoredUins.push_back(pUser->Uin());
+      ignoredUsers.push_back(strdup(pUser->IdString()));
 
       pthread_mutex_lock(&mutex_modifyserverusers);
-      m_lszModifyServerUsers.push_back(strdup(pUser->UinString()));
+      m_lszModifyServerUsers.push_back(strdup(pUser->IdString()));
       pthread_mutex_unlock(&mutex_modifyserverusers);
     }
@@ -173 +177 @@
       if (pUser->InvisibleList() && pUser->GetInvisibleSID() == 0)
       {
-        invisibleUins.push_back(pUser->Uin());
+        invisibleUsers.push_back(strdup(pUser->IdString()));
 
         pthread_mutex_lock(&mutex_modifyserverusers);
-        m_lszModifyServerUsers.push_back(strdup(pUser->UinString()));
+        m_lszModifyServerUsers.push_back(strdup(pUser->IdString()));
         pthread_mutex_unlock(&mutex_modifyserverusers);
       }
@@ -182 +186 @@
       if (pUser->VisibleList() && pUser->GetVisibleSID() == 0)
       {
-        visibleUins.push_back(pUser->Uin());
+        visibleUsers.push_back(strdup(pUser->IdString()));
 
         pthread_mutex_lock(&mutex_modifyserverusers);
-        m_lszModifyServerUsers.push_back(strdup(pUser->UinString()));
+        m_lszModifyServerUsers.push_back(strdup(pUser->IdString()));
         pthread_mutex_unlock(&mutex_modifyserverusers);
       }
     }
   }
-  FOR_EACH_USER_END
-
-  if (visibleUins.size())
-    icqExportUsers(visibleUins, ICQ_ROSTxVISIBLE);
-
-  if (invisibleUins.size())
-    icqExportUsers(invisibleUins, ICQ_ROSTxINVISIBLE);
-
-  if (ignoredUins.size())
-    icqExportUsers(ignoredUins, ICQ_ROSTxIGNORE);
+  FOR_EACH_PROTO_USER_END
+
+  if (visibleUsers.size())
+    icqExportUsers(visibleUsers, ICQ_ROSTxVISIBLE);
+
+  if (invisibleUsers.size())
+    icqExportUsers(invisibleUsers, ICQ_ROSTxINVISIBLE);
+
+  if (ignoredUsers.size())
+    icqExportUsers(ignoredUsers, ICQ_ROSTxIGNORE);
 }
 
 //-----icqExportUsers-----------------------------------------------------------
-void CICQDaemon::icqExportUsers(UinList &uins, unsigned short _nType)
+void CICQDaemon::icqExportUsers(UserStringList &users, unsigned short _nType)
 {
   if (!UseServerContactList())  return;
@@ -210 +214 @@
   SendEvent_Server(pStart);
 
-  CSrvPacketTcp *pExport = new CPU_ExportToServerList(uins, _nType);
+  CSrvPacketTcp *pExport = new CPU_ExportToServerList(users, _nType);
   gLog.Info("%sExporting users to server contact list...\n", L_SRVxSTR);
   SendExpectEvent_Server(0L, pExport, NULL);
@@ -827 +831 @@
 {
   unsigned short n = 0;
-  UinList uins;
-  FOR_EACH_USER_START(LOCK_W)
+  UserStringList users;
+  FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_W)
   {
     n++;
-    uins.push_back(pUser->Uin());
+    users.push_back(strdup(pUser->IdString()));
     if (n == m_nMaxUsersPerPacket)
     {
-      CSrvPacketTcp *p = new CPU_GenericUinList(uins, ICQ_SNACxFAM_BUDDY, ICQ_SNACxBDY_ADDxTOxLIST);
+      CSrvPacketTcp *p = new CPU_GenericUinList(users, ICQ_SNACxFAM_BUDDY, ICQ_SNACxBDY_ADDxTOxLIST);
       gLog.Info("%sUpdating contact list (#%ld)...\n", L_SRVxSTR, p->Sequence());
       SendEvent_Server(p);
-      uins.erase(uins.begin(), uins.end());
+      users.erase(users.begin(), users.end());
       n = 0;
     }
@@ -843 +847 @@
     if (!pUser->StatusOffline()) ChangeUserStatus(pUser, ICQ_STATUS_OFFLINE);
   }
-  FOR_EACH_USER_END
+  FOR_EACH_PROTO_USER_END
   if (n != 0)
   {
-    CSrvPacketTcp *p = new CPU_GenericUinList(uins, ICQ_SNACxFAM_BUDDY, ICQ_SNACxBDY_ADDxTOxLIST);
+    CSrvPacketTcp *p = new CPU_GenericUinList(users, ICQ_SNACxFAM_BUDDY, ICQ_SNACxBDY_ADDxTOxLIST);
     gLog.Info("%sUpdating contact list (#%ld)...\n", L_SRVxSTR, p->Sequence());
     SendEvent_Server(p);
@@ -858 +862 @@
   // Go through the entire list of users, checking if each one is on
   // the visible list
-  UinList uins;
-  FOR_EACH_USER_START(LOCK_R)
+  UserStringList users;
+  FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_R)
   {
     if (pUser->GetInGroup(GROUPS_SYSTEM, GROUP_VISIBLE_LIST) )
-      uins.push_back(pUser->Uin());
-  }
-  FOR_EACH_USER_END
-  CSrvPacketTcp* p = new CPU_GenericUinList(uins, ICQ_SNACxFAM_BOS, ICQ_SNACxBOS_ADDxVISIBLExLIST);
+      users.push_back(strdup(pUser->IdString()));
+  }
+  FOR_EACH_PROTO_USER_END
+  CSrvPacketTcp* p = new CPU_GenericUinList(users, ICQ_SNACxFAM_BOS, ICQ_SNACxBOS_ADDxVISIBLExLIST);
   gLog.Info("%sSending visible list (#%ld)...\n", L_SRVxSTR, p->Sequence());
   SendEvent_Server(p);
@@ -874 +878 @@
 void CICQDaemon::icqSendInvisibleList()
 {
-  UinList uins;
-  FOR_EACH_USER_START(LOCK_R)
+  UserStringList users;
+  FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_R)
   {
     if (pUser->GetInGroup(GROUPS_SYSTEM, GROUP_INVISIBLE_LIST) )
-      uins.push_back(pUser->Uin());
-  }
-  FOR_EACH_USER_END
-
-  CSrvPacketTcp* p = new CPU_GenericUinList(uins, ICQ_SNACxFAM_BOS, ICQ_SNACxBOS_ADDxINVISIBxLIST);
+      users.push_back(strdup(pUser->IdString()));
+  }
+  FOR_EACH_PROTO_USER_END
+
+  CSrvPacketTcp* p = new CPU_GenericUinList(users, ICQ_SNACxFAM_BOS, ICQ_SNACxBOS_ADDxINVISIBxLIST);
   gLog.Info("%sSending invisible list (#%ld)...\n", L_SRVxSTR, p->Sequence());
   SendEvent_Server(p);

branches/protocol_plugin_1_3_0/licq/src/icqpacket.cpp

@@ -917 +917 @@
 }
 
+CPU_GenericUinList::CPU_GenericUinList(UserStringList &users, unsigned short family, unsigned short Subtype)
+  : CPU_CommonFamily(family, Subtype)
+{
+  char len[2];
+  len[1] = '\0';
+  int nLen = 0;
+  UserStringList::iterator it;
+  for (it = users.begin(); it != users.end(); it++)
+    nLen += strlen(*it)+1;
+
+  char *contacts = new char[nLen+1];
+  contacts[0] = '\0';
+
+  for (it = users.begin(); it != users.end(); it++) {
+    len[0] = strlen(*it);
+    strcat(contacts, len);
+    strcat(contacts, *it);
+    free (*it);
+  }
+
+  m_nSize += strlen(contacts);
+  InitBuffer();
+
+  buffer->Pack(contacts, strlen(contacts));
+}
+
 CPU_GenericUinList::CPU_GenericUinList(const char *szId, unsigned short family, unsigned short Subtype)
   : CPU_CommonFamily(family, Subtype)
@@ -1787 +1813 @@
 
 //-----ExportToServerList-------------------------------------------------------
-CPU_ExportToServerList::CPU_ExportToServerList(UinList &uins,
+CPU_ExportToServerList::CPU_ExportToServerList(UserStringList &users,
                                                unsigned short _nType)
   : CPU_CommonFamily(ICQ_SNACxFAM_LIST, ICQ_SNACxLIST_ROSTxADD)
@@ -1795 +1821 @@
   int nSize = 0;
 
-  UinList::iterator i;
-  for (i = uins.begin(); i != uins.end(); i++)
-  {
-    ICQUser *pUser = gUserManager.FetchUser(*i, LOCK_R);
+  UserStringList::iterator i;
+  for (i = users.begin(); i != users.end(); i++)
+  {
+    ICQUser *pUser = gUserManager.FetchUser(*i, LICQ_PPID, LOCK_R);
     if (pUser)
     {
-      char szTmp[13];
-      szTmp[12] = '\0';
-
-      nSize += snprintf(szTmp, 12, "%lu", *i);
+      nSize += strlen(*i);
       nSize += 10;
 
@@ -1820 +1843 @@
   InitBuffer();
 
-  for (i = uins.begin(); i != uins.end(); i++)
-  {
-    char szUin[13];
-    szUin[12] = '\0';
+  for (i = users.begin(); i != users.end(); i++)
+  {
     int nLen;
     int nAliasSize = 0;
@@ -1831 +1852 @@
 
     // Save the SID
-    ICQUser *u = gUserManager.FetchUser(*i, LOCK_W);
+    ICQUser *u = gUserManager.FetchUser(*i, LICQ_PPID, LOCK_W);
     switch (_nType)
     {
@@ -1878 +1899 @@
     SetExtraInfo(m_nGSID);
 
-    nLen = snprintf(szUin, 12, "%lu", *i);
+    nLen = strlen(*i);
     buffer->PackUnsignedShortBE(nLen);
-    buffer->Pack(szUin, nLen);
+    buffer->Pack(*i, nLen);
     buffer->PackUnsignedShortBE(m_nGSID);
     buffer->PackUnsignedShortBE(m_nSID);
@@ -1897 +1918 @@
     if (szUnicodeName)
       delete [] szUnicodeName;
+      
+    free(*i);
   }
 }