this->Timeout = NULL;
this->state = I_DISCONNECTED;
this->fd = -1;
- this->Instance = SI;
+ this->ServerInstance = SI;
}
BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip)
this->fd = newfd;
this->state = I_CONNECTED;
strlcpy(this->IP,ip,MAXBUF);
- this->Instance = SI;
+ this->ServerInstance = SI;
if (this->fd > -1)
- this->Instance->SE->AddFd(this);
+ this->ServerInstance->SE->AddFd(this);
}
BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip)
{
this->cbindip = connectbindip;
this->fd = -1;
- this->Instance = SI;
+ this->ServerInstance = SI;
strlcpy(host,ipaddr.c_str(),MAXBUF);
this->Timeout = NULL;
}
if (!ipvalid)
{
- this->Instance->Logs->Log("SOCKET", DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!");
+ 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;
}
}
-void BufferedSocket::WantWrite()
-{
- this->Instance->SE->WantWrite(this);
-}
-
-void BufferedSocket::SetQueues(int nfd)
+void BufferedSocket::SetQueues()
{
// attempt to increase socket sendq and recvq as high as its possible
int sendbuf = 32768;
int recvbuf = 32768;
- if(setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf)) || setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&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->Instance->Log(DEFAULT, "Could not increase SO_SNDBUF/SO_RCVBUF for socket %u", GetFd());
+ //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 BufferedSocket::BindAddr(const std::string &ip)
{
- ConfigReader Conf(this->Instance);
+ ConfigReader Conf(this->ServerInstance);
socklen_t size = sizeof(sockaddr_in);
#ifdef IPV6
bool v6 = false;
}
}
- if (Instance->SE->Bind(this->fd, s, size) < 0)
+ if (ServerInstance->SE->Bind(this->fd, s, size) < 0)
{
this->state = I_ERROR;
this->OnError(I_ERR_BIND);
}
j++;
}
- Instance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!");
+ ServerInstance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!");
return true;
}
}
}
- Instance->SE->NonBlocking(this->fd);
+ ServerInstance->SE->NonBlocking(this->fd);
- if (Instance->SE->Connect(this, (sockaddr*)addr, size) == -1)
+ if (ServerInstance->SE->Connect(this, (sockaddr*)addr, size) == -1)
{
if (errno != EINPROGRESS)
{
return false;
}
- this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, maxtime, this->Instance->Time());
- this->Instance->Timers->AddTimer(this->Timeout);
+ 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)
{
- if (!this->Instance->SE->AddFd(this))
+ if (!this->ServerInstance->SE->AddFd(this))
{
this->OnError(I_ERR_NOMOREFDS);
this->Close();
this->state = I_ERROR;
return false;
}
- this->SetQueues(this->fd);
+ this->SetQueues();
}
- Instance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
+ ServerInstance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
return true;
}
}
catch (CoreException& modexcept)
{
- Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
}
}
- Instance->SE->Shutdown(this, 2);
- if (Instance->SE->Close(this) != -1)
+ ServerInstance->SE->Shutdown(this, 2);
+ if (ServerInstance->SE->Close(this) != -1)
this->OnClose();
- if (Instance->SocketCull.find(this) == Instance->SocketCull.end())
- Instance->SocketCull[this] = this;
+ if (ServerInstance->SocketCull.find(this) == ServerInstance->SocketCull.end())
+ ServerInstance->SocketCull[this] = this;
}
errno = save;
}
const char* BufferedSocket::Read()
{
- if (!Instance->SE->BoundsCheckFd(this))
+ if (!ServerInstance->SE->BoundsCheckFd(this))
return NULL;
int n = 0;
- char* ReadBuffer = Instance->GetReadBuffer();
+ char* ReadBuffer = ServerInstance->GetReadBuffer();
if (this->GetIOHook())
{
int MOD_RESULT = 0;
try
{
- MOD_RESULT = this->GetIOHook()->OnRawSocketRead(this->fd, ReadBuffer, Instance->Config->NetBufferSize, result2);
+ MOD_RESULT = this->GetIOHook()->OnRawSocketRead(this->fd, ReadBuffer, ServerInstance->Config->NetBufferSize, result2);
}
catch (CoreException& modexcept)
{
- Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
}
if (MOD_RESULT < 0)
{
}
else
{
- n = recv(this->fd, ReadBuffer, Instance->Config->NetBufferSize, 0);
+ n = recv(this->fd, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
}
/*
outbuffer.push_back(data);
/* Mark ourselves as wanting write */
- this->Instance->SE->WantWrite(this);
+ this->ServerInstance->SE->WantWrite(this);
}
bool BufferedSocket::FlushWriteBuffer()
}
catch (CoreException& modexcept)
{
- Instance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
return true;
}
}
while (outbuffer.size() && (errno != EAGAIN))
{
/* Send a line */
- int result = Instance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0);
+ int result = ServerInstance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0);
if (result > 0)
{
}
else if (result == 0)
{
- this->Instance->SE->DelFd(this);
+ this->ServerInstance->SE->DelFd(this);
this->Close();
return true;
}
{
this->OnError(I_ERR_WRITE);
this->state = I_ERROR;
- this->Instance->SE->DelFd(this);
+ this->ServerInstance->SE->DelFd(this);
this->Close();
return true;
}
if ((errno == EAGAIN) && (fd > -1))
{
- this->Instance->SE->WantWrite(this);
+ this->ServerInstance->SE->WantWrite(this);
}
return (fd < 0);
this->sock->Timeout = NULL;
}
-bool BufferedSocket::Poll()
+bool BufferedSocket::InternalMarkConnected()
{
-#ifndef WINDOWS
- if (!Instance->SE->BoundsCheckFd(this))
- return false;
-#endif
-
- if (Instance->SE->GetRef(this->fd) != this)
- 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_CONNECTING:
- /* Our socket was in write-state, so delete it and re-add it
- * in read-state.
- */
-#ifndef WINDOWS
- if (this->fd > -1)
- {
- this->Instance->SE->DelFd(this);
- if (!this->Instance->SE->AddFd(this))
- return false;
- }
-#endif
- this->SetState(I_CONNECTED);
-
- if (this->GetIOHook())
- {
- Instance->Logs->Log("SOCKET",DEBUG,"Hook for raw connect");
- try
- {
- this->GetIOHook()->OnRawSocketConnect(this->fd);
- }
- catch (CoreException& modexcept)
- {
- Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
- }
- }
- return this->OnConnected();
- break;
- case I_CONNECTED:
- /* Process the read event */
- return this->OnDataReady();
- 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 BufferedSocket::SetState(BufferedSocketState s)
this->Close();
if (Timeout)
{
- Instance->Timers->DelTimer(Timeout);
+ ServerInstance->Timers->DelTimer(Timeout);
Timeout = NULL;
}
}
switch (et)
{
case EVENT_ERROR:
+ {
switch (errornum)
{
case ETIMEDOUT:
break;
}
- if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
- this->Instance->SocketCull[this] = this;
+ if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+ this->ServerInstance->SocketCull[this] = this;
return;
break;
+ }
case EVENT_READ:
- if (!this->Poll())
+ {
+ if (!this->OnDataReady())
{
- if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
- this->Instance->SocketCull[this] = this;
+ 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)
{
- /* This might look wrong as if we should be actually calling
- * with EVENT_WRITE, but trust me it is correct. There are some
- * writeability-state things in the read code, because of how
- * BufferedSocket used to work regarding write buffering in previous
- * versions of InspIRCd. - Brain
- */
- this->HandleEvent(EVENT_READ);
+ 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->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
- this->Instance->SocketCull[this] = this;
+ if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+ this->ServerInstance->SocketCull[this] = this;
return;
}
}
break;
+ }
}
}
projects / user / henk / code / inspircd.git / blobdiff