From 3b595d39a50e38283768bc6ec8aeb9e73071224f Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Mon, 28 Aug 2017 15:13:25 +0100
Subject: [PATCH] Get rid of irc::sockets::satoap().

This function is being misused in all but one scenario. It isn't
really worth keeping IMO.
---
 include/socket.h        | 8 --------
 src/listensocket.cpp    | 3 ++-
 src/modules/m_httpd.cpp | 6 ++----
 src/socket.cpp          | 7 -------
 src/users.cpp           | 3 +--
 5 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/include/socket.h b/include/socket.h
index 427ee9fe7..9d6c56a18 100644
--- a/include/socket.h
+++ b/include/socket.h
@@ -116,14 +116,6 @@ namespace irc
 		 * @return true if the conversion was successful, false if not.
 		 */
 		CoreExport bool aptosa(const std::string& addr, int port, irc::sockets::sockaddrs& sa);
-
-		/** Convert a binary sockaddr to an address-port pair
-		 * @param sa The structure to convert
-		 * @param addr the IP address
-		 * @param port the port
-		 * @return true if the conversion was successful, false if unknown address family
-		 */
-		CoreExport bool satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port);
 	}
 }
 
diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index dc588386d..b56e97025 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -28,7 +28,8 @@
 ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to)
 	: bind_tag(tag)
 {
-	irc::sockets::satoap(bind_to, bind_addr, bind_port);
+	bind_addr = bind_to.addr();
+	bind_port = bind_to.port();
 	bind_desc = bind_to.str();
 
 	fd = socket(bind_to.sa.sa_family, SOCK_STREAM, 0);
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 961a70473..05112eb9c 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -408,10 +408,8 @@ class ModuleHttpServer : public Module
 	{
 		if (from->bind_tag->getString("type") != "httpd")
 			return MOD_RES_PASSTHRU;
-		int port;
-		std::string incomingip;
-		irc::sockets::satoap(*client, incomingip, port);
-		sockets.push_front(new HttpServerSocket(nfd, incomingip, from, client, server, timeoutsec));
+
+		sockets.push_front(new HttpServerSocket(nfd, client->addr(), from, client, server, timeoutsec));
 		return MOD_RES_ALLOW;
 	}
 
diff --git a/src/socket.cpp b/src/socket.cpp
index 018e0b0db..0ba57a810 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -159,13 +159,6 @@ std::string irc::sockets::sockaddrs::addr() const
 	return "";
 }
 
-bool irc::sockets::satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port)
-{
-	port = sa.port();
-	addr = sa.addr();
-	return !addr.empty();
-}
-
 std::string irc::sockets::sockaddrs::str() const
 {
 	if (sa.sa_family == AF_INET)
diff --git a/src/users.cpp b/src/users.cpp
index dd0d54286..7d72692d9 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -681,10 +681,9 @@ int LocalUser::GetServerPort()
 
 const std::string& User::GetIPString()
 {
-	int port;
 	if (cachedip.empty())
 	{
-		irc::sockets::satoap(client_sa, cachedip, port);
+		cachedip = client_sa.addr();
 		/* IP addresses starting with a : on irc are a Bad Thing (tm) */
 		if (cachedip[0] == ':')
 			cachedip.insert(cachedip.begin(),1,'0');
-- 
2.39.2