* ---------------------------------------------------
*/
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <fstream>
-#include <stdexcept>
-#include "inspircd_config.h"
#include "socket.h"
#include "configreader.h"
#include "inspstring.h"
-#include "helperfuncs.h"
#include "socketengine.h"
-#include "message.h"
#include "inspircd.h"
-using irc::sockets::BindSocket;
using irc::sockets::OpenTCPSocket;
using irc::sockets::insp_inaddr;
using irc::sockets::insp_sockaddr;
-extern time_t TIME;
-extern Server* MyServer;
+bool InspSocket::Readable()
+{
+ return ((this->state != I_CONNECTING) && (this->WaitingForWriteEvent == false));
+}
InspSocket::InspSocket(InspIRCd* SI)
{
this->state = I_DISCONNECTED;
this->fd = -1;
- this->ClosePending = false;
+ this->WaitingForWriteEvent = false;
this->Instance = SI;
}
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)
- {
- this->ClosePending = (!this->Instance->SE->AddFd(this->fd,true,X_ESTAB_MODULE));
- this->Instance->socket_ref[this->fd] = this;
- }
+ this->Instance->SE->AddFd(this);
}
-InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime) : fd(-1)
+InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime)
{
+ this->fd = -1;
this->Instance = SI;
strlcpy(host,ipaddr.c_str(),MAXBUF);
- this->ClosePending = false;
- if (listening) {
+ 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*)ipaddr.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;
this->state = I_LISTENING;
if (this->fd > -1)
{
- if (!this->Instance->SE->AddFd(this->fd,true,X_ESTAB_MODULE))
+ if (!this->Instance->SE->AddFd(this))
{
this->Close();
this->state = I_ERROR;
this->OnError(I_ERR_NOMOREFDS);
- this->ClosePending = true;
}
- this->Instance->socket_ref[this->fd] = this;
}
- log(DEBUG,"New socket now in I_LISTENING state");
+ this->Instance->Log(DEBUG,"New socket now in I_LISTENING state");
return;
}
}
if (insp_aton(host,&addy) < 1)
{
- log(DEBUG,"You cannot pass hostnames to InspSocket, resolve them first with Resolver!");
+ 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);
- this->ClosePending = true;
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();
}
}
*
* This behaviour may be fixed in a later version.
*/
+ this->Instance->SE->DelFd(this);
this->WaitingForWriteEvent = true;
- this->Instance->SE->DelFd(this->fd);
- if (!this->Instance->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);
- this->ClosePending = true;
}
}
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);
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;
#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;
}
return false;
}
- log(DEBUG,"Part 2 DoConnect() %s",this->IP);
+ this->Instance->Log(DEBUG,"Part 2 DoConnect() %s",this->IP);
insp_aton(this->IP,&addy);
#ifdef IPV6
addr.sin6_family = AF_FAMILY;
{
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)
{
- if (!this->Instance->SE->AddFd(this->fd,false,X_ESTAB_MODULE))
+ if (!this->Instance->SE->AddFd(this))
{
this->OnError(I_ERR_NOMOREFDS);
this->Close();
- this->fd = -1;
this->state = I_ERROR;
- this->ClosePending = true;
return false;
}
- this->Instance->socket_ref[this->fd] = this;
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);
- this->Instance->socket_ref[this->fd] = NULL;
- this->ClosePending = true;
- this->fd = -1;
}
}
}
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;
}
}
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.
// 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);
bool InspSocket::FlushWriteBuffer()
{
- if (this->ClosePending)
- return true;
-
if ((this->fd > -1) && (this->state == I_CONNECTED))
{
if (outbuffer.size())
}
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;
}
}
return (fd < 0);
}
-bool InspSocket::Timeout(time_t current)
+void SocketTimeout::Tick(time_t now)
{
- if (!this->Instance->socket_ref[this->fd] || !this->Instance->SE->HasFd(this->fd))
- {
- log(DEBUG,"No FD or socket ref");
- return false;
- }
-
- if (this->ClosePending)
+ if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
{
- log(DEBUG,"Close is pending");
- return true;
+ ServerInstance->Log(DEBUG,"No FD or socket ref");
+ return;
}
- if ((this->state == I_CONNECTING) && (current > timeout_end))
+ if (this->sock->state == I_CONNECTING)
{
- 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 (!this->Instance->socket_ref[this->fd] || !this->Instance->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_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)
{
- this->Instance->SE->DelFd(this->fd);
- if (!this->Instance->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();
if (this->WaitingForWriteEvent)
{
/* Switch back to read events */
- this->Instance->SE->DelFd(this->fd);
- if (!this->Instance->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 */
void InspSocket::SetState(InspSocketState s)
{
- log(DEBUG,"Socket state change");
+ this->Instance->Log(DEBUG,"Socket state change");
this->state = s;
}
{
this->Close();
}
+
+void InspSocket::HandleEvent(EventType et)
+{
+ if (!this->Poll())
+ {
+ this->Instance->SE->DelFd(this);
+ this->Close();
+ delete this;
+ }
+}
+
projects / user / henk / code / inspircd.git / blobdiff