* @param result Result string
* @param ttl Time to live for result
* @param cached True if the result was found in the cache
+ * @param resultnum Result number, we are only interested in result 0
*/
- void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached);
+ void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0);
/** Called on failed lookup
* @param e Error code
/** Type of line, either CC_ALLOW or CC_DENY
*/
char type;
+ /** Connect class name
+ */
+ std::string name;
/** Max time to register the connection in seconds
*/
unsigned int registration_timeout;
/** Global max when connecting by this connection class
*/
unsigned long maxglobal;
+
+ /** Max channels for this class
+ */
+ unsigned int maxchans;
+
/** Port number this connect class applies to
*/
int port;
/** Create a new connect class with no settings.
*/
- ConnectClass() : type(CC_DENY), registration_timeout(0), flood(0), host(""), pingtime(0), pass(""),
+ ConnectClass() : type(CC_DENY), name("unnamed"), registration_timeout(0), flood(0), host(""), pingtime(0), pass(""),
threshold(0), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0) { }
/** Create a new connect class to ALLOW connections.
+ * @param thename Name of the connect class
* @param timeout The registration timeout
* @param fld The flood value
* @param hst The IP mask to allow
* @param maxl The maximum local sessions
* @param maxg The maximum global sessions
*/
- ConnectClass(unsigned int timeout, unsigned int fld, const std::string &hst, unsigned int ping,
+ ConnectClass(const std::string &thename, unsigned int timeout, unsigned int fld, const std::string &hst, unsigned int ping,
const std::string &pas, unsigned int thres, unsigned long sendq, unsigned long recvq,
- unsigned long maxl, unsigned long maxg, int p = 0) :
- type(CC_ALLOW), registration_timeout(timeout), flood(fld), host(hst), pingtime(ping), pass(pas),
- threshold(thres), sendqmax(sendq), recvqmax(recvq), maxlocal(maxl), maxglobal(maxg), port(p) { }
+ unsigned long maxl, unsigned long maxg, unsigned int maxc, int p = 0) :
+ type(CC_ALLOW), name(thename), registration_timeout(timeout), flood(fld), host(hst), pingtime(ping), pass(pas),
+ threshold(thres), sendqmax(sendq), recvqmax(recvq), maxlocal(maxl), maxglobal(maxg), maxchans(maxc), port(p) { }
- /** Create a new connect class to DENY connections
+ /** Create a new connect class to DENY connections
+ * @param thename Name of the connect class
* @param hst The IP mask to deny
*/
- ConnectClass(const std::string &hst) : type(CC_DENY), registration_timeout(0), flood(0), host(hst), pingtime(0),
- pass(""), threshold(0), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), port(0) { }
+ ConnectClass(const std::string &thename, const std::string &hst) : type(CC_DENY), name(thename), registration_timeout(0),
+ flood(0), host(hst), pingtime(0), pass(""), threshold(0), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0) { }
+
+ /* Create a new connect class based on another class
+ * @param thename The name of the connect class
+ * @param source Another connect class to inherit all but the name from
+ */
+ ConnectClass(const std::string &thename, const ConnectClass &source) : type(source.type), name(thename),
+ registration_timeout(source.registration_timeout), flood(source.flood), host(source.host),
+ pingtime(source.pingtime), pass(source.pass), threshold(source.threshold), sendqmax(source.sendqmax),
+ recvqmax(source.recvqmax), maxlocal(source.maxlocal), maxglobal(source.maxglobal), maxchans(source.maxchans),
+ port(source.port)
+ {
+ }
+
+ /* Update an existing entry with new values
+ */
+ void Update(unsigned int timeout, unsigned int fld, const std::string &hst, unsigned int ping,
+ const std::string &pas, unsigned int thres, unsigned long sendq, unsigned long recvq,
+ unsigned long maxl, unsigned long maxg, unsigned int maxc, int p)
+ {
+ if (timeout)
+ registration_timeout = timeout;
+ if (fld)
+ flood = fld;
+ if (!hst.empty())
+ host = hst;
+ if (ping)
+ pingtime = ping;
+ if (!pas.empty())
+ pass = pas;
+ if (thres)
+ threshold = thres;
+ if (sendq)
+ sendqmax = sendq;
+ if (recvq)
+ recvqmax = recvq;
+ if (maxl)
+ maxlocal = maxl;
+ if (maxg)
+ maxglobal = maxg;
+ if (maxc)
+ maxchans = maxc;
+ if (p)
+ port = p;
+ }
+
+ int GetMaxChans()
+ {
+ return maxchans;
+ }
/** Returns the type, CC_ALLOW or CC_DENY
*/
return (type == CC_ALLOW ? CC_ALLOW : CC_DENY);
}
+ std::string& GetName()
+ {
+ return name;
+ }
+
/** Returns the registration timeout
*/
unsigned int GetRegTimeout()
return host;
}
+ /** Get port number
+ */
int GetPort()
{
return port;
}
+ /** Set port number
+ */
+ void SetPort(int p)
+ {
+ port = p;
+ }
+
/** Returns the ping frequency
*/
unsigned int GetPingTime()
{
return maxglobal;
}
+
+ bool operator= (ConnectClass &other)
+ {
+ return (other.GetName() == name);
+ }
};
/** Holds a complete list of all channels to which a user has been invited and has not yet joined.
*/
char* operquit;
+ /** Max channels for this user
+ */
+ unsigned int MaxChans;
+
public:
/** Resolvers for looking up this users IP address
* This will occur if and when res_reverse completes.
*/
void StartDNSLookup();
+ unsigned int GetMaxChans();
+
/** The users nickname.
* An invalid nickname indicates an unregistered connection prior to the NICK command.
* Use InspIRCd::IsNick() to validate nicknames.
/** Call this method to find the matching <connect> for a user, and to check them against it.
*/
- void CheckClass();
+ void CheckClass(const std::string &explicit_class = "");
/** Use this method to fully connect a user.
* This will send the message of the day, check G/K/E lines, etc.
*/
unsigned long LocalCloneCount();
+ /** Remove all clone counts from the user, you should
+ * use this if you change the user's IP address in
+ * userrec::ip after they have registered.
+ */
+ void RemoveCloneCounts();
+
/** Write text to this user, appending CR/LF.
* @param text A std::string to send to the user
*/
void PurgeEmptyChannels();
/** Get the connect class which matches this user's host or IP address
+ * @param explicit_name Set this string to tie the user to a specific class name
* @return A reference to this user's connect class
*/
- ConnectClass* GetClass();
+ ConnectClass* GetClass(const std::string &explicit_name = "");
/** Show the message of the day to this user
*/
projects / user / henk / code / inspircd.git / blobdiff