Changeset 6438 for trunk/licq

Timestamp:

07/09/08 09:45:38 (5 months ago)

Author:

eugene

Message:

Fixed user TLVs handling received in the initial contact list packet.

Location:

trunk/licq

Files:

• include/licq_user.h (modified) (1 diff)
• src/icqd-srv.cpp (modified) (3 diffs)
• src/user.cpp (modified) (1 diff)

trunk/licq/include/licq_user.h

@@ -896 +896 @@
   void AddTLV(TLVPtr);
   void RemoveTLV(unsigned long);
+  void SetTLVList(TLVList& tlvs);
   TLVList GetTLVList();
 

trunk/licq/src/icqd-srv.cpp

@@ -4201 +4201 @@
 
             CUserProperties* data = iter->second;
+
+            TLVList list = packet.getTLVList();
+            for (TLVListIter it = list.begin(); it != list.end(); it++)
+              data->tlvs[it->first] = it->second;
 
 #define COPYTLV(type, var) \
@@ -6374 +6378 @@
       continue;
 
+    // For now, just save all the TLVs. We should change this to have awaiting auth check
+    // for the 0x0066 TLV, SMS number if it has the 0x013A TLV, etc
+    u->SetTLVList(data->tlvs);
+
     if (data->newAlias != NULL)
       u->SetAlias(data->newAlias.get());
@@ -6403 +6411 @@
         delete[] tmp;
       }
-    }
-
-    // For now, just save all the TLVs. We should change this to have awaiting auth check
-    // for the 0x0066 TLV, SMS number if it has the 0x013A TLV, etc
-    TLVListIter tlvIter;
-    for (tlvIter = data->tlvs.begin(); tlvIter != data->tlvs.end(); tlvIter++)
-    {
-      TLVPtr tlv = tlvIter->second;
-      u->AddTLV(tlv);
     }
 

trunk/licq/src/user.cpp

@@ -3875 +3875 @@
 }
 
+void ICQUser::SetTLVList(TLVList& tlvs)
+{
+  myTLVs.clear();
+
+  for (TLVListIter it = tlvs.begin(); it != tlvs.end(); it++)
+    myTLVs[it->first] = it->second;
+}
+
 //=====ICQOwner=================================================================