#include <sstream>
#include <iostream>
#include <fstream>
+#include <stdexcept>
#include "socket.h"
#include "inspircd.h"
#include "inspircd_io.h"
extern InspIRCd* ServerInstance;
+extern ServerConfig* Config;
extern time_t TIME;
InspSocket* socket_ref[MAX_DESCRIPTORS];
InspSocket::InspSocket()
{
this->state = I_DISCONNECTED;
+ this->fd = -1;
}
InspSocket::InspSocket(int newfd, char* ip)
InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime)
{
+ this->fd = -1;
if (listening) {
if ((this->fd = OpenTCPSocket()) == ERROR)
{
return;
}
}
- } else {
+ }
+ else
+ {
this->host = host;
+ this->port = port;
- if (this->dns.ForwardLookupWithFD(host,fd))
+ if (!inet_aton(host.c_str(),&addy))
{
- timeout_end = time(NULL)+maxtime;
+ 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
{
- this->state = I_ERROR;
- this->OnError(I_ERR_RESOLVE);
- return;
+ log(DEBUG,"No need to resolve %s",this->host.c_str());
+ this->IP = host;
+ timeout_end = time(NULL) + maxtime;
+ this->DoConnect();
}
+ }
+}
+
+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));
}
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 != "")
{
- this->IP = ip;
+ log(DEBUG,"Socket result set to %s",res_ip.c_str());
+ this->IP = res_ip;
+ socket_ref[this->fd] = NULL;
}
else
{
- this->IP = this->host;
- }
-
- if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
- {
+ log(DEBUG,"Socket DNS failure");
+ this->Close();
this->state = I_ERROR;
- this->OnError(I_ERR_SOCKET);
+ 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)
+ 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)
{
- if (errno != EINPROGRESS)
- {
- this->Close();
- this->OnError(I_ERR_CONNECT);
- this->state = I_ERROR;
- return false;
- }
+ 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;
- 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;
}
+
void InspSocket::Close()
{
if (this->fd != -1)
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 "";
}
// 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();
}
result = send(this->fd,this->Buffer.c_str(),this->Buffer.length(),0);
if (result > 0)
{
- /* If we wrote some, advance the buffer forwards */
- char* n = (char*)this->Buffer.c_str();
- n += result;
- this->Buffer = n;
+ if (result == (int)this->Buffer.length())
+ {
+ this->Buffer = "";
+ }
+ else
+ {
+ /* If we wrote some, advance the buffer forwards */
+ char* n = (char*)this->Buffer.c_str();
+ n += result;
+ this->Buffer = n;
+ }
}
}
}
{
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
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;
+
+ log(DEBUG,"InspSocket::Poll()");
switch (this->state)
{
case I_RESOLVING:
+ log(DEBUG,"State = I_RESOLVING, calling DoResolve()");
return this->DoResolve();
break;
case I_CONNECTING:
+ log(DEBUG,"State = I_CONNECTED");
this->SetState(I_CONNECTED);
/* Our socket was in write-state, so delete it and re-add it
* in read-state.
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();
+ log(DEBUG,"State = I_CONNECTED");
+ n = this->OnDataReady();
+ log(DEBUG,"State return: %d",(int)n);
+ /* 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;
}
projects / user / henk / code / inspircd.git / blobdiff