X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=e73d01af9c37ed37fbdd1909b95dd83dbba0e5af;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=787e656da0835764c5888abcd5e607227ba4c97b;hpb=883c04a08ab3c927219d754de4265c84c20f580d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 787e656da..e73d01af9 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -1,419 +1,370 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Oliver Lupton * - * --------------------------------------------------- + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -using namespace std; - -#include "inspircd_config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "socket.h" + #include "inspircd.h" -#include "inspircd_io.h" -#include "inspstring.h" -#include "helperfuncs.h" +#include "socket.h" #include "socketengine.h" +using irc::sockets::sockaddrs; - -extern InspIRCd* ServerInstance; -extern ServerConfig* Config; -extern time_t TIME; - -InspSocket* socket_ref[MAX_DESCRIPTORS]; - -InspSocket::InspSocket() +/** 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) { - this->state = I_DISCONNECTED; - this->fd = -1; - this->ClosePending = false; -} + sockaddrs servaddr; + int ret; -InspSocket::InspSocket(int newfd, char* ip) -{ - this->fd = newfd; - this->state = I_CONNECTED; - strlcpy(this->IP,ip,MAXBUF); - this->ClosePending = false; - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); - socket_ref[this->fd] = this; -} + if ((*addr == '*' || *addr == '\0') && port == -1) + { + /* Port -1: Means UDP IPV4 port binding - Special case + * used by DNS engine. + */ + memset(&servaddr, 0, sizeof(servaddr)); + servaddr.in4.sin_family = AF_INET; + } + else if (!irc::sockets::aptosa(addr, port, servaddr)) + return false; -InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1) -{ - strlcpy(host,ahost.c_str(),MAXBUF); - this->ClosePending = false; - if (listening) { - if ((this->fd = OpenTCPSocket()) == ERROR) - { - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - log(DEBUG,"OpenTCPSocket() error"); - return; - } - else + ret = SE->Bind(sockfd, servaddr); + + if (ret < 0) + { + return false; + } + else + { + if (dolisten) { - if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str())) + if (SE->Listen(sockfd, Config->MaxConn) == -1) { - this->Close(); - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_BIND); - log(DEBUG,"BindSocket() error %s",strerror(errno)); - return; + this->Logs->Log("SOCKET",DEFAULT,"ERROR in listen(): %s",strerror(errno)); + return false; } else { - this->state = I_LISTENING; - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); - socket_ref[this->fd] = this; - log(DEBUG,"New socket now in I_LISTENING state"); - return; + this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port); + SE->NonBlocking(sockfd); + return true; } - } + } + else + { + this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port); + return true; + } } - else +} + +int InspIRCd::BindPorts(FailedPortList &failed_ports) +{ + int bound = 0; + std::vector old_ports(ports.begin(), ports.end()); + + ConfigTagList tags = ServerInstance->Config->ConfTags("bind"); + for(ConfigIter i = tags.first; i != tags.second; ++i) { - strlcpy(this->host,ahost.c_str(),MAXBUF); - this->port = aport; + ConfigTag* tag = i->second; + std::string porttag = tag->getString("port"); + std::string Addr = tag->getString("address"); - if (!inet_aton(host,&addy)) + if (strncasecmp(Addr.c_str(), "::ffff:", 7) == 0) + this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead."); + + irc::portparser portrange(porttag, false); + int portno = -1; + while (0 != (portno = portrange.GetToken())) { - log(DEBUG,"Attempting to resolve %s",this->host); - /* Its not an ip, spawn the resolver */ - this->dns.SetNS(std::string(Config->DNSServer)); - this->dns.ForwardLookupWithFD(host,fd); - timeout_end = time(NULL) + maxtime; - timeout = false; - this->state = I_RESOLVING; - socket_ref[this->fd] = this; + irc::sockets::sockaddrs bindspec; + if (!irc::sockets::aptosa(Addr, portno, bindspec)) + continue; + std::string bind_readable = bindspec.str(); + + bool skip = false; + for (std::vector::iterator n = old_ports.begin(); n != old_ports.end(); ++n) + { + if ((**n).bind_desc == bind_readable) + { + (*n)->bind_tag = tag; // Replace tag, we know addr and port match, but other info (type, ssl) may not + skip = true; + old_ports.erase(n); + break; + } + } + if (!skip) + { + ListenSocket* ll = new ListenSocket(tag, bindspec); + + if (ll->GetFd() > -1) + { + bound++; + ports.push_back(ll); + } + else + { + failed_ports.push_back(std::make_pair(bind_readable, strerror(errno))); + delete ll; + } + } } - else + } + + std::vector::iterator n = ports.begin(); + for (std::vector::iterator o = old_ports.begin(); o != old_ports.end(); ++o) + { + while (n != ports.end() && *n != *o) + n++; + if (n == ports.end()) { - log(DEBUG,"No need to resolve %s",this->host); - strlcpy(this->IP,host,MAXBUF); - timeout_end = time(NULL) + maxtime; - this->DoConnect(); + this->Logs->Log("SOCKET",DEFAULT,"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).bind_desc.c_str()); + delete *n; + + // this keeps the iterator valid, pointing to the next element + n = ports.erase(n); } -} -void InspSocket::SetQueues(int nfd) -{ - // attempt to increase socket sendq and recvq as high as its possible - int sendbuf = 32768; - int recvbuf = 32768; - setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const void *)&sendbuf,sizeof(sendbuf)); - setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const void *)&recvbuf,sizeof(sendbuf)); + return bound; } -bool InspSocket::DoResolve() +bool irc::sockets::aptosa(const std::string& addr, int port, irc::sockets::sockaddrs& sa) { - log(DEBUG,"In DoResolve(), trying to resolve IP"); - if (this->dns.HasResult()) + memset(&sa, 0, sizeof(sa)); + if (addr.empty() || addr.c_str()[0] == '*') { - log(DEBUG,"Socket has result"); - std::string res_ip = dns.GetResultIP(); - if (res_ip != "") + if (ServerInstance->Config->WildcardIPv6) { - log(DEBUG,"Socket result set to %s",res_ip.c_str()); - strlcpy(this->IP,res_ip.c_str(),MAXBUF); - socket_ref[this->fd] = NULL; + sa.in6.sin6_family = AF_INET6; + sa.in6.sin6_port = htons(port); } else { - log(DEBUG,"Socket DNS failure"); - this->Close(); - this->state = I_ERROR; - this->OnError(I_ERR_RESOLVE); - this->fd = -1; - return false; + sa.in4.sin_family = AF_INET; + sa.in4.sin_port = htons(port); } - return this->DoConnect(); + return true; } - log(DEBUG,"No result for socket yet!"); - return true; -} - -bool InspSocket::DoConnect() -{ - log(DEBUG,"In DoConnect()"); - if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) + else if (inet_pton(AF_INET, addr.c_str(), &sa.in4.sin_addr) > 0) { - log(DEBUG,"Cant socket()"); - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - this->fd = -1; - return false; + sa.in4.sin_family = AF_INET; + sa.in4.sin_port = htons(port); + return true; } - - log(DEBUG,"Part 2 DoConnect() %s",this->IP); - inet_aton(this->IP,&addy); - addr.sin_family = AF_INET; - addr.sin_addr = addy; - addr.sin_port = htons(this->port); - - int flags; - flags = fcntl(this->fd, F_GETFL, 0); - fcntl(this->fd, F_SETFL, flags | O_NONBLOCK); - - if (connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1) + else if (inet_pton(AF_INET6, addr.c_str(), &sa.in6.sin6_addr) > 0) { - if (errno != EINPROGRESS) - { - log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno)); - this->OnError(I_ERR_CONNECT); - this->state = I_ERROR; - this->Close(); - this->fd = -1; - return false; - } + sa.in6.sin6_family = AF_INET6; + sa.in6.sin6_port = htons(port); + return true; } - this->state = I_CONNECTING; - ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE); - socket_ref[this->fd] = this; - this->SetQueues(this->fd); - log(DEBUG,"Returning true from InspSocket::DoConnect"); - return true; + return false; } +int irc::sockets::sockaddrs::port() const +{ + if (sa.sa_family == AF_INET) + return ntohs(in4.sin_port); + if (sa.sa_family == AF_INET6) + return ntohs(in6.sin6_port); + return -1; +} -void InspSocket::Close() +std::string irc::sockets::sockaddrs::addr() const { - if (this->fd != -1) + char addrv[INET6_ADDRSTRLEN+1]; + if (sa.sa_family == AF_INET) { - this->OnClose(); - shutdown(this->fd,2); - close(this->fd); - socket_ref[this->fd] = NULL; - this->fd = -1; + if (!inet_ntop(AF_INET, &in4.sin_addr, addrv, sizeof(addrv))) + return ""; + return addrv; } + else if (sa.sa_family == AF_INET6) + { + if (!inet_ntop(AF_INET6, &in6.sin6_addr, addrv, sizeof(addrv))) + return ""; + return addrv; + } + return ""; } -std::string InspSocket::GetIP() +bool irc::sockets::satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port) { - return this->IP; + port = sa.port(); + addr = sa.addr(); + return !addr.empty(); } -char* InspSocket::Read() +std::string irc::sockets::sockaddrs::str() const { - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) - return NULL; - int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0); - if ((n > 0) && (n <= (int)sizeof(this->ibuf))) + char buffer[MAXBUF]; + if (sa.sa_family == AF_INET) { - ibuf[n] = 0; - return ibuf; + const uint8_t* bits = reinterpret_cast(&in4.sin_addr); + sprintf(buffer, "%d.%d.%d.%d:%u", bits[0], bits[1], bits[2], bits[3], ntohs(in4.sin_port)); } - else + else if (sa.sa_family == AF_INET6) { - if (errno == EAGAIN) - { - return ""; - } - else - { - log(DEBUG,"EOF or error on socket: %s",strerror(errno)); - return NULL; - } + buffer[0] = '['; + if (!inet_ntop(AF_INET6, &in6.sin6_addr, buffer+1, MAXBUF - 10)) + return ""; // should never happen, buffer is large enough + int len = strlen(buffer); + // no need for snprintf, buffer has at least 9 chars left, max short len = 5 + sprintf(buffer + len, "]:%u", ntohs(in6.sin6_port)); } + else + return ""; + return std::string(buffer); } -void InspSocket::MarkAsClosed() +int irc::sockets::sockaddrs::sa_size() const { - log(DEBUG,"Marked as closed"); - this->ClosePending = true; + if (sa.sa_family == AF_INET) + return sizeof(in4); + if (sa.sa_family == AF_INET6) + return sizeof(in6); + return 0; } -// There are two possible outcomes to this function. -// It will either write all of the data, or an undefined amount. -// If an undefined amount is written the connection has failed -// and should be aborted. -int InspSocket::Write(const std::string &data) +bool irc::sockets::sockaddrs::operator==(const irc::sockets::sockaddrs& other) const { - if (this->ClosePending) - return false; - - int result = write(this->fd,data.c_str(),data.length()); - if (result < 1) + if (sa.sa_family != other.sa.sa_family) return false; - return true; - - /* Try and append the data to the back of the queue, and send it on its way - */ - //outbuffer.push_back(data); - //return (!this->FlushWriteBuffer()); + if (sa.sa_family == AF_INET) + return (in4.sin_port == other.in4.sin_port) && (in4.sin_addr.s_addr == other.in4.sin_addr.s_addr); + if (sa.sa_family == AF_INET6) + return (in6.sin6_port == other.in6.sin6_port) && !memcmp(in6.sin6_addr.s6_addr, other.in6.sin6_addr.s6_addr, 16); + return !memcmp(this, &other, sizeof(*this)); } -bool InspSocket::FlushWriteBuffer() +static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, int range) { - if (this->ClosePending) - return true; + const unsigned char* base; + unsigned char target_byte; + cidr.type = sa.sa.sa_family; - /*if ((this->fd > -1) && (this->state == I_CONNECTED)) - { - if (outbuffer.size()) - { - log(DEBUG,"Writing %d to socket",outbuffer.size()); - int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length()); - if (result > 0) - { - log(DEBUG,"Wrote %d to socket",result); - if ((unsigned int)result == outbuffer[0].length()) - { - * The whole block was written (usually a line) - * Pop the block off the front of the queue - * - log(DEBUG,"Popping front item, now %d items left",outbuffer.size()); - outbuffer.pop_front(); - } - else - { - log(DEBUG,"Cutting front item"); - std::string temp = outbuffer[0].substr(result); - outbuffer[0] = temp; - log(DEBUG,"Front item is now: ",outbuffer[0].c_str()); - } - } - else if ((result == -1) && (errno != EAGAIN)) - { - log(DEBUG,"Write error on socket: %s",strerror(errno)); - this->OnError(I_ERR_WRITE); - this->state = I_ERROR; - return true; - } - } - }*/ - return false; -} + memset(cidr.bits, 0, sizeof(cidr.bits)); -bool InspSocket::Timeout(time_t current) -{ - if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd)) + if (cidr.type == AF_INET) { - log(DEBUG,"No FD or socket ref"); - return false; + target_byte = sizeof(sa.in4.sin_addr); + base = (unsigned char*)&sa.in4.sin_addr; + if (range > 32) + range = 32; } - - if (this->ClosePending) + else if (cidr.type == AF_INET6) { - log(DEBUG,"Close is pending"); - return true; + target_byte = sizeof(sa.in6.sin6_addr); + base = (unsigned char*)&sa.in6.sin6_addr; + if (range > 128) + range = 128; } - - if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end)) + else { - log(DEBUG,"Timed out, current=%lu timeout_end=%lu"); - // for non-listening sockets, the timeout can occur - // which causes termination of the connection after - // the given number of seconds without a successful - // connection. - this->OnTimeout(); - this->OnError(I_ERR_TIMEOUT); - timeout = true; - this->state = I_ERROR; - return true; + cidr.length = 0; + return; + } + cidr.length = range; + unsigned int border = range / 8; + unsigned int bitmask = (0xFF00 >> (range & 7)) & 0xFF; + for(unsigned int i=0; i < target_byte; i++) + { + if (i < border) + cidr.bits[i] = base[i]; + else if (i == border) + cidr.bits[i] = base[i] & bitmask; + else + return; } - return this->FlushWriteBuffer(); } -bool InspSocket::Poll() +irc::sockets::cidr_mask::cidr_mask(const irc::sockets::sockaddrs& sa, int range) { - if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd)) - return false; - - int incoming = -1; - bool n = true; + sa2cidr(*this, sa, range); +} - if ((fd < 0) || (fd > MAX_DESCRIPTORS) || (this->ClosePending)) - return false; +irc::sockets::cidr_mask::cidr_mask(const std::string& mask) +{ + std::string::size_type bits_chars = mask.rfind('/'); + irc::sockets::sockaddrs sa; - switch (this->state) + if (bits_chars == std::string::npos) { - case I_RESOLVING: - log(DEBUG,"State = I_RESOLVING, calling DoResolve()"); - return this->DoResolve(); - break; - case I_CONNECTING: - log(DEBUG,"State = I_CONNECTING"); - this->SetState(I_CONNECTED); - /* Our socket was in write-state, so delete it and re-add it - * in read-state. - */ - ServerInstance->SE->DelFd(this->fd); - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); - return this->OnConnected(); - break; - case I_LISTENING: - length = sizeof (client); - incoming = accept (this->fd, (sockaddr*)&client,&length); - this->SetQueues(incoming); - this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr)); - return true; - break; - case I_CONNECTED: - n = this->OnDataReady(); - /* Flush any pending, but not till after theyre done with the event - * so there are less write calls involved. - * Both FlushWriteBuffer AND the return result of OnDataReady must - * return true for this to be ok. - */ - return (n && !this->FlushWriteBuffer()); - break; - default: - break; + irc::sockets::aptosa(mask, 0, sa); + sa2cidr(*this, sa, 128); + } + else + { + int range = ConvToInt(mask.substr(bits_chars + 1)); + irc::sockets::aptosa(mask.substr(0, bits_chars), 0, sa); + sa2cidr(*this, sa, range); } - return true; } -void InspSocket::SetState(InspSocketState s) +std::string irc::sockets::cidr_mask::str() const { - log(DEBUG,"Socket state change"); - this->state = s; + irc::sockets::sockaddrs sa; + sa.sa.sa_family = type; + unsigned char* base; + int len; + if (type == AF_INET) + { + base = (unsigned char*)&sa.in4.sin_addr; + len = 4; + } + else if (type == AF_INET6) + { + base = (unsigned char*)&sa.in6.sin6_addr; + len = 16; + } + else + return ""; + memcpy(base, bits, len); + return sa.addr() + "/" + ConvToStr((int)length); } -InspSocketState InspSocket::GetState() +bool irc::sockets::cidr_mask::operator==(const cidr_mask& other) const { - return this->state; + return type == other.type && length == other.length && + 0 == memcmp(bits, other.bits, 16); } -int InspSocket::GetFd() +bool irc::sockets::cidr_mask::operator<(const cidr_mask& other) const { - return this->fd; + if (type != other.type) + return type < other.type; + if (length != other.length) + return length < other.length; + return memcmp(bits, other.bits, 16) < 0; } -bool InspSocket::OnConnected() { return true; } -void InspSocket::OnError(InspSocketError e) { return; } -int InspSocket::OnDisconnect() { return 0; } -int InspSocket::OnIncomingConnection(int newfd, char* ip) { return 0; } -bool InspSocket::OnDataReady() { return true; } -void InspSocket::OnTimeout() { return; } -void InspSocket::OnClose() { return; } - -InspSocket::~InspSocket() +bool irc::sockets::cidr_mask::match(const irc::sockets::sockaddrs& addr) const { - this->Close(); + if (addr.sa.sa_family != type) + return false; + irc::sockets::cidr_mask tmp(addr, length); + return tmp == *this; } +