Ticket #1445: newdiff.patch

include/licq_icq.h

@@ -7 +7 @@
 #define MODE_INDIRECT 0x02
 #define MODE_DENIED   0x01  // user denies direct connection from "any" user
 
-#define ICQ_VERSION 8
-const unsigned short ICQ_VERSION_TCP               = 0x0008;
+#define ICQ_VERSION 9
+const unsigned short ICQ_VERSION_TCP               = 0x0009;
 
 #define LICQ_WITHSSL     0x7D800000
 #define LICQ_WITHOUTSSL  0x7D000000
@@ -558 +558 @@
                                           ' ',  'R',  '.',  'K',  '.',  ' ', 
                                           0x00, 0x00, 0x00, 0x00 };
 
+const char ICQ_CAPABILITY_AIM_FILE[]  = { 0x09, 0x46, 0x13, 0x43, 0x4c, 0x7f,
+                                          0x11, 0xd1, 0x82, 0x22, 0x44, 0x45,
+                                          0x53, 0x54, 0x00, 0x00 };
+
+const char ICQ_CAPABILITY_UNKNOWN1[]  = { 0xb2, 0xec, 0x8f, 0x16, 0x7c, 0x6f,
+                                          0x45, 0x1b, 0xbd, 0x79, 0xdc, 0x58,
+                                          0x49, 0x78, 0x88, 0xb9 };
+const char ICQ_CAPABILITY_UNKNOWN2[]  = {0x09, 0x46, 0x13, 0x4c, 0x4c, 0x7f, 0x11, 0xd1, 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00  };
+const char ICQ_CAPABILITY_UNKNOWN3[]  = {0x17, 0x8c, 0x2d, 0x9b, 0xda, 0xa5, 0x45, 0xbb, 0x8d, 0xdb, 0xf3, 0xbd, 0xbd, 0x53, 0xa1, 0x0a  };
+const char ICQ_CAPABILITY_UNKNOWN4[]  = {0x67, 0x36, 0x15, 0x15, 0x61, 0x2d, 0x4c, 0x07, 0x8f, 0x3d, 0xbd, 0xe6, 0x40, 0x8e, 0xa0, 0x41 };
+const char ICQ_CAPABILITY_UNKNOWN5[]  = {0xb9, 0x97, 0x08, 0xb5, 0x3a, 0x92, 0x42, 0x02, 0xb0, 0x69, 0xf1, 0xe7, 0x57, 0xbb, 0x2e, 0x17 };
+// Unknown {b2ec8f16-7c6f-451b-bd79-dc58497888b9}
+// Unknown {0946134c-4c7f-11d1-8222-444553540000}
+// Unknown {178c2d9b-daa5-45bb-8ddb-f3bdbd53a10a}
+// Unknown {67361515-612d-4c07-8f3d-bde6408ea041}
+// Unknown {b99708b5-3a92-4202-b069-f1e757bb2e17}
+// Send File {09461343-4c7f-11d1-8222-444553540000}
+// Unknown {563fc809-0b6f-41bd-9f79-422609dfa2f3} TYPING
+// Unknown {1a093c6c-d7fd-4ec5-9d51-a6474e34f5a0} XTRA
+
 // XtraAway
 const int XTRA_AWAY_COUNT             = 32;
 const char XtraAwayCaps[XTRA_AWAY_COUNT][0x10] = 

include/licq_icqd.h

@@ -817 +817 @@
   unsigned long icqRequestStatusPlugin(ICQUser *, bool, const char *);
   void icqUpdateInfoTimestamp(const char *);
 
+  // Xtraz
+  int checkXtraAway(char *);
+
   void StupidChatLinkageFix();
 
   // Declare all our thread functions as friends

src/icqpacket.cpp

@@ -827 +827 @@
   buffer->PackUnsignedShortBE(0x0014);
   // Client version minor
   buffer->PackUnsignedLongBE(0x00180002);
-  buffer->PackUnsignedShortBE(0x0022);
+  buffer->PackUnsignedShortBE(0x0034);
   buffer->PackUnsignedLongBE(0x00190002);
   buffer->PackUnsignedShortBE(0x0000);
   // Client version build
