Changeset 3487 for branches/protocol_plugin_1_3_0

Timestamp:

05/03/03 09:10:11 (6 years ago)

Author:

emostar

Message:

Chat support for protocol plugin kind of. It needs work, this just gives the GP a string for the user id instead and ppid.

Location:

branches/protocol_plugin_1_3_0/licq

Files:

• include/licq_chat.h (modified) (10 diffs)
• src/icqd-chat.cpp (modified) (22 diffs)

branches/protocol_plugin_1_3_0/licq/include/licq_chat.h

@@ -189 +189 @@
   const char *Name() { return m_szName; }
   unsigned long Uin() { return m_nUin; }
+  char *Id() { return m_szId; }
+  unsigned long PPID() { return m_nPPID; }
   unsigned short Port() { return m_nPort; }
   int ColorForeRed() { return m_nColorForeRed; }
@@ -197 +199 @@
   int ColorBackBlue() { return m_nColorBackBlue; }
 
-  virtual ~CPChat_Color() { if (m_szName != NULL) free(m_szName); }
+  virtual ~CPChat_Color() { if (m_szName != NULL) free(m_szName); if (m_szId != NULL) free(m_szId); }
+
 protected:
   unsigned long m_nUin;
+  char *m_szId;
+  unsigned long m_nPPID;
   char *m_szName;
   unsigned short m_nPort;
@@ -219 +224 @@
   CChatClient();
   CChatClient(ICQUser *);
+  ~CChatClient() { if (m_szId) free(m_szId); }
 
   // Initialize from the handshake buffer (does not set the session
@@ -230 +236 @@
   unsigned short m_nPort;
   unsigned long m_nUin;
+  char *m_szId;
+  unsigned long m_nPPID;
   unsigned long m_nIp;
   unsigned long m_nIntIp;
@@ -264 +272 @@
   CPChat_ColorFont(CBuffer &);
 
-  virtual ~CPChat_ColorFont()  {  if (m_szName != NULL) free (m_szName); if (m_szFontFamily != NULL) free(m_szFontFamily); }
+  virtual ~CPChat_ColorFont()  {  if (m_szName != NULL) free (m_szName); if (m_szFontFamily != NULL) free(m_szFontFamily); if (m_szId != NULL) free(m_szId); }
 
   // Accessors
   const char *Name() { return m_szName; }
   unsigned long Uin() { return m_nUin; }
+  char *Id() { return m_szId; }
+  unsigned long PPID() { return m_nPPID; }
   unsigned short Session() { return m_nSession; }
   int ColorForeRed() { return m_nColorForeRed; }
@@ -290 +300 @@
 protected:
   unsigned long m_nUin;
+  char *m_szId;
+  unsigned long m_nPPID;
   unsigned short m_nSession;
   char *m_szName;
@@ -443 +455 @@
 public:
   unsigned long Uin()          { return uin; }
+  char *Id()                   { return szId; }
+  unsigned long PPID()         { return nPPID; }
   unsigned long ToKick()       { return nToKick; }
   const char *Name()           { return chatname; }
@@ -458 +472 @@
   bool Sleep()                 { return sleep; }
 
-  ~CChatUser() {}
+  ~CChatUser() {if (szId) free(szId);}
 
 protected:
@@ -464 +478 @@
 
   unsigned long uin;
+  char *szId;
+  unsigned long nPPID;
   unsigned long nToKick;
   char chatname[32];
@@ -580 +596 @@
   int pipe_events[2], pipe_thread[2];
   unsigned long m_nUin;
+  char *m_szId;
+  unsigned long m_nPPID;
   unsigned short m_nSession;
   ChatUserList chatUsers;

branches/protocol_plugin_1_3_0/licq/src/icqd-chat.cpp

@@ -38 +38 @@
   m_nPort = _nLocalPort;
   m_nUin = gUserManager.OwnerUin();
