Changeset 6404 for trunk/licq/include/licq_icqd.h

Timestamp:

07/03/08 07:19:15 (5 months ago)

Author:

eugene

Message:

Made server-side users be collected into a separate map and processed all at once when contact list is received.

Files:

• trunk/licq/include/licq_icqd.h (modified) (4 diffs)

trunk/licq/include/licq_icqd.h

@@ -11 +11 @@
 #include <map>
 #include <string>
+
+#include <boost/shared_array.hpp>
 
 #include "licq_events.h"
@@ -140 +142 @@
 
 typedef std::list<CConversation *> ConversationList;
+
+/**
+ * Internal template class for storing and processing received contact list.
+ */
+class CUserProperties
+{
+public:
+  CUserProperties();
+
+private:
+  boost::shared_array<char> newAlias;
+  boost::shared_array<char> newCellular;
+
+  unsigned short normalSid;
+  unsigned short groupId;
+
+  unsigned short visibleSid;
+  unsigned short invisibleSid;
+  bool inIgnoreList;
+
+  bool awaitingAuth;
+
+  TLVList tlvs;
+
+friend class CICQDaemon;
+};
+
+typedef std::map<std::string, CUserProperties*> ContactUserList;
+typedef ContactUserList::iterator ContactUserListIter;
 
 //=====CICQDaemon===============================================================
@@ -745 +776 @@
   static pthread_cond_t  cond_reverseconnect_done;
 
+  ContactUserList receivedUserList;
+
   ConversationList m_lConversations;
   pthread_mutex_t mutex_conversations;
@@ -830 +863 @@
   void ProcessListFam(CBuffer &, unsigned short);
   void ProcessAuthFam(CBuffer &, unsigned short);
+
+  void ProcessUserList();
 
   void ProcessSystemMessage(CBuffer &packet, unsigned long checkUin, unsigned short newCommand, time_t timeSent);