Add IP address conversion utility functions, irc::sockets::aptosa and irc::sockets...

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

diff --git a/src/socket.cpp b/src/socket.cpp
index fa5f0709c2e0a87c83d1da509f88939055b33484..3a15c8a56843da90ced2d5b4d9d8ce9b70a21d84 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,7 +20,7 @@
 /** This will bind a socket to a port. It works for UDP/TCP.
  * It can only bind to IP addresses, if you wish to bind to hostnames
  * you should first resolve them using class 'Resolver'.
- */ 
+ */
 bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 {
        /* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
@@ -195,10 +195,10 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
                Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF);
                Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF);
                Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF);
-               
+
                if (strncmp(Addr, "::ffff:", 7) == 0)
                        this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
-               
+
                if ((!*Type) || (!strcmp(Type,"clients")))
                {
                        irc::portparser portrange(configToken, false);
@@ -276,4 +276,42 @@ int irc::sockets::insp_aton(const char* a, insp_inaddr* n)
        return inet_pton(AF_FAMILY, a, n);
 }
 
+int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
+{
+       memset(sa, 0, sizeof(sa));
+       if (inet_pton(AF_INET, addr, &sa->in4.sin_addr) > 0)
+       {
+               sa->in4.sin_family = AF_INET;
+               sa->in4.sin_port = htons(port);
+               return true;
+       }
+       else if (inet_pton(AF_INET6, addr, &sa->in6.sin6_addr) > 0)
+       {
+               sa->in6.sin6_family = AF_INET6;
+               sa->in6.sin6_port = htons(port);
+               return true;
+       }
+       return false;
+}
+
+int irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
+       char addrv[INET6_ADDRSTRLEN+1];
+       if (sa->sa.sa_family == AF_INET)
+       {
+               if (!inet_ntop(AF_INET, &sa->in4.sin_addr, addrv, sizeof(addrv)))
+                       return false;
+               addr = addrv;
+               port = ntohs(sa->in4.sin_port);
+               return true;
+       }
+       else if (sa->sa.sa_family == AF_INET6)
+       {
+               if (!inet_ntop(AF_INET6, &sa->in6.sin6_addr, addrv, sizeof(addrv)))
+                       return false;
+               addr = addrv;
+               port = ntohs(sa->in6.sin6_port);
+               return true;
+       }
+       return false;
+}