Changeset 6382

Timestamp:

07/01/08 18:58:01 (3 months ago)

Author:

flynd

Message:

Marked old owner functions in user manager as deprecated. Updated daemon to use newer owner calls.

Location:

trunk/licq

Files:

• include/licq_user.h (modified) (4 diffs)
• src/fifo.cpp (modified) (8 diffs)
• src/icqd-chat.cpp (modified) (6 diffs)
• src/icqd-srv.cpp (modified) (51 diffs)
• src/icqd-tcp.cpp (modified) (10 diffs)
• src/icqd-threads.cpp (modified) (2 diffs)
• src/icqd-udp.cpp (modified) (34 diffs)
• src/icqd.cpp (modified) (4 diffs)
• src/icqpacket.cpp (modified) (68 diffs)
• src/Makefile.am (modified) (1 diff)
• src/message.cpp (modified) (1 diff)
• src/onevent.cpp (modified) (1 diff)
• src/oscarservice.cpp (modified) (1 diff)
• src/user.cpp (modified) (5 diffs)

trunk/licq/include/licq_user.h

@@ -1255 +1255 @@
   ~CUserManager();
   bool Load();
-  void SetOwnerUin(unsigned long _nUin);
 
   // For protocol plugins
@@ -1264 +1263 @@
   ICQUser *FetchUser(const char *, unsigned long, unsigned short);
   ICQOwner *FetchOwner(unsigned long, unsigned short);
-  void DropOwner(unsigned long);
 
   /**
@@ -1287 +1285 @@
   ICQUser *FetchUser(unsigned long, unsigned short);
   void DropUser(ICQUser *);
-  ICQOwner *FetchOwner(unsigned short);
-  void DropOwner();
-  unsigned long OwnerUin()  {return m_nOwnerUin; }
   bool IsOnList(unsigned long nUin);
+
+  // Deprecated owner functions, to be removed
+  void SetOwnerUin(unsigned long _nUin) __attribute__ ((deprecated));
+  unsigned long OwnerUin() __attribute__ ((deprecated)) { return icqOwnerUin(); }
+  ICQOwner *FetchOwner(unsigned short) __attribute__ ((deprecated));
+  void DropOwner() __attribute__ ((deprecated));
+  void DropOwner(unsigned long) __attribute__ ((deprecated));
+
+  /**
+   * Convenience function to get icq owner as an unsigned long
+   * Only meant to be used internally for icq protocol functions
+   *
+   * @return Icq owner
+   */
+  unsigned long icqOwnerUin();
 
   /**
@@ -1502 +1512 @@
   OwnerList m_vpcOwners;
   ICQOwner *m_xOwner;
-  unsigned long m_nOwnerUin;
   unsigned short m_nUserListLockType;
   unsigned short myGroupListLockType;

trunk/licq/src/fifo.cpp

@@ -154 +154 @@
 StringToStatus(char *_szStatus)
 {
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   unsigned long nStatus = o->AddStatusFlags(0);
   int i =0;
@@ -172 +172 @@
     { NULL,       0                      }
   };
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
   if (_szStatus[0] == '*')
   {
@@ -335 +335 @@
 static int fifo_status( int argc, const char *const *argv, void *data)
 {
-  ICQOwner *o;
   CICQDaemon *d= (CICQDaemon *) data;
   const char *szStatus = argv[1];
@@ -348 +347 @@
 
   // Determine the status to go to
-  o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   bOffline = o->StatusOffline();
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
   nStatus = StringToStatus(const_cast<char *>(szStatus));
 
@@ -374 +373 @@
   if( argc > 2 )
   {
-    ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
     o->SetAutoResponse(argv[2]);
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
   }
 
@@ -386 +385 @@
 static int fifo_auto_response( int argc, const char *const *argv, void* /* data */)
 {
-  ICQOwner *o; 
-
   if( argc == 1 )
   {
@@ -394 +391 @@
   }
 
-  o = gUserManager.FetchOwner(LOCK_W);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
   o->SetAutoResponse(argv[1]);
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 
   return 0;
@@ -504 +501 @@
   }
 
-  ICQUser *owner = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* owner = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   d->icqSendSms(argv[1], argv[2], owner->Uin());
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(owner);
   return 0;
 }

trunk/licq/src/icqd-chat.cpp

@@ -49 +49 @@
   m_szName = NULL;
   m_nPort = _nLocalPort;
-  m_nUin = gUserManager.OwnerUin();
-  char szUin[24];
-  sprintf(szUin, "%lu", m_nUin);
-  m_szId = strdup(szUin);
+  m_szId = strdup(gUserManager.OwnerId(LICQ_PPID).c_str());
+  m_nUin = atol(m_szId);
   m_nPPID = LICQ_PPID;
   m_nColorForeRed = nColorForeRed;
