Changeset 6411 for trunk/licq

Timestamp:

07/04/08 03:27:41 (5 months ago)

Author:

flynd

Message:

Removed uin functions from socket classes as they are no longer used.

Location:

trunk/licq

Files:

• include/licq_socket.h (modified) (6 diffs)
• src/icqd-threads.cpp (modified) (2 diffs)
• src/icqd.cpp (modified) (1 diff)
• src/socket.cpp (modified) (7 diffs)

trunk/licq/include/licq_socket.h

@@ -36 +36 @@
 {
 public:
-  INetSocket(unsigned long _nOwner);
   INetSocket(const char *_szOwnerId, unsigned long _nOwnerPPID);
   virtual ~INetSocket();
@@ -46 +45 @@
   unsigned long OwnerPPID() { return m_nOwnerPPID; }
   void SetOwner(const char *s, unsigned long n);
-  unsigned long Owner()     { return (m_nOwner); }
-  void SetOwner(unsigned long _nOwner);
   unsigned long Version()     { return (m_nVersion); }
   void SetVersion(unsigned long _nVersion)  { m_nVersion = _nVersion; }
@@ -100 +97 @@
   char m_szID[4];
   int m_nSockType;
-  unsigned long m_nOwner;
   unsigned short m_nVersion;
   SocketError_et m_nErrorType;
@@ -114 +110 @@
 {
 public:
-  TCPSocket(unsigned long _nOwner);
   TCPSocket(const char *s, unsigned long n);
   TCPSocket();
@@ -151 +146 @@
 {
 public:
-  SrvSocket(unsigned long _nOwner);
   SrvSocket(const char *s, unsigned long n);
   virtual ~SrvSocket();
@@ -172 +166 @@
 {
 public:
-  UDPSocket(unsigned long _nOwner);
+  UDPSocket(const char* ownerId, unsigned long ownerPpid);
   virtual ~UDPSocket();
 

trunk/licq/src/icqd-threads.cpp

@@ -813 +813 @@
             DEBUG_THREADS("[MonitorSockets_tep] Data on listening TCP socket."
                           "\n");
-            TCPSocket *tcp = static_cast<TCPSocket *>(s);
+            TCPSocket* tcp = static_cast<TCPSocket *>(s);
             if (tcp == NULL)
             {
@@ -821 +821 @@
             else
             {
-              TCPSocket *newSocket = new TCPSocket(0);
+              TCPSocket *newSocket = new TCPSocket();
               bool ok = tcp->RecvConnection(*newSocket);
               gSocketManager.DropSocket(tcp);

trunk/licq/src/icqd.cpp

@@ -385 +385 @@
   int nResult = 0;
 
-  TCPSocket *s = new TCPSocket(0);
+  TCPSocket* s = new TCPSocket();
   m_nTCPSocketDesc = StartTCPServer(s);
   if (m_nTCPSocketDesc == -1)

trunk/licq/src/socket.cpp

@@ -179 +179 @@
 }
 
-//-----INetSocket::SetOwner---------------------------------------------------
-void INetSocket::SetOwner(unsigned long _nOwner)
-{
-  m_nOwner = _nOwner;
-  if (_nOwner)
-  {
-    char szUin[24];
-    sprintf(szUin, "%lu", _nOwner);
-    m_szOwnerId = strdup(szUin);
-    m_nOwnerPPID = LICQ_PPID;
-  }
-  else
-  {
-    m_szOwnerId = 0;
-    m_nOwnerPPID = 0;
-  }
-}
-
 void INetSocket::SetOwner(const char *_szOwnerId, unsigned long _nOwnerPPID)
 {
   m_szOwnerId = strdup(_szOwnerId);
   m_nOwnerPPID = _nOwnerPPID;
-  if (m_nOwnerPPID == LICQ_PPID)
-    m_nOwner = strtoul(_szOwnerId, (char **)NULL, 10);
-  else
-    m_nOwner = 0;
 }
 
@@ -266 +244 @@
 
 
-//-----INetSocket::constructor--------------------------------------------------
-INetSocket::INetSocket(unsigned long _nOwner)
-{
-  m_nDescriptor = -1;
-  SetOwner(_nOwner);
-
-  m_nVersion = 0;
-  m_nErrorType = SOCK_ERROR_none;
-  memset(&m_sRemoteAddr, 0, sizeof(struct sockaddr_in));
-  memset(&m_sLocalAddr, 0, sizeof(struct sockaddr_in));
-  m_szRemoteName = NULL;
-  m_xProxy = NULL;
-  m_nChannel = ICQ_CHNxNONE;
-  
-  // Initialise the mutex
-  pthread_mutex_init(&mutex, NULL);
-}
-
 INetSocket::INetSocket(const char *_szOwnerId, unsigned long _nOwnerPPID)
 {
@@ -292 +252 @@
     m_szOwnerId = 0;
   m_nOwnerPPID = _nOwnerPPID;
-  if (m_nOwnerPPID == LICQ_PPID)
-    m_nOwner = strtoul(_szOwnerId, (char **)NULL, 10);
-  else
-    m_nOwner = 0;
   m_nVersion = 0;
   m_nErrorType = SOCK_ERROR_none;
@@ -638 +594 @@
 //=====SrvSocket===============================================================
 
-SrvSocket::SrvSocket(unsigned long _nOwner) : INetSocket(_nOwner)
-{
-  strcpy(m_szID, "SRV");
-  m_nSockType = SOCK_STREAM;
-}
-
 SrvSocket::SrvSocket(const char *s, unsigned long n) : INetSocket(s, n)
 {
@@ -826 +776 @@
   return true;
 }
-    
+
 //=====TCPSocket===============================================================
-TCPSocket::TCPSocket(unsigned long _nOwner) : INetSocket(_nOwner)
-{
-  strcpy(m_szID, "TCP");
-  m_nSockType = SOCK_STREAM;
-  m_p_SSL = NULL;
-}
-
 TCPSocket::TCPSocket(const char *s, unsigned long n) : INetSocket(s, n)
 {
@@ -906 +849 @@
     m_szOwnerId = 0;
   m_nOwnerPPID = from.m_nOwnerPPID;
-
-  if (m_nOwnerPPID == LICQ_PPID)
-    m_nOwner = from.m_nOwner;
 
   m_nVersion = from.m_nVersion;
@@ -1376 +1316 @@
 #endif /*-----End of OpenSSL code------------------------------------------*/
 
-UDPSocket::UDPSocket(unsigned long _nOwner) : INetSocket(_nOwner)
+UDPSocket::UDPSocket(const char* ownerId, unsigned long ownerPpid)
+    : INetSocket(ownerId, ownerPpid)
 {
   strcpy(m_szID, "UDP");