X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=d1dc1ce6bb783b45bd8f6c0ece5c5e6ee13d406d;hb=547ee1342e8b07bcdf46bc81343d1a1f7a2998e5;hp=66ba5c58e2b8089c70a97bc745346846a4a92c10;hpb=4789b3f6536ef8267c79c7cb3ee6678546c2150b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 66ba5c58e..d1dc1ce6b 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -14,66 +14,61 @@ * --------------------------------------------------- */ -#include -#include -#include -#include -#include -#include "inspircd_config.h" #include "socket.h" -#include "inspircd.h" #include "configreader.h" #include "inspstring.h" -#include "helperfuncs.h" #include "socketengine.h" -#include "message.h" - +#include "inspircd.h" -extern InspIRCd* ServerInstance; -extern ServerConfig* Config; -extern time_t TIME; +using irc::sockets::OpenTCPSocket; +using irc::sockets::insp_inaddr; +using irc::sockets::insp_sockaddr; -InspSocket* socket_ref[MAX_DESCRIPTORS]; +bool InspSocket::Readable() +{ + return ((this->state != I_CONNECTING) && (this->WaitingForWriteEvent == false)); +} -InspSocket::InspSocket() +InspSocket::InspSocket(InspIRCd* SI) { this->state = I_DISCONNECTED; this->fd = -1; - this->ClosePending = false; + this->WaitingForWriteEvent = false; + this->Instance = SI; } -InspSocket::InspSocket(int newfd, const char* ip) +InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip) { this->fd = newfd; this->state = I_CONNECTED; strlcpy(this->IP,ip,MAXBUF); - this->ClosePending = false; + this->WaitingForWriteEvent = false; + this->Instance = SI; if (this->fd > -1) - { - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); - socket_ref[this->fd] = this; - } + this->Instance->SE->AddFd(this); } -InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1) +InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime) { - strlcpy(host,ahost.c_str(),MAXBUF); - this->ClosePending = false; - if (listening) { + this->fd = -1; + this->Instance = SI; + strlcpy(host,ipaddr.c_str(),MAXBUF); + this->WaitingForWriteEvent = false; + if (listening) + { if ((this->fd = OpenTCPSocket()) == ERROR) { this->fd = -1; this->state = I_ERROR; this->OnError(I_ERR_SOCKET); - this->ClosePending = true; - log(DEBUG,"OpenTCPSocket() error"); + this->Instance->Log(DEBUG,"OpenTCPSocket() error"); return; } else { - if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str())) + if (!SI->BindSocket(this->fd,this->client,this->server,aport,(char*)ipaddr.c_str())) { - log(DEBUG,"BindSocket() error %s",strerror(errno)); + this->Instance->Log(DEBUG,"BindSocket() error %s",strerror(errno)); this->Close(); this->fd = -1; this->state = I_ERROR; @@ -86,35 +81,37 @@ InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsi this->state = I_LISTENING; if (this->fd > -1) { - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); - socket_ref[this->fd] = this; + if (!this->Instance->SE->AddFd(this)) + { + this->Close(); + this->state = I_ERROR; + this->OnError(I_ERR_NOMOREFDS); + } } - log(DEBUG,"New socket now in I_LISTENING state"); + this->Instance->Log(DEBUG,"New socket now in I_LISTENING state"); return; } } } else { - strlcpy(this->host,ahost.c_str(),MAXBUF); + strlcpy(this->host,ipaddr.c_str(),MAXBUF); this->port = aport; - if (!inet_aton(host,&addy)) + if (insp_aton(host,&addy) < 1) { - 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; + this->Instance->Log(DEBUG,"You cannot pass hostnames to InspSocket, resolve them first with Resolver!"); + this->Close(); + this->fd = -1; + this->state = I_ERROR; + this->OnError(I_ERR_RESOLVE); + return; } else { - log(DEBUG,"No need to resolve %s",this->host); + this->Instance->Log(DEBUG,"No need to resolve %s",this->host); strlcpy(this->IP,host,MAXBUF); - timeout_end = time(NULL) + maxtime; + timeout_val = maxtime; this->DoConnect(); } } @@ -132,9 +129,15 @@ void InspSocket::WantWrite() * * This behaviour may be fixed in a later version. */ + this->Instance->SE->DelFd(this); this->WaitingForWriteEvent = true; - ServerInstance->SE->DelFd(this->fd); - ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE); + if (!this->Instance->SE->AddFd(this)) + { + this->Close(); + this->fd = -1; + this->state = I_ERROR; + this->OnError(I_ERR_NOMOREFDS); + } } void InspSocket::SetQueues(int nfd) @@ -146,35 +149,6 @@ void InspSocket::SetQueues(int nfd) setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const void *)&recvbuf,sizeof(sendbuf)); } -bool InspSocket::DoResolve() -{ - log(DEBUG,"In DoResolve(), trying to resolve IP"); - if (this->dns.HasResult()) - { - log(DEBUG,"Socket has result"); - std::string res_ip = dns.GetResultIP(); - if (res_ip != "") - { - log(DEBUG,"Socket result set to %s",res_ip.c_str()); - strlcpy(this->IP,res_ip.c_str(),MAXBUF); - socket_ref[this->fd] = NULL; - } - else - { - log(DEBUG,"Socket DNS failure"); - this->Close(); - this->state = I_ERROR; - this->OnError(I_ERR_RESOLVE); - this->fd = -1; - this->ClosePending = true; - return false; - } - return this->DoConnect(); - } - log(DEBUG,"No result for socket yet!"); - return true; -} - /* Most irc servers require you to specify the ip you want to bind to. * If you dont specify an IP, they rather dumbly bind to the first IP * of the box (e.g. INADDR_ANY). In InspIRCd, we scan thought the IP @@ -186,9 +160,9 @@ bool InspSocket::DoResolve() bool InspSocket::BindAddr() { insp_inaddr n; - ConfigReader Conf; + ConfigReader Conf(this->Instance); - log(DEBUG,"In InspSocket::BindAddr()"); + this->Instance->Log(DEBUG,"In InspSocket::BindAddr()"); for (int j =0; j < Conf.Enumerate("bind"); j++) { std::string Type = Conf.ReadValue("bind","type",j); @@ -198,66 +172,67 @@ bool InspSocket::BindAddr() if ((IP != "*") && (IP != "127.0.0.1") && (IP != "")) { insp_sockaddr s; - char resolved_addr[MAXBUF]; - - if (!inet_aton(IP.c_str(),&n)) - { - /* If they gave a hostname, bind to the IP it resolves to */ - log(DEBUG,"Resolving host %s",IP.c_str()); - if (CleanAndResolve(resolved_addr, IP.c_str(), true, 1)) - { - log(DEBUG,"Resolved host %s to %s",IP.c_str(),resolved_addr); - IP = resolved_addr; - } - } - if (inet_aton(IP.c_str(),&n)) + if (insp_aton(IP.c_str(),&n) > 0) { - log(DEBUG,"Found an IP to bind to: %s",IP.c_str()); + this->Instance->Log(DEBUG,"Found an IP to bind to: %s",IP.c_str()); +#ifdef IPV6 + s.sin6_addr = n; + s.sin6_family = AF_FAMILY; +#else s.sin_addr = n; s.sin_family = AF_FAMILY; +#endif if (bind(this->fd,(struct sockaddr*)&s,sizeof(s)) < 0) { - log(DEBUG,"Cant bind()"); + this->Instance->Log(DEBUG,"Cant bind()"); this->state = I_ERROR; this->OnError(I_ERR_BIND); this->fd = -1; return false; } - log(DEBUG,"bind() reports outbound fd bound to ip %s",IP.c_str()); + this->Instance->Log(DEBUG,"bind() reports outbound fd bound to ip %s",IP.c_str()); return true; } else { - log(DEBUG,"Address '%s' was not an IP address",IP.c_str()); + this->Instance->Log(DEBUG,"Address '%s' was not an IP address",IP.c_str()); } } } } - log(DEBUG,"Found no suitable IPs to bind, binding INADDR_ANY"); + this->Instance->Log(DEBUG,"Found no suitable IPs to bind, binding INADDR_ANY"); return true; } bool InspSocket::DoConnect() { - log(DEBUG,"In DoConnect()"); + this->Instance->Log(DEBUG,"In DoConnect()"); if ((this->fd = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) { - log(DEBUG,"Cant socket()"); + this->Instance->Log(DEBUG,"Cant socket()"); this->state = I_ERROR; this->OnError(I_ERR_SOCKET); - this->fd = -1; return false; } - if (!this->BindAddr()) - return false; + if ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP)) + { + if (!this->BindAddr()) + return false; + } - log(DEBUG,"Part 2 DoConnect() %s",this->IP); - inet_aton(this->IP,&addy); + this->Instance->Log(DEBUG,"Part 2 DoConnect() %s",this->IP); + insp_aton(this->IP,&addy); +#ifdef IPV6 + addr.sin6_family = AF_FAMILY; + memcpy(&addr.sin6_addr, &addy, sizeof(insp_inaddr)); + addr.sin6_port = htons(this->port); +#else addr.sin_family = AF_FAMILY; addr.sin_addr = addy; addr.sin_port = htons(this->port); +#endif int flags; flags = fcntl(this->fd, F_GETFL, 0); @@ -267,37 +242,40 @@ bool InspSocket::DoConnect() { if (errno != EINPROGRESS) { - log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno)); + this->Instance->Log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno)); this->OnError(I_ERR_CONNECT); this->Close(); this->state = I_ERROR; - this->fd = -1; - this->ClosePending = true; return false; } + + this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, timeout_val, this->Instance->Time()); + this->Instance->Timers->AddTimer(this->Timeout); } this->state = I_CONNECTING; if (this->fd > -1) { - ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE); - socket_ref[this->fd] = this; + if (!this->Instance->SE->AddFd(this)) + { + this->OnError(I_ERR_NOMOREFDS); + this->Close(); + this->state = I_ERROR; + return false; + } this->SetQueues(this->fd); } - log(DEBUG,"Returning true from InspSocket::DoConnect"); + this->Instance->Log(DEBUG,"Returning true from InspSocket::DoConnect"); return true; } void InspSocket::Close() { - if (this->fd != -1) + if (this->fd > -1) { this->OnClose(); shutdown(this->fd,2); close(this->fd); - socket_ref[this->fd] = NULL; - this->ClosePending = true; - this->fd = -1; } } @@ -318,13 +296,17 @@ char* InspSocket::Read() } else { - if (errno == EAGAIN) + int err = errno; + if (err == EAGAIN) { return ""; } else { - log(DEBUG,"EOF or error on socket: %s",strerror(errno)); + if (!n) + this->Instance->Log(DEBUG,"EOF or error on socket: EOF"); + else + this->Instance->Log(DEBUG,"EOF or error on socket: %s",strerror(err)); return NULL; } } @@ -332,8 +314,7 @@ char* InspSocket::Read() void InspSocket::MarkAsClosed() { - log(DEBUG,"Marked as closed"); - this->ClosePending = true; + this->Instance->Log(DEBUG,"Marked as closed"); } // There are two possible outcomes to this function. @@ -342,14 +323,6 @@ void InspSocket::MarkAsClosed() // and should be aborted. int InspSocket::Write(const std::string &data) { - if (this->ClosePending) - return false; - - /*int result = write(this->fd,data.c_str(),data.length()); - if (result < 1) - 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); @@ -358,9 +331,6 @@ int InspSocket::Write(const std::string &data) bool InspSocket::FlushWriteBuffer() { - if (this->ClosePending) - return true; - if ((this->fd > -1) && (this->state == I_CONNECTED)) { if (outbuffer.size()) @@ -383,10 +353,9 @@ bool InspSocket::FlushWriteBuffer() } else if ((result == -1) && (errno != EAGAIN)) { - log(DEBUG,"Write error on socket: %s",strerror(errno)); + this->Instance->Log(DEBUG,"Write error on socket: %s",strerror(errno)); this->OnError(I_ERR_WRITE); this->state = I_ERROR; - this->ClosePending = true; return true; } } @@ -394,64 +363,57 @@ bool InspSocket::FlushWriteBuffer() return (fd < 0); } -bool InspSocket::Timeout(time_t current) +void SocketTimeout::Tick(time_t now) { - if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd)) + if (ServerInstance->SE->GetRef(this->sfd) != this->sock) { - log(DEBUG,"No FD or socket ref"); - return false; + ServerInstance->Log(DEBUG,"No FD or socket ref"); + return; } - if (this->ClosePending) + if (this->sock->state == I_CONNECTING) { - log(DEBUG,"Close is pending"); - return true; - } - - if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end)) - { - log(DEBUG,"Timed out, current=%lu timeout_end=%lu"); + ServerInstance->Log(DEBUG,"Timed out, current=%lu",now); // 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; - this->ClosePending = true; - return true; + this->sock->OnTimeout(); + this->sock->OnError(I_ERR_TIMEOUT); + this->sock->timeout = true; + this->sock->state = I_ERROR; + ServerInstance->SE->DelFd(this->sock); + this->sock->Close(); + delete this->sock; + return; } - return this->FlushWriteBuffer(); + this->sock->FlushWriteBuffer(); } bool InspSocket::Poll() { - if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd)) + if (this->Instance->SE->GetRef(this->fd) != this) return false; int incoming = -1; bool n = true; - if ((fd < 0) || (fd > MAX_DESCRIPTORS) || (this->ClosePending)) + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return false; switch (this->state) { - 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); + this->Instance->Log(DEBUG,"State = I_CONNECTING"); /* Our socket was in write-state, so delete it and re-add it * in read-state. */ if (this->fd > -1) { - ServerInstance->SE->DelFd(this->fd); - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); + this->Instance->SE->DelFd(this); + this->SetState(I_CONNECTED); + if (!this->Instance->SE->AddFd(this)) + return false; } return this->OnConnected(); break; @@ -459,7 +421,11 @@ bool InspSocket::Poll() length = sizeof (client); incoming = accept (this->fd, (sockaddr*)&client,&length); this->SetQueues(incoming); - this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr)); +#ifdef IPV6 + this->OnIncomingConnection(incoming,(char*)insp_ntoa(client.sin6_addr)); +#else + this->OnIncomingConnection(incoming,(char*)insp_ntoa(client.sin_addr)); +#endif return true; break; case I_CONNECTED: @@ -467,8 +433,11 @@ bool InspSocket::Poll() if (this->WaitingForWriteEvent) { /* Switch back to read events */ - ServerInstance->SE->DelFd(this->fd); - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); + this->Instance->SE->DelFd(this); + this->WaitingForWriteEvent = false; + if (!this->Instance->SE->AddFd(this)) + return false; + /* Trigger the write event */ n = this->OnWriteReady(); } @@ -494,7 +463,7 @@ bool InspSocket::Poll() void InspSocket::SetState(InspSocketState s) { - log(DEBUG,"Socket state change"); + this->Instance->Log(DEBUG,"Socket state change"); this->state = s; } @@ -521,3 +490,14 @@ InspSocket::~InspSocket() { this->Close(); } + +void InspSocket::HandleEvent(EventType et) +{ + if (!this->Poll()) + { + this->Instance->SE->DelFd(this); + this->Close(); + delete this; + } +} +