summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Burchell <robin+git@viroteck.net>2012-07-01 21:12:16 +0200
committerRobin Burchell <robin+git@viroteck.net>2012-07-01 21:12:16 +0200
commit59dc6b0ec277b76996014ea7350b0bcafa5396b5 (patch)
tree1b062aed0ecfe6ebd3473365ee7fab108dfbc5d4
parent433044e8fc6ae601c0c5b8439494afee9f2e6be6 (diff)
Revert "users: add SetClientIP function for irc::sockets::sockaddrs type."
This reverts commit f0474272303ac9297f637ce956315518138bafff.
-rw-r--r--include/users.h5
-rw-r--r--src/users.cpp14
2 files changed, 1 insertions, 18 deletions
diff --git a/include/users.h b/include/users.h
index 66e867ad0..6852b3fb9 100644
--- a/include/users.h
+++ b/include/users.h
@@ -395,11 +395,6 @@ class CoreExport User : public Extensible
*/
bool SetClientIP(const char* sip);
- /** Sets the client IP for this user
- * @return true always
- */
- bool SetClientIP(irc::sockets::sockaddrs *sa);
-
/** Constructor
* @throw CoreException if the UID allocated to the user already exists
*/
diff --git a/src/users.cpp b/src/users.cpp
index cca517332..9c3d645f7 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -977,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");