InspSocket -> BufferedSocket. Paves the way for a SimpleSocket class which ident...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treesocket.h

diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index fae22638d6c8d4c030184e74f93fda7c0eebcd04..ba0a04c3af0cdd743791e9804e13736b950939d0 100644 (file)
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -14,10 +14,6 @@
 #ifndef __TREESOCKET_H__
 #define __TREESOCKET_H__
 
-#include "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
@@ -66,7 +62,7 @@ enum ServerState { LISTENER, CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED };
 
 /** Every SERVER connection inbound or outbound is represented by
  * an object of type TreeSocket.
- * TreeSockets, being inherited from InspSocket, can be tied into
+ * TreeSockets, being inherited from BufferedSocket, can be tied into
  * the core socket engine, and we cn therefore receive activity events
  * for them, just like activex objects on speed. (yes really, that
  * is a technical term!) Each of these which relates to a locally
@@ -75,7 +71,7 @@ enum ServerState { LISTENER, CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED };
  * maintain a list of servers, some of which are directly connected,
  * some of which are not.
  */
-class TreeSocket : public InspSocket
+class TreeSocket : public BufferedSocket
 {
        SpanningTreeUtilities* Utils;           /* Utility class */
        std::string myhost;                     /* Canonical hostname */
@@ -83,6 +79,7 @@ class TreeSocket : public InspSocket
        ServerState LinkState;                  /* Link state */
        std::string InboundServerName;          /* Server name sent to us by other side */
        std::string InboundDescription;         /* Server description (GECOS) sent to us by the other side */
+       std::string InboundSID;                 /* Server ID sent to us by the other side */
        int num_lost_users;                     /* Users lost in split */
        int num_lost_servers;                   /* Servers lost in split */
        time_t NextPing;                        /* Time when we are due to ping this server */
@@ -99,14 +96,14 @@ class TreeSocket : public InspSocket
  public:
 
        /** Because most of the I/O gubbins are encapsulated within
-        * InspSocket, we just call the superclass constructor for
+        * BufferedSocket, we just call the superclass constructor for
         * most of the action, and append a few of our own values
         * to it.
         */
        TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, Module* HookMod = NULL);
 
        /** Because most of the I/O gubbins are encapsulated within
-        * InspSocket, we just call the superclass constructor for
+        * BufferedSocket, we just call the superclass constructor for
         * most of the action, and append a few of our own values
         * to it.
         */
@@ -169,7 +166,7 @@ class TreeSocket : public InspSocket
 
        /** Handle socket error event
         */
-       virtual void OnError(InspSocketError e);
+       virtual void OnError(BufferedSocketError e);
 
        /** Sends an error to the remote server, and displays it locally to show
         * that it was sent.
@@ -230,14 +227,17 @@ class TreeSocket : public InspSocket
        /** FJOIN, similar to TS6 SJOIN, but not quite. */
        bool ForceJoin(const std::string &source, std::deque<std::string> &params);
 
-       /** NICK command */
-       bool IntroduceClient(const std::string &source, std::deque<std::string> &params);
+       /* Used on nick collision ... XXX ugly function HACK */
+       int DoCollision(User *u, time_t remotets, const char *remoteident, const char *remoteip, const char *remoteuid);
+
+       /** UID command */
+       bool ParseUID(const std::string &source, std::deque<std::string> &params);
 
        /** Send one or more FJOINs for a channel of users.
         * If the length of a single line is more than 480-NICKMAX
         * in length, it is split over multiple lines.
         */
-       void SendFJoins(TreeServer* Current, chanrec* c);
+       void SendFJoins(TreeServer* Current, Channel* c);
 
        /** Send G, Q, Z and E lines */
        void SendXLines(TreeServer* Current);
@@ -257,7 +257,7 @@ class TreeSocket : public InspSocket
 
        /** This function is called when we receive data from a remote
         * server. We buffer the data in a std::string (it doesnt stay
-        * there for long), reading using InspSocket::Read() which can
+        * there for long), reading using BufferedSocket::Read() which can
         * read up to 16 kilobytes in one operation.
         *
         * IF THIS FUNCTION RETURNS FALSE, THE CORE CLOSES AND DELETES
@@ -299,6 +299,10 @@ class TreeSocket : public InspSocket
         */
        bool ServiceJoin(const std::string &prefix, std::deque<std::string> &params);
 
+       /** SVSPART
+        */
+       bool ServicePart(const std::string &prefix, std::deque<std::string> &params);
+
        /** REHASH
         */
        bool RemoteRehash(const std::string &prefix, std::deque<std::string> &params);