@@ -66 +64 @@
   buffer->PackUnsignedLong(0x65);
   buffer->PackUnsignedLong(-ICQ_VERSION_TCP);
-  buffer->PackUnsignedLong(gUserManager.OwnerUin());
+  buffer->PackUnsignedLong(m_nUin);
   buffer->PackString(_sLocalName);
   buffer->PackUnsignedShort(ReversePort(_nLocalPort));
@@ -305 +303 @@
   m_szName = NULL;
   m_nPort = nLocalPort;
-  m_nUin = gUserManager.OwnerUin();
-  char szUin[24];
-  sprintf(szUin, "%lu", m_nUin);
-  m_szId = strdup(szUin);
+  m_szId = strdup(gUserManager.OwnerId(LICQ_PPID).c_str());
+  m_nUin = atol(m_szId);
   m_nPPID = LICQ_PPID;
   m_nColorForeRed = nColorForeRed;
@@ -332 +328 @@
 
   buffer->PackUnsignedLong(0x65);
-  buffer->PackUnsignedLong(gUserManager.OwnerUin());
+  buffer->PackUnsignedLong(m_nUin);
   buffer->PackString(szLocalName);
   buffer->PackChar(nColorForeRed);
@@ -688 +684 @@
   licqDaemon = d;
 
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   strncpy(m_szName, o->GetAlias(), 32);
   m_szName[31] = '\0';
   m_nSession = o->Port();
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 
   m_nFontFace = FONT_PLAIN;
