Changeset 6257 for branches/licq_group/src/icqpacket.cpp

Timestamp:

06/11/08 08:20:10 (6 months ago)

Author:

eugene

Message:

Applied the latest version of flynd's daemon patch.

Files:

• branches/licq_group/src/icqpacket.cpp (modified) (15 diffs)

branches/licq_group/src/icqpacket.cpp

@@ -41 +41 @@
 #include "support.h"
 
+using namespace std;
 
 unsigned short ReversePort(unsigned short p)
@@ -2813 +2814 @@
     {
       // Use the first group that the user is in as the server stored group
-      GroupIDList *pID = gUserManager.LockGroupIDList(LOCK_R);
-      for (unsigned short j = 1; j < pID->size() + 1; j++)
+      const UserGroupList& userGroups = u->GetGroups();
+
+      for (UserGroupList::const_iterator j = userGroups.begin(); j != userGroups.end(); ++j)
       {
-        if (u->GetInGroup(GROUPS_USER, j))
-        {
-          m_nGSID = (*pID)[j-1];
-          if (m_nGSID)
-            break;
-        }
+        m_nGSID = gUserManager.GetIDFromGroup(*j);
+        if (m_nGSID != 0)
+          break;
       }
 
@@ -2828 +2827 @@
       {
         unsigned short nNewGroup = gUserManager.NewUserGroup();
-        if (nNewGroup && nNewGroup <= pID->size())
-          m_nGSID = (*pID)[nNewGroup-1];
-
-        if (m_nGSID == 0 && pID->size())
-          m_nGSID = (*pID)[0]; // first group if none was specified
+        m_nGSID = gUserManager.GetIDFromGroup(nNewGroup);
+
+        if (m_nGSID == 0)
+        {
+          // First group if none was specified
+          GroupMap* groups = gUserManager.LockGroupList(LOCK_R);
+          if (groups->size() > 0)
+          {
+            LicqGroup* g = groups->begin()->second;
+            g->Lock(LOCK_R);
+            m_nGSID = g->icqGroupId();
+            g->Unlock();
+          }
+          gUserManager.UnlockGroupList();
+        }
 
         if (m_nGSID == 0)
           m_nGSID = 1; // General (unless user renamed group or wasnt created yet)
       }
-      gUserManager.UnlockGroupIDList();
 
       u->SetGSID(m_nGSID);
@@ -2867 +2875 @@
     if (szUnicodeName)
       free(szUnicodeName);
-      
+
     free(*i);
   }
@@ -2873 +2881 @@
 
 //-----ExportGroupsToServerList-------------------------------------------------
