Changeset 6181

Timestamp:

05/05/08 16:31:53 (5 months ago)

Author:

emostar

Message:

Add the patch by Sergey Kononenko (Message-ID: <20080122012616.48112055@…>)
Included the following additions:

• Add support for AIM (not all users yet)
• Fix a few memory leaks
• Rename SSBI to BART
• Add constants for BART Types
• Add support to qt4-gui
• Use boost in a few cases

Location:

trunk

Files:

• licq/include/licq_buffer.h (modified) (1 diff)
• licq/include/licq_events.h (modified) (4 diffs)
• licq/include/licq_icq.h (modified) (4 diffs)
• licq/include/licq_icqd.h (modified) (10 diffs)
• licq/include/licq_oscarservice.h (added)
• licq/include/licq_packets.h (modified) (8 diffs)
• licq/include/licq_proxy.h (modified) (2 diffs)
• licq/include/licq_socket.h (modified) (1 diff)
• licq/include/licq_user.h (modified) (3 diffs)
• licq/src/buffer.cpp (modified) (1 diff)
• licq/src/icqd-srv.cpp (modified) (13 diffs)
• licq/src/icqd-tcp.cpp (modified) (4 diffs)
• licq/src/icqd-threads.cpp (modified) (8 diffs)
• licq/src/icqd.cpp (modified) (8 diffs)
• licq/src/icqevent.cpp (modified) (3 diffs)
• licq/src/icqpacket.cpp (modified) (15 diffs)
• licq/src/Makefile.am (modified) (1 diff)
• licq/src/oscarservice.cpp (added)
• licq/src/socket.cpp (modified) (1 diff)
• licq/src/support.c (modified) (1 diff)
• licq/src/support.h (modified) (1 diff)
• licq/src/user.cpp (modified) (4 diffs)
• qt-gui/src/sigman.cpp (modified) (1 diff)
• qt-gui/src/userinfodlg.cpp (modified) (1 diff)
• qt4-gui/src/core/signalmanager.cpp (modified) (1 diff)
• qt4-gui/src/dialogs/userinfodlg.cpp (modified) (1 diff)

trunk/licq/include/licq_buffer.h

@@ -127 +127 @@
    CBuffer& operator >> (unsigned long &in);
    char *UnpackRaw(char *, unsigned short);
+   char *UnpackBinBlock(char *, unsigned short);
    char *UnpackString(char *, unsigned short);
    char *UnpackString();                // Need to delete[] returned string

trunk/licq/include/licq_events.h

@@ -248 +248 @@
 
   // Daemon only
-  unsigned short SubType() const { return m_nSubType; }
-  unsigned short ExtraInfo() const { return m_nExtraInfo; }
+  unsigned short SubType() const     { return m_nSubType; }
+  unsigned short ExtraInfo() const   { return m_nExtraInfo; }
+  void SetSubType(unsigned short nSubType) { m_nSubType = nSubType; }
+  bool NoAck() const           { return m_NoAck; }
+  void SetNoAck(bool NoAck)    { m_NoAck = NoAck; }
+  bool IsCancelled() const     { return m_bCancelled; }
+
+  void AttachPacket(CPacket *p);
 
   // Compare this event to another one
@@ -291 +297 @@
 
 friend class CICQDaemon;
+friend class COscarService;
 friend class CMSN;
 friend void *ProcessRunningEvent_Client_tep(void *p);
 friend void *ProcessRunningEvent_Server_tep(void *p);
+friend void *OscarServiceSendQueue_tep(void *p);
 friend void *MonitorSockets_tep(void *p);
 };
@@ -477 +485 @@
   //! The user has requested to update the owner's profile/information.
   PROTOxUPDATExINFO,
+  //! The user has requested the user's picture/icon/avatar/etc..
+  PROTOxREQUESTxPICTURE,
   //! The user has requested this user be added to the Invisible/Block list.
   PROTOxBLOCKxUSER,
@@ -685 +695 @@
 };
 
