Changeset 3478 for branches/protocol_plugin_1_3_0

Timestamp:

05/02/03 09:17:08 (6 years ago)

Author:

emostar

Message:

Support adding AIM contacts on the server to the local list

Files:

• branches/protocol_plugin_1_3_0/licq/src/icqd-srv.cpp (modified) (7 diffs)

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

@@ -2820 +2820 @@
       nPacketCount = packet.UnpackUnsignedShortBE();
       nCount += nPacketCount;
-      
+
       for (unsigned short i = 0; i < nPacketCount; i++)
       {
-        char *szName;
+        char *szId;
         unsigned short nTag, nID, nType, nByteLen;
 
-        // Can't use UnpackUinString because this may be a group name
-        szName = packet.UnpackStringBE();
+        // Can't use UnpackUserString because this may be a group name
+        szId = packet.UnpackStringBE();
         nTag = packet.UnpackUnsignedShortBE();
         nID = packet.UnpackUnsignedShortBE();
@@ -2833 +2833 @@
         nByteLen = packet.UnpackUnsignedShortBE();
 
-        char *szUnicodeName = gTranslator.FromUnicode(szName);
+        char *szUnicodeName = gTranslator.FromUnicode(szId);
 
         if (nByteLen)
@@ -2841 +2841 @@
             gLog.Error("%sUnable to parse contact list TLV, aborting!\n",
                                              L_ERRORxSTR);
-            delete[] szName;
+            delete[] szId;
             return;
           }
@@ -2857 +2857 @@
             bool bAwaitingAuth = packet.hasTLV(0x0066);
 
-            unsigned long nUin = atoi(szName);
+            //unsigned long nUin = atoi(szName);
             unsigned short nInGroup = gUserManager.GetGroupFromID(nTag);
             bool isOnList = true;
-            if (nUin && !gUserManager.IsOnList(nUin))
+            if (szId && !gUserManager.IsOnList(szId, LICQ_PPID))
             {
               isOnList = false;
-              AddUserToList(nUin, false); // Don't notify server
+              AddUserToList(szId, LICQ_PPID, false); // Don't notify server
             }
 
             char *szUnicodeAlias = gTranslator.FromUnicode(szNewName);
 
-            ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
+            ICQUser *u = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_W);
             if (u)
             {
@@ -2923 +2923 @@
             }
 
-            gLog.Info("%sAdded %s (%ld) to list from server.\n", L_SRVxSTR,
-              (szUnicodeAlias ? szUnicodeAlias : ""), nUin);
+            gLog.Info("%sAdded %s (%s) to list from server.\n", L_SRVxSTR,
+              (szUnicodeAlias ? szUnicodeAlias : ""), szId);
             if (szUnicodeAlias)
               delete [] szUnicodeAlias;
@@ -2937 +2937 @@
           case ICQ_ROSTxGROUP:
           {
-            if (szName[0] != '\0')
+            if (szId[0] != '\0')
             {
               // Rename the group if we have it already or else add it
@@ -2959 +2959 @@
 
         packet.cleanupTLV();
-        delete[] szName;
+        delete[] szId;
       } // for count