X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=f9b605d3be05a2a1377d18ece0befafca5489261;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=7be61c9d4c0762b39789af3f50869161450b5a32;hpb=181d7379971c7381b6cbd17d6a0ae24ac588c90c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 7be61c9d4..f9b605d3b 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -14,267 +14,236 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include +#include "configreader.h" #include "socket.h" #include "inspircd.h" -#include "inspircd_io.h" #include "inspstring.h" #include "helperfuncs.h" #include "socketengine.h" +#include "message.h" -extern SocketEngine* SE; - -extern int boundPortCount; -extern int openSockfd[MAXSOCKS]; +extern InspIRCd* ServerInstance; +extern ServerConfig* Config; extern time_t TIME; - -InspSocket* socket_ref[65535]; - -InspSocket::InspSocket() +extern int openSockfd[MAX_DESCRIPTORS]; + +InspSocket* socket_ref[MAX_DESCRIPTORS]; + +/** This will bind a socket to a port. It works for UDP/TCP. + * If a hostname is given to bind to, the function will first + * attempt to resolve the hostname, then bind to the IP the + * hostname resolves to. This is a blocking lookup blocking for + * a maximum of one second before it times out, using the DNS + * server specified in the configuration file. + */ +bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) { - this->state = I_DISCONNECTED; -} + memset(&server,0,sizeof(server)); + insp_inaddr addy; + bool resolved = false; + char resolved_addr[128]; -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; -} + if (*addr == '*') + *addr = 0; -InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime) -{ - if (listening) { - if ((this->fd = OpenTCPSocket()) == ERROR) + if (*addr && !inet_aton(addr,&addy)) + { + /* If they gave a hostname, bind to the IP it resolves to */ + if (CleanAndResolve(resolved_addr, addr, true)) { - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - log(DEBUG,"OpenTCPSocket() error"); - return; + inet_aton(resolved_addr,&addy); + log(DEFAULT,"Resolved binding '%s' -> '%s'",addr,resolved_addr); + server.sin_addr = addy; + resolved = true; } else { - if (BindSocket(this->fd,this->client,this->server,port,(char*)host.c_str()) == ERROR) - { - this->Close(); - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_BIND); - log(DEBUG,"BindSocket() error %s",strerror(errno)); - return; - } - 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; - } - } - } 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); + log(DEFAULT,"WARNING: Could not resolve '%s' to an IP for binding to on port %d",addr,port); + return false; } - - this->IP = ip; - - timeout_end = time(NULL)+maxtime; - timeout = false; - if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) + } + server.sin_family = AF_INET; + if (!resolved) + { + if (!*addr) { - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - return; + server.sin_addr.s_addr = htonl(INADDR_ANY); + } + else + { + server.sin_addr = addy; } - 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() -{ - if (this->fd != -1) + server.sin_port = htons(port); + if (bind(sockfd,(struct sockaddr*)&server,sizeof(server)) < 0) { - this->OnClose(); - shutdown(this->fd,2); - close(this->fd); - socket_ref[this->fd] = NULL; - this->fd = -1; + return false; + } + else + { + log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port); + if (listen(sockfd, Config->MaxConn) == -1) + { + log(DEFAULT,"ERROR in listen(): %s",strerror(errno)); + return false; + } + else + { + NonBlocking(sockfd); + return true; + } } } -std::string InspSocket::GetIP() -{ - return this->IP; -} -char* InspSocket::Read() +// Open a TCP Socket +int OpenTCPSocket() { - int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0); - if (n > 0) + int sockfd; + int on = 1; + struct linger linger = { 0 }; + + if ((sockfd = socket (AF_INET, SOCK_STREAM, 0)) < 0) { - ibuf[n] = 0; - return ibuf; + log(DEFAULT,"Error creating TCP socket: %s",strerror(errno)); + return (ERROR); } else { - log(DEBUG,"EOF or error on socket"); - return NULL; + setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &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)); + 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) -{ - this->Buffer = this->Buffer + data; - this->FlushWriteBuffer(); -} - -void InspSocket::FlushWriteBuffer() +bool HasPort(int port, char* addr) { - int result = 0; - if (this->Buffer.length()) + for (int count = 0; count < ServerInstance->stats->BoundPortCount; count++) { - result = send(this->fd,this->Buffer,this->Buffer.length(),0); - if (result > 0) + if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr))) { - /* If we wrote some, advance the buffer forwards */ - char* n = (char*)this->Buffer.c_str(); - n += result; - this->Buffer = n; + return true; } } + return false; } -bool InspSocket::Timeout(time_t current) +int BindPorts(bool bail) { - if ((this->state == I_CONNECTING) && (current > timeout_end)) + char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; + insp_sockaddr client, server; + int clientportcount = 0; + int BoundPortCount = 0; + + if (!bail) { - // 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; + int InitialPortCount = ServerInstance->stats->BoundPortCount; + log(DEBUG,"Initial port count: %d",InitialPortCount); + + for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++) + { + 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 (((!*Type) || (!strcmp(Type,"clients"))) && (!HasPort(atoi(configToken),Addr))) + { + // modules handle server bind types now + Config->ports[clientportcount+InitialPortCount] = atoi(configToken); + if (*Addr == '*') + *Addr = 0; + + strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256); + clientportcount++; + log(DEBUG,"NEW binding %s:%s [%s] from config",Addr,configToken, Type); + } + } + int PortCount = clientportcount; + if (PortCount) + { + for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++) + { + if ((openSockfd[count] = OpenTCPSocket()) == ERROR) + { + log(DEBUG,"Bad fd %d binding port [%s:%d]",openSockfd[count],Config->addrs[count],Config->ports[count]); + return ERROR; + } + if (!BindSocket(openSockfd[count],client,server,Config->ports[count],Config->addrs[count])) + { + log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno)); + } + else + { + /* Associate the new open port with a slot in the socket engine */ + ServerInstance->SE->AddFd(openSockfd[count],true,X_LISTEN); + BoundPortCount++; + } + } + return InitialPortCount + BoundPortCount; + } + else + { + log(DEBUG,"There is nothing new to bind!"); + } + return InitialPortCount; } - if (this->Buffer.length()) - this->FlushWriteBuffer(); - return false; -} -bool InspSocket::Poll() -{ - int incoming = -1; - - switch (this->state) + for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++) { - 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; - } + 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); - return true; -} + if ((!*Type) || (!strcmp(Type,"clients"))) + { + // modules handle server bind types now + Config->ports[clientportcount] = atoi(configToken); + + // If the client put bind "*", this is an unrealism. + // We don't actually support this as documented, but + // i got fed up of people trying it, so now it converts + // it to an empty string meaning the same 'bind to all'. + if (*Addr == '*') + *Addr = 0; + + strlcpy(Config->addrs[clientportcount],Addr,256); + clientportcount++; + log(DEBUG,"Binding %s:%s [%s] from config",Addr,configToken, Type); + } + } -void InspSocket::SetState(InspSocketState s) -{ - log(DEBUG,"Socket state change"); - this->state = s; -} + int PortCount = clientportcount; -InspSocketState InspSocket::GetState() -{ - return this->state; -} + for (int count = 0; count < PortCount; count++) + { + if ((openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR) + { + log(DEBUG,"Bad fd %d binding port [%s:%d]",openSockfd[BoundPortCount],Config->addrs[count],Config->ports[count]); + return ERROR; + } -int InspSocket::GetFd() -{ - return this->fd; -} + if (!BindSocket(openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count])) + { + log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno)); + } + else + { + /* well we at least bound to one socket so we'll continue */ + BoundPortCount++; + } + } -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; } + /* if we didn't bind to anything then abort */ + if (!BoundPortCount) + { + log(DEFAULT,"No ports bound, bailing!"); + printf("\nERROR: Could not bind any of %d ports! Please check your configuration.\n\n", PortCount); + return ERROR; + } -InspSocket::~InspSocket() -{ - this->Close(); + return BoundPortCount; } - -/* -int BindSocket (int sockfd, struct sockaddr_in client, struct sockaddr_in server, int port, char* addr) -int OpenTCPSocket (void) -*/