* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
* E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
#include <sstream>
#include <iostream>
#include <fstream>
+#include <stdexcept>
#include "socket.h"
#include "inspircd.h"
#include "inspircd_io.h"
-#include "inspircd_util.h"
#include "inspstring.h"
#include "helperfuncs.h"
+#include "socketengine.h"
-extern FILE *log_file;
-extern int boundPortCount;
-extern int openSockfd[MAXSOCKS];
+
+extern InspIRCd* ServerInstance;
+extern ServerConfig* Config;
extern time_t TIME;
-extern bool unlimitcore;
-extern int MaxConn;
+
+InspSocket* socket_ref[MAX_DESCRIPTORS];
InspSocket::InspSocket()
{
this->state = I_DISCONNECTED;
+ this->fd = -1;
+ this->ClosePending = false;
}
InspSocket::InspSocket(int newfd, char* ip)
{
this->fd = newfd;
this->state = I_CONNECTED;
- this->IP = ip;
+ strlcpy(this->IP,ip,MAXBUF);
+ this->ClosePending = false;
+ ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+ socket_ref[this->fd] = this;
}
-InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime)
+InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1)
{
+ strlcpy(host,ahost.c_str(),MAXBUF);
+ this->ClosePending = false;
if (listening) {
if ((this->fd = OpenTCPSocket()) == ERROR)
{
}
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()))
{
this->Close();
this->fd = -1;
else
{
this->state = I_LISTENING;
+ ServerInstance->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);
+ }
+ else
+ {
+ strlcpy(this->host,ahost.c_str(),MAXBUF);
+ this->port = aport;
+
+ if (!inet_aton(host,&addy))
+ {
+ 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;
}
+ else
+ {
+ log(DEBUG,"No need to resolve %s",this->host);
+ strlcpy(this->IP,host,MAXBUF);
+ 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());
+ 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_SOCKET);
- return;
+ this->OnError(I_ERR_RESOLVE);
+ this->fd = -1;
+ return false;
}
- 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;
- return;
+ return this->DoConnect();
}
+ log(DEBUG,"No result for socket yet!");
+ return true;
}
+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);
+ this->fd = -1;
+ return false;
+ }
+
+ log(DEBUG,"Part 2 DoConnect() %s",this->IP);
+ inet_aton(this->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)
+ {
+ log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno));
+ this->OnError(I_ERR_CONNECT);
+ this->state = I_ERROR;
+ this->Close();
+ this->fd = -1;
+ 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)
this->OnClose();
shutdown(this->fd,2);
close(this->fd);
+ socket_ref[this->fd] = NULL;
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
{
- log(DEBUG,"EOF or error on socket");
- return NULL;
+ if (errno == EAGAIN)
+ {
+ return "";
+ }
+ else
+ {
+ log(DEBUG,"EOF or error on socket: %s",strerror(errno));
+ return NULL;
+ }
}
}
+void InspSocket::MarkAsClosed()
+{
+ log(DEBUG,"Marked as closed");
+ this->ClosePending = true;
+}
+
// 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)
+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);
+ //return (!this->FlushWriteBuffer());
+}
+
+bool InspSocket::FlushWriteBuffer()
{
- char* d = (char*)data.c_str();
- unsigned int written = 0;
- int n = 0;
- int s = data.length();
- while ((written < data.length()) && (n >= 0))
+ if (this->ClosePending)
+ return true;
+
+ /*if ((this->fd > -1) && (this->state == I_CONNECTED))
{
- n = send(this->fd,d,s,0);
- if (n > 0)
+ if (outbuffer.size())
{
- // 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;
+ log(DEBUG,"Writing %d to socket",outbuffer.size());
+ int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
+ if (result > 0)
+ {
+ log(DEBUG,"Wrote %d to socket",result);
+ if ((unsigned int)result == outbuffer[0].length())
+ {
+ * The whole block was written (usually a line)
+ * Pop the block off the front of the queue
+ *
+ log(DEBUG,"Popping front item, now %d items left",outbuffer.size());
+ outbuffer.pop_front();
+ }
+ else
+ {
+ log(DEBUG,"Cutting front item");
+ std::string temp = outbuffer[0].substr(result);
+ outbuffer[0] = temp;
+ log(DEBUG,"Front item is now: ",outbuffer[0].c_str());
+ }
+ }
+ else if ((result == -1) && (errno != EAGAIN))
+ {
+ log(DEBUG,"Write error on socket: %s",strerror(errno));
+ this->OnError(I_ERR_WRITE);
+ this->state = I_ERROR;
+ return true;
+ }
}
- }
- return written;
+ }*/
+ return false;
}
-bool InspSocket::Poll()
+bool InspSocket::Timeout(time_t current)
{
- if ((time(NULL) > timeout_end) && (this->state == I_CONNECTING))
+ if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
+ {
+ log(DEBUG,"No FD or socket ref");
+ return false;
+ }
+
+ if (this->ClosePending)
{
+ 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");
// 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;
+ timeout = true;
this->state = I_ERROR;
- return false;
+ return true;
}
- polls.fd = this->fd;
- state == I_CONNECTING ? polls.events = POLLOUT : polls.events = POLLIN;
- int ret = poll(&polls,1,1);
+ return this->FlushWriteBuffer();
+}
- if (ret > 0)
+bool InspSocket::Poll()
+{
+ if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
+ return false;
+
+ int incoming = -1;
+ bool n = true;
+
+ if ((fd < 0) || (fd > MAX_DESCRIPTORS) || (this->ClosePending))
+ return false;
+
+ switch (this->state)
{
- int incoming = -1;
-
- switch (this->state)
- {
- case I_CONNECTING:
- this->SetState(I_CONNECTED);
- 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;
- }
+ 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.
+ */
+ ServerInstance->SE->DelFd(this->fd);
+ ServerInstance->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->SetQueues(incoming);
+ this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr));
+ return true;
+ break;
+ case I_CONNECTED:
+ n = this->OnDataReady();
+ /* Flush any pending, but not till after theyre done with the event
+ * so there are less write calls involved.
+ * Both FlushWriteBuffer AND the return result of OnDataReady must
+ * return true for this to be ok.
+ */
+ return (n && !this->FlushWriteBuffer());
+ break;
+ default:
+ break;
}
return true;
}
return this->state;
}
+int InspSocket::GetFd()
+{
+ return this->fd;
+}
+
bool InspSocket::OnConnected() { return true; }
void InspSocket::OnError(InspSocketError e) { return; }
int InspSocket::OnDisconnect() { return 0; }
{
this->Close();
}
-
-/*
-int BindSocket (int sockfd, struct sockaddr_in client, struct sockaddr_in server, int port, char* addr)
-int OpenTCPSocket (void)
-*/