+class CRequestPicture : public CSignal
+{
+public:
+  CRequestPicture(const char *);
+  virtual ~CRequestPicture();
+};
+
 class CBlockUserSignal : public CSignal
 {

trunk/licq/include/licq_icq.h

@@ -35 +35 @@
 const unsigned short ICQ_SNACxFAM_MESSAGE          = 0x0004;
 const unsigned short ICQ_SNACxFAM_BOS              = 0x0009;
+const unsigned short ICQ_SNACxFAM_BART             = 0x0010;
 const unsigned short ICQ_SNACxFAM_LIST             = 0x0013;
 const unsigned short ICQ_SNACxFAM_VARIOUS          = 0x0015;
@@ -104 +105 @@
 const unsigned short ICQ_SNACxREQUEST_IMAGE        = 0x000C; // client
 const unsigned short ICQ_SNACxSEND_IMAGE           = 0x000D; // server
+
+// Subtypes for BART family
+const unsigned short ICQ_SNACxBART_ERROR           = 0x0001; // server
+const unsigned short ICQ_SNACxBART_UPLOAD          = 0x0002; // client
+const unsigned short ICQ_SNACxBART_UPLOADxACK      = 0x0003; // server
+const unsigned short ICQ_SNACxBART_DOWNLOADxREQUEST= 0x0006; // client
+const unsigned short ICQ_SNACxBART_DOWNLOADxREPLY  = 0x0007; // server
 
 // Subtypes for list family
@@ -469 +477 @@
 const unsigned short CHARSET_CUSTOM  = 0x0003;
 
+// BART Types
+const unsigned short BART_TYPExBUDDY_ICON_SMALL = 0x0000;
+const unsigned short BART_TYPExBUDDY_ICON       = 0x0001;
+const unsigned short BART_TYPExSTATUS_STR       = 0x0002;
+
 //actual plugins
 const char PLUGIN_PHONExBOOK[]        = { 0x90, 0x7C, 0x21, 0x2C, 0x91, 0x4D,
@@ -544 +557 @@
                                           0x4E, 0xC5, 0x9D, 0x51, 0xA6, 0x47,
                                           0x4E, 0x34, 0xF5, 0xA0 };
+
+const char ICQ_CAPABILITY_BART[]      = { 0x09, 0x46, 0x13, 0x46, 0x4C, 0x7F,
+                                          0x11, 0xD1, 0x82, 0x22, 0x44, 0x45,
+                                          0x53, 0x54, 0x00, 0x00 };
 
 const char ICQ_CAPABILITY_LICQxVER[]  = { 'L',  'i',  'c',  'q',  ' ',  'c',

trunk/licq/include/licq_icqd.h

@@ -43 +43 @@
 class INetSocket;
 class ProxyServer;
+class COscarService;
 class CReverseConnectToUserData;
 class CMSN;
@@ -300 +301 @@
     const char *szFaxNumber, const char *szAddress, const char *szCellularNumber,
     const char *szZipCode, unsigned short nCountryCode, bool bHideEmail);
+
+  unsigned long ProtoRequestPicture(const char *szId, unsigned long nPPID);
 
   unsigned long ProtoOpenSecureChannel(const char *szId, unsigned long nPPID);
@@ -476 +479 @@
   void icqTypingNotification(const char *_szId, bool _bActive);
   void icqCheckInvisible(const char *_szId);
+  void icqRequestService(unsigned short nFam);
 
   // Visible/Invisible/Ignore list functions
@@ -516 +520 @@
   char *ProtoPluginName(unsigned long);
 
+  EDaemonStatus Status() { return m_eStatus; }
+
   void PluginUIViewEvent(const char *szId, unsigned long nPPID ) {
     PushPluginSignal(new CICQSignal(SIGNAL_UI_VIEWEVENT, 0, szId, nPPID, 0));
@@ -569 +575 @@
   // Proxy options
   void InitProxy();
+  ProxyServer *CreateProxy();
   bool ProxyEnabled() {  return m_bProxyEnabled;  }
+  ProxyServer *GetProxy() {  return m_xProxy;  }
   void SetProxyEnabled(bool b) {  m_bProxyEnabled = b;  }
   unsigned short ProxyType() {  return m_nProxyType;  }
@@ -611 +619 @@
   // ICQ options
   bool UseServerContactList()         { return m_bUseSS; }
+  bool UseServerSideBuddyIcons()      { return m_bUseBART; }
   bool SendTypingNotification()       { return m_bSendTN; }
 
-  void SetUseServerContactList(bool b)   { m_bUseSS = b; }
-  void SetSendTypingNotification(bool b) { m_bSendTN = b; }
+  void SetUseServerContactList(bool b)    { m_bUseSS = b; }
+  void SetUseServerSideBuddyIcons(bool b);
+  void SetSendTypingNotification(bool b)  { m_bSendTN = b; }
 
   // Misc functions
@@ -702 +712 @@
   ProxyServer *m_xProxy;
 
+  // Services
+  COscarService *m_xBARTService;
+
   // Misc
   bool m_bUseSS; // server side list
+  bool m_bUseBART; // server side buddy icons
   bool m_bSendTN; // Send typing notifications
   bool m_bReconnectAfterUinClash; // reconnect after uin has been used from another location?
@@ -731 +745 @@
             thread_ping,
             thread_updateusers,
+            thread_ssbiservice,
             thread_shutdown;
 
@@ -764 +779 @@
   bool hasServerEvent(unsigned long);
   void ProcessDoneEvent(ICQEvent *);
+  void PushEvent(ICQEvent *);
   void PushExtendedEvent(ICQEvent *);
   void PushPluginSignal(CICQSignal *);
@@ -832 +848 @@
   friend void *ProcessRunningEvent_Client_tep(void *p);
   friend void *ProcessRunningEvent_Server_tep(void *p);
+  friend void *OscarServiceSendQueue_tep(void *p);
   friend void *Shutdown_tep(void *p);
   friend void *ConnectToServer_tep(void *s);
   friend class ICQUser;
   friend class CSocketManager;
+  friend class COscarService;
   friend class CChatManager;
   friend class CFileTransferManager;

trunk/licq/include/licq_packets.h

@@ -135 +135 @@
 
   static bool s_bRegistered;
-  static unsigned short s_nSequence;
+  static unsigned short s_nSequence[32];
   static unsigned short s_nSubSequence;
   static pthread_mutex_t s_xMutex;
@@ -146 +146 @@
   unsigned short m_nSubCommand;
   unsigned short m_nExtraInfo;
+  unsigned short m_nService;
 
   char *m_szSequenceOffset;
@@ -220 +221 @@
 {
 public:
-  CPU_SendCookie(const char *, int len);
+  CPU_SendCookie(const char *, int len, unsigned short nService = 0);
   virtual ~CPU_SendCookie();
 };
@@ -238 +239 @@
 {
 public:
-  CPU_GenericFamily(unsigned short Family, unsigned short SubType);
+  CPU_GenericFamily(unsigned short Family, unsigned short SubType,
+                    unsigned short nService = 0);
   virtual ~CPU_GenericFamily();
 };
@@ -320 +322 @@
 {
 public:
-    CPU_ImICQ();
+  CPU_ImICQ();
+  CPU_ImICQ(unsigned short VerArray[][2], unsigned short NumVer,
+            unsigned short nService);
 };
 
@@ -341 +345 @@
 {
 public:
-  CPU_RateAck();
+  CPU_RateAck(unsigned short nService = 0);
 };
 
@@ -495 +499 @@
 public:
    CPU_ClientReady();
+   CPU_ClientReady(unsigned short VerArray[][4], unsigned short NumVer,
+                   unsigned short nService);
 };
 
@@ -1134 +1140 @@
 };
 
