Changeset 6402 for trunk/licq/src/icqd-tcp.cpp

Timestamp:

07/03/08 05:54:19 (5 months ago)

Author:

flynd

Message:

More uin calls removed or rewritten.

Files:

• trunk/licq/src/icqd-tcp.cpp (modified) (70 diffs)

trunk/licq/src/icqd-tcp.cpp

@@ -1213 +1213 @@
  * Shake hands on the given socket with the given user.
  *-------------------------------------------------------------------------*/
-bool CICQDaemon::Handshake_Send(TCPSocket *s, unsigned long nUin,
+bool CICQDaemon::Handshake_Send(TCPSocket *s, const char* id,
    unsigned short nPort, unsigned short nVersion, bool bConfirm,
    unsigned long nId)
 {
   s->SetVersion(nVersion);
-  s->SetOwner(nUin);
+  s->SetOwner(id, LICQ_PPID);
+
+  unsigned long nUin = strtoul(id, NULL, 10);
 
   switch (nVersion)
@@ -1359 +1361 @@
  * to the global socket manager and to the user.
  *----------------------------------------------------------------------------*/
-int CICQDaemon::ConnectToUser(unsigned long nUin, unsigned char nChannel)
-{
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
+int CICQDaemon::ConnectToUser(const char* id, unsigned char nChannel)
+{
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
   if (u == NULL) return -1;
 
@@ -1370 +1372 @@
   {
     gUserManager.DropUser(u);
-    gLog.Warn(tr("%sConnection attempted to already connected user (%ld).\n"),
-       L_WARNxSTR, nUin);
+    gLog.Warn(tr("%sConnection attempted to already connected user (%s).\n"),
+       L_WARNxSTR, id);
     return sd;
   }
@@ -1387 +1389 @@
     struct timeval tv = { 2, 0 };
     if (select(0, NULL, NULL, NULL, &tv) == -1 && errno == EINTR) return -1;
-    u = gUserManager.FetchUser(nUin, LOCK_W);
+    u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
     if (u == NULL) return -1;
   }
@@ -1395 +1397 @@
   if (sd != -1) return sd;
 
-  TCPSocket *s = new TCPSocket(nUin);
-  if (!OpenConnectionToUser(nUin, s, nPort))
-  {
-    u = gUserManager.FetchUser(nUin, LOCK_W);
+  TCPSocket* s = new TCPSocket(id, LICQ_PPID);
+  if (!OpenConnectionToUser(id, s, nPort))
+  {
+    u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
     if (u != NULL) u->SetConnectionInProgress(false);
     gUserManager.DropUser(u);
@@ -1405 +1407 @@
   }
   s->SetChannel(nChannel);
-  
-  gLog.Info(tr("%sShaking hands with %s (%ld) [v%d].\n"), L_TCPxSTR,
-     szAlias, nUin, nVersion);
+
+  gLog.Info(tr("%sShaking hands with %s (%s) [v%d].\n"), L_TCPxSTR,
+     szAlias, id, nVersion);
   nPort = s->LocalPort();
 
-  if (!Handshake_Send(s, nUin, 0, nVersion))
-  {
-    u = gUserManager.FetchUser(nUin, LOCK_W);
+  if (!Handshake_Send(s, id, 0, nVersion))
+  {
+    u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
     if (u != NULL) u->SetConnectionInProgress(false);
     gUserManager.DropUser(u);
@@ -1422 +1424 @@
 
   // Set the socket descriptor in the user
-  u = gUserManager.FetchUser(nUin, LOCK_W);
+  u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
   if (u == NULL) return -1;
   u->SetSocketDesc(s);
@@ -1445 +1447 @@
  * Connects a socket to a given user on a given port.
  *----------------------------------------------------------------------------*/
-bool CICQDaemon::OpenConnectionToUser(unsigned long nUin, TCPSocket *sock,
+bool CICQDaemon::OpenConnectionToUser(const char* id, TCPSocket *sock,
                                       unsigned short nPort)
 {
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
   if (u == NULL) return false;
 
@@ -1532 +1534 @@
  * to the global socket manager and to the user.
  *----------------------------------------------------------------------------*/
-int CICQDaemon::ReverseConnectToUser(unsigned long nUin, unsigned long nIp,
+int CICQDaemon::ReverseConnectToUser(const char* id, unsigned long nIp,
    unsigned short nPort, unsigned short nVersion, unsigned short nFailedPort,
    unsigned long nId, unsigned long nMsgID1, unsigned long nMsgID2)
@@ -1551 +1553 @@
   }
 
-  TCPSocket *s = new TCPSocket(nUin);
+  TCPSocket* s = new TCPSocket(id, LICQ_PPID);
   char buf[32];
 
-  gLog.Info(tr("%sReverse connecting to %lu at %s:%d.\n"), L_TCPxSTR, nUin,
+  gLog.Info(tr("%sReverse connecting to %s at %s:%d.\n"), L_TCPxSTR, id,
             ip_ntoa(nIp, buf), nPort);
 
@@ -1563 +1565 @@
   {
     char buf[128];
-    gLog.Warn(tr("%sReverse connect to %lu failed:\n%s%s.\n"), L_WARNxSTR,
-              nUin, L_BLANKxSTR, s->ErrorStr(buf, 128));
-              
-    CPU_ReverseConnectFailed *p = new CPU_ReverseConnectFailed(nUin, nMsgID1,
-                                                     nMsgID2, nPort,
-                                                     nFailedPort, nId);
+    gLog.Warn(tr("%sReverse connect to %s failed:\n%s%s.\n"), L_WARNxSTR,
+        id, L_BLANKxSTR, s->ErrorStr(buf, 128));
+
+    CPU_ReverseConnectFailed* p = new CPU_ReverseConnectFailed(id, nMsgID1,
+        nMsgID2, nPort, nFailedPort, nId);
     SendEvent_Server(p);
     return -1;
   }
 
-  gLog.Info(tr("%sReverse shaking hands with %lu.\n"), L_TCPxSTR, nUin);
+  gLog.Info(tr("%sReverse shaking hands with %s.\n"), L_TCPxSTR, id);
   bool bConfirm = ftm == NULL && cm == NULL;
 
@@ -1579 +1580 @@
   nVersion = VersionToUse(nVersion);
 
-  if (!Handshake_Send(s, nUin, 0, nVersion, bConfirm, nId))
+  if (!Handshake_Send(s, id, 0, nVersion, bConfirm, nId))
   {
     delete s;
@@ -1605 +1606 @@
   {
     // Set the socket descriptor in the user if this user is on our list
-    ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
+    ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
     if (u != NULL)
     {
@@ -1625 +1626 @@
 bool CICQDaemon::ProcessTcpPacket(TCPSocket *pSock)
 {
-  unsigned long nUin, senderIp, localIp,
+  unsigned long senderIp, localIp,
                 senderPort, junkLong, nPort, nPortReversed;
   unsigned short version, command, junkShort, newCommand, messageLen,
@@ -1632 +1633 @@
   bool errorOccured = false;
   char *message = 0;
+  char id[16] = "";
 
   // only used for v7,v8
@@ -1647 +1649 @@
     case 3:
     {
+      unsigned long nUin;
       packet >> nUin
              >> version
@@ -1655 +1658 @@
              >> messageLen   // length of incoming message
       ;
+      snprintf(id, 15, "%lu", nUin);
       break;
     }
@@ -1667 +1671 @@
         return false;
       }
+      unsigned long nUin;
       packet >> nUin
              >> version
@@ -1676 +1681 @@
              >> messageLen   // length of incoming message
       ;
+      snprintf(id, 15, "%lu", nUin);
       break;
     }
     case 6:
     {
-      nUin = pSock->Owner();
+      strncpy(id, pSock->OwnerId(), 15); id[15] = '\0';
       if (!Decrypt_Client(&packet, 6))
       {
@@ -1703 +1709 @@
     case 8:
     {
-      nUin = pSock->Owner();
+      strncpy(id, pSock->OwnerId(), 15); id[15] = '\0';
       if (!Decrypt_Client(&packet, nInVersion))
       {
@@ -1725 +1731 @@
         msgFlags = packet.UnpackUnsignedShort();
         packet >> messageLen;
-        
+
         // Stupid AOL
-        ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+        ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
         if (u && (u->LicqVersion() == 0 || u->LicqVersion() >= 1022))
         {
@@ -1751 +1757 @@
 
   // Some simple validation of the packet
-  if (nUin == 0 || command == 0)
+  if (id[0] == '\0' || command == 0)
   {
     char *buf;
-    gLog.Unknown("%sInvalid TCP packet (uin: %08lx, cmd: %04x):\n%s\n",
-                 L_UNKNOWNxSTR, nUin, command, packet.print(buf));
+    gLog.Unknown("%sInvalid TCP packet (uin: %s, cmd: %04x):\n%s\n",
+        L_UNKNOWNxSTR, id, command, packet.print(buf));
     delete [] buf;
     return false;
   }
 
-  if (nUin == gUserManager.icqOwnerUin() || nUin != pSock->Owner())
+  if (gUserManager.FindOwner(id, LICQ_PPID) != NULL || strcmp(id, pSock->OwnerId()) != 0)
   {
     char *buf;
-    if (nUin == gUserManager.icqOwnerUin())
+    if (gUserManager.FindOwner(id, LICQ_PPID) != NULL)
       gLog.Warn(tr("%sTCP message from self (probable spoof):\n%s\n"), L_WARNxSTR, packet.print(buf));
     else
-      gLog.Warn(tr("%sTCP message from invalid UIN (%ld, expect %ld):\n%s\n"),
-                L_WARNxSTR, nUin, pSock->Owner(), packet.print(buf));
+      gLog.Warn(tr("%sTCP message from invalid UIN (%s, expect %s):\n%s\n"),
+          L_WARNxSTR, id, pSock->OwnerId(), packet.print(buf));
     delete [] buf;
     return false;
@@ -1779 +1785 @@
   // find which user was sent
   bool bNewUser = false;
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_W);
+  ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_W);
   if (u == NULL)
   {
-    u = new ICQUser(nUin);
+    u = new ICQUser(id, LICQ_PPID);
     u->SetSocketDesc(pSock);
     bNewUser = true;
@@ -1923 +1929 @@
                 nMask |= licqVersion;
                 if (licqChar == 'L')
-                    gLog.Info(tr("%sMessage from %s (%ld) [Licq %s].\n"), L_TCPxSTR, u->GetAlias(),
-             nUin, CUserEvent::LicqVersionToString(licqVersion));
-                else
-                    gLog.Info(tr("%sMessage from %s (%ld).\n"), L_TCPxSTR, u->GetAlias(), nUin);
+            gLog.Info(tr("%sMessage from %s (%s) [Licq %s].\n"), L_TCPxSTR,
+                u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+      else
+            gLog.Info(tr("%sMessage from %s (%s).\n"), L_TCPxSTR, u->GetAlias(), id);
 
         CPT_AckGeneral p(newCommand, theSequence, true, bAccept, u);
@@ -1951 +1957 @@
             // FIXME should either refuse the event or have a special auto response
             // for rejected events instead of pretending to accept the user
-            RejectEvent(nUin, e);
+              RejectEvent(id, e);
             break;
           }
@@ -1982 +1988 @@
         packet >> licqChar >> licqVersion;
         if (licqChar == 'L')
-          gLog.Info(tr("%s%s (%ld) requested auto response [Licq %s].\n"), L_TCPxSTR,
-             u->GetAlias(), nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%s%s (%ld) requested auto response.\n"), L_TCPxSTR, u->GetAlias(), nUin);
+            gLog.Info(tr("%s%s (%s) requested auto response [Licq %s].\n"), L_TCPxSTR,
+                u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%s%s (%s) requested auto response.\n"), L_TCPxSTR, u->GetAlias(), id);
 
         CPT_AckGeneral p(newCommand, theSequence, true, false, u);
@@ -1993 +1999 @@
         u->SetLastCheckedAutoResponse();
 
-        PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_EVENTS, nUin));
+          PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_EVENTS, id, LICQ_PPID));
         break;
       }
@@ -2021 +2027 @@
         nMask |= licqVersion;
         if (licqChar == 'L')
-          gLog.Info(tr("%sURL from %s (%ld) [Licq %s].\n"), L_TCPxSTR, u->GetAlias(),
-            nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%sURL from %s (%ld).\n"), L_TCPxSTR, u->GetAlias(), nUin);
+            gLog.Info(tr("%sURL from %s (%s) [Licq %s].\n"), L_TCPxSTR, u->GetAlias(),
+                id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%sURL from %s (%s).\n"), L_TCPxSTR, u->GetAlias(), id);
 
         CEventUrl *e = CEventUrl::Parse(message, ICQ_CMDxTCP_START, TIME_NOW, nMask);
@@ -2054 +2060 @@
           if (Ignore(IGNORE_NEWUSERS))
           {
-            RejectEvent(nUin, e);
+              RejectEvent(id, e);
             break;
           }
@@ -2090 +2096 @@
         nMask |= licqVersion;
         if (licqChar == 'L')
-          gLog.Info(tr("%sContact list from %s (%ld) [Licq %s].\n"), L_TCPxSTR,
-             u->GetAlias(), nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%sContact list from %s (%ld).\n"), L_TCPxSTR, u->GetAlias(),
-             nUin);
+            gLog.Info(tr("%sContact list from %s (%s) [Licq %s].\n"), L_TCPxSTR,
+               u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%sContact list from %s (%s).\n"), L_TCPxSTR,
+                u->GetAlias(), id);
 
         CEventContactList *e = CEventContactList::Parse(message, ICQ_CMDxTCP_START, TIME_NOW, nMask);
@@ -2124 +2130 @@
           if (Ignore(IGNORE_NEWUSERS))
           {
-            RejectEvent(nUin, e);
+              RejectEvent(id, e);
             break;
           }
@@ -2157 +2163 @@
 
         if (licqChar == 'L')
-          gLog.Info(tr("%sChat request from %s (%ld) [Licq %s].\n"), L_TCPxSTR,
-             u->GetAlias(), nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%sChat request from %s (%ld).\n"), L_TCPxSTR, u->GetAlias(),
-             nUin);
+            gLog.Info(tr("%sChat request from %s (%s) [Licq %s].\n"), L_TCPxSTR,
+               u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%sChat request from %s (%s).\n"), L_TCPxSTR,
+                u->GetAlias(), id);
 
         // translating string with translation table
@@ -2173 +2179 @@
           if (Ignore(IGNORE_NEWUSERS))
           {
-            RejectEvent(nUin, e);
+              RejectEvent(id, e);
             break;
           }
@@ -2211 +2217 @@
 
         if (licqChar == 'L')
-          gLog.Info(tr("%sFile transfer request from %s (%ld) [Licq %s].\n"),
-             L_TCPxSTR, u->GetAlias(), nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%sFile transfer request from %s (%ld).\n"), L_TCPxSTR,
-             u->GetAlias(), nUin);
+            gLog.Info(tr("%sFile transfer request from %s (%s) [Licq %s].\n"),
+                L_TCPxSTR, u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%sFile transfer request from %s (%s).\n"), L_TCPxSTR,
+                u->GetAlias(), id);
 
         ConstFileList filelist;
@@ -2230 +2236 @@
           if (Ignore(IGNORE_NEWUSERS))
           {
-            RejectEvent(nUin, e);
+              RejectEvent(id, e);
             break;
           }
@@ -2297 +2303 @@
                     packet.incDataPosRead(2); // reversed port (BE)
 
-                    gLog.Info(tr("%sFile transfer request from %s (%ld).\n"), L_TCPxSTR,
-                                        u->GetAlias(), nUin);
+              gLog.Info(tr("%sFile transfer request from %s (%s).\n"),
+                  L_TCPxSTR, u->GetAlias(), id);
 
                     ConstFileList filelist;
@@ -2311 +2317 @@
                         if (Ignore(IGNORE_NEWUSERS))
                         {
-                            RejectEvent(nUin, e);
+                  RejectEvent(id, e);
                             break;
                         }
@@ -2332 +2338 @@
                         nPort = nPortReversed;
 
-                    gLog.Info(tr("%sChat request from %s (%ld).\n"), L_TCPxSTR,
-                                        u->GetAlias(), nUin);
-                    
+              gLog.Info(tr("%sChat request from %s (%s).\n"), L_TCPxSTR,
+                  u->GetAlias(), id);
+
                     // translating string with translation table
                     gTranslator.ServerToClient(szMessage);
@@ -2343 +2349 @@
                         if (Ignore(IGNORE_NEWUSERS))
                         {
-                            RejectEvent(nUin, e);
+                  RejectEvent(id, e);
                             break;
                         }
@@ -2356 +2362 @@
                 case ICQ_CMDxSUB_URL:
                 {
-                    gLog.Info(tr("%sURL from %s (%ld).\n"), L_TCPxSTR, u->GetAlias(), nUin);
+              gLog.Info(tr("%sURL from %s (%s).\n"), L_TCPxSTR, u->GetAlias(), id);
                     CEventUrl *e = CEventUrl::Parse(szMessage, ICQ_CMDxTCP_START,
                                                                                     TIME_NOW, nMask);
@@ -2373 +2379 @@
                         if (Ignore(IGNORE_NEWUSERS))
                         {
-                            RejectEvent(nUin, e);
+                  RejectEvent(id, e);
                             break;
                         }
@@ -2386 +2392 @@
                 case ICQ_CMDxSUB_CONTACTxLIST:
                 {
-                    gLog.Info(tr("%sContact list from %s (%ld).\n"), L_TCPxSTR,
-                                        u->GetAlias(), nUin);
+              gLog.Info(tr("%sContact list from %s (%s).\n"), L_TCPxSTR,
+                  u->GetAlias(), id);
                     CEventContactList *e = CEventContactList::Parse(szMessage,
                                                                                                                     ICQ_CMDxTCP_START,
@@ -2405 +2411 @@
                         if (Ignore(IGNORE_NEWUSERS))
                         {
-                            RejectEvent(nUin, e);
+                  RejectEvent(id, e);
                             break;
                         }
@@ -2424 +2430 @@
       case ICQ_CMDxSUB_SECURExOLD:
       {
-        gLog.Info(tr("%sReceived old-style key request from %s (%ld) but we do not support it.\n"),
-           L_TCPxSTR, u->GetAlias(), nUin);
+          gLog.Info(tr("%sReceived old-style key request from %s (%s) but we do not support it.\n"),
+              L_TCPxSTR, u->GetAlias(), id);
         // Send the nack back
         CPT_AckOldSecureChannel p(theSequence, u);
@@ -2449 +2455 @@
 
         if (licqChar == 'L')
-          gLog.Info(tr("%sSecure channel request from %s (%ld) [Licq %s].\n"),
-           L_TCPxSTR, u->GetAlias(), nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%sSecure channel request from %s (%ld).\n"), L_TCPxSTR,
-           u->GetAlias(), nUin);
+            gLog.Info(tr("%sSecure channel request from %s (%s) [Licq %s].\n"),
+                L_TCPxSTR, u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%sSecure channel request from %s (%s).\n"), L_TCPxSTR,
+                u->GetAlias(), id);
 
         CPT_AckOpenSecureChannel p(theSequence, true, u);
@@ -2475 +2481 @@
 
         u->SetSendServer(false);
-        PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, nUin, 1));
-
-        gLog.Info(tr("%sSecure channel established with %s (%ld).\n"),
-         L_SSLxSTR, u->GetAlias(), nUin);
+          PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, id, LICQ_PPID, 1));
+
+          gLog.Info(tr("%sSecure channel established with %s (%s).\n"),
+              L_SSLxSTR, u->GetAlias(), id);
 
         break;
 
 #else // We do not support OpenSSL
-       gLog.Info(tr("%sReceived secure channel request from %s (%ld) but we do not support OpenSSL.\n"),
-           L_TCPxSTR, u->GetAlias(), nUin);
+          gLog.Info(tr("%sReceived secure channel request from %s (%s) but we do not support OpenSSL.\n"),
+              L_TCPxSTR, u->GetAlias(), id);
         // Send the nack back
         CPT_AckOpenSecureChannel p(theSequence, false, u);
@@ -2510 +2516 @@
 
         if (licqChar == 'L')
-          gLog.Info(tr("%sSecure channel closed by %s (%ld) [Licq %s].\n"),
-           L_TCPxSTR, u->GetAlias(), nUin, CUserEvent::LicqVersionToString(licqVersion));
-        else
-          gLog.Info(tr("%sSecure channel closed by %s (%ld).\n"), L_TCPxSTR,
-           u->GetAlias(), nUin);
+            gLog.Info(tr("%sSecure channel closed by %s (%s) [Licq %s].\n"),
+                L_TCPxSTR, u->GetAlias(), id, CUserEvent::LicqVersionToString(licqVersion));
+          else
+            gLog.Info(tr("%sSecure channel closed by %s (%s).\n"), L_TCPxSTR,
+                u->GetAlias(), id);
 
         // send ack
@@ -2522 +2528 @@
         pSock->SecureStop();
         u->SetSecure(false);
-        PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, nUin, 0));
+          PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, id, LICQ_PPID, 0));
         break;
 
 #else // We do not support OpenSSL
-        gLog.Info(tr("%sReceived secure channel close from %s (%ld) but we do not support OpenSSL.\n"),
-           L_TCPxSTR, u->GetAlias(), nUin);
+          gLog.Info(tr("%sReceived secure channel close from %s (%s) but we do not support OpenSSL.\n"),
+              L_TCPxSTR, u->GetAlias(), id);
         // Send the nack back
         CPT_AckCloseSecureChannel p(theSequence, u);
@@ -2736 +2742 @@
         if (licqChar == 'L') sprintf(l, " [Licq %s]",
          CUserEvent::LicqVersionToString(licqVersion));
-        gLog.Info(tr("%sSecure channel response from %s (%ld)%s.\n"), L_TCPxSTR,
-         u->GetAlias(), nUin, l);
+          gLog.Info(tr("%sSecure channel response from %s (%s)%s.\n"), L_TCPxSTR,
+              u->GetAlias(), id, l);
 
         ICQEvent *e = NULL;
@@ -2744 +2750 @@
         if (message[0] == '\0')
         {
-          gLog.Info(tr("%s%s (%ld) does not support OpenSSL.\n"), L_TCPxSTR,
-             u->GetAlias(), nUin);
+            gLog.Info(tr("%s%s (%s) does not support OpenSSL.\n"), L_TCPxSTR,
+                u->GetAlias(), id);
           u->SetSecure(false);
-          PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, nUin, 0));
+            PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_SECURITY, id, LICQ_PPID, 0));
           // find the event, fail it
           e = DoneEvent(sockfd, theSequence, EVENT_FAILED);
@@ -2759 +2765 @@
           if (e == NULL)
           {
-            gLog.Warn(tr("%sSecure channel response from %s (%ld) when no request in progress.\n"),
-               L_WARNxSTR, u->GetAlias(), nUin);
+              gLog.Warn(tr("%sSecure channel response from %s (%s) when no request in progress.\n"),
+                  L_WARNxSTR, u->GetAlias(), id);
             // Close the connection as we are in trouble
             u->SetSecure(false);
             gUserManager.DropUser(u);
-