@@ -923 +923 @@
 CPU_CapabilitySettings::CPU_CapabilitySettings()
   : CPU_CommonFamily(ICQ_SNACxFAM_LOCATION, ICQ_SNACxLOC_SETxUSERxINFO)
 {
-  char data[7][CAP_LENGTH];
+  char data[13][CAP_LENGTH];
   m_nSize += 4 + sizeof(data);
   InitBuffer();
 
@@ -934 +934 @@
   memcpy(data[4], ICQ_CAPABILITY_AIMxINTER, CAP_LENGTH);
   memcpy(data[5], ICQ_CAPABILITY_RTFxMSGS, CAP_LENGTH);
   memcpy(data[6], ICQ_CAPABILITY_ICHAT, CAP_LENGTH);
+  memcpy(data[7], ICQ_CAPABILITY_UTF8, CAP_LENGTH);
+  //memcpy(data[8], ICQ_CAPABILITY_AIM_FILE, CAP_LENGTH);
+  //memcpy(data[9], ICQ_CAPABILITY_XTRAZ, CAP_LENGTH);
+  memcpy(data[8], ICQ_CAPABILITY_UNKNOWN1, CAP_LENGTH);
+  memcpy(data[9], ICQ_CAPABILITY_UNKNOWN2, CAP_LENGTH);
+  memcpy(data[10], ICQ_CAPABILITY_UNKNOWN3, CAP_LENGTH);
+  memcpy(data[11], ICQ_CAPABILITY_UNKNOWN4, CAP_LENGTH);
+  memcpy(data[12], ICQ_CAPABILITY_UNKNOWN5, CAP_LENGTH);
 
   // Send our licq version
   data[3][12] = INT_VERSION / 1000;

src/icqd.cpp

@@ -2415 +2415 @@
                                 unsigned short nSequence, bool bIsAck,
                                 bool &bNewUser)
 {
+  gLog.Info("Msg Type: %d, Mask: %ld, Sequence: %d, Ack %c\nText: %s",
+      nMsgType, nMask, nSequence, bIsAck? '1': '0', message);
   char *szType = NULL;
   CUserEvent *pEvent = NULL;
   unsigned short nEventType = 0;

src/icqd-srv.cpp

@@ -2937 +2937 @@
   {
     gLog.Info(tr("%sReceived rights for Contact List..\n"), L_SRVxSTR);
 
-    icqUpdateContactList();
+    // ICQ5.1 doesn't seem to do this anymore.
+    //icqUpdateContactList();
     break;
   }
 
@@ -3226 +3227 @@
         break;
       }
  
+      // XXX Temporary workaround for the UIN being sent instead of the message
+      // type when we are invisible. Needs a real fix.
+      unsigned long nTmpHack;
+      char szHackStr[11];
       advMsg >> nStatus >> nMsgFlags;
+      //nTmpHack = (nMsgType << 16) & nStatus;
+      nTmpHack = (nMsgType & 0x00FF) << 24 |
+                 (nMsgType & 0xFF00) << 8 |
+                 (nStatus & 0x00FF) << 8 |
+                 (nStatus & 0xFF00) >> 8;
+      snprintf(szHackStr, 11, "%ld", nTmpHack);
 
+      if (strcmp(szHackStr, szId) == 0)
+      {
+        nMsgType = 0x0001;
+      }
+        
       if (nMsgType & ICQ_CMDxSUB_FxMULTIREC)
       {
         nMask |= ICQ_CMDxSUB_FxMULTIREC;
@@ -3266 +3282 @@
 
       u->SetTyping(ICQ_TYPING_INACTIVEx0);
       
+      // XXX Part of the hack above. If it is a messed up packet, ignore the
+      // status. If not, don't touch the status here... we extracted it above.
+      if (strcmp(szHackStr, szId) != 0)
+        nStatus = u->Status(); 
+
       if (msgTxt.getTLVLen(0x0004) == 4)
       {
         unsigned long Ip = msgTxt.UnpackUnsignedLongTLV(0x0004);