-CPU_ExportGroupsToServerList::CPU_ExportGroupsToServerList(GroupList &groups)
+CPU_ExportGroupsToServerList::CPU_ExportGroupsToServerList(const GroupNameMap& groups)
   : CPU_CommonFamily(ICQ_SNACxFAM_LIST, ICQ_SNACxLIST_ROSTxADD)
 {
@@ -2879 +2887 @@
   int nGSID = 0;
 
-  GroupList::iterator g;
+  GroupNameMap::const_iterator g;
   for (g = groups.begin(); g != groups.end(); ++g)
   {
-    char *szUnicode = gTranslator.ToUnicode(*g);
+    const char* szUnicode = gTranslator.ToUnicode(g->second.c_str());
     nSize += strlen(szUnicode);
     nSize += 10;
     delete [] szUnicode;
   }
-  
+
   m_nSize += nSize;
   InitBuffer();
@@ -2898 +2906 @@
     nGSID = gUserManager.GenerateSID();
 
-    gUserManager.ModifyGroupID(*g, nGSID);
-
-    char *szUnicodeName = gTranslator.ToUnicode(*g);
+    gUserManager.ModifyGroupID(g->first, nGSID);
+
+    const char* szUnicodeName = gTranslator.ToUnicode(g->second.c_str());
 
     buffer->PackUnsignedShortBE(strlen(szUnicodeName));
@@ -2963 +2971 @@
 
       // Check for a group id
-      GroupIDList *pID = gUserManager.LockGroupIDList(LOCK_R);
+      const UserGroupList& userGroups = u->GetGroups();
       if (_nGroup)
       {
         // Use the passed in group
-        m_nGSID = (*pID)[_nGroup-1];
+        m_nGSID = gUserManager.GetIDFromGroup(_nGroup);
       }
       else if (u->GetGSID() && _bAuthReq)
@@ -2976 +2984 @@
       {
         // Use the first group that the user is in as the server stored group
-        for (unsigned short i = 1; i < pID->size() + 1; i++)
+        for (UserGroupList::iterator i = userGroups.begin(); i != userGroups.end(); ++i)
         {
-          if (u->GetInGroup(GROUPS_USER, i))
-          {
-            m_nGSID = (*pID)[i-1];
-            if (m_nGSID)
-              break;
-          }
+          m_nGSID = gUserManager.GetIDFromGroup(*i);
+          if (m_nGSID != 0)
+            break;
         }
       }
@@ -3007 +3012 @@
       {
         unsigned short nNewGroup = gUserManager.NewUserGroup();
-        if (nNewGroup && nNewGroup <= pID->size())
-          m_nGSID = (*pID)[nNewGroup-1];
-
-        if (m_nGSID == 0 && pID->size())
-          m_nGSID = (*pID)[0];
-        
+        m_nGSID = gUserManager.GetIDFromGroup(nNewGroup);
+
         if (m_nGSID == 0)
-          m_nGSID = 1; // General (unless user renamed group)
+        {
+          GroupMap* groups = gUserManager.LockGroupList(LOCK_R);
+          if (groups->size() > 0)
+          {
+            LicqGroup* g = groups->begin()->second;
+            g->Lock(LOCK_R);
+            m_nGSID = g->icqGroupId();
+            g->Unlock();
+          }
+          gUserManager.UnlockGroupList();
+        }
+
+        if (m_nGSID == 0)
+          m_nGSID = 1; // General (unless user renamed group or wasnt created yet)
       }
 
@@ -3022 +3036 @@
       SetExtraInfo(m_nGSID);
       u->SetGSID(m_nGSID);
-      gUserManager.UnlockGroupIDList();
       gUserManager.DropUser(u);
 
@@ -3087 +3100 @@
     if (_bTopLevel)
     {
-      GroupIDList *pID = gUserManager.LockGroupIDList(LOCK_R);
-
       // We are creating our top level group, so attach all the group ids now
       buffer->PackUnsignedShortBE(0x00C8);
       buffer->PackUnsignedShortBE(gUserManager.NumGroups() * 2);
-      
-      for (unsigned short i = 0; i < pID->size(); i++)
-        buffer->PackUnsignedShortBE((*pID)[i]);
-     
-      gUserManager.UnlockGroupIDList();
+
+      FOR_EACH_GROUP_START(LOCK_R)
+      {
+        buffer->PackUnsignedShortBE(pGroup->icqGroupId());
+      }
+      FOR_EACH_GROUP_END
     }
     else
@@ -3271 +3283 @@
   unsigned short nNameLen = strlen(_szName);
   char *szUnicodeName = 0;
-  GroupIDList *gID = 0;
+  const GroupMap* groups = 0;
   CBuffer tlvBuffer;
 
@@ -3317 +3329 @@
       if (nGSID == 0)
       {
-        gID = gUserManager.LockGroupIDList(LOCK_R);
-        nExtraLen += (gID->size() * 2);
+        groups = gUserManager.LockGroupList(LOCK_R);
+        nExtraLen += (groups->size() * 2);
         if (nExtraLen == 0)
-          gUserManager.UnlockGroupIDList();
+          gUserManager.UnlockGroupList();
       }
       else
@@ -3362 +3374 @@
       buffer->PackUnsignedShortBE(0x00C8);
       buffer->PackUnsignedShortBE(nExtraLen-4);
-      
+
       if (nGSID == 0)
       {
-        for (unsigned int i = 0; i != gID->size(); i++)
+        GroupMap::const_iterator i;
+        for (i = groups->begin(); i != groups->end(); ++i)
         {
-          buffer->PackUnsignedShortBE((*gID)[i]);
+          i->second->Lock(LOCK_R);
+          buffer->PackUnsignedShortBE(i->second->icqGroupId());
+          i->second->Unlock();
         }
-        gUserManager.UnlockGroupIDList();
+        gUserManager.UnlockGroupList();
       }
       else