* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <fstream>
-#include <stdexcept>
-#include "inspircd_config.h"
-#include "socket.h"
#include "inspircd.h"
-#include "configreader.h"
+#include "socket.h"
#include "inspstring.h"
-#include "helperfuncs.h"
#include "socketengine.h"
+bool BufferedSocket::Readable()
+{
+ return (this->state != I_CONNECTING);
+}
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern time_t TIME;
-
-InspSocket* socket_ref[MAX_DESCRIPTORS];
-
-InspSocket::InspSocket()
+BufferedSocket::BufferedSocket(InspIRCd* SI)
{
+ this->Timeout = NULL;
this->state = I_DISCONNECTED;
this->fd = -1;
- this->ClosePending = false;
+ this->ServerInstance = SI;
}
-InspSocket::InspSocket(int newfd, char* ip)
+BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip)
{
+ this->Timeout = NULL;
this->fd = newfd;
this->state = I_CONNECTED;
strlcpy(this->IP,ip,MAXBUF);
- this->ClosePending = false;
+ this->ServerInstance = SI;
if (this->fd > -1)
- {
- ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
- socket_ref[this->fd] = this;
- }
+ this->ServerInstance->SE->AddFd(this);
}
-InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1)
+BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip)
{
- strlcpy(host,ahost.c_str(),MAXBUF);
- this->ClosePending = 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");
- return;
- }
- else
- {
- if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()))
- {
- this->Close();
- this->fd = -1;
- this->state = I_ERROR;
- this->OnError(I_ERR_BIND);
- this->ClosePending = true;
- log(DEBUG,"BindSocket() error %s",strerror(errno));
- return;
- }
- else
- {
- this->state = I_LISTENING;
- if (this->fd > -1)
- {
- ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
- socket_ref[this->fd] = this;
- }
- log(DEBUG,"New socket now in I_LISTENING state");
- return;
- }
- }
+ this->cbindip = connectbindip;
+ this->fd = -1;
+ this->ServerInstance = SI;
+ strlcpy(host,ipaddr.c_str(),MAXBUF);
+ this->Timeout = NULL;
+
+ strlcpy(this->host,ipaddr.c_str(),MAXBUF);
+ this->port = aport;
+
+ irc::sockets::sockaddrs testaddr;
+ if (!irc::sockets::aptosa(host, aport, &testaddr))
+ {
+ this->ServerInstance->Logs->Log("SOCKET", DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!");
+ this->OnError(I_ERR_CONNECT);
+ this->Close();
+ this->fd = -1;
+ this->state = I_ERROR;
+ return;
}
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
+ strlcpy(this->IP,host,MAXBUF);
+ if (!this->DoConnect(maxtime))
{
- log(DEBUG,"No need to resolve %s",this->host);
- strlcpy(this->IP,host,MAXBUF);
- timeout_end = time(NULL) + maxtime;
- this->DoConnect();
+ this->OnError(I_ERR_CONNECT);
+ this->Close();
+ this->fd = -1;
+ this->state = I_ERROR;
+ return;
}
}
}
-void InspSocket::SetQueues(int nfd)
+void BufferedSocket::SetQueues()
{
// 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));
+ if(setsockopt(this->fd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf)) || setsockopt(this->fd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf)))
+ {
+ //this->ServerInstance->Log(DEFAULT, "Could not increase SO_SNDBUF/SO_RCVBUF for socket %u", GetFd());
+ ; // do nothing. I'm a little sick of people trying to interpret this message as a result of why their incorrect setups don't work.
+ }
}
-bool InspSocket::DoResolve()
+bool BufferedSocket::DoBindMagic(const std::string ¤t_ip)
{
- log(DEBUG,"In DoResolve(), trying to resolve IP");
- if (this->dns.HasResult())
+ irc::sockets::sockaddrs s;
+ if (!irc::sockets::aptosa(current_ip.c_str(), 0, &s))
{
- 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();
+ errno = EADDRNOTAVAIL;
+ return false;
}
- log(DEBUG,"No result for socket yet!");
+
+ if (ServerInstance->SE->Bind(this->fd, &s.sa, sa_size(s)) < 0)
+ {
+ this->state = I_ERROR;
+ this->OnError(I_ERR_BIND);
+ return false;
+ }
+
return true;
}
-bool InspSocket::BindAddr()
+/* 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
+ * addresses we've bound server ports to, and we try and bind our outbound
+ * connections to the first usable non-loopback and non-any IP we find.
+ * This is easier to configure when you have a lot of links and a lot
+ * of servers to configure.
+ */
+bool BufferedSocket::BindAddr(const std::string &ip_to_bind)
{
- insp_inaddr n;
- ConfigReader Conf;
+ ConfigReader Conf(this->ServerInstance);
- log(DEBUG,"In InspSocket::BindAddr()");
- for (int j =0; j < Conf.Enumerate("bind"); j++)
+ // Case one: If they provided an IP, try bind it
+ if (!ip_to_bind.empty())
{
- std::string Type = Conf.ReadValue("bind","type",j);
- std::string IP = Conf.ReadValue("bind","address",j);
- if (Type == "servers")
- {
- if ((IP != "*") && (IP != "127.0.0.1"))
- {
- insp_sockaddr s;
+ // And if it fails, don't do anything.
+ return this->DoBindMagic(ip_to_bind);
+ }
- if (inet_aton(IP.c_str(),&n))
- {
- log(DEBUG,"Found an IP to bind to: %s",IP.c_str());
- s.sin_addr = n;
- s.sin_family = AF_INET;
- if (bind(this->fd,(struct sockaddr*)&s,sizeof(s)) < 0)
- {
- 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());
- return true;
- }
- else
- {
- log(DEBUG,"Address '%s' was not an IP address",IP.c_str());
- }
- }
- }
+ for (int j = 0; j < Conf.Enumerate("bind"); j++)
+ {
+ // We only want to try bind to a server ip.
+ if (Conf.ReadValue("bind","type",j) != "servers")
+ continue;
+
+ // set current IP to the <bind> tag
+ std::string current_ip = Conf.ReadValue("bind","address",j);
+
+ // Make sure IP is nothing local
+ if (current_ip == "*" || current_ip == "127.0.0.1" || current_ip.empty() || current_ip == "::1")
+ continue;
+
+ // Try bind, don't fail if it doesn't bind though.
+ if (this->DoBindMagic(current_ip))
+ return true;
}
- log(DEBUG,"Found no suitable IPs to bind, binding INADDR_ANY");
+
+ // NOTE: You may wonder WTF we are returning *true* here, but that is because there were no custom binds setup, and so we have nothing to do
+ // (remember, outgoing connections without binding are perfectly ok).
+ ServerInstance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!");
return true;
}
-bool InspSocket::DoConnect()
+bool BufferedSocket::DoConnect(unsigned long maxtime)
{
- log(DEBUG,"In DoConnect()");
- if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
+ irc::sockets::sockaddrs addr;
+ irc::sockets::aptosa(this->host, this->port, &addr);
+
+ this->fd = socket(addr.sa.sa_family, SOCK_STREAM, 0);
+
+ if (this->fd == -1)
{
- log(DEBUG,"Cant socket()");
this->state = I_ERROR;
this->OnError(I_ERR_SOCKET);
- this->fd = -1;
return false;
}
- if (!this->BindAddr())
+ if (!this->BindAddr(this->cbindip))
+ {
+ this->Close();
+ 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);
+ ServerInstance->SE->NonBlocking(this->fd);
- if (connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
+ if (ServerInstance->SE->Connect(this, &addr.sa, sa_size(addr)) == -1)
{
if (errno != EINPROGRESS)
{
- 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->ServerInstance, this, maxtime, this->ServerInstance->Time());
+ this->ServerInstance->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;
- this->SetQueues(this->fd);
+ if (!this->ServerInstance->SE->AddFd(this))
+ {
+ this->OnError(I_ERR_NOMOREFDS);
+ this->Close();
+ this->state = I_ERROR;
+ return false;
+ }
+ this->SetQueues();
}
- log(DEBUG,"Returning true from InspSocket::DoConnect");
+
+ ServerInstance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
return true;
}
-void InspSocket::Close()
+void BufferedSocket::Close()
{
- if (this->fd != -1)
+ /* Save this, so we dont lose it,
+ * otherise on failure, error messages
+ * might be inaccurate.
+ */
+ int save = errno;
+ if (this->fd > -1)
{
- this->OnClose();
- shutdown(this->fd,2);
- close(this->fd);
- socket_ref[this->fd] = NULL;
- this->ClosePending = true;
- this->fd = -1;
+ if (this->GetIOHook())
+ {
+ try
+ {
+ this->GetIOHook()->OnRawSocketClose(this->fd);
+ }
+ catch (CoreException& modexcept)
+ {
+ ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ }
+ }
+ ServerInstance->SE->Shutdown(this, 2);
+ if (ServerInstance->SE->Close(this) != -1)
+ this->OnClose();
+
+ if (ServerInstance->SocketCull.find(this) == ServerInstance->SocketCull.end())
+ ServerInstance->SocketCull[this] = this;
}
+ errno = save;
}
-std::string InspSocket::GetIP()
+std::string BufferedSocket::GetIP()
{
return this->IP;
}
-char* InspSocket::Read()
+const char* BufferedSocket::Read()
{
- if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+ if (!ServerInstance->SE->BoundsCheckFd(this))
return NULL;
- int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);
- if ((n > 0) && (n <= (int)sizeof(this->ibuf)))
- {
- ibuf[n] = 0;
- return ibuf;
- }
- else
+
+ int n = 0;
+ char* ReadBuffer = ServerInstance->GetReadBuffer();
+
+ if (this->GetIOHook())
{
- if (errno == EAGAIN)
+ int result2 = 0;
+ int MOD_RESULT = 0;
+ try
{
- return "";
+ MOD_RESULT = this->GetIOHook()->OnRawSocketRead(this->fd, ReadBuffer, ServerInstance->Config->NetBufferSize, result2);
+ }
+ catch (CoreException& modexcept)
+ {
+ ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ }
+ if (MOD_RESULT < 0)
+ {
+ n = -1;
+ errno = EAGAIN;
}
else
{
- log(DEBUG,"EOF or error on socket: %s",strerror(errno));
- return NULL;
+ n = result2;
}
}
-}
+ else
+ {
+ n = recv(this->fd, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
+ }
-void InspSocket::MarkAsClosed()
-{
- log(DEBUG,"Marked as closed");
- this->ClosePending = true;
+ /*
+ * This used to do some silly bounds checking instead of just passing bufsize - 1 to recv.
+ * Not only does that make absolutely no sense, but it could potentially result in a read buffer's worth
+ * of data being thrown into the bit bucket for no good reason, which is just *stupid*.. do things correctly now.
+ * --w00t (july 2, 2008)
+ */
+ if (n > 0)
+ {
+ ReadBuffer[n] = 0;
+ return ReadBuffer;
+ }
+ else
+ {
+ int err = errno;
+ if (err == EAGAIN)
+ return "";
+ else
+ return NULL;
+ }
}
-// 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(const std::string &data)
+/*
+ * This function formerly tried to flush write buffer each call.
+ * While admirable in attempting to get the data out to wherever
+ * it is going, on a full socket, it's just going to syscall write() and
+ * EAGAIN constantly, instead of waiting in the SE to know if it can write
+ * which will chew a bit of CPU.
+ *
+ * So, now this function returns void (take note) and just adds to the sendq.
+ *
+ * It'll get written at a determinate point when the socketengine tells us it can write.
+ * -- w00t (april 1, 2008)
+ */
+void BufferedSocket::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
- */
+ /* Append the data to the back of the queue ready for writing */
outbuffer.push_back(data);
- return (!this->FlushWriteBuffer());
+
+ /* Mark ourselves as wanting write */
+ this->ServerInstance->SE->WantWrite(this);
}
-bool InspSocket::FlushWriteBuffer()
+bool BufferedSocket::FlushWriteBuffer()
{
- if (this->ClosePending)
- return true;
-
+ errno = 0;
if ((this->fd > -1) && (this->state == I_CONNECTED))
{
- if (outbuffer.size())
+ if (this->GetIOHook())
{
- int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
- if (result > 0)
+ while (outbuffer.size() && (errno != EAGAIN))
{
- if ((unsigned int)result == outbuffer[0].length())
+ try
{
- /* The whole block was written (usually a line)
- * Pop the block off the front of the queue
+ /* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
+ * implement their own buffering mechanisms
*/
+ this->GetIOHook()->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length());
outbuffer.pop_front();
}
- else
+ catch (CoreException& modexcept)
{
- std::string temp = outbuffer[0].substr(result);
- outbuffer[0] = temp;
+ ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ return true;
}
}
- else if ((result == -1) && (errno != EAGAIN))
+ }
+ else
+ {
+ /* If we have multiple lines, try to send them all,
+ * not just the first one -- Brain
+ */
+ while (outbuffer.size() && (errno != EAGAIN))
{
- log(DEBUG,"Write error on socket: %s",strerror(errno));
- this->OnError(I_ERR_WRITE);
- this->state = I_ERROR;
- this->ClosePending = true;
- return true;
+ /* Send a line */
+ int result = ServerInstance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0);
+
+ if (result > 0)
+ {
+ if ((unsigned int)result >= outbuffer[0].length())
+ {
+ /* The whole block was written (usually a line)
+ * Pop the block off the front of the queue,
+ * dont set errno, because we are clear of errors
+ * and want to try and write the next block too.
+ */
+ outbuffer.pop_front();
+ }
+ else
+ {
+ std::string temp = outbuffer[0].substr(result);
+ outbuffer[0] = temp;
+ /* We didnt get the whole line out. arses.
+ * Try again next time, i guess. Set errno,
+ * because we shouldnt be writing any more now,
+ * until the socketengine says its safe to do so.
+ */
+ errno = EAGAIN;
+ }
+ }
+ else if (result == 0)
+ {
+ this->ServerInstance->SE->DelFd(this);
+ this->Close();
+ return true;
+ }
+ else if ((result == -1) && (errno != EAGAIN))
+ {
+ this->OnError(I_ERR_WRITE);
+ this->state = I_ERROR;
+ this->ServerInstance->SE->DelFd(this);
+ this->Close();
+ return true;
+ }
}
}
}
+
+ if ((errno == EAGAIN) && (fd > -1))
+ {
+ this->ServerInstance->SE->WantWrite(this);
+ }
+
return (fd < 0);
}
-bool InspSocket::Timeout(time_t current)
+void SocketTimeout::Tick(time_t)
{
- if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
- {
- log(DEBUG,"No FD or socket ref");
- return false;
- }
+ ServerInstance->Logs->Log("SOCKET", DEBUG,"SocketTimeout::Tick");
- if (this->ClosePending)
- {
- log(DEBUG,"Close is pending");
- return true;
- }
+ if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
+ return;
- if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end))
+ if (this->sock->state == I_CONNECTING)
{
- log(DEBUG,"Timed out, current=%lu timeout_end=%lu");
- // for non-listening sockets, the timeout can occur
+ // for connecting 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);
+
+ /* NOTE: We must set this AFTER DelFd, as we added
+ * this socket whilst writeable. This means that we
+ * must DELETE the socket whilst writeable too!
+ */
+ this->sock->state = I_ERROR;
+
+ if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end())
+ ServerInstance->SocketCull[this->sock] = this->sock;
}
- return this->FlushWriteBuffer();
+
+ this->sock->Timeout = NULL;
}
-bool InspSocket::Poll()
+bool BufferedSocket::InternalMarkConnected()
{
- 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;
+ /* Our socket was in write-state, so delete it and re-add it
+ * in read-state.
+ */
+ this->SetState(I_CONNECTED);
- switch (this->state)
+ if (this->GetIOHook())
{
- 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.
- */
- if (this->fd > -1)
- {
- 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.
- */
- if (this->FlushWriteBuffer())
- return false;
- return n;
- break;
- default:
- break;
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"Hook for raw connect");
+ try
+ {
+ this->GetIOHook()->OnRawSocketConnect(this->fd);
+ }
+ catch (CoreException& modexcept)
+ {
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ return false;
+ }
}
- return true;
+ return this->OnConnected();
}
-void InspSocket::SetState(InspSocketState s)
+void BufferedSocket::SetState(BufferedSocketState s)
{
- log(DEBUG,"Socket state change");
this->state = s;
}
-InspSocketState InspSocket::GetState()
+BufferedSocketState BufferedSocket::GetState()
{
return this->state;
}
-int InspSocket::GetFd()
+bool BufferedSocket::OnConnected() { return true; }
+void BufferedSocket::OnError(BufferedSocketError) { return; }
+int BufferedSocket::OnDisconnect() { return 0; }
+bool BufferedSocket::OnDataReady() { return true; }
+bool BufferedSocket::OnWriteReady()
{
- return this->fd;
+ // Default behaviour: just try write some.
+ return !this->FlushWriteBuffer();
}
+void BufferedSocket::OnTimeout() { return; }
+void BufferedSocket::OnClose() { return; }
-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; }
-
-InspSocket::~InspSocket()
+BufferedSocket::~BufferedSocket()
{
this->Close();
+ if (Timeout)
+ {
+ ServerInstance->Timers->DelTimer(Timeout);
+ Timeout = NULL;
+ }
+}
+
+void BufferedSocket::HandleEvent(EventType et, int errornum)
+{
+ switch (et)
+ {
+ case EVENT_ERROR:
+ {
+ switch (errornum)
+ {
+ case ETIMEDOUT:
+ this->OnError(I_ERR_TIMEOUT);
+ break;
+ case ECONNREFUSED:
+ case 0:
+ this->OnError(this->state == I_CONNECTING ? I_ERR_CONNECT : I_ERR_WRITE);
+ break;
+ case EADDRINUSE:
+ this->OnError(I_ERR_BIND);
+ break;
+ case EPIPE:
+ case EIO:
+ this->OnError(I_ERR_WRITE);
+ break;
+ }
+
+ if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+ this->ServerInstance->SocketCull[this] = this;
+ return;
+ break;
+ }
+ case EVENT_READ:
+ {
+ if (!this->OnDataReady())
+ {
+ if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+ this->ServerInstance->SocketCull[this] = this;
+ return;
+ }
+ break;
+ }
+ case EVENT_WRITE:
+ {
+ if (this->state == I_CONNECTING)
+ {
+ if (!this->InternalMarkConnected())
+ {
+ if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+ this->ServerInstance->SocketCull[this] = this;
+ return;
+ }
+ return;
+ }
+ else
+ {
+ if (!this->OnWriteReady())
+ {
+ if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+ this->ServerInstance->SocketCull[this] = this;
+ return;
+ }
+ }
+ break;
+ }
+ }
}
+
projects / user / henk / code / inspircd.git / blobdiff