@@ -813 +809 @@
   if (!bSuccess)
   {
-    ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
     unsigned long nIp = bSendIntIp ? o->IntIp() : o->Ip();
-    gUserManager.DropOwner();
-  
+    gUserManager.DropOwner(o);
+
     // try reverse connect
     int nId = licqDaemon->RequestReverseConnection(c->m_nUin, c->m_nSession,

trunk/licq/src/icqd-srv.cpp

@@ -500 +500 @@
 void CICQDaemon::icqAlertUser(const char* id, unsigned long ppid)
 {
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  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(),
           0xFE, o->GetLastName(), 0xFE, o->GetEmailPrimary(), 0xFE,
           o->GetAuthorization() ? '0' : '1', 0xFE);
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
   CPU_ThroughServer *p = new CPU_ThroughServer(id, ICQ_CMDxSUB_ADDEDxTOxLIST, sz);
   gLog.Info(tr("%sAlerting user they were added (#%hu)...\n"), L_SRVxSTR, p->Sequence());
@@ -659 +659 @@
   if (m_eStatus == STATUS_ONLINE)
   {
-    ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
     status = o->StatusFull();
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
   }
   else
@@ -783 +783 @@
   bool isLogon = o->StatusOffline();
   int nPDINFO = o->GetPDINFO();
-  gUserManager.DropOwner(LICQ_PPID);
+  gUserManager.DropOwner(o);
 
   if (nPDINFO == 0)
   {
     icqCreatePDINFO();
-  
+
     o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
     nPDINFO = o->GetPDINFO();
-    gUserManager.DropOwner(LICQ_PPID);
-  }
-  
+    gUserManager.DropOwner(o);
+  }
+
   if (goInvisible)
   {
@@ -1077 +1077 @@
   // 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);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
   o->SetEnableSave(false);
   o->SetAuthorization(bAuthorize);
@@ -1085 +1085 @@
   o->SaveLicqInfo();
   unsigned short s = o->StatusFull();
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
   // Set status to ensure the status flags are set
   icqSetStatus(s);
@@ -1180 +1180 @@
   o->SetClientInfoTimestamp(time(NULL));
   bool bOffline = o->StatusOffline();
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 
   if (!bOffline)
@@ -1192 +1192 @@
   o->SetClientInfoTimestamp(time(NULL));
   bool bOffline = o->StatusOffline();
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 
   if (!bOffline)
@@ -1205 +1205 @@
   o->SetPhoneFollowMeStatus(nNewStatus);
   bool bOffline = o->StatusOffline();
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 
   if (!bOffline)
@@ -1851 +1851 @@
   if (o->IdString() == 0)
   {
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
     gLog.Error("%sNo registered user, unable to process logon attempt.\n", L_ERRORxSTR);
     return 0;
@@ -1857 +1857 @@
   if (o->Password()[0] == '\0')
   {
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
     gLog.Error(tr("%sNo password set.  Edit ~/.licq/owner.Licq and fill in the password field.\n"), L_ERRORxSTR);
     return 0;
@@ -1863 +1863 @@
 
   m_nDesiredStatus = o->AddStatusFlags(logonStatus);
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 
   CPU_ConnectStart *startPacket = new CPU_ConnectStart();
@@ -1883 +1883 @@
     ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
     CPU_RequestLogonSalt *p =  new CPU_RequestLogonSalt(o->IdString());
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
     gLog.Info(tr("%sRequesting logon salt (#%hu)...\n"), L_SRVxSTR, p->Sequence());
     SendEvent_Server(p);
@@ -2028 +2028 @@
 #endif
 
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
   if (o)
     ChangeUserStatus(o, ICQ_STATUS_OFFLINE);
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 
   if (m_szRegisterPasswd)
@@ -2083 +2083 @@
 int CICQDaemon::ConnectToServer(const char* server, unsigned short port)
 {
-  SrvSocket *s = new SrvSocket(gUserManager.OwnerUin());
+  SrvSocket *s = new SrvSocket(gUserManager.icqOwnerUin());
 
   if (m_bProxyEnabled)
@@ -2119 +2119 @@
     // Now get the internal ip from this socket
     CPacket::SetLocalIp(  NetworkIpToPacketIp(s->LocalIp() ));
-    ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
     if (o)
       o->SetIntIp(s->LocalIp());
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
 
     gSocketManager.AddSocket(s);
@@ -2364 +2364 @@
       // ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
       // unsigned long nListTime = o->GetSSTime();
-      // gUserManager.DropOwner(LICQ_PPID);
+      // gUserManager.DropOwner(o);
 
       CSrvPacketTcp* p;
@@ -2457 +2457 @@
       realIP = PacketIpToNetworkIp(realIP);
       CPacket::SetRealIp(NetworkIpToPacketIp(realIP));
-      ICQOwner *owner = gUserManager.FetchOwner(LOCK_W);
+      ICQOwner* owner = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
       owner->SetIp(realIP);
-      gUserManager.DropOwner();
+      gUserManager.DropOwner(owner);
 
       char buf[32];
@@ -2468 +2468 @@
       nOnlineSince = packet.UnpackUnsignedLongTLV(0x0003);
 
-    ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
     unsigned long nPFM = o->PhoneFollowMeStatus();
     // Workaround for the ICQ4.0 problem of it not liking the PFM flags
@@ -2480 +2480 @@
     gLog.Info(tr("%sServer says we're now: %s\n"), L_SRVxSTR, ICQUser::StatusToStatusStr(o->Status(), o->StatusInvisible()));
 
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
 
     break;
@@ -3776 +3776 @@
           ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
           AddUserEvent(o, e);
-          gUserManager.DropOwner();
+          gUserManager.DropOwner(o);
         }
       }
@@ -3841 +3841 @@
         if (AddUserEvent(o, eEvent))
         {
-          gUserManager.DropOwner(LICQ_PPID);
+          gUserManager.DropOwner(o);
           eEvent->AddToHistory(NULL, LICQ_PPID, D_RECEIVER);
           m_xOnEventManager.Do(ON_EVENT_SYSMSG, NULL);
         }
         else
-          gUserManager.DropOwner(LICQ_PPID);
+          gUserManager.DropOwner(o);
         break;
       }
@@ -3871 +3871 @@
           if (AddUserEvent(o, eEvent))
           {
-            gUserManager.DropOwner();
+            gUserManager.DropOwner(o);
             eEvent->AddToHistory(NULL, LICQ_PPID, D_RECEIVER);
             m_xOnEventManager.Do(ON_EVENT_SMS, NULL);
           }
           else
-            gUserManager.DropOwner();
+            gUserManager.DropOwner(o);
         }
         break;
@@ -4349 +4349 @@
             if (cPrivacySettings == ICQ_PRIVACY_ALLOW_FOLLOWING)
               ChangeUserStatus(o, o->StatusFull() | ICQ_STATUS_FxPRIVATE);
-            gUserManager.DropOwner(LICQ_PPID);
+            gUserManager.DropOwner(o);
             break;
           }
@@ -4367 +4367 @@
         CheckExport();
       }
-      
+
       // Update local info about contact list
       nTime = packet.UnpackUnsignedLongBE();
-      ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+      ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
       o->SetSSTime(nTime);
       o->SetSSCount(nCount);
-      gUserManager.DropOwner();
+      gUserManager.DropOwner(o);
 
       gLog.Info(tr("%sActivate server contact list.\n"), L_SRVxSTR);
@@ -4465 +4465 @@
       unsigned long nListTime = o->GetSSTime();
       o->SetSSTime(time(0));
-      gUserManager.DropOwner(LICQ_PPID);
+      gUserManager.DropOwner(o);
 
       CSrvPacketTcp *pReply = 0;
@@ -4644 +4644 @@
       if (AddUserEvent(o, e))
       {
-        gUserManager.DropOwner(LICQ_PPID);
+        gUserManager.DropOwner(o);
         e->AddToHistory(NULL, LICQ_PPID, D_RECEIVER);
         m_xOnEventManager.Do(ON_EVENT_SYSMSG, NULL);
       }
       else