+  char szUin[24];
+  sprintf(szUin, "%lu", m_nUin);
+  m_szId = strdup(szUin);
+  m_nPPID = LICQ_PPID;
   m_nColorForeRed = nColorForeRed;
   m_nColorForeGreen = nColorForeGreen;
@@ -72 +76 @@
   b.UnpackUnsignedLong();
   m_nUin = b.UnpackUnsignedLong();
+  char szUin[24];
+  sprintf(szUin, "%lu", m_nUin);
+  m_szId = strdup(szUin);
+  m_nPPID = LICQ_PPID;
   m_szName = strdup(b.UnpackString(buf, sizeof(buf)));
   m_nPort = b.UnpackUnsignedShort();
@@ -89 +97 @@
 CChatClient::CChatClient()
 {
-  m_nVersion = m_nUin = m_nIp = m_nIntIp = m_nPort = m_nMode
+  m_nVersion = m_nUin = m_nPPID = m_nIp = m_nIntIp = m_nPort = m_nMode
      = m_nSession = m_nHandshake = 0;
+  m_szId = NULL;
 }
 
@@ -98 +107 @@
   m_nVersion = u->Version();
   m_nUin = u->Uin();
+  m_szId = strdup(u->IdString());
+  m_nPPID = u->PPID();
   m_nIp = u->Ip();
   m_nIntIp = u->IntIp();
@@ -121 +132 @@
   b.UnpackUnsignedShort();
   m_nUin = b.UnpackUnsignedLong();
+  char szUin[24];
+  sprintf(szUin, "%lu", m_nUin);
+  m_szId = strdup(szUin);
+  m_nPPID = LICQ_PPID;
   m_nIp = b.UnpackUnsignedLong();
   m_nIntIp = b.UnpackUnsignedLong();
@@ -141 +156 @@
   b.UnpackUnsignedLong();
   m_nUin = b.UnpackUnsignedLong();
+  char szUin[24];
+  sprintf(szUin, "%lu", m_nUin);
+  m_szId = strdup(szUin);
+  m_nPPID = LICQ_PPID;
   m_nIp = b.UnpackUnsignedLong();
   m_nIntIp = b.UnpackUnsignedLong();
@@ -163 +182 @@
   b.UnpackUnsignedLong();
   m_nUin = b.UnpackUnsignedLong();
+  char szUin[24];
+  sprintf(szUin, "%lu", m_nUin);
+  m_szId = strdup(szUin);
+  m_nPPID = LICQ_PPID;
   m_nIp = b.UnpackUnsignedLong();  // Will probably be zero...
   m_nIntIp = b.UnpackUnsignedLong();
@@ -182 +205 @@
   m_nVersion = hand.VersionMajor();
   m_nUin = hand.SourceUin();
+  char szUin[24];
+  sprintf(szUin, "%lu", m_nUin);
+  m_szId = strdup(szUin);
+  m_nPPID = LICQ_PPID;
   m_nIntIp = hand.LocalIp();
   m_nIp = hand.RealIp();
@@ -201 +228 @@
   m_nVersion = hand.VersionMajor();
   m_nUin = hand.SourceUin();
+  char szUin[24];
+  sprintf(szUin, "%lu", m_nUin);
+  m_szId = strdup(szUin);
+  m_nPPID = LICQ_PPID;
   m_nIntIp = hand.LocalIp();
   m_nIp = hand.RealIp();
@@ -226 +257 @@
   m_nPort = nLocalPort;
   m_nUin = gUserManager.OwnerUin();
+  char szUin[24];
+  sprintf(szUin, "%lu", m_nUin);
+  m_szId = strdup(szUin);
+  m_nPPID = LICQ_PPID;
   m_nColorForeRed = nColorForeRed;
   m_nColorForeGreen = nColorForeGreen;
@@ -293 +328 @@
   b.UnpackUnsignedLong();
   m_nUin = b.UnpackUnsignedLong();
