Makefile updates: clean up command lines

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

diff --git a/src/socket.cpp b/src/socket.cpp
index f1a81435868e493ecf4cb0ae0a8e24d4daea5a58..8b016152d34c9736d487fcfba65c9d335ddd0604 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * 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) */
@@ -143,14 +143,20 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 }
 
 // Open a TCP Socket
-int irc::sockets::OpenTCPSocket(char* addr, int socktype)
+int irc::sockets::OpenTCPSocket(const char* addr, int socktype)
 {
        int sockfd;
        int on = 1;
        addr = addr;
        struct linger linger = { 0, 0 };
 #ifdef IPV6
-       if (strchr(addr,':') || (!*addr))
+       if (!*addr)
+       {
+               sockfd = socket (PF_INET6, socktype, 0);
+               if (sockfd < 0)
+                       sockfd = socket (PF_INET, socktype, 0);
+       }
+       else if (strchr(addr,':'))
                sockfd = socket (PF_INET6, socktype, 0);
        else
                sockfd = socket (PF_INET, socktype, 0);
@@ -172,6 +178,7 @@ int irc::sockets::OpenTCPSocket(char* addr, int socktype)
        }
 }
 
+// XXX: it would be VERY nice to genericize this so all listen stuff (server/client) could use the one function. -- w00t
 int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 {
        char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
@@ -180,7 +187,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
        std::vector<std::pair<std::string, int> > old_ports;
 
        /* XXX: Make a copy of the old ip/port pairs here */
-       for (std::vector<ListenSocket*>::iterator o = Config->ports.begin(); o != Config->ports.end(); ++o)
+       for (std::vector<ListenSocketBase *>::iterator o = Config->ports.begin(); o != Config->ports.end(); ++o)
                old_ports.push_back(make_pair((*o)->GetIP(), (*o)->GetPort()));
 
        for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
@@ -188,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);
@@ -202,7 +209,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
                                        *Addr = 0;
 
                                bool skip = false;
-                               for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+                               for (std::vector<ListenSocketBase *>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
                                {
                                        if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
                                        {
@@ -220,7 +227,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
                                }
                                if (!skip)
                                {
-                                       ListenSocket* ll = new ListenSocket(this, portno, Addr);
+                                       ClientListenSocket *ll = new ClientListenSocket(this, portno, Addr);
                                        if (ll->GetFd() > -1)
                                        {
                                                bound++;
@@ -241,7 +248,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
        {
                for (size_t k = 0; k < old_ports.size(); ++k)
                {
-                       for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+                       for (std::vector<ListenSocketBase *>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
                        {
                                if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
                                {
@@ -269,4 +276,53 @@ 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 (!addr || !*addr)
+       {
+#ifdef IPV6
+               sa->in6.sin6_family = AF_INET6;
+               sa->in6.sin6_port = htons(port);
+#else
+               sa->in4.sin_family = AF_INET;
+               sa->in4.sin_port = htons(port);
+#endif
+               return true;
+       }
+       else 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;
+}