Changeset 6417

Timestamp:

07/04/08 05:44:34 (2 months ago)

Author:

flynd

Message:

Marked uin functions in licq_user.h as deprecated.

Location:

trunk/licq

Files:

• include/licq_user.h (modified) (12 diffs)
• src/user.cpp (modified) (7 diffs)

trunk/licq/include/licq_user.h

@@ -431 +431 @@
 {
 public:
-  ICQUser(unsigned long id, char *filename);
-  ICQUser(unsigned long id);
   ICQUser(const char *id, unsigned long ppid, char *filename);
   ICQUser(const char *id, unsigned long ppid, bool bTempUser = false);
@@ -595 +593 @@
   bool EnableSave()                     { return m_bEnableSave; }
   bool ShowAwayMsg()                    { return m_bShowAwayMsg; }
-  unsigned long Uin()                   { return m_nUin; }
-  char *UinString()                     { return m_szUinString; }
   unsigned short Sequence(bool = false);
   char Mode()                           { return m_nMode; }
@@ -924 +920 @@
   void Unlock();
 
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED ICQUser(unsigned long id, char *filename);
+  LICQ_DEPRECATED ICQUser(unsigned long id);
+  LICQ_DEPRECATED unsigned long Uin() const;
+  LICQ_DEPRECATED const char* UinString() const { return m_szId; }
+
 protected:
   ICQUser() { /* ICQOwner inherited constructor - does nothing */ }
@@ -937 +939 @@
   void LoadPictureInfo();
   void LoadLicqInfo();
-  void Init(unsigned long nUin);
   void Init(const char *, unsigned long);
   bool LoadInfo();
@@ -956 +957 @@
   void SetIdleSince(time_t t)       { m_nIdleSince = t; }
   void SetRegisteredTime(time_t t)  { m_nRegisteredTime = t; }
+
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED void Init(unsigned long nUin);
 
   CIniFile m_fConf;
@@ -973 +977 @@
   unsigned short m_nPort, m_nLocalPort, m_nConnectionVersion;
   unsigned short m_nTyping;
-  unsigned long m_nUin,
-                m_nStatus;
+  unsigned long m_nStatus;
   UserGroupList myGroups;               /**< List of user groups */
   unsigned long mySystemGroups;         /**< Bitmask for system groups */
@@ -986 +989 @@
   char *m_szCustomAutoResponse;
   char *m_szId;
-  char m_szUinString[13];
   bool m_bOnlineNotify,
        m_bSendIntIp,
@@ -1105 +1107 @@
 {
 public:
-  ICQOwner();
   ICQOwner(const char *, unsigned long);
   virtual ~ICQOwner();
@@ -1117 +1118 @@
   void SetHideIp(bool b)       {  m_bHideIp = b; SaveLicqInfo(); }
   void SetSavePassword(bool b) {  m_bSavePassword = b; SaveLicqInfo(); }
-  void SetUin(unsigned long n) { m_nUin = n; SaveLicqInfo(); }
   void SetId(const char *s)    { SetString(&m_szId, s); SaveLicqInfo(); }
   void SetRandomChatGroup(unsigned long n)  { m_nRandomChatGroup = n; SaveLicqInfo(); }
@@ -1125 +1125 @@
   unsigned long RandomChatGroup() { return m_nRandomChatGroup; }
   unsigned long AddStatusFlags(unsigned long nStatus);
+
+  // Deprecated functions, to be removed
+  LICQ_DEPRECATED void SetUin(unsigned long n);
 
   // Server Side List functions
@@ -1292 +1295 @@
 
   // ICQ Protocol only (from original Licq)
-  unsigned long AddUser(ICQUser *);
-  void RemoveUser(unsigned long);
-  ICQUser *FetchUser(unsigned long, unsigned short);
+  void AddUser(ICQUser *);
   void DropUser(ICQUser *);
-  bool IsOnList(unsigned long nUin);
+
+  // Deprecated user functions, to be removed
+  LICQ_DEPRECATED ICQUser *FetchUser(unsigned long, unsigned short);
+  LICQ_DEPRECATED void RemoveUser(unsigned long);
+  LICQ_DEPRECATED bool IsOnList(unsigned long nUin);
 
   // Deprecated owner functions, to be removed
@@ -1483 +1488 @@
 
   // Deprecated group manipulation functions
-  void AddUserToGroup(unsigned long _nUin, unsigned short _nGroup);
-  void RemoveUserFromGroup(unsigned long _nUin, unsigned short _nGroup);
+  LICQ_DEPRECATED void AddUserToGroup(unsigned long _nUin, unsigned short _nGroup);
+  LICQ_DEPRECATED void RemoveUserFromGroup(unsigned long _nUin, unsigned short _nGroup);
 
   /**

trunk/licq/src/user.cpp

@@ -854 +854 @@
  * The user is write locked upon return of this function
  *-------------------------------------------------------------------------*/
-unsigned long CUserManager::AddUser(ICQUser *pUser)
-{
-  AddUser(pUser, pUser->IdString(), LICQ_PPID);
-  return pUser->Uin();
+void CUserManager::AddUser(ICQUser *pUser)
+{
+  AddUser(pUser, pUser->IdString(), pUser->PPID());
 }
 
@@ -866 +865 @@
 void CUserManager::RemoveUser(unsigned long _nUin)
 {
-  ICQUser *u = FetchUser(_nUin, LOCK_R);
-  char *szId = u->IdString();
-  unsigned long nPPID = u->PPID();
-  DropUser(u);
-  RemoveUser(szId, nPPID);
+  char szId[16];
+  snprintf(szId, 16, "%lu", _nUin);
+  RemoveUser(szId, LICQ_PPID);
 }
 
@@ -1366 +1363 @@
 void CUserManager::DropOwner()
 {
-  DropOwner(LICQ_PPID);
+  LockOwnerList(LOCK_R);
+  OwnerList::iterator iter;
+  for (iter = m_vpcOwners.begin(); iter != m_vpcOwners.end(); ++iter)
+  {
+    if ((*iter)->PPID() == LICQ_PPID)
+    {
+      (*iter)->Unlock();
+      break;
+    }
+  }
+  UnlockOwnerList();
 }
 
@@ -2322 +2329 @@
     m_szId = 0;
   m_nPPID = _nPPID;
-  
+
   // gui plugin compat
-  if (m_nPPID == LICQ_PPID && m_szId)
-    m_nUin = strtoul(m_szId, (char **)NULL, 10);
-  else
-   m_nUin = 0;
   SetStatus(ICQ_STATUS_OFFLINE);
   SetAutoResponse("");
@@ -2367 +2370 @@
   m_szClientInfo = NULL;
 
-  snprintf(m_szUinString, 12, "%lu", m_nUin);
-  m_szUinString[12] = '\0';
-
   pthread_rdwr_init_np (&mutex_rw, NULL);
-  pthread_rdwr_set_name(&mutex_rw, m_szUinString);
+  pthread_rdwr_set_name(&mutex_rw, m_szId);
+}
+
+unsigned long ICQUser::Uin() const
+{
+  return strtoul(m_szId, NULL, 0);
 }
 
@@ -3873 +3878 @@
 
 //-----ICQOwner::constructor----------------------------------------------------
-ICQOwner::ICQOwner()
-{
-  gLog.Info(tr("%sOwner configuration.\n"), L_INITxSTR);
-  char szTemp[MAX_LINE_LEN];
-  char filename[MAX_FILENAME_LEN];
-  m_bException = false;
-  m_bSavePassword = true;
-  m_szPassword = NULL;
-  m_nPDINFO = 0;
-
-  Init("0", LICQ_PPID);
-  //SetOnContactList(true);
-  m_bOnContactList = true;
-
-  // Get data from the config file
-  snprintf(filename, MAX_FILENAME_LEN - 1, "%s/owner.Licq", BASE_DIR);
-  filename[MAX_FILENAME_LEN - 1] = '\0';
-
-  // Make sure owner.Licq is mode 0600
-  if (chmod(filename, S_IRUSR | S_IWUSR) == -1)
-  {
-    gLog.Warn(tr("%sUnable to set %s to mode 0600.  Your ICQ password is vulnerable.\n"),
-                 L_WARNxSTR, filename);
-  }
-
-  m_fConf.SetFileName(filename);
-  LoadInfo();
-  // Owner encoding fixup to be UTF-8 by default
-  if (strcmp(m_szEncoding, "") == 0)
-    SetString(&m_szEncoding, "UTF-8");
-  m_fConf.ReadNum("Uin", m_nUin, 0);
-  snprintf(m_szUinString, 12, "%lu", m_nUin);
-  m_szUinString[12] = '\0';
-  if (m_szId)  free (m_szId);
-  m_szId = strdup(m_szUinString);
-  m_fConf.ReadStr("Password", szTemp, "", false);
-  SetPassword(&szTemp[1]); // skip leading space since we didn't trim
-  m_fConf.ReadBool("WebPresence", m_bWebAware, false);
-  m_fConf.ReadBool("HideIP", m_bHideIp, false);
-  m_fConf.ReadNum("RCG", m_nRandomChatGroup, ICQ_RANDOMxCHATxGROUP_NONE);
-  m_fConf.ReadStr("AutoResponse", szTemp, "");
-  m_fConf.ReadNum("SSTime", (unsigned long&)m_nSSTime, 0L);
-  m_fConf.ReadNum("SSCount", m_nSSCount, 0);
-  m_fConf.ReadNum("PDINFO", m_nPDINFO, 0);
-
-  SetAutoResponse(szTemp);
-
-  m_fConf.CloseFile();
-
-  snprintf(filename, MAX_FILENAME_LEN - 1, "%s/%s/owner.history", BASE_DIR, HISTORY_DIR);
-  SetHistoryFile(filename);
-
-  if (m_nTimezone != SystemTimezone() && m_nTimezone != TIMEZONE_UNKNOWN)
-  {
-    gLog.Warn(tr("%sCurrent Licq GMT offset (%d) does not match system GMT offset (%d).\n"
-              "%sUpdate general info on server to fix.\n"),
-       L_WARNxSTR, m_nTimezone, SystemTimezone(), L_BLANKxSTR);
-  }
-
-  //if owner timestamps do not exist, set them to current time
-  unsigned long nTime = time(NULL);
-
-/*  if (m_nClientTimestamp == 0)
-    m_nClientTimestamp = nTime;*/
-  if (m_nClientInfoTimestamp == 0)
-    m_nClientInfoTimestamp = nTime;
-  if (m_nClientStatusTimestamp == 0)
-    m_nClientStatusTimestamp = nTime;
-
-  SetEnableSave(true);
-}
-
 ICQOwner::ICQOwner(const char *_szId, unsigned long _nPPID)
 {
@@ -4040 +3973 @@
 }
 
-
+void ICQOwner::SetUin(unsigned long uin)
+{
+  char id[16];
+  snprintf(id, 16, "%lu", uin);
+  free(m_szId);
+  m_szId = strdup(id);
+  m_nPPID = LICQ_PPID;
+  SaveLicqInfo();
+}
 
 unsigned long ICQOwner::AddStatusFlags(unsigned long s)