X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket.h;h=b6230a6a58741174bb7f29e6e1b494fcbd2fd394;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=bc51f3277839abb63e59f447cf99fece36408bb1;hpb=8320bb61ca24b9c397ed4244b3b81b39c32e29ca;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index bc51f3277..b6230a6a5 100644 --- a/src/modules/m_spanningtree/treesocket.h +++ b/src/modules/m_spanningtree/treesocket.h @@ -1,22 +1,28 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Craig Edwards * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * --------------------------------------------------- + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#ifndef __TREESOCKET_H__ -#define __TREESOCKET_H__ -#include "socket.h" +#pragma once + #include "inspircd.h" -#include "xline.h" #include "utils.h" @@ -49,13 +55,16 @@ * WAIT_AUTH_2: indicates that the socket is inbound * but has not yet sent and received * SERVER strings. - * CONNECTED: represents a fully authorized, fully + * CONNECTED: represents a fully authorized, fully * connected server. + * DYING: represents a server that has had an error. */ -enum ServerState { CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED }; +enum ServerState { CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED, DYING }; struct CapabData { + reference link; /* Link block used for this connection */ + reference ac; /* Autoconnect used to cause this connection, if any */ 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; @@ -63,40 +72,27 @@ struct CapabData std::map 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 - * 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 - * connected server is assocated with it, by hooking it onto a - * TreeSocket class using its constructor. In this way, we can - * maintain a list of servers, some of which are directly connected, - * some of which are not. +/** Every SERVER connection inbound or outbound is represented by an object of + * type TreeSocket. During setup, the object can be found in Utils->timeoutlist; + * after setup, MyRoot will have been created as a child of Utils->TreeRoot */ class TreeSocket : public BufferedSocket { SpanningTreeUtilities* Utils; /* Utility class */ - std::string myhost; /* Canonical hostname */ + std::string linkID; /* Description for this link */ 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 */ - std::string IP; - CapabData* capab; - int num_lost_users; /* Users lost in split */ - int num_lost_servers; /* Servers lost in split */ + CapabData* capab; /* Link setup data (held until burst is sent) */ + TreeServer* MyRoot; /* The server we are talking to */ time_t NextPing; /* Time when we are due to ping this server */ 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 */ public: - reference myautoconnect; /* Autoconnect used to cause this connection, if any */ time_t age; /** Because most of the I/O gubbins are encapsulated within @@ -104,7 +100,7 @@ class TreeSocket : public BufferedSocket * most of the action, and append a few of our own values * to it. */ - TreeSocket(SpanningTreeUtilities* Util, const std::string& host, int port, unsigned long maxtime, const std::string &ServerName, const std::string &bindto, Autoconnect* myac, const std::string& Hook); + TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* myac, const std::string& ipaddr); /** When a listening socket gives us a new file descriptor, * we must associate it with a socket without creating a new @@ -145,10 +141,6 @@ class TreeSocket : public BufferedSocket */ ~TreeSocket(); - /** Generate random string used for challenge-response auth - */ - std::string RandString(unsigned int length); - /** Construct a password, optionally hashed with the other side's * challenge string */ @@ -174,13 +166,8 @@ class TreeSocket : public BufferedSocket /** Recursively send the server tree with distances as hops. * This is used during network burst to inform the other server * (and any of ITS servers too) of what servers we know about. - * If at any point any of these servers already exist on the other - * end, our connection may be terminated. The hopcounts given - * by this function are relative, this doesn't matter so long as - * they are all >1, as all the remote servers re-calculate them - * to be relative too, with themselves as hop 0. */ - void SendServers(TreeServer* Current, TreeServer* s, int hops); + void SendServers(TreeServer* Current, TreeServer* s); /** Returns module list as a string, filtered by filter * @param filter a module version bitmask, such as VF_COMMON or VF_OPTCOMMON @@ -191,9 +178,6 @@ class TreeSocket : public BufferedSocket */ void SendCapabilities(int phase); - /** Add modules to VF_COMMON list for backwards compatability */ - void CompatAddModules(std::vector& modlist); - /* 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); @@ -206,7 +190,7 @@ class TreeSocket : public BufferedSocket * is having a REAL bad hair day, this function shouldnt be called * too many times a month ;-) */ - void SquitServer(std::string &from, TreeServer* Current); + void SquitServer(std::string &from, TreeServer* Current, int& num_lost_servers, int& num_lost_users); /** This is a wrapper function for SquitServer above, which * does some validation first and passes on the SQUIT to all @@ -214,35 +198,23 @@ class TreeSocket : public BufferedSocket */ void Squit(TreeServer* Current, const std::string &reason); - /** FMODE command - server mode with timestamp checks */ - void ForceMode(User* who, parameterlist ¶ms); - - /** FTOPIC command */ - bool ForceTopic(const std::string &source, parameterlist ¶ms); - - /** FJOIN, similar to TS6 SJOIN, but not quite. */ - void ForceJoin(User* who, parameterlist ¶ms); - /* 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 ¶ms); - /** 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, Channel* c); + void SendFJoins(Channel* c); /** Send G, Q, Z and E lines */ - void SendXLines(TreeServer* Current); + void SendXLines(); - /** Send channel modes and topics */ - void SendChannelModes(TreeServer* Current); + /** Send all known information about a channel */ + void SyncChannel(Channel* chan); /** send all users and their oper state/modes */ - void SendUsers(TreeServer* Current); + void SendUsers(); /** This function is called when we want to send a netburst to a local * server. There is a set order we must do this, because for example @@ -263,19 +235,6 @@ class TreeSocket : public BufferedSocket /** Handle ERROR command */ void Error(parameterlist ¶ms); - /** remote MOTD. */ - bool Motd(const std::string &prefix, parameterlist ¶ms); - - /** remote ADMIN. */ - bool Admin(const std::string &prefix, parameterlist ¶ms); - - bool Stats(const std::string &prefix, parameterlist ¶ms); - - /** 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 ¶ms); - /** Remote AWAY */ bool Away(const std::string &prefix, parameterlist ¶ms); @@ -290,26 +249,14 @@ class TreeSocket : public BufferedSocket */ bool OperQuit(const std::string &prefix, parameterlist ¶ms); - /** KILL - */ - bool RemoteKill(const std::string &prefix, parameterlist ¶ms); - /** PONG */ bool LocalPong(const std::string &prefix, parameterlist ¶ms); - /** METADATA - */ - bool MetaData(const std::string &prefix, parameterlist ¶ms); - /** VERSION */ bool ServerVersion(const std::string &prefix, parameterlist ¶ms); - /** CHGHOST - */ - bool ChangeHost(const std::string &prefix, parameterlist ¶ms); - /** ADDLINE */ bool AddLine(const std::string &prefix, parameterlist ¶ms); @@ -318,13 +265,6 @@ class TreeSocket : public BufferedSocket */ bool DelLine(const std::string &prefix, parameterlist ¶ms); - /** CHGNAME - */ - bool ChangeName(const std::string &prefix, parameterlist ¶ms); - - /** FIDENT */ - bool ChangeIdent(const std::string &prefix, parameterlist ¶ms); - /** WHOIS */ bool Whois(const std::string &prefix, parameterlist ¶ms); @@ -333,19 +273,10 @@ class TreeSocket : public BufferedSocket */ bool Push(const std::string &prefix, parameterlist ¶ms); - /** TIME - */ - bool Time(const std::string &prefix, parameterlist ¶ms); - /** PING */ bool LocalPing(const std::string &prefix, parameterlist ¶ms); - /** 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 ¶ms); - /** <- (remote) <- SERVER */ bool RemoteServer(const std::string &prefix, parameterlist ¶ms); @@ -368,33 +299,18 @@ class TreeSocket : public BufferedSocket void ProcessConnectedLine(std::string& prefix, std::string& command, parameterlist& params); - /** Get this server's name - */ - virtual std::string GetName(); - /** Handle socket timeout from connect() */ virtual void OnTimeout(); /** Handle server quit on close */ virtual void Close(); -}; -/* Used to validate the value lengths of multiple parameters for a command */ -struct cmd_validation -{ - const char* item; - size_t param; - size_t length; -}; + /** Returns true if this server was introduced to the rest of the network + */ + bool Introduced(); -/* Used to validate the length values in CAPAB CAPABILITIES */ -struct cap_validation -{ - const char* reason; - const char* key; - size_t size; + /** Fixes messages coming from old servers so the new command handlers understand them + */ + bool PreProcessOldProtocolMessage(User*& who, std::string& cmd, std::vector& params); }; - -#endif -