+  char szUin[24];
+  sprintf(szUin, "%lu", m_nUin);
+  m_szId = strdup(szUin);
+  m_nPPID = LICQ_PPID;
   m_szName = strdup(b.UnpackString(buf, sizeof(buf)));
   m_nColorForeRed = (unsigned char)b.UnpackChar();
@@ -523 +562 @@
 {
   uin = 0;
+  szId = 0;
+  nPPID = 0;
   nToKick = 0;
   state = CHAT_STATE_DISCONNECTED;
@@ -572 +613 @@
 
   m_nUin = nUin;
+  char szUin[24];
+  sprintf(szUin, "%lu", m_nUin);
+  m_szId = strdup(szUin);
+  m_nPPID = LICQ_PPID;
+
 //  m_nSession = rand();
   licqDaemon = d;
@@ -647 +693 @@
   if (!StartChatServer()) return;
 
-  ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_R);
+  ICQUser *u = gUserManager.FetchUser(m_szId, LICQ_PPID, LOCK_R);
   if (u == NULL) return;
   m_pChatClient = new CChatClient(u);
@@ -669 +715 @@
   u->m_pClient->m_nSession = m_nSession;
   u->uin = c->m_nUin;
+  u->szId = strdup(c->m_szId);
+  u->nPPID = c->m_nPPID;
 
   bool bSendIntIp = false;
@@ -720 +768 @@
   u->m_pClient->m_nVersion = s->Version();
   u->m_pClient->m_nUin = s->Owner();
+  u->m_pClient->m_szId = s->OwnerId();
+  u->m_pClient->m_nPPID = s->OwnerPPID();
   u->m_pClient->m_nIp = s->RemoteIp();
   u->m_pClient->m_nIntIp = s->RemoteIp();
@@ -730 +780 @@
 
   u->uin = u->m_pClient->m_nUin;
+  u->szId = strdup(u->m_pClient->m_szId);
+  u->nPPID = u->m_pClient->m_nPPID;
   u->state = CHAT_STATE_WAITxFORxCOLOR;
   chatUsers.push_back(u);
@@ -803 +855 @@
           break;
       }
-      gLog.Info("%sChat: Received handshake from %ld [v%ld].\n", L_TCPxSTR,
-         u->m_pClient->m_nUin, u->sock.Version());
+      gLog.Info("%sChat: Received handshake from %s [v%ld].\n", L_TCPxSTR,
+         u->m_pClient->m_szId, u->sock.Version());
       u->uin = u->m_pClient->m_nUin;
+      if (u->szId)  free(u->szId);
+      u->szId = strdup(u->m_pClient->m_szId);
+      u->nPPID = u->m_pClient->m_nPPID;
       u->state = CHAT_STATE_WAITxFORxCOLOR;
       break;
@@ -836 +891 @@
       {
         // Skip this guys client info and anybody we haven't connected to yet
-        if ((*iter)->uin == u->uin || (*iter)->m_pClient->m_nUin == 0) continue;
+        if ((strcmp((*iter)->szId, u->szId) == 0 && (*iter)->nPPID == u->nPPID)
+            || (*iter)->m_pClient->m_szId == 0) continue;
         l.push_back((*iter)->m_pClient);
       }
@@ -882 +938 @@
       CPChat_ColorFont pin(u->sock.RecvBuffer());
       u->uin = pin.Uin();
+      u->szId = strdup(pin.Id());
+      u->nPPID = pin.PPID();
 //      m_nSession = pin.Session();
 
@@ -916 +974 @@
           for (iter2 = chatUsers.begin(); iter2 != chatUsers.end(); iter2++)
           {
-            if ((*iter2)->uin == iter->m_nUin) break;
+            if (strcmp((*iter2)->szId, iter->m_szId) == 0 &&
+                (*iter2)->nPPID == iter->m_nPPID) break;
           }
           if (iter2 != chatUsers.end()) continue;
@@ -2262 +2321 @@
   }
   if (iter != cmList.end()) cmList.erase(iter);
-}
-
+
+  if (m_szId) free(m_szId);
+}
+