Changeset 6402 for trunk/licq/include/licq_icqd.h

Timestamp:

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

Author:

flynd

Message:

More uin calls removed or rewritten.

Files:

• trunk/licq/include/licq_icqd.h (modified) (7 diffs)

trunk/licq/include/licq_icqd.h

@@ -243 +243 @@
      unsigned short nLevel, bool bMultipleRecipients = false,
      CICQColor *pColor = NULL);
-
-  unsigned long ProtoSendContactList(const char *szId, unsigned long nPPID,
-     UinList &uins, bool bOnline, unsigned short nLevel,
-     bool bMultipleRecipients = false, CICQColor *pColor = NULL);
 
   unsigned long ProtoFetchAutoResponseServer(const char *szId, unsigned long nPPID);
@@ -551 +547 @@
   void CancelEvent(unsigned long );
   void CancelEvent(ICQEvent *);
-  bool OpenConnectionToUser(unsigned long nUin, TCPSocket *sock,
+  bool OpenConnectionToUser(const char* id, TCPSocket *sock,
      unsigned short nPort);
   bool OpenConnectionToUser(const char *szAlias, unsigned long nIp,
@@ -677 +673 @@
      unsigned long nMsgID2, unsigned short nSequence,
      TCPSocket *pSock);
-  bool WaitForReverseConnection(unsigned short id, unsigned long uin);
+  bool WaitForReverseConnection(unsigned short id, const char* userId);
 
 protected:
@@ -841 +837 @@
   void ProcessFifo(char *);
 
-  static bool Handshake_Send(TCPSocket *, unsigned long, unsigned short,
+  static bool Handshake_Send(TCPSocket *, const char* id, unsigned short,
                              unsigned short, bool = true, unsigned long = 0);
   static bool Handshake_SendConfirm_v7(TCPSocket *);
@@ -848 +844 @@
   int ConnectToServer(const char* server, unsigned short port);
   int ConnectToLoginServer();
-  int ConnectToUser(unsigned long, unsigned char);
-  int ReverseConnectToUser(unsigned long nUin, unsigned long nIp,
+  int ConnectToUser(const char* id, unsigned char channel);
+  int 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);
-  int RequestReverseConnection(unsigned long, unsigned long, unsigned long,
+  int RequestReverseConnection(const char* id, unsigned long, unsigned long,
                                unsigned short, unsigned short);
 
@@ -898 +894 @@
 {
 public:
-  CReverseConnectToUserData(unsigned long uin, unsigned long id,
+  CReverseConnectToUserData(const char* idString, unsigned long id,
       unsigned long data, unsigned long ip, unsigned short port,
       unsigned short version, unsigned short failedport, unsigned long msgid1,
@@ -904 +900 @@
   ~CReverseConnectToUserData();
 
-  unsigned long nUin;
+  std::string myIdString;
   unsigned long nId;
   unsigned long nData;