Make SAJOIN/SAPART more spanningtree friendly, they are throwbacks to the inspircd...

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 69bea3e0a614ad9d03711b2fb91c8cae5e5197f7..7a746ba0f5484c1fb483e0a74732b33402c54de1 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -39,7 +39,6 @@ const char inverted_bits[8] = {       0x00, /* 00000000 - 0 bits - never actually used
 ListenSocket::ListenSocket(InspIRCd* Instance, int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) : ServerInstance(Instance), desc("plaintext")
 {
        this->SetFd(sockfd);
-       Instance->Log(DEBUG,"CRAP");
        if (!Instance->BindSocket(this->fd,port,addr))
                this->fd = -1;
 #ifdef IPV6
@@ -56,8 +55,10 @@ ListenSocket::~ListenSocket()
 {
        if (this->GetFd() > -1)
        {
-               shutdown(this->fd, 2);
-               close(this->fd);
+               ServerInstance->SE->DelFd(this);
+               ServerInstance->Log(DEBUG,"Shut down listener on fd %d", this->fd);
+               if (shutdown(this->fd, 2) || close(this->fd))
+                       ServerInstance->Log(DEBUG,"Failed to cancel listener: %s", strerror(errno));
                this->fd = -1;
        }
 }
@@ -326,16 +327,13 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
 #ifdef IPV6
        if (*addr)
        {
-               printf("Address %s not empty\n", addr);
                /* There is an address here. Is it ipv6? */
                if (strchr(addr,':'))
                {
-                       printf("Address %s is ipv6\n", addr);
                        /* Yes it is */
                        in6_addr addy;
                        if (inet_pton(AF_INET6, addr, &addy) < 1)
                        {
-                               printf("Failed to interpret address %s", addr);
                                delete[] server;
                                return false;
                        }
@@ -348,7 +346,6 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
                else
                {
                        /* No, its not */
-                       printf("Address %s is ipv4\n", addr);
                        in_addr addy;
                        if (inet_pton(AF_INET, addr, &addy) < 1)
                        {
@@ -364,13 +361,11 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
        }
        else
        {
-               printf("Address empty port=%d\n", port);
                if (port == -1)
                {
                        /* Port -1: Means UDP IPV4 port binding - Special case
                         * used by DNS engine.
                         */
-                       printf("Special case AF_INET udp bind to all\n");
                        ((sockaddr_in*)server)->sin_family = AF_INET;
                        ((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY);
                        ((sockaddr_in*)server)->sin_port = 0;
@@ -413,7 +408,6 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
 
        if (ret < 0)
        {
-               Log(DEBUG,"Bind fails it! %s", strerror(errno));
                return false;
        }
        else
@@ -427,12 +421,14 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
                        }
                        else
                        {
+                               this->Log(DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
                                NonBlocking(sockfd);
                                return true;
                        }
                }
                else
                {
+                       this->Log(DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
                        return true;
                }
        }
@@ -445,23 +441,15 @@ int irc::sockets::OpenTCPSocket(char* addr, int socktype)
        int on = 1;
        struct linger linger = { 0 };
 #ifdef IPV6
-       printf("IPV6 ENABLED OPENTCPSOCKET\n");
        if (strchr(addr,':') || (!*addr))
-       {
-               printf("IPV6 OPENTCPSOCKET DO\n");
                sockfd = socket (PF_INET6, socktype, 0);
-       }
        else
-       {
-               printf("IPV6->IPV4 OPENTCPSOCKET DO\n");
                sockfd = socket (PF_INET, socktype, 0);
-       }
        if (sockfd < 0)
 #else
        if ((sockfd = socket (PF_INET, socktype, 0)) < 0)
 #endif
        {
-               printf("SOCKET FAIL: %s\n", strerror(errno));
                return ERROR;
        }
        else
@@ -491,7 +479,6 @@ bool InspIRCd::HasPort(int port, char* addr)
 /* XXX: Probably belongs in class InspIRCd */
 int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_ports)
 {
-       Log(DEBUG,"BINDING PORTS");
        char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
        insp_sockaddr client, server;
        int clientportcount = 0;
@@ -503,7 +490,6 @@ int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_port
 
        for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
        {
-               Log(DEBUG,"FOUND PORT");
                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);
@@ -539,11 +525,9 @@ int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_port
                                        if (fd == ERROR)
                                        {
                                                failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
-                                               Log(DEBUG,"SOCKET FAIL");
                                        }
                                        else
                                        {
-                                               Log(DEBUG,"BIND");
                                                Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]);
                                                if (Config->openSockfd[BoundPortCount]->GetFd() > -1)
                                                {
@@ -573,12 +557,10 @@ int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_port
                int fd = OpenTCPSocket(Config->addrs[count]);
                if (fd == ERROR)
                {
-                       Log(DEBUG,"SOCKET FAIL");
                        failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
                }
                else
                {
-                       Log(DEBUG,"BIND");
                        Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]);
                        if (Config->openSockfd[BoundPortCount]->GetFd() > -1)
                        {