Merge remote/local MODULES output

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

diff --git a/src/modules/m_spanningtree/link.h b/src/modules/m_spanningtree/link.h
index 6883f7bbb7c2bd56c8abf2ba91ef50abdddc308f..ae7655ebbb84d0e4c90b08b92ae80b45bcd70989 100644 (file)
--- a/src/modules/m_spanningtree/link.h
+++ b/src/modules/m_spanningtree/link.h
@@ -14,13 +14,7 @@
 #ifndef __LINK_H__
 #define __LINK_H__
 
-/** The Link class might as well be a struct,
- * but this is C++ and we don't believe in structs (!).
- * It holds the entire information of one <link>
- * tag from the main config file. We maintain a list
- * of them, and populate the list on rehash/load.
- */
-class Link : public classbase
+class Link : public refcountbase
 {
  public:
        irc::string Name;
@@ -28,15 +22,24 @@ class Link : public classbase
        int Port;
        std::string SendPass;
        std::string RecvPass;
+       std::string Fingerprint;
        std::string AllowMask;
-       unsigned long AutoConnect;
-       time_t NextConnectTime;
        bool HiddenFromStats;
-       std::string FailOver;
        std::string Hook;
        int Timeout;
        std::string Bind;
        bool Hidden;
 };
 
+class Autoconnect : public refcountbase
+{
+ public:
+       std::vector<std::string> servers;
+       unsigned long Period;
+       time_t NextConnectTime;
+       /** Negative == inactive */
+       int position;
+};
+
+
 #endif