#include <stdexcept>
#include "inspircd_config.h"
#include "socket.h"
-#include "inspircd.h"
#include "configreader.h"
#include "inspstring.h"
-#include "helperfuncs.h"
#include "socketengine.h"
-#include "message.h"
-
-
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern time_t TIME;
-extern Server* MyServer;
+#include "inspircd.h"
-InspSocket* socket_ref[MAX_DESCRIPTORS];
+using irc::sockets::OpenTCPSocket;
+using irc::sockets::insp_inaddr;
+using irc::sockets::insp_sockaddr;
+bool InspSocket::Readable()
+{
+ return ((this->state != I_CONNECTING) && (this->WaitingForWriteEvent == false));
+}
-InspSocket::InspSocket()
+InspSocket::InspSocket(InspIRCd* SI)
{
this->state = I_DISCONNECTED;
this->fd = -1;
+ this->WaitingForWriteEvent = false;
this->ClosePending = false;
+ this->Instance = SI;
}
-InspSocket::InspSocket(int newfd, const char* ip)
+InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip)
{
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)
- {
- ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
- socket_ref[this->fd] = this;
- }
+ this->ClosePending = (!this->Instance->SE->AddFd(this));
}
-InspSocket::InspSocket(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)
{
- ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
- socket_ref[this->fd] = this;
+ if (!this->Instance->SE->AddFd(this))
+ {
+ this->Close();
+ this->state = I_ERROR;
+ this->OnError(I_ERR_NOMOREFDS);
+ this->ClosePending = true;
+ }
}
- 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;
}
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;
this->DoConnect();
*
* This behaviour may be fixed in a later version.
*/
+ this->Instance->SE->DelFd(this);
this->WaitingForWriteEvent = true;
- ServerInstance->SE->DelFd(this->fd);
- ServerInstance->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;
+ }
}
void InspSocket::SetQueues(int nfd)
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;
}
- 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->state = I_CONNECTING;
if (this->fd > -1)
{
- ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE);
- socket_ref[this->fd] = this;
+ 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->SetQueues(this->fd);
}
- log(DEBUG,"Returning true from InspSocket::DoConnect");
+ this->Instance->Log(DEBUG,"Returning true from InspSocket::DoConnect");
return true;
}
this->OnClose();
shutdown(this->fd,2);
close(this->fd);
- socket_ref[this->fd] = NULL;
this->ClosePending = true;
this->fd = -1;
}
}
else
{
- log(DEBUG,"EOF or error on socket: %s",strerror(errno));
+ this->Instance->Log(DEBUG,"EOF or error on socket: %s",strerror(errno));
return NULL;
}
}
void InspSocket::MarkAsClosed()
{
- log(DEBUG,"Marked as closed");
+ this->Instance->Log(DEBUG,"Marked as closed");
this->ClosePending = true;
}
}
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;
bool InspSocket::Timeout(time_t current)
{
- if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
+ if (this->Instance->SE->GetRef(this->fd) != this)
{
- log(DEBUG,"No FD or socket ref");
+ this->Instance->Log(DEBUG,"No FD or socket ref");
return false;
}
if (this->ClosePending)
{
- log(DEBUG,"Close is pending");
+ this->Instance->Log(DEBUG,"Close is pending");
return true;
}
if ((this->state == I_CONNECTING) && (current > timeout_end))
{
- log(DEBUG,"Timed out, current=%lu timeout_end=%lu");
+ this->Instance->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
bool InspSocket::Poll()
{
- if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
+ if (this->Instance->SE->GetRef(this->fd) != this)
return false;
int incoming = -1;
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)
{
- ServerInstance->SE->DelFd(this->fd);
- ServerInstance->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();
break;
if (this->WaitingForWriteEvent)
{
/* Switch back to read events */
- ServerInstance->SE->DelFd(this->fd);
- ServerInstance->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 */
n = this->OnWriteReady();
}
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);
+ delete this;
+ }
+}
+
projects / user / henk / code / inspircd.git / blobdiff