Remove leftover #ifdefs and #includes from cmd_*.cpp

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index 0580bf54f91e2424eb8b6dba8b7b12ea5b5a540d..9c3d645f72c0a64b2ea6491269fedc18a32724db 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -224,8 +224,7 @@ LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::so
 {
        lastping = 0;
        eh.SetFd(myfd);
-
-       SetClientIP(client);
+       memcpy(&client_sa, client, sizeof(irc::sockets::sockaddrs));
        memcpy(&server_sa, servaddr, sizeof(irc::sockets::sockaddrs));
 }
 
@@ -978,22 +977,10 @@ irc::sockets::cidr_mask User::GetCIDRMask()
        return irc::sockets::cidr_mask(client_sa, range);
 }
 
-bool User::SetClientIP(irc::sockets::sockaddrs *sa)
-{
-       memcpy(&client_sa, sa, sizeof(irc::sockets::sockaddrs));
-
-       return true;
-}
-
 bool User::SetClientIP(const char* sip)
 {
-       irc::sockets::sockaddrs sa;
-
        this->cachedip = "";
-       if (!irc::sockets::aptosa(sip, 0, sa))
-               return false;
-
-       return SetClientIP(&sa);
+       return irc::sockets::aptosa(sip, 0, client_sa);
 }
 
 static std::string wide_newline("\r\n");