+//-----RequestBuddyIcon------------------------------------------------------
+class CPU_RequestBuddyIcon : public CPU_CommonFamily
+{
+public:
+  CPU_RequestBuddyIcon(const char *szId, unsigned short _nBuddyIconType,
+                       char _nBuddyIconHashType, const char *_szBuddyIconHash,
+                       unsigned short nService);
+};
+
+class CPU_RequestService : public CPU_CommonFamily
+{
+public:
+  CPU_RequestService(unsigned short nFam);
+};
+
 //-----AIMFetchAwayMessage--------------------------------------------------
 class CPU_AIMFetchAwayMessage : public CPU_CommonFamily

trunk/licq/include/licq_proxy.h

@@ +1 @@
+#ifndef PROXY_H
+#define PROXY_H
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -69 +72 @@
   bool HTTPOpenProxyConnection(const char *_szRemoteName, unsigned short _nRemotePort);
 };
+
+#endif

trunk/licq/include/licq_socket.h

@@ -167 +167 @@
   bool SendPacket(CBuffer *b);
   bool RecvPacket();
+  bool ConnectTo(const char* server, unsigned short port, ProxyServer *xProxy);
 };
 

trunk/licq/include/licq_user.h

@@ -516 +516 @@
   // Picture Info
   bool GetPicturePresent()              { return m_bPicturePresent; }
+  unsigned short BuddyIconType()    { return m_nBuddyIconType; }
+  char BuddyIconHashType()      { return m_nBuddyIconHashType; }
+  char *BuddyIconHash()         { return m_szBuddyIconHash; }
+  char *OurBuddyIconHash()      { return m_szOurBuddyIconHash; }
 
   // Dynamic info fields for protocol plugins
@@ -635 +639 @@
   // Picture info
   void SetPicturePresent(bool b)      { m_bPicturePresent = b; SavePictureInfo(); }
+  void SetBuddyIconType(unsigned short s) { m_nBuddyIconType = s; }
+  void SetBuddyIconHashType(char s)   { m_nBuddyIconHashType = s; }
+  void SetBuddyIconHash(char *s)      { SetString(&m_szBuddyIconHash, s); }
+  void SetOurBuddyIconHash(char *s)   { SetString(&m_szOurBuddyIconHash, s); }
 
   // Licq Info
@@ -946 +954 @@
   // Picture Info
   bool m_bPicturePresent;
+  unsigned short m_nBuddyIconType;
+  char m_nBuddyIconHashType;
+  char *m_szBuddyIconHash, *m_szOurBuddyIconHash;
 
   // Dynamic info fields for protocol plugins

trunk/licq/src/buffer.cpp

@@ -324 +324 @@
   for (unsigned short i = 0; i < _nSize; i++) *this >> sz[i];
   sz[_nSize] = '\0';
+  return sz;
+}
+
+char *CBuffer::UnpackBinBlock(char *sz, unsigned short _nSize)
+{
+  for (unsigned short i = 0; i < _nSize; i++) *this >> sz[i];
   return sz;
 }

trunk/licq/src/icqd-srv.cpp

@@ -21 +21 @@
 #include <algorithm>
 
+#include <boost/scoped_array.hpp>
+
 // Localization
 #include "gettext.h"
@@ -28 +30 @@
 #include "licq_icqd.h"
 #include "licq_translate.h"
+#include "licq_oscarservice.h"
 #include "licq_packets.h"
 #include "licq_socket.h"
@@ -717 +720 @@
 }
 
+//-----ProtoRequestPicture------------------------------------------------------
+unsigned long CICQDaemon::ProtoRequestPicture(const char *_szId, unsigned long _nPPID)
+{
+  unsigned long nRet = 0;
+
+  if (_nPPID == LICQ_PPID)
+  {
+    ICQUser *u = gUserManager.FetchUser(_szId, LICQ_PPID, LOCK_R);
+    if (u == NULL) return 0;
+
+    if (UseServerSideBuddyIcons() && strlen(u->BuddyIconHash()) > 0)
+    {
+      gUserManager.DropUser(u);
+      nRet = m_xBARTService->SendEvent(_szId, ICQ_SNACxBART_DOWNLOADxREQUEST, true);
+    }
+    else
+    {
+      bool bSendServer = (u->SocketDesc(ICQ_CHNxINFO) < 0);
+      gUserManager.DropUser(u);
+      nRet = icqRequestPicture(_szId, bSendServer);
+    }
+  }
+  else
+    PushProtoSignal(new CRequestPicture(_szId), _nPPID);
+  
+  return nRet;
+}
+
+//-----icqRequestService--------------------------------------------------------
+void CICQDaemon::icqRequestService(unsigned short nFam)
+{
+  CPU_CommonFamily *p = new CPU_RequestService(nFam);
+  gLog.Info(tr("%sRequesting service socket for FAM 0x%02X (#%hu/#%d)...\n"),
+            L_SRVxSTR, nFam, p->Sequence(), p->SubSequence());
+  SendEvent_Server(p);
+}
+
 //-----icqSetStatus-------------------------------------------------------------
 unsigned long CICQDaemon::ProtoSetStatus(unsigned long _nPPID,
@@ -1737 +1777 @@
       case MAKESNAC(ICQ_SNACxFAM_LOCATION, ICQ_SNACxREQUESTxUSERxINFO):
       case MAKESNAC(ICQ_SNACxFAM_LOCATION, ICQ_SNACxLOC_INFOxREQ):
+      case MAKESNAC(ICQ_SNACxFAM_BART, ICQ_SNACxBART_DOWNLOADxREQUEST):
         PushPluginEvent(e);
         break;
@@ -1877 +1918 @@
 void CICQDaemon::postLogoff(int nSD, ICQEvent *cancelledEvent)
 {
+  if (m_xBARTService)
+  {
+    if (m_xBARTService->GetSocketDesc() != -1)
+    {
+      gSocketManager.CloseSocket(m_xBARTService->GetSocketDesc());
+      m_xBARTService->ResetSocket();
+      m_xBARTService->ChangeStatus(STATUS_UNINITIALIZED);
+      m_xBARTService->ClearQueue();
+    }
+  }
   pthread_mutex_lock(&mutex_runningevents);
   pthread_mutex_lock(&mutex_sendqueue_server);
@@ -2026 +2077 @@
       return (-1);
     }
-    s->SetProxy(m_xProxy);
   }
   else if (m_xProxy != NULL)
@@ -2034 +2084 @@
   }
   
-  char ipbuf[32];
-
-  if (m_xProxy == NULL)
-  {
-    gLog.Info(tr("%sResolving %s port %d...\n"), L_SRVxSTR, server, port);
-    if (!s->SetRemoteAddr(server, port)) {
-      char buf[128];
-      gLog.Warn(tr("%sUnable to resolve %s:\n%s%s.\n"), L_ERRORxSTR,
-                server, L_BLANKxSTR, s->ErrorStr(buf, 128));
-      delete s;
-      return (-1); // no route to host (not connected)
-    }
-    gLog.Info(tr("%sICQ server found at %s:%d.\n"), L_SRVxSTR,
-          s->RemoteIpStr(ipbuf), s->RemotePort());
-  }
-  else
-  {
-    // It doesn't matter if it resolves or not, the proxy should do it then
-    s->SetRemoteAddr(server, port);
-  }
-
-  if (m_xProxy == NULL)
-    gLog.Info(tr("%sOpening socket to server.\n"), L_SRVxSTR);
-  else
-    gLog.Info("%sOpening socket to server via proxy.\n", L_SRVxSTR);
-  if (!s->OpenConnection())
-  {
-    char buf[128];
-    gLog.Warn(tr("%sUnable to connect to %s:%d:\n%s%s.\n"), L_ERRORxSTR,
-              s->RemoteIpStr(ipbuf), s->RemotePort(), L_BLANKxSTR,
-              s->ErrorStr(buf, 128));
+  if (!s->ConnectTo(server, port, m_xProxy))
+  {
     delete s;
     return -1;
@@ -2222 +2243 @@
   // each case to do the same thing. However, the individual case's may depend on the tlv
   // coming to them, so leave this commented out for now and do some testing
-  /*
   if (snacFlags & 0x8000)
   {
     unsigned short bytes = packet.UnpackUnsignedShortBE();
-    unsigned short tlvCount = packet.UnpackUnsignedShortBE();
-    if (!packet.readTLV(tlvCount, bytes))
+    if (!packet.readTLV(-1, bytes))
     {
       gLog.Error(tr("%sError parsing SNAC header\n"), L_SRVxSTR);
@@ -2233 +2252 @@
     }
   }
-  */
 
   switch (nSubtype)
   {
-  case ICQ_SNACxSUB_READYxSERVER:
+    case ICQ_SNACxSUB_READYxSERVER:
     {
       CSrvPacketTcp* p;
@@ -2258 +2276 @@
     }
 
-  case ICQ_SNACxSRV_ACKxIMxICQ:
+    case ICQ_SNACxSUB_REDIRECT:
+    {
+      unsigned short nFam = 0;
+
+      if (!packet.readTLV())
+      {
+        gLog.Warn(tr("%sError during parsing service redirect packet!\n"), L_WARNxSTR);
+        break;
+      }
+      if (packet.getTLVLen(0x000D) == 2)
+        nFam = packet.UnpackUnsignedShortTLV(0x000D);
+
+      gLog.Info(tr("%sRedirect for service 0x%02X received.\n"), L_SRVxSTR, nFam);
+
+      char *szServer = packet.UnpackStringTLV(0x0005);
+      char *szCookie = packet.UnpackStringTLV(0x0006);
+      unsigned short nCookieLen = packet.getTLVLen(0x0006);
+      if (!szServer || !szCookie)
+      {
+        gLog.Warn(tr("%sInvalid servername (%s) or cookie (%s) in service redirect packet!\n"),
+                  L_WARNxSTR, szServer ? szServer : "(null)", szCookie ? szCookie : "(null)");
+        if (szServer) delete [] szServer;
+        if (szCookie) delete [] szCookie;
+        break;
+      }
+
+      char *szPort = strchr(szServer, ':');
+      unsigned short nPort;
+      if (szPort)
+      {
+        *szPort++ = '\0';
+        nPort = atoi(szPort);
+      }
+      else
+      {
+        nPort = m_nICQServerPort;
+      }
+
+      switch (nFam)
+      {
+        case ICQ_SNACxFAM_BART:
+          if (m_xBARTService)
+          {
+            m_xBARTService->SetConnectCredential(szServer, nPort, szCookie, nCookieLen);
+            m_xBARTService->ChangeStatus(STATUS_SERVICE_REQ_ACKED);
+            break;
+          }
+          else
+          {
+            gLog.Warn(tr("%sService redirect packet for unallocated BART service.\n"),
+                      L_WARNxSTR);
+            break;
+          }
+
+        default:
+          gLog.Warn(tr("%sService redirect packet for unhandled service 0x%02X.\n"),
+                    L_WARNxSTR, nFam);
+      }
+
+      delete [] szServer;
+      delete [] szCookie;
+      break;
+    }
+
+    case ICQ_SNACxSRV_ACKxIMxICQ:
     {
       // ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
@@ -2297 +2379 @@
       break;
     }
-  case ICQ_SNACxSUB_RATE_INFO:
-  {
+
+    case ICQ_SNACxSUB_RATE_INFO:
+    {
       gLog.Info(tr("%sServer sent us rate information.\n"), L_SRVxSTR);
       CSrvPacketTcp *p = new CPU_RateAck();
@@ -2320 +2403 @@
   case ICQ_SNACxRCV_NAMExINFO:
   {
-    if (snacFlags & 0x8000)
-    {
-      unsigned short bytes = packet.UnpackUnsignedShortBE();
-      if (!packet.readTLV(-1, bytes))
-      {
-        gLog.Error(tr("%sError parsing SNAC header\n"), L_SRVxSTR);
-        return;
-      }
-    }
-
     unsigned short evil, tlvBlocks;
     unsigned long nUin, realIP;
@@ -2869 +2942 @@
     }
 
+    if (packet.hasTLV(0x001d))  // Server-stored buddy icon information
+    {
+      CBuffer BART_info = packet.UnpackTLV(0x001d);
+      unsigned short IconType = BART_info.UnpackUnsignedShortBE();
+      char HashType = BART_info.UnpackChar();
+      char HashLength = BART_info.UnpackChar();
+      
+      switch (IconType)
+      {
+        case BART_TYPExBUDDY_ICON_SMALL:
+        case BART_TYPExBUDDY_ICON:
+        {
+          if (HashType == 1 && HashLength > 0 && HashLength <= 16)
+          {
+            boost::scoped_array<char> Hash(new char[HashLength]);
+            boost::scoped_array<char> HashHex(new char[HashLength*2 + 1]);
+            
+            BART_info.UnpackBinBlock(Hash.get(), HashLength);
+            u->SetBuddyIconHash(PrintHex(HashHex.get(), Hash.get(), HashLength));
+            u->SetBuddyIconType(IconType);
+            u->SetBuddyIconHashType(HashType);
+            u->SavePictureInfo();
+          }
+          break;
+        }
+
+        default:    // Unsupported types of BART
+          gLog.Warn(tr("%sUnsupported type 0x%02X of buddy icon for %s.\n"),
+                    L_WARNxSTR, IconType, u->GetAlias());
+          break;
+