Make VF_OPTCOMMON module mismatches a fatal link error by default

[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 6d99c2a767beedf254a94124c6bbf9dbd956d73d..1350950eb57db643ba714e3d0f5c682fcc48c649 100644 (file)
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -82,7 +82,8 @@ class TreeSocket : public BufferedSocket
        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 ModuleList;                 /* Module list of other server from CAPAB */
+       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 */
        Module* Hook;                           /* I/O hooking module that we're attached to for this socket */
        std::string ourchallenge;               /* Challenge sent for challenge/response */
@@ -93,6 +94,7 @@ class TreeSocket : public BufferedSocket
        bool auth_challenge;                    /* Did we auth using challenge/response */
  public:
        HandshakeTimer* hstimer;                /* Handshake timer, needed to work around I/O hook buffering */
+       time_t age;
 
        /** Because most of the I/O gubbins are encapsulated within
         * BufferedSocket, we just call the superclass constructor for
@@ -184,9 +186,10 @@ class TreeSocket : public BufferedSocket
         */
        void SendServers(TreeServer* Current, TreeServer* s, int hops);
 
-       /** Returns my capabilities as a string
+       /** Returns module list as a string, filtered by filter
+        * @param filter a module version bitmask, such as VF_COMMON or VF_OPTCOMMON
         */
-       std::string MyCapabilities();
+       std::string MyModules(int filter);
 
        /** Send my capabilities to the remote side
         */