diff options
author | attilamolnar <attilamolnar@hush.com> | 2013-04-28 00:32:14 +0200 |
---|---|---|
committer | attilamolnar <attilamolnar@hush.com> | 2013-04-28 00:32:14 +0200 |
commit | 8790551dc182cd8804ee7d8ef89ccb31067cc2a4 (patch) | |
tree | fa411b244ae8541e49eb126a9d15a7b5a13504db /src/modules/m_spanningtree/treesocket.h | |
parent | 021c09faff4be2e37fa86b0fe3e61707ffddab27 (diff) | |
parent | 9b96fee72a3720e6d12812243edb4192d0790b34 (diff) |
Merge insp20
Diffstat (limited to 'src/modules/m_spanningtree/treesocket.h')
-rw-r--r-- | src/modules/m_spanningtree/treesocket.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index b6230a6a5..0a519041c 100644 --- a/src/modules/m_spanningtree/treesocket.h +++ b/src/modules/m_spanningtree/treesocket.h @@ -75,6 +75,12 @@ struct CapabData 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 */ + + // Data saved from incoming SERVER command, for later use when our credentials have been accepted by the other party + std::string description; + std::string sid; + std::string name; + bool hidden; }; /** Every SERVER connection inbound or outbound is represented by an object of @@ -92,6 +98,11 @@ class TreeSocket : public BufferedSocket bool LastPingWasGood; /* Responded to last ping we sent? */ int proto_version; /* Remote protocol version */ bool ConnectionFailureShown; /* Set to true if a connection failure message was shown */ + + /** Checks if the given servername and sid are both free + */ + bool CheckDuplicate(const std::string& servername, const std::string& sid); + public: time_t age; |