X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=efe799bfc746f3436faa724172987e6bfd45a1a3;hb=74066e0f563ef630e432d3bbb10544318b70ade3;hp=e32bda90168358ac2d09c66d7b94c0c26cb2069f;hpb=06e0d5c7f0f78c489090fe5f0c18a91e8cb41ae8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index e32bda901..efe799bfc 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -27,37 +27,17 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten) sockaddrs servaddr; int ret; - if (*addr == '*') - addr = ""; - - if (*addr) - { - irc::sockets::aptosa(addr, port, &servaddr); - } - else + if ((*addr == '*' || *addr == '\0') && port == -1) { + /* Port -1: Means UDP IPV4 port binding - Special case + * used by DNS engine. + */ memset(&servaddr, 0, sizeof(servaddr)); - if (port == -1) - { - /* Port -1: Means UDP IPV4 port binding - Special case - * used by DNS engine. - */ - servaddr.in4.sin_family = AF_INET; - } - else - { - /* No address */ -#ifdef IPV6 - /* Default to ipv6 bind to all */ - servaddr.in6.sin6_family = AF_INET6; - servaddr.in6.sin6_port = htons(port); -#else - /* Bind ipv4 to all */ - servaddr.in4.sin_family = AF_INET; - servaddr.in4.sin_port = htons(port); -#endif - } + servaddr.in4.sin_family = AF_INET; } + else if (!irc::sockets::aptosa(addr, port, &servaddr)) + return false; + ret = SE->Bind(sockfd, &servaddr.sa, sa_size(servaddr)); if (ret < 0) @@ -89,13 +69,12 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten) } // Open a TCP Socket -int irc::sockets::OpenTCPSocket(const char* addr, int socktype) +int irc::sockets::OpenTCPSocket(const std::string& addr, int socktype) { int sockfd; int on = 1; - addr = addr; struct linger linger = { 0, 0 }; - if (!*addr) + if (addr.empty()) { #ifdef IPV6 sockfd = socket (PF_INET6, socktype, 0); @@ -103,7 +82,7 @@ int irc::sockets::OpenTCPSocket(const char* addr, int socktype) #endif sockfd = socket (PF_INET, socktype, 0); } - else if (strchr(addr,':')) + else if (addr.find(':') != std::string::npos) sockfd = socket (PF_INET6, socktype, 0); else sockfd = socket (PF_INET, socktype, 0); @@ -114,11 +93,11 @@ int irc::sockets::OpenTCPSocket(const char* addr, int socktype) } else { - setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on)); /* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */ linger.l_onoff = 1; linger.l_linger = 1; - setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger)); + setsockopt(sockfd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger)); return (sockfd); } } @@ -128,12 +107,7 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports) { char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF], Desc[MAXBUF]; int bound = 0; - bool started_with_nothing = (ports.size() == 0); - std::vector > old_ports; - - /* XXX: Make a copy of the old ip/port pairs here */ - for (std::vector::iterator o = ports.begin(); o != ports.end(); ++o) - old_ports.push_back(make_pair((*o)->GetIP(), (*o)->GetPort())); + std::vector old_ports(ports.begin(), ports.end()); for (int count = 0; count < Config->ConfValueEnum("bind"); count++) { @@ -154,66 +128,64 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports) if (*Addr == '*') *Addr = 0; + irc::sockets::sockaddrs bindspec; + irc::sockets::aptosa(Addr, portno, &bindspec); + std::string bind_readable = irc::sockets::satouser(&bindspec); + bool skip = false; - for (std::vector::iterator n = ports.begin(); n != ports.end(); ++n) + for (std::vector::iterator n = old_ports.begin(); n != old_ports.end(); ++n) { - if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno)) + if ((*n)->GetBindDesc() == bind_readable) { skip = true; - /* XXX: Here, erase from our copy of the list */ - for (std::vector >::iterator k = old_ports.begin(); k != old_ports.end(); ++k) - { - if ((k->first == Addr) && (k->second == portno)) - { - old_ports.erase(k); - break; - } - } + old_ports.erase(n); + break; } } if (!skip) { - ClientListenSocket *ll = new ClientListenSocket(this, portno, Addr); + ClientListenSocket *ll = new ClientListenSocket(portno, Addr, "clients", *Desc ? Desc : "plaintext"); if (ll->GetFd() > -1) { bound++; - ll->SetDescription(*Desc ? Desc : "plaintext"); ports.push_back(ll); } else { - failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno))); + failed_ports.push_back(std::make_pair(bind_readable, strerror(errno))); + delete ll; } } } } } - /* XXX: Here, anything left in our copy list, close as removed */ - if (!started_with_nothing) + std::vector::iterator n = ports.begin(); + for (std::vector::iterator o = old_ports.begin(); o != old_ports.end(); ++o) { - for (size_t k = 0; k < old_ports.size(); ++k) + while (n != ports.end() && *n != *o) + n++; + if (n == ports.end()) { - for (std::vector::iterator n = ports.begin(); n != ports.end(); ++n) - { - if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second)) - { - this->Logs->Log("SOCKET",DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second); - delete *n; - ports.erase(n); - break; - } - } + this->Logs->Log("SOCKET",ERROR,"Port bindings slipped out of vector, aborting close!"); + break; } + + this->Logs->Log("SOCKET",DEFAULT, "Port binding %s was removed from the config file, closing.", + (*n)->GetBindDesc().c_str()); + delete *n; + + // this keeps the iterator valid, pointing to the next element + n = ports.erase(n); } return bound; } -bool irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa) +bool irc::sockets::aptosa(const std::string& addr, int port, irc::sockets::sockaddrs* sa) { memset(sa, 0, sizeof(*sa)); - if (!addr || !*addr) + if (addr.empty()) { #ifdef IPV6 sa->in6.sin6_family = AF_INET6; @@ -224,13 +196,13 @@ bool irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* s #endif return true; } - else if (inet_pton(AF_INET, addr, &sa->in4.sin_addr) > 0) + else if (inet_pton(AF_INET, addr.c_str(), &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) + else if (inet_pton(AF_INET6, addr.c_str(), &sa->in6.sin6_addr) > 0) { sa->in6.sin6_family = AF_INET6; sa->in6.sin6_port = htons(port); @@ -297,7 +269,7 @@ std::string irc::sockets::satouser(const irc::sockets::sockaddrs* sa) { return std::string(buffer); } -int irc::sockets::sa_size(irc::sockets::sockaddrs& sa) +int irc::sockets::sa_size(const irc::sockets::sockaddrs& sa) { if (sa.sa.sa_family == AF_INET) return sizeof(sa.in4);