Changeset 6467 for trunk

Timestamp:

07/26/08 05:34:44 (4 months ago)

Author:

flynd

Message:

Use const pointers for user and owner objects in daemon when they are only read locked. Fixed some places where we modified the objects without getting write access.

Location:

trunk/licq

Files:

• include/licq_chat.h (modified) (1 diff)
• include/licq_icqd.h (modified) (1 diff)
• include/licq_packets.h (modified) (22 diffs)
• include/licq_user.h (modified) (3 diffs)
• include/licq_utility.h (modified) (1 diff)
• src/fifo.cpp (modified) (5 diffs)
• src/gpg.cpp (modified) (1 diff)
• src/icqd-chat.cpp (modified) (6 diffs)
• src/icqd-filetransfer.cpp (modified) (4 diffs)
• src/icqd-srv.cpp (modified) (23 diffs)
• src/icqd-tcp.cpp (modified) (19 diffs)
• src/icqd-threads.cpp (modified) (2 diffs)
• src/icqd.cpp (modified) (4 diffs)
• src/icqpacket.cpp (modified) (43 diffs)
• src/onevent.cpp (modified) (1 diff)
• src/oscarservice.cpp (modified) (1 diff)
• src/user.cpp (modified) (4 diffs)
• src/utility.cpp (modified) (2 diffs)

trunk/licq/include/licq_chat.h

@@ -249 +249 @@
 public:
   CChatClient();
-  CChatClient(ICQUser *);
+  CChatClient(const ICQUser* u);
   CChatClient(const CChatClient &);
   CChatClient& operator=(const CChatClient &);

trunk/licq/include/licq_icqd.h

@@ -869 +869 @@
   { return SendExpectEvent_Server("0", LICQ_PPID, packet, ue, extendedEvent); }
 
-  ICQEvent *SendExpectEvent_Client(ICQUser *, CPacket *, CUserEvent *);
+  ICQEvent* SendExpectEvent_Client(const ICQUser* u, CPacket* packet, CUserEvent* ue);
   ICQEvent *SendExpectEvent(ICQEvent *, void *(*fcn)(void *));
   void AckTCP(CPacketTcp &, int);

trunk/licq/include/licq_packets.h

