Changeset 4902

Timestamp:

05/04/07 09:52:47 (19 months ago)

Author:

emostar

Message:

Fix updating our security settings (Require Auth, Show Web Presence).
I'm pretty sure Hide IP is not supported on the protocol anymore.. need to investigate whether to keep it or not.
We get some more packets that are marked as unknown, but for now it is ok to ignore these.

Also, if you look at the code, the META_... commands seem to have been changed. Maybe we need to fix more of them... Will check into that.

Fixes #1473 and #404

Location:

trunk/licq

Files:

• include/licq_icq.h (modified) (2 diffs)
• src/icqd-srv.cpp (modified) (3 diffs)
• src/icqpacket.cpp (modified) (2 diffs)

trunk/licq/include/licq_icq.h

@@ -220 +220 @@
 const unsigned short ICQ_CMDxMETA_ORGBACKxINFOxRSP = 0x0096; // 150
 const unsigned short ICQ_CMDxMETA_SENDxSMSxRSP     = 0x0096; // 150
-const unsigned short ICQ_CMDxMETA_SECURITYxRSP     = 0x00A0; // 160
+// Deprecated? const unsigned short ICQ_CMDxMETA_SECURITYxRSP     = 0x00A0; // 160
+const unsigned short ICQ_CMDxMETA_SECURITYxRSP     = 0x0C3F;
 const unsigned short ICQ_CMDxMETA_PASSWORDxRSP     = 0x00AA; // 170
 const unsigned short ICQ_CMDxMETA_RANDOMxUSERxRSP  = 0x0366; // 870
@@ -242 +243 @@
 const unsigned short ICQ_CMDxMETA_INTERESTSxINFOxSET = 0x0410; // 1040
 const unsigned short ICQ_CMDxMETA_ORGBACKxINFOxSET = 0x041A; // 1050
-const unsigned short ICQ_CMDxMETA_SECURITYxSET     = 0x0424; // 1060
+// Deprecated? const unsigned short ICQ_CMDxMETA_SECURITYxSET     = 0x0424; // 1060
+const unsigned short ICQ_CMDxMETA_SECURITYxSET     = 0x0C3A;
 const unsigned short ICQ_CMDxMETA_PASSWORDxSET     = 0x042E; // 1070
 const unsigned short ICQ_CMDxMETA_REQUESTxALLxINFO = 0x04B2; // 1202

trunk/licq/src/icqd-srv.cpp

@@ -1088 +1088 @@
 unsigned long CICQDaemon::icqSetSecurityInfo(bool bAuthorize, bool bHideIp, bool bWebAware)
 {
+  // Since ICQ5.1, the status change packet is sent first, which means it is
+  // assumed that the set security info packet works.
+  ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+  o->SetEnableSave(false);
+  o->SetAuthorization(bAuthorize);
+  o->SetWebAware(bWebAware);
+  o->SetHideIp(bHideIp);
+  o->SetEnableSave(true);
+  o->SaveLicqInfo();
+  unsigned short s = o->StatusFull();
+  gUserManager.DropOwner();
+  // Set status to ensure the status flags are set
+  icqSetStatus(s);
+
+  // Now send the set security info packet
     CPU_Meta_SetSecurityInfo *p = new CPU_Meta_SetSecurityInfo(bAuthorize, bHideIp, bWebAware);
     gLog.Info(tr("%sUpdating security info (#%hu/#%d)...\n"), L_SRVxSTR, p->Sequence(), p->SubSequence());
@@ -4987 +5002 @@
     }
     case 0x07DA:
+    case 0x07D0: // XXX Now I see this one, huh?
     {
       unsigned short nSubtype;
@@ -5015 +5031 @@
         pEvent = DoneServerEvent(nSubSequence,
           nResult == META_SUCCESS ? EVENT_SUCCESS : EVENT_FAILED);
-
-        if (pEvent != NULL && nResult == META_SUCCESS)
-        {
-          CPU_Meta_SetSecurityInfo *p = (CPU_Meta_SetSecurityInfo *)pEvent->m_pPacket;
-          ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
-          o->SetEnableSave(false);
-          o->SetAuthorization(p->Authorization());
-          o->SetWebAware(p->WebAware());
-          o->SetHideIp(p->HideIp());
-          o->SetEnableSave(true);
-          o->SaveLicqInfo();
-          unsigned short s = o->StatusFull();
-          gUserManager.DropOwner();
-
-          // Set status to ensure the status flags are set
-          icqSetStatus(s);
-        }
       }
       else if (nSubtype == ICQ_CMDxMETA_GENERALxINFOxRSP)

trunk/licq/src/icqpacket.cpp

@@ -4019 +4019 @@
 
 
-  int packetSize = 2+2+2+4+2+2+2+4;
+  int packetSize = 2+2+2+4+2+2+2+4+6;
   m_nSize += packetSize;
   InitBuffer();
@@ -4031 +4031 @@
   buffer->PackUnsignedShortBE(m_nSubSequence);
   buffer->PackUnsignedShort(m_nMetaCommand); // subtype
-  buffer->PackChar(m_nAuthorization);
+  buffer->PackUnsignedShortBE(0x0C03);
+  buffer->PackUnsignedShortBE(0x0100);
   buffer->PackChar(m_nWebAware);
+  buffer->PackChar(0xF8);
+  buffer->PackChar(2);
   buffer->PackChar(1);
   buffer->PackChar(0);
+  buffer->PackChar(m_nAuthorization);
 }