Get rid of irc::sockets::satoap().

This function is being misused in all but one scenario. It isn't
really worth keeping IMO.

diff --git a/include/socket.h b/include/socket.h
index 427ee9fe7e3f7823aad489f5b253ba81523a9149..9d6c56a182f9c05a426b8758c6067ef7f8113c31 100644 (file)
--- 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);
                 * @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 dc588386de7893e2b27b78ddd1f6341f9695931e..b56e970253533a3de9b421bd6513b66c7601aaba 100644 (file)
--- 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)
 {
 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);
        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 961a70473f7383cfd152dead0711d45e61370078..05112eb9cc61ddedf2cdfa10a33e3fb2fe58a5ef 100644 (file)
--- 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;
        {
                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;
        }
 
                return MOD_RES_ALLOW;
        }
 

diff --git a/src/socket.cpp b/src/socket.cpp
index 018e0b0db754c22d4d9574fa895946bee30754c5..0ba57a81009c3810745609a305a850f31dd85e2c 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -159,13 +159,6 @@ std::string irc::sockets::sockaddrs::addr() const
        return "";
 }
 
        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)
 std::string irc::sockets::sockaddrs::str() const
 {
        if (sa.sa_family == AF_INET)

diff --git a/src/users.cpp b/src/users.cpp
index dd0d54286702a3a809b301ba6f8b6f5f3e6fd07e..7d72692d9284103eb55403660fcdcbdb6a06cc57 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -681,10 +681,9 @@ int LocalUser::GetServerPort()
 
 const std::string& User::GetIPString()
 {
 
 const std::string& User::GetIPString()
 {

-       int port;

        if (cachedip.empty())
        {
        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');
                /* IP addresses starting with a : on irc are a Bad Thing (tm) */
                if (cachedip[0] == ':')
                        cachedip.insert(cachedip.begin(),1,'0');