-        gUserManager.DropOwner(LICQ_PPID);
-      
+        gUserManager.DropOwner(o);
+
       delete [] szId;
       delete [] szMsg;
@@ -4695 +4695 @@
       if (AddUserEvent(o, eEvent))
       {
-        gUserManager.DropOwner(LICQ_PPID);
+        gUserManager.DropOwner(o);
         eEvent->AddToHistory(NULL, LICQ_PPID, D_RECEIVER);
         m_xOnEventManager.Do(ON_EVENT_SYSMSG, NULL);
       }
       else
-        gUserManager.DropOwner(LICQ_PPID);
+        gUserManager.DropOwner(o);
 
       delete [] szId;
@@ -4718 +4718 @@
       if (AddUserEvent(o, e))
       {
-        gUserManager.DropOwner(LICQ_PPID);
+        gUserManager.DropOwner(o);
         e->AddToHistory(NULL, LICQ_PPID, D_RECEIVER);
         m_xOnEventManager.Do(ON_EVENT_SYSMSG, NULL);
       }
       else
-        gUserManager.DropOwner(LICQ_PPID);
+        gUserManager.DropOwner(o);
 
       delete [] szId;
@@ -4831 +4831 @@
       sendTM.tm_isdst = -1;
 
-      ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+          ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
       nTimeSent = mktime(&sendTM) - o->SystemTimeGMTOffset();
-      gUserManager.DropOwner();
-      
+          gUserManager.DropOwner(o);
+
       // Msg type & flags
       unsigned short nTypeMsg = msg.UnpackUnsignedShort();
@@ -5079 +5079 @@
           CEventUnknownSysMsg *e = new CEventUnknownSysMsg(nTypeMsg, ICQ_CMDxRCV_SYSxMSGxOFFLINE,
                                                            nUin, szMessage, nTimeSent, 0);
-          
-      ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+
+              ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
           AddUserEvent(o, e);
-          gUserManager.DropOwner();
+              gUserManager.DropOwner(o);
     }
       }
@@ -5141 +5141 @@
             }
 
-        ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+                ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
             if (AddUserEvent(o, eEvent))
         {
-              gUserManager.DropOwner();
+                  gUserManager.DropOwner(o);
               eEvent->AddToHistory(NULL, LICQ_PPID, D_RECEIVER);
               m_xOnEventManager.Do(ON_EVENT_SYSMSG, NULL);
         }
         else
-          gUserManager.DropOwner();
+                  gUserManager.DropOwner(o);
             break;
       }
@@ -5166 +5166 @@
         }
         else
-        {  
-          ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+                {
+                  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
           gLog.Info(tr("%sOffline SMS from %s.\n"), L_BLANKxSTR, eSms->Number());
           if (AddUserEvent(o, eEvent))
           {
-            gUserManager.DropOwner();
+                    gUserManager.DropOwner(o);
             eEvent->AddToHistory(NULL, LICQ_PPID, D_RECEIVER);
             m_xOnEventManager.Do(ON_EVENT_SMS, NULL);
           }
           else
-            gUserManager.DropOwner();
-        }
+                    gUserManager.DropOwner(o);
+                }
         break;
       }
@@ -5210 +5210 @@
         if (pEvent != NULL && nResult == META_SUCCESS)
         {
-          ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+              ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
           o->SetEnableSave(false);
           o->SetPassword(((CPU_SetPassword *)pEvent->m_pPacket)->m_szPassword);
           o->SetEnableSave(true);
           o->SaveLicqInfo();
-          gUserManager.DropOwner();
+              gUserManager.DropOwner(o);
         }
       }
@@ -5233 +5233 @@
         {
           CPU_Meta_SetGeneralInfo *p = (CPU_Meta_SetGeneralInfo *)pEvent->m_pPacket;
-          ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+              ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
           o->SetEnableSave(false);
           o->SetAlias(p->m_szAlias);
@@ -5266 +5266 @@
           o->SetEnableSave(true);
           o->SaveGeneralInfo();
-          gUserManager.DropOwner();
+              gUserManager.DropOwner(o);
         }
       }
@@ -5278 +5278 @@
         {
           CPU_Meta_SetEmailInfo *p = (CPU_Meta_SetEmailInfo *)pEvent->m_pPacket;
-          ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+              ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
           o->SetEnableSave(false);
           o->SetEmailSecondary(p->m_szEmailSecondary);
@@ -5290 +5290 @@
           o->SetEnableSave(true);
           o->SaveGeneralInfo();
-          gUserManager.DropOwner();
+              gUserManager.DropOwner(o);
         }
       }