Improve SSL fingerprint on link message

[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 773a6cd1352bc6b074f8ca7587858c26fe3aded6..1bd02762d5db2eb2bef1f05a7c86e40b19d04e98 100644 (file)
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -54,6 +54,21 @@
  */
 enum ServerState { CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED };
 
+struct CapabData
+{
+       std::string ModuleList;                 /* Required module list of other server from CAPAB */
+       std::string OptModuleList;              /* Optional module list of other server from CAPAB */
+       std::string ChanModes;
+       std::string UserModes;
+       std::map<std::string,std::string> CapKeys;      /* CAPAB keys from other server */
+       std::string ourchallenge;               /* Challenge sent for challenge/response */
+       std::string theirchallenge;             /* Challenge recv for challenge/response */
+       std::string OutboundPass;               /* Outbound password */
+       int capab_phase;                        /* Have sent CAPAB already */
+       bool auth_fingerprint;                  /* Did we auth using SSL fingerprint */
+       bool auth_challenge;                    /* Did we auth using challenge/response */
+};
+
 /** Every SERVER connection inbound or outbound is represented by
  * an object of type TreeSocket.
  * TreeSockets, being inherited from BufferedSocket, can be tied into
@@ -73,20 +88,12 @@ class TreeSocket : public BufferedSocket
        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 */
+       std::string IP;
+       CapabData* capab;
        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 */
        bool LastPingWasGood;                   /* Responded to last ping we sent? */
-       std::string IP;
-       std::string ModuleList;                 /* Required module list of other server from CAPAB */
-       std::string OptModuleList;              /* Optional module list of other server from CAPAB */
-       std::map<std::string,std::string> CapKeys;      /* CAPAB keys from other server */
-       std::string ourchallenge;               /* Challenge sent for challenge/response */
-       std::string theirchallenge;             /* Challenge recv for challenge/response */
-       std::string OutboundPass;               /* Outbound password */
-       int capab_phase;                        /* Have sent CAPAB already */
-       bool auth_fingerprint;                  /* Did we auth using SSL fingerprint */
-       bool auth_challenge;                    /* Did we auth using challenge/response */
        int proto_version;                      /* Remote protocol version */
  public:
        reference<Autoconnect> myautoconnect;           /* Autoconnect used to cause this connection, if any */
@@ -187,11 +194,9 @@ class TreeSocket : public BufferedSocket
        /** Add modules to VF_COMMON list for backwards compatability */
        void CompatAddModules(std::vector<std::string>& modlist);
 
-       /* Check a comma seperated list for an item */
-       bool HasItem(const std::string &list, const std::string &item);
-
-       /* Isolate and return the elements that are different between two comma seperated lists */
-       std::string ListDifference(const std::string &one, const std::string &two);
+       /* Isolate and return the elements that are different between two lists */
+       void ListDifference(const std::string &one, const std::string &two, char sep,
+               std::string& mleft, std::string& mright);
 
        bool Capab(const parameterlist &params);
 
@@ -209,21 +214,9 @@ class TreeSocket : public BufferedSocket
         */
        void Squit(TreeServer* Current, const std::string &reason);
 
-       /** FMODE command - server mode with timestamp checks */
-       void ForceMode(User* who, parameterlist &params);
-
-       /** FTOPIC command */
-       bool ForceTopic(const std::string &source, parameterlist &params);
-
-       /** FJOIN, similar to TS6 SJOIN, but not quite. */
-       void ForceJoin(User* who, parameterlist &params);
-
        /* Used on nick collision ... XXX ugly function HACK */
        int DoCollision(User *u, time_t remotets, const std::string &remoteident, const std::string &remoteip, const std::string &remoteuid);
 
-       /** UID command */
-       bool ParseUID(const std::string &source, parameterlist &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.
@@ -258,19 +251,6 @@ class TreeSocket : public BufferedSocket
        /** Handle ERROR command */
        void Error(parameterlist &params);
 
-       /** remote MOTD. */
-       bool Motd(const std::string &prefix, parameterlist &params);
-
-       /** remote ADMIN. */
-       bool Admin(const std::string &prefix, parameterlist &params);
-
-       bool Stats(const std::string &prefix, parameterlist &params);
-
-       /** Because the core won't let users or even SERVERS set +o,
-        * we use the OPERTYPE command to do this.
-        */
-       bool OperType(const std::string &prefix, parameterlist &params);
-
        /** Remote AWAY */
        bool Away(const std::string &prefix, parameterlist &params);
 
@@ -293,18 +273,10 @@ class TreeSocket : public BufferedSocket
         */
        bool LocalPong(const std::string &prefix, parameterlist &params);
 
-       /** METADATA
-        */
-       bool MetaData(const std::string &prefix, parameterlist &params);
-
        /** VERSION
         */
        bool ServerVersion(const std::string &prefix, parameterlist &params);
 
-       /** CHGHOST
-        */
-       bool ChangeHost(const std::string &prefix, parameterlist &params);
-
        /** ADDLINE
         */
        bool AddLine(const std::string &prefix, parameterlist &params);
@@ -313,13 +285,6 @@ class TreeSocket : public BufferedSocket
         */
        bool DelLine(const std::string &prefix, parameterlist &params);
 
-       /** CHGNAME
-        */
-       bool ChangeName(const std::string &prefix, parameterlist &params);
-
-       /** FIDENT */
-       bool ChangeIdent(const std::string &prefix, parameterlist &params);
-
        /** WHOIS
         */
        bool Whois(const std::string &prefix, parameterlist &params);
@@ -328,19 +293,10 @@ class TreeSocket : public BufferedSocket
         */
        bool Push(const std::string &prefix, parameterlist &params);
 
-       /** TIME
-        */
-       bool Time(const std::string &prefix, parameterlist &params);
-
        /** PING
         */
        bool LocalPing(const std::string &prefix, parameterlist &params);
 
-       /** Remove all modes from a channel, including statusmodes (+qaovh etc), simplemodes, parameter modes.
-        * This does not update the timestamp of the target channel, this must be done seperately.
-        */
-       void RemoveStatus(User* source, parameterlist &params);
-
        /** <- (remote) <- SERVER
         */
        bool RemoteServer(const std::string &prefix, parameterlist &params);