X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=4c03c933dc98e0a634f9fa79cd4043337f816fbf;hb=b7c16f1ebc0809bb9f85573a37c6bb11f6854aca;hp=c202914539f8d772a40e63e56496750fec8cd03a;hpb=bcc3e538236fdccc784f4d37449028315fbbc2f8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index c20291453..4c03c933d 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: * * @@ -29,6 +29,7 @@ using namespace std; #include #include #include +#include #include "socket.h" #include "inspircd.h" #include "inspircd_io.h" @@ -38,6 +39,7 @@ using namespace std; extern InspIRCd* ServerInstance; +extern ServerConfig* Config; extern time_t TIME; InspSocket* socket_ref[MAX_DESCRIPTORS]; @@ -45,6 +47,7 @@ InspSocket* socket_ref[MAX_DESCRIPTORS]; InspSocket::InspSocket() { this->state = I_DISCONNECTED; + this->fd = -1; } InspSocket::InspSocket(int newfd, char* ip) @@ -56,8 +59,11 @@ InspSocket::InspSocket(int newfd, char* ip) socket_ref[this->fd] = this; } -InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime) +InspSocket::InspSocket(std::string ahost, int aport, bool listening, unsigned long maxtime) { + this->fd = -1; + this->host = ahost; + this->Buffer = ""; if (listening) { if ((this->fd = OpenTCPSocket()) == ERROR) { @@ -69,7 +75,7 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long } else { - if (BindSocket(this->fd,this->client,this->server,port,(char*)host.c_str()) == ERROR) + if (BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()) == ERROR) { this->Close(); this->fd = -1; @@ -87,54 +93,110 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long 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); + } + else + { + this->host = ahost; + this->port = aport; + + if (!inet_aton(host.c_str(),&addy)) + { + log(DEBUG,"Attempting to resolve %s",this->host.c_str()); + /* 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; } + else + { + log(DEBUG,"No need to resolve %s",this->host.c_str()); + this->IP = host; + timeout_end = time(NULL) + maxtime; + this->DoConnect(); + } + } +} - this->IP = ip; +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)); +} - timeout_end = time(NULL)+maxtime; - timeout = false; - if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) +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()); + this->IP = res_ip; + socket_ref[this->fd] = NULL; + } + else { + log(DEBUG,"Socket DNS failure"); + this->Close(); this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - return; + this->OnError(I_ERR_RESOLVE); + return false; } - this->port = port; - inet_aton(ip,&addy); - addr.sin_family = AF_INET; - addr.sin_addr = addy; - addr.sin_port = htons(this->port); + return this->DoConnect(); + } + log(DEBUG,"No result for socket yet!"); + return true; +} - int flags; - flags = fcntl(this->fd, F_GETFL, 0); - fcntl(this->fd, F_SETFL, flags | O_NONBLOCK); +bool InspSocket::DoConnect() +{ + log(DEBUG,"In DoConnect()"); + if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) + { + log(DEBUG,"Cant socket()"); + this->state = I_ERROR; + this->OnError(I_ERR_SOCKET); + return false; + } - 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; - ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE); - socket_ref[this->fd] = this; - return; + log(DEBUG,"Part 2 DoConnect() %s",this->IP.c_str()); + inet_aton(this->IP.c_str(),&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) + { + log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno)); + this->OnError(I_ERR_CONNECT); + this->state = I_ERROR; + this->Close(); + return false; + } } + 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; } + void InspSocket::Close() { if (this->fd != -1) @@ -154,15 +216,17 @@ std::string InspSocket::GetIP() char* InspSocket::Read() { + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + return NULL; int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0); - if (n > 0) + if ((n > 0) && (n <= (int)sizeof(this->ibuf))) { ibuf[n] = 0; return ibuf; } else { - if (n == EAGAIN) + if (errno == EAGAIN) { return ""; } @@ -180,31 +244,51 @@ char* InspSocket::Read() // and should be aborted. int InspSocket::Write(std::string data) { - this->Buffer = this->Buffer + data; - this->FlushWriteBuffer(); + try + { + if ((data != "") && (this->Buffer.length() + data.length() < this->Buffer.max_size())) + this->Buffer.append(data); + } + catch (std::length_error) + { + log(DEBUG,"std::length_error exception caught while appending to socket buffer!"); + return 0; + } return data.length(); } void InspSocket::FlushWriteBuffer() { - int result = 0; - if (this->Buffer.length()) + if ((this->fd > -1) && (this->state == I_CONNECTED)) { - result = send(this->fd,this->Buffer.c_str(),this->Buffer.length(),0); - if (result > 0) + int result = 0, v = 0; + const char* n = Buffer.c_str(); + v = Buffer.length(); + if (v > 0) { - /* If we wrote some, advance the buffer forwards */ - char* n = (char*)this->Buffer.c_str(); - n += result; - this->Buffer = n; + result = write(this->fd,n,v); + if (result > 0) + { + if (result == v) + { + Buffer = ""; + } + else + { + /* If we wrote some, advance the buffer forwards */ + n += result; + Buffer = n; + } + } } } } bool InspSocket::Timeout(time_t current) { - if ((this->state == I_CONNECTING) && (current > timeout_end)) + if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end)) { + 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 @@ -215,18 +299,23 @@ bool InspSocket::Timeout(time_t current) this->state = I_ERROR; return true; } - if (this->Buffer.length()) - this->FlushWriteBuffer(); + this->FlushWriteBuffer(); return false; } bool InspSocket::Poll() { int incoming = -1; - + bool n = true; + 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); /* Our socket was in write-state, so delete it and re-add it * in read-state. @@ -238,19 +327,20 @@ bool InspSocket::Poll() 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: - return this->OnDataReady(); + n = this->OnDataReady(); + /* Flush any pending, but not till after theyre done with the event + * so there are less write calls involved. */ + this->FlushWriteBuffer(); + return n; break; default: break; } - - if (this->Buffer.length()) - this->FlushWriteBuffer(); - return true; } @@ -283,7 +373,3 @@ InspSocket::~InspSocket() this->Close(); } -/* -int BindSocket (int sockfd, struct sockaddr_in client, struct sockaddr_in server, int port, char* addr) -int OpenTCPSocket (void) -*/