X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=d18a8f5bc97c81c29fa053a04715d8ec2b4dbaa7;hb=1fb8a3f1b120db764375911be9ad8019a807a8ad;hp=420c29f6ff6700789edc8f006728073d9595bb62;hpb=d582107b33c3b154747a0a38f33963af7ad3c53f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 420c29f6f..d18a8f5bc 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -2,279 +2,334 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * 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. * * --------------------------------------------------- */ -using namespace std; +/* $Core */ -#include "inspircd_config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "socket.h" #include "inspircd.h" -#include "inspircd_io.h" -#include "inspircd_util.h" -#include "inspstring.h" -#include "helperfuncs.h" +#include "socket.h" #include "socketengine.h" -extern SocketEngine* SE; +/** 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) */ + sockaddr* servaddr = new sockaddr[2]; + memset(servaddr,0,sizeof(sockaddr)*2); -extern int boundPortCount; -extern int openSockfd[MAXSOCKS]; -extern time_t TIME; + int ret, size; -InspSocket* socket_ref[65535]; + if (*addr == '*') + addr = ""; -InspSocket::InspSocket() -{ - this->state = I_DISCONNECTED; -} +#ifdef IPV6 + if (*addr) + { + /* There is an address here. Is it ipv6? */ + if (strchr(addr,':')) + { + /* Yes it is */ + in6_addr addy; + if (inet_pton(AF_INET6, addr, &addy) < 1) + { + delete[] servaddr; + return false; + } -InspSocket::InspSocket(int newfd, char* ip) -{ - this->fd = newfd; - this->state = I_CONNECTED; - this->IP = ip; - SE->AddFd(this->fd,true,X_ESTAB_MODULE); - socket_ref[this->fd] = this; -} + ((sockaddr_in6*)servaddr)->sin6_family = AF_INET6; + memcpy(&(((sockaddr_in6*)servaddr)->sin6_addr), &addy, sizeof(in6_addr)); + ((sockaddr_in6*)servaddr)->sin6_port = htons(port); + size = sizeof(sockaddr_in6); + } + else + { + /* No, its not */ + in_addr addy; + if (inet_pton(AF_INET, addr, &addy) < 1) + { + delete[] servaddr; + return false; + } -InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime) -{ - if (listening) { - if ((this->fd = OpenTCPSocket()) == ERROR) + ((sockaddr_in*)servaddr)->sin_family = AF_INET; + ((sockaddr_in*)servaddr)->sin_addr = addy; + ((sockaddr_in*)servaddr)->sin_port = htons(port); + size = sizeof(sockaddr_in); + } + } + else + { + if (port == -1) { - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - log(DEBUG,"OpenTCPSocket() error"); - return; + /* Port -1: Means UDP IPV4 port binding - Special case + * used by DNS engine. + */ + ((sockaddr_in*)servaddr)->sin_family = AF_INET; + ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY); + ((sockaddr_in*)servaddr)->sin_port = 0; + size = sizeof(sockaddr_in); } else { - if (BindSocket(this->fd,this->client,this->server,port,(char*)host.c_str()) == ERROR) + /* Theres no address here, default to ipv6 bind to all */ + ((sockaddr_in6*)servaddr)->sin6_family = AF_INET6; + memset(&(((sockaddr_in6*)servaddr)->sin6_addr), 0, sizeof(in6_addr)); + ((sockaddr_in6*)servaddr)->sin6_port = htons(port); + size = sizeof(sockaddr_in6); + } + } +#else + /* If we aren't built with ipv6, the choice becomes simple */ + ((sockaddr_in*)servaddr)->sin_family = AF_INET; + if (*addr) + { + /* There is an address here. */ + in_addr addy; + if (inet_pton(AF_INET, addr, &addy) < 1) + { + delete[] servaddr; + return false; + } + ((sockaddr_in*)servaddr)->sin_addr = addy; + } + else + { + /* Bind ipv4 to all */ + ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY); + } + /* Bind ipv4 port number */ + ((sockaddr_in*)servaddr)->sin_port = htons(port); + size = sizeof(sockaddr_in); +#endif + ret = SE->Bind(sockfd, servaddr, size); + delete[] servaddr; + + if (ret < 0) + { + return false; + } + else + { + if (dolisten) + { + 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; - 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 { - char* ip; - this->host = host; - hostent* hoste = gethostbyname(host.c_str()); - if (!hoste) { - ip = (char*)host.c_str(); - } else { - struct in_addr* ia = (in_addr*)hoste->h_addr; - ip = inet_ntoa(*ia); } - - this->IP = ip; - - timeout_end = time(NULL)+maxtime; - timeout = false; - if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) + else { - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - return; + this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port); + return true; } - this->port = port; - inet_aton(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) - { - if (errno != EINPROGRESS) - { - this->Close(); - this->OnError(I_ERR_CONNECT); - this->state = I_ERROR; - return; - } - } - this->state = I_CONNECTING; - SE->AddFd(this->fd,false,X_ESTAB_MODULE); - socket_ref[this->fd] = this; - return; } } -void InspSocket::Close() +// Open a TCP Socket +int irc::sockets::OpenTCPSocket(const char* addr, int socktype) { - if (this->fd != -1) + int sockfd; + int on = 1; + addr = addr; + struct linger linger = { 0, 0 }; +#ifdef IPV6 + if (!*addr) { - this->OnClose(); - shutdown(this->fd,2); - close(this->fd); - socket_ref[this->fd] = NULL; - this->fd = -1; + sockfd = socket (PF_INET6, socktype, 0); + if (sockfd < 0) + sockfd = socket (PF_INET, socktype, 0); } -} - -std::string InspSocket::GetIP() -{ - return this->IP; -} - -char* InspSocket::Read() -{ - int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0); - if (n > 0) + else if (strchr(addr,':')) + sockfd = socket (PF_INET6, socktype, 0); + else + sockfd = socket (PF_INET, socktype, 0); + if (sockfd < 0) +#else + if ((sockfd = socket (PF_INET, socktype, 0)) < 0) +#endif { - ibuf[n] = 0; - return ibuf; + return ERROR; } else { - log(DEBUG,"EOF or error on socket"); - return NULL; + 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, (char*)&linger,sizeof(linger)); + return (sockfd); } } -// 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(std::string data) +// XXX: it would be VERY nice to genericize this so all listen stuff (server/client) could use the one function. -- w00t +int InspIRCd::BindPorts(FailedPortList &failed_ports) { - char* d = (char*)data.c_str(); - unsigned int written = 0; - int n = 0; - int s = data.length(); - while ((written < data.length()) && (n >= 0)) + char configToken[MAXBUF], Addr[MAXBUF], Type[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())); + + for (int count = 0; count < Config->ConfValueEnum("bind"); count++) { - n = send(this->fd,d,s,0); - if (n > 0) + Config->ConfValue("bind", "port", count, configToken, MAXBUF); + Config->ConfValue("bind", "address", count, Addr, MAXBUF); + Config->ConfValue("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"))) { - // If we didnt write everything, advance - // the pointers so that when we retry - // the next time around the loop, we try - // to write what we failed to write before. - written += n; - s -= n; - d += n; - } - } - return written; -} + irc::portparser portrange(configToken, false); + int portno = -1; + while (0 != (portno = portrange.GetToken())) + { + if (*Addr == '*') + *Addr = 0; -bool InspSocket::Timeout(time_t current) -{ - if ((this->state == I_CONNECTING) && (current > timeout_end)) - { - // 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; + bool skip = false; + for (std::vector::iterator n = ports.begin(); n != ports.end(); ++n) + { + if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno)) + { + 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; + } + } + } + } + if (!skip) + { + ClientListenSocket *ll = new ClientListenSocket(this, portno, Addr); + if (ll->GetFd() > -1) + { + bound++; + ports.push_back(ll); + } + else + { + failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno))); + } + } + } + } } - return false; -} -bool InspSocket::Poll() -{ - int incoming = -1; - - switch (this->state) + /* XXX: Here, anything left in our copy list, close as removed */ + if (!started_with_nothing) { - case I_CONNECTING: - this->SetState(I_CONNECTED); - /* Our socket was in write-state, so delete it and re-add it - * in read-state. - */ - SE->DelFd(this->fd); - 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->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr)); - return true; - break; - case I_CONNECTED: - return this->OnDataReady(); - break; - default: - break; + for (size_t k = 0; k < old_ports.size(); ++k) + { + 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; + } + } + } } - return true; + return bound; } -void InspSocket::SetState(InspSocketState s) +const char* irc::sockets::insp_ntoa(insp_inaddr n) { - log(DEBUG,"Socket state change"); - this->state = s; + static char buf[1024]; + inet_ntop(AF_FAMILY, &n, buf, sizeof(buf)); + return buf; } -InspSocketState InspSocket::GetState() +int irc::sockets::insp_aton(const char* a, insp_inaddr* n) { - return this->state; + return inet_pton(AF_FAMILY, a, n); } -int InspSocket::GetFd() +int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa) { - return this->fd; + 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; } -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; } +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; +} -InspSocket::~InspSocket() +int irc::sockets::sa_size(irc::sockets::sockaddrs& sa) { - this->Close(); + if (sa.sa.sa_family == AF_INET) + return sizeof(sa.in4); + if (sa.sa.sa_family == AF_INET6) + return sizeof(sa.in6); + return 0; } - -/* -int BindSocket (int sockfd, struct sockaddr_in client, struct sockaddr_in server, int port, char* addr) -int OpenTCPSocket (void) -*/