@@ -703 +703 @@
 {
 public:
-  CPU_Type2Message(ICQUser *u, bool _bAck, bool _bDirectInfo, const char *cap,
+  CPU_Type2Message(const ICQUser* u, bool _bAck, bool _bDirectInfo, const char *cap,
                    unsigned long nMsgID1 = 0,
                    unsigned long nMsgID2 = 0);
@@ -709 +709 @@
   void InitBuffer();
 
-  ICQUser *m_pUser;
+  const ICQUser* m_pUser;
   bool m_bAck;
   bool m_bDirectInfo;
@@ -721 +721 @@
 {
 public:
-  CPU_ReverseConnect(ICQUser *u, unsigned long nLocalIP,
+  CPU_ReverseConnect(const ICQUser* u, unsigned long nLocalIP,
                      unsigned short nLocalPort, unsigned short nRemotePort);
 };
@@ -738 +738 @@
 {
 public:
-  CPU_PluginMessage(ICQUser *u, bool bAck, const char *PluginGUID,
+  CPU_PluginMessage(const ICQUser* u, bool bAck, const char *PluginGUID,
                     unsigned long nMsgID1 = 0, unsigned long nMsgID2 = 0);
 
@@ -751 +751 @@
 {
 public:
-  CPU_InfoPluginReq(ICQUser *u, const char *GUID, unsigned long nTime);
+  CPU_InfoPluginReq(const ICQUser* u, const char *GUID, unsigned long nTime);
   virtual const char *RequestGUID() { return m_ReqGUID; }
   virtual unsigned short ExtraInfo() { return ServerInfoPluginRequest; }
@@ -763 +763 @@
 {
 public:
-  CPU_StatusPluginReq(ICQUser *u, const char *GUID, unsigned long nTime);
+  CPU_StatusPluginReq(const ICQUser* u, const char *GUID, unsigned long nTime);
   virtual unsigned short ExtraInfo() { return ServerStatusPluginRequest; }
   virtual const char *RequestGUID() { return m_ReqGUID; }
@@ -775 +775 @@
 {
 public:
-  CPU_AdvancedMessage(ICQUser *u, unsigned short _nMsgType,
+  CPU_AdvancedMessage(const ICQUser* u, unsigned short _nMsgType,
                       unsigned short _nMsgFlags, bool _bAck,
                       unsigned short _nSequence,
@@ -793 +793 @@
 public:
   CPU_ChatRequest(char *szReason, const char *szChatUsers, unsigned short nPort,
-                  unsigned short nLevel, ICQUser *pUser, bool bICBM);
+      unsigned short nLevel, const ICQUser* pUser, bool bICBM);
 };
 
@@ -800 +800 @@
 {
 public:
-  CPU_FileTransfer(ICQUser *, ConstFileList &lFileList, const char *_szFile,
+  CPU_FileTransfer(const ICQUser* u, ConstFileList &lFileList, const char *_szFile,
                    const char *_szDesc, unsigned short nLevel, bool bICBM);
 };
@@ -808 +808 @@
 {
 public:
-    CPU_NoManager(ICQUser *u, unsigned long nMsgID1, unsigned long nMsgID2);
+    CPU_NoManager(const ICQUser* u, unsigned long nMsgID1, unsigned long nMsgID2);
 };
 
@@ -815 +815 @@
 {
 public:
-    CPU_AckThroughServer(ICQUser *u, unsigned long msgid1,
+    CPU_AckThroughServer(const ICQUser* u, unsigned long msgid1,
                          unsigned long msgid2, unsigned short sequence,
                          unsigned short msgType, bool bAccept,
@@ -833 +833 @@
 {
 public:
-  CPU_AckGeneral(ICQUser *u, unsigned long nMsgID1,
+  CPU_AckGeneral(const ICQUser* u, unsigned long nMsgID1,
                  unsigned long nMsgID2, unsigned short nSequence,
                  unsigned short nMsgType, bool bAccept, unsigned short nLevel);
@@ -842 +842 @@
 {
 public:
-  CPU_AckFileAccept(ICQUser* u, const unsigned long nMsgID[],
+  CPU_AckFileAccept(const ICQUser* u, const unsigned long nMsgID[],
                     unsigned short nSequence, unsigned short nPort,
                     const char *szDesc, const char *szFile,
@@ -852 +852 @@
 {
 public:
-  CPU_AckFileRefuse(ICQUser* u, const unsigned long nMsgID[],
+  CPU_AckFileRefuse(const ICQUser* u, const unsigned long nMsgID[],
                     unsigned short nSequence, const char *msg);
 };
@@ -860 +860 @@
 {
 public:
-  CPU_AckChatAccept(ICQUser* u, const char *szClients, const unsigned long nMsgID[],
+  CPU_AckChatAccept(const ICQUser* u, const char *szClients, const unsigned long nMsgID[],
                     unsigned short nSequence, unsigned short nPort);
 };
@@ -868 +868 @@
 {
 public:
-  CPU_AckChatRefuse(ICQUser* u, const unsigned long nMsgID[],
+  CPU_AckChatRefuse(const ICQUser* u, const unsigned long nMsgID[],
                     unsigned short nSequence, const char *msg);
 };
@@ -876 +876 @@
 {
 public:
-  CPU_PluginError(ICQUser *u, unsigned long nMsgID1, unsigned long nMsgID2,
+  CPU_PluginError(const ICQUser* u, unsigned long nMsgID1, unsigned long nMsgID2,
                   unsigned short nSequence, const char *GUID);
 };
@@ -884 +884 @@
 {
 public:
-  CPU_InfoPluginListResp(ICQUser *u, unsigned long nMsgID1,
+  CPU_InfoPluginListResp(const ICQUser* u, unsigned long nMsgID1,
                          unsigned long nMsgID2, unsigned short nSequence);
 };
@@ -892 +892 @@
 {
 public:
-  CPU_InfoPhoneBookResp(ICQUser *u, unsigned long nMsgID1,
+  CPU_InfoPhoneBookResp(const ICQUser* u, unsigned long nMsgID1,
                         unsigned long nMsgID2, unsigned short nSequence);
 };
@@ -900 +900 @@
 {
 public:
-  CPU_InfoPictureResp(ICQUser *u, unsigned long nMsgID1,
+  CPU_InfoPictureResp(const ICQUser* u, unsigned long nMsgID1,
                       unsigned long nMsgID2, unsigned short nSequence);
 };
@@ -908 +908 @@
 {
 public:
-  CPU_StatusPluginListResp(ICQUser *u, unsigned long nMsgID1,
+  CPU_StatusPluginListResp(const ICQUser* u, unsigned long nMsgID1,
                            unsigned long nMsgID2, unsigned short nSequence);
 };
@@ -916 +916 @@
 {
 public:
-  CPU_StatusPluginResp(ICQUser *u, unsigned long nMsgID1,
+  CPU_StatusPluginResp(const ICQUser* u, unsigned long nMsgID1,
                        unsigned long nMsgID2, unsigned short nSequence,
                        unsigned long nStatus);

trunk/licq/include/licq_user.h

@@ -570 +570 @@
 
   // Picture Info
-  bool GetPicturePresent() const              { return m_bPicturePresent; }
-  unsigned short BuddyIconType()    { return m_nBuddyIconType; }
-  char BuddyIconHashType()      { return m_nBuddyIconHashType; }
-  char *BuddyIconHash()         { return m_szBuddyIconHash; }
-  char *OurBuddyIconHash()      { return m_szOurBuddyIconHash; }
+  bool GetPicturePresent() const                { return m_bPicturePresent; }
+  unsigned short BuddyIconType() const          { return m_nBuddyIconType; }
+  char BuddyIconHashType() const                { return m_nBuddyIconHashType; }
+  const char* BuddyIconHash() const             { return m_szBuddyIconHash; }
+  const char* OurBuddyIconHash() const          { return m_szOurBuddyIconHash; }
 
   // Dynamic info fields for protocol plugins
@@ -903 +903 @@
   void RemoveTLV(unsigned long);
   void SetTLVList(TLVList& tlvs);
-  TLVList GetTLVList();
+  TLVList GetTLVList()                          { return myTLVs; }
+  const TLVList GetTLVList() const              { return myTLVs; }
+
 
   // Don't call these:
@@ -1130 +1132 @@
   bool SavePassword() const                     { return m_bSavePassword; }
   unsigned long RandomChatGroup() const         { return m_nRandomChatGroup; }
-  unsigned long AddStatusFlags(unsigned long nStatus);
+  unsigned long AddStatusFlags(unsigned long nStatus) const;
 
   // Deprecated functions, to be removed

trunk/licq/include/licq_utility.h

@@ -50 +50 @@
   const char *Default()  { return m_szDefault; }
   const char *FullDefault()  { return m_szFullDefault; }
-  bool SetFields(ICQUser *);
+  bool SetFields(const ICQUser* u);
 protected:
   char *m_szTitle;

trunk/licq/src/fifo.cpp

@@ -156 +156 @@
 StringToStatus(char *_szStatus)
 {
-  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+  const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   unsigned long nStatus = o->AddStatusFlags(0);
   int i =0;
@@ -349 +349 @@
 
   // Determine the status to go to
-  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+  const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   bOffline = o->StatusOffline();
   gUserManager.DropOwner(o);
@@ -468 +468 @@
     if( nPPID == LICQ_PPID )
     {
-      ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
+      const ICQUser* u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
       if (u != NULL)
       {
@@ -569 +569 @@
   unsigned long nPPID;
   char *szId = 0; 
-  ICQUser *u;
   int ret = -1; 
 
@@ -580 +579 @@
   else
   {
-    u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
     if (u == NULL)
       gLog.Warn(tr("%s %s: user %s not on contact list, not retrieving "

trunk/licq/src/gpg.cpp

@@ -89 +89 @@
   mKeysIni.SetSection("keys");
 
-  ICQUser *u = gUserManager.FetchUser( szId, nPPID, LOCK_R );
-  if ( u )
+  const ICQUser* u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
+  if (u != NULL)
   {
     const char *tmp = u->GPGKey();

trunk/licq/src/icqd-chat.cpp

@@ -121 +121 @@
 
 
-CChatClient::CChatClient(ICQUser *u)
+CChatClient::CChatClient(const ICQUser* u)
 {
   m_nVersion = u->Version();
@@ -682 +682 @@
   licqDaemon = d;
 
-  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+  const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   strncpy(m_szName, o->GetAlias(), 32);
   m_szName[31] = '\0';
@@ -761 +761 @@
   if (!StartChatServer()) return;
 
-  ICQUser *u = gUserManager.FetchUser(m_szId, LICQ_PPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(m_szId, LICQ_PPID, LOCK_R);
   if (u == NULL) return;
   m_pChatClient = new CChatClient(u);
@@ -788 +788 @@
   bool bTryDirect = true;
   bool bResult = false;
-  ICQUser* temp_user = gUserManager.FetchUser(u->szId, u->nPPID, LOCK_R);
+  const ICQUser* temp_user = gUserManager.FetchUser(u->szId, u->nPPID, LOCK_R);
   if (temp_user != NULL)
   {
@@ -806 +806 @@
   if (!bSuccess)
   {
-    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+    const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
     unsigned long nIp = bSendIntIp ? o->IntIp() : o->Ip();
     gUserManager.DropOwner(o);
@@ -2502 +2502 @@
 
   bool bSendIntIp = false;
-  ICQUser* temp_user = gUserManager.FetchUser(rc->u->Id(), rc->u->PPID(), LOCK_R);
+  const ICQUser* temp_user = gUserManager.FetchUser(rc->u->Id(), rc->u->PPID(), LOCK_R);
   if (temp_user != NULL)
   {

trunk/licq/src/icqd-filetransfer.cpp

@@ -207 +207 @@
   licqDaemon = d;
 
-  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+  const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   strncpy(m_szLocalName, o->GetAlias(), sizeof(m_szLocalName) - 1);
   m_szLocalName[sizeof(m_szLocalName) - 1] = '\0';
@@ -342 +342 @@
 bool CFileTransferManager::ConnectToFileServer(unsigned short nPort)
 {
-  ICQUser *u = gUserManager.FetchUser(myId, LICQ_PPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId, LICQ_PPID, LOCK_R);
   if (u == NULL)
     return false;
@@ -360 +360 @@
   if (!bSuccess)
   {
-    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+    const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
     unsigned long nIp = bSendIntIp ? o->IntIp() : o->Ip();
     gUserManager.DropOwner(o);
@@ -392 +392 @@
 
   // Send handshake packet:
-  ICQUser *u = gUserManager.FetchUser(myId, LICQ_PPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(myId, LICQ_PPID, LOCK_R);
   unsigned short nVersion = u->ConnectionVersion();
   gUserManager.DropUser(u);

trunk/licq/src/icqd-srv.cpp

@@ -281 +281 @@
 
   // Get their old SID
-  ICQUser* u = gUserManager.FetchUser(_szId, _nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(_szId, _nPPID, LOCK_R);
   const char* alias = u->GetAlias();
   int nSID = u->GetSID();
@@ -474 +474 @@
   if (!UseServerContactList() || m_nTCPSrvSocketDesc == -1) return;
 
-  ICQUser *u = gUserManager.FetchUser(_szId, LICQ_PPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(_szId, LICQ_PPID, LOCK_R);
   if (u == NULL) return;
   const char* szNewAlias = u->GetAlias();
@@ -496 +496 @@
 void CICQDaemon::icqAlertUser(const char* id, unsigned long ppid)
 {
-  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+  const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   char sz[MAX_MESSAGE_SIZE];
   sprintf(sz, "%s%c%s%c%s%c%s%c%c%c", o->GetAlias(), 0xFE, o->GetFirstName(),
@@ -525 +525 @@
   else
   {
-    ICQUser *u = gUserManager.FetchUser(_szId, LICQ_PPID, LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser(_szId, LICQ_PPID, LOCK_R);
     if (!u) return 0;
 
@@ -655 +655 @@
   if (m_eStatus == STATUS_ONLINE)
   {
-    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+    const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
     status = o->StatusFull();
     gUserManager.DropOwner(o);
@@ -717 +717 @@
   if (_nPPID == LICQ_PPID)
   {
-    ICQUser *u = gUserManager.FetchUser(_szId, LICQ_PPID, LOCK_R);
+    const ICQUser* u = gUserManager.FetchUser(_szId, LICQ_PPID, LOCK_R);
     if (u == NULL) return 0;
 
@@ -772 +772 @@
 
   // Set the status flags
-  ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+  const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   unsigned long s = o->AddStatusFlags(newStatus);
   unsigned long pfm = o->PhoneFollowMeStatus();
@@ -1310 +1310 @@
 void CICQDaemon::ProtoToggleVisibleList(const char* _szId, unsigned long _nPPID)
 {
-  ICQUser *u = gUserManager.FetchUser(_szId, _nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(_szId, _nPPID, LOCK_R);
   if (u == NULL) return;
   bool b = u->VisibleList();
@@ -1343 +1343 @@
 void CICQDaemon::ProtoToggleInvisibleList(const char *_szId, unsigned long _nPPID)
 {
-  ICQUser *u = gUserManager.FetchUser(_szId, _nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(_szId, _nPPID, LOCK_R);
   if (u == NULL) return;
   bool b = u->InvisibleList();
@@ -1376 +1376 @@
 void CICQDaemon::icqToggleIgnoreList(const char *_szId, unsigned long _nPPID)
 {
-  ICQUser *u = gUserManager.FetchUser(_szId, _nPPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(_szId, _nPPID, LOCK_R);
   if (u == NULL) return;
   bool b = u->IgnoreList();
@@ -1685 +1685 @@
 {
   ICQEvent* result;
-  ICQUser *u = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_R);
+  const ICQUser* u = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_R);
   bool bOffline = u->StatusOffline();
   gUserManager.DropUser(u);
@@ -1760 +1760 @@
       e->m_nSubResult != ICQ_TCPxACK_RETURN)
   {
-    ICQUser *u = gUserManager.FetchUser(e->m_szId, e->m_nPPID, LOCK_R);
+    ICQUser* u = gUserManager.FetchUser(e->m_szId, e->m_nPPID, LOCK_W);
     if (u != NULL)
     {
@@ -1860 +1860 @@
     return 0;
   }
-  ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+  const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   if (o->IdString() == 0)
   {
@@ -1893 +1893 @@
   if (m_bNeedSalt)
   {
-    ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+    const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
     CPU_RequestLogonSalt *p =  new CPU_RequestLogonSalt(o->IdString());
     gUserManager.DropOwner(o);
@@ -2379 +2379 @@
     case ICQ_SNACxSRV_ACKxIMxICQ:
     {
-      // ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+      // const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
       // unsigned long nListTime = o->GetSSTime();
       // gUserManager.DropOwner(o);
@@ -3046 +3046 @@
     if (bFake && isdigit(szId[0]))
     {
-      ICQUser *user = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_R);
+      const ICQUser* user = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_R);
       //XXX Debug output
       //gLog.Error("%sIgnoring fake offline: %s (%s)\n", L_SRVxSTR,
@@ -3132 +3132 @@
         if ((*iter)->nId == nSubSequence)
         {
-          ICQUser* u = gUserManager.FetchUser((*iter)->myIdString.c_str(), LICQ_PPID, LOCK_R);
+          const ICQUser* u = gUserManager.FetchUser((*iter)->myIdString.c_str(), LICQ_PPID, LOCK_R);
           if (u == NULL)
             gLog.Warn("%sReverse connection from %s failed.\n", L_WARNxSTR,
@@ -3847 +3847 @@
       case ICQ_CMDxSUB_EMAILxPAGER:
       {
-            ICQUser *u = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_R);
+            const ICQUser* u = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_R);
             bool bIgnore = (u && u->IgnoreList());
             gUserManager.DropUser(u);
@@ -4527 +4527 @@
             if (e->SubType() == ICQ_SNACxLIST_ROSTxADD && !bTopLevelUpdated)
             {
-              ICQUser *u = gUserManager.FetchUser(pending.c_str(), LICQ_PPID, LOCK_R);
+              ICQUser* u = gUserManager.FetchUser(pending.c_str(), LICQ_PPID, LOCK_W);
               if (u)
               {
@@ -4572 +4572 @@
     {
       char *szId = packet.UnpackUserString();
-      ICQUser *u = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_R);
+      const ICQUser* u = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_R);
       bool bIgnore = (u && u->IgnoreList());
       gUserManager.DropUser(u);
@@ -4786 +4786 @@
       sendTM.tm_isdst = -1;
 
-          ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+          const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
       nTimeSent = mktime(&sendTM) - o->SystemTimeGMTOffset();
           gUserManager.DropOwner(o);
@@ -5082 +5082 @@
       case ICQ_CMDxSUB_EMAILxPAGER:
       {
-                ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
+                const ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
             bool bIgnore = false;
             if (u)
@@ -6265 +6265 @@
     {
       char *md5Salt = packet.UnpackStringBE();
-      ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+      const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
       CPU_NewLogon *p = new CPU_NewLogon(o->Password(), o->IdString(), md5Salt);
       gUserManager.DropOwner(o);

trunk/licq/src/icqd-tcp.cpp

@@ -265 +265 @@
    bool bMultipleRecipients, CICQColor *pColor)
 {
-  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+  const ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   if (o != NULL)
   {