Fix reading the setname config tag.

[user/henk/code/inspircd.git] / include / users.h

diff --git a/include/users.h b/include/users.h
index 469c1712415ef7bdd40b267c3022d137f50e920b..3937f74aae4cc651e5702370238f970a5f69988f 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -380,9 +380,9 @@ class CoreExport User : public Extensible
        /** Sets the client IP for this user
         * @return true if the conversion was successful
         */
-       virtual bool SetClientIP(const std::string& address, bool recheck_eline = true);
+       virtual bool SetClientIP(const std::string& address);
 
-       virtual void SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline = true);
+       virtual void SetClientIP(const irc::sockets::sockaddrs& sa);
 
        /** Constructor
         * @throw CoreException if the UID allocated to the user already exists
@@ -681,15 +681,18 @@ class CoreExport User : public Extensible
 
 class CoreExport UserIOHandler : public StreamSocket
 {
+ private:
+        size_t checked_until;
  public:
        LocalUser* const user;
        UserIOHandler(LocalUser* me)
                : StreamSocket(StreamSocket::SS_USER)
+               , checked_until(0)
                , user(me)
        {
        }
        void OnDataReady() CXX11_OVERRIDE;
-       void OnSetEndPoint(const irc::sockets::sockaddrs& local, const irc::sockets::sockaddrs& remote) CXX11_OVERRIDE;
+       bool OnSetEndPoint(const irc::sockets::sockaddrs& local, const irc::sockets::sockaddrs& remote) CXX11_OVERRIDE;
        void OnError(BufferedSocketError error) CXX11_OVERRIDE;
 
        /** Adds to the user's write buffer.
@@ -820,9 +823,9 @@ class CoreExport LocalUser : public User, public insp::intrusive_list_node<Local
         */
        void SetClass(const std::string &explicit_name = "");
 
-       bool SetClientIP(const std::string& address, bool recheck_eline = true) CXX11_OVERRIDE;
+       bool SetClientIP(const std::string& address) CXX11_OVERRIDE;
 
-       void SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline = true) CXX11_OVERRIDE;
+       void SetClientIP(const irc::sockets::sockaddrs& sa) CXX11_OVERRIDE;
 
        /** Send a NOTICE message from the local server to the user.
         * The message will be sent even if the user is connected to a remote server.