* | 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-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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 "configreader.h"
#include "inspstring.h"
this->fd = -1;
this->WaitingForWriteEvent = false;
this->Instance = SI;
+ this->IsIOHooked = false;
}
InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip)
strlcpy(this->IP,ip,MAXBUF);
this->WaitingForWriteEvent = false;
this->Instance = SI;
+ this->IsIOHooked = false;
if (this->fd > -1)
this->Instance->SE->AddFd(this);
}
this->Instance = SI;
strlcpy(host,ipaddr.c_str(),MAXBUF);
this->WaitingForWriteEvent = false;
+ this->IsIOHooked = false;
if (listening)
{
- if ((this->fd = OpenTCPSocket()) == ERROR)
+ if ((this->fd = OpenTCPSocket(host)) == ERROR)
{
this->fd = -1;
this->state = I_ERROR;
this->OnError(I_ERR_SOCKET);
- this->Instance->Log(DEBUG,"OpenTCPSocket() error");
return;
}
else
{
- if (!SI->BindSocket(this->fd,this->client,this->server,aport,(char*)ipaddr.c_str()))
+ if (!SI->BindSocket(this->fd,aport,(char*)ipaddr.c_str()))
{
- this->Instance->Log(DEBUG,"BindSocket() error %s",strerror(errno));
this->Close();
this->fd = -1;
this->state = I_ERROR;
this->OnError(I_ERR_NOMOREFDS);
}
}
- this->Instance->Log(DEBUG,"New socket now in I_LISTENING state");
return;
}
- }
+ }
}
else
{
if (insp_aton(host,&addy) < 1)
{
- this->Instance->Log(DEBUG,"You cannot pass hostnames to InspSocket, resolve them first with Resolver!");
+ this->Instance->Log(DEBUG,"BUG: Hostname passed to InspSocket, rather than an IP address!");
this->Close();
this->fd = -1;
this->state = I_ERROR;
}
else
{
- this->Instance->Log(DEBUG,"No need to resolve %s",this->host);
strlcpy(this->IP,host,MAXBUF);
timeout_val = maxtime;
this->DoConnect();
void InspSocket::WantWrite()
{
- /** XXX:
- * The socket engine may only have each FD in the list ONCE.
- * This means we cant watch for write AND read at the same
- * time. We have to remove the READ fd, to insert the WRITE
- * fd. Once we receive our WRITE event (which WILL ARRIVE,
- * pretty much gauranteed) we switch back to watching for
- * READ events again.
- *
- * This behaviour may be fixed in a later version.
- */
- this->Instance->SE->DelFd(this);
+ this->Instance->SE->WantWrite(this);
this->WaitingForWriteEvent = true;
- if (!this->Instance->SE->AddFd(this))
- {
- this->Close();
- this->fd = -1;
- this->state = I_ERROR;
- this->OnError(I_ERR_NOMOREFDS);
- }
}
void InspSocket::SetQueues(int nfd)
{
insp_inaddr n;
ConfigReader Conf(this->Instance);
-
- this->Instance->Log(DEBUG,"In InspSocket::BindAddr()");
for (int j =0; j < Conf.Enumerate("bind"); j++)
{
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") && (IP != ""))
+ if ((IP != "*") && (IP != "127.0.0.1") && (IP != "") && (IP != "::1"))
{
insp_sockaddr s;
if (insp_aton(IP.c_str(),&n) > 0)
{
- this->Instance->Log(DEBUG,"Found an IP to bind to: %s",IP.c_str());
#ifdef IPV6
- s.sin6_addr = n;
+ memcpy(&s.sin6_addr, &n, sizeof(n));
s.sin6_family = AF_FAMILY;
#else
s.sin_addr = n;
#endif
if (bind(this->fd,(struct sockaddr*)&s,sizeof(s)) < 0)
{
- this->Instance->Log(DEBUG,"Cant bind()");
this->state = I_ERROR;
this->OnError(I_ERR_BIND);
this->fd = -1;
return false;
}
- this->Instance->Log(DEBUG,"bind() reports outbound fd bound to ip %s",IP.c_str());
return true;
}
- else
- {
- this->Instance->Log(DEBUG,"Address '%s' was not an IP address",IP.c_str());
- }
}
}
}
- this->Instance->Log(DEBUG,"Found no suitable IPs to bind, binding INADDR_ANY");
return true;
}
bool InspSocket::DoConnect()
{
- this->Instance->Log(DEBUG,"In DoConnect()");
if ((this->fd = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1)
{
- this->Instance->Log(DEBUG,"Cant socket()");
this->state = I_ERROR;
this->OnError(I_ERR_SOCKET);
return false;
return false;
}
- this->Instance->Log(DEBUG,"Part 2 DoConnect() %s",this->IP);
insp_aton(this->IP,&addy);
#ifdef IPV6
addr.sin6_family = AF_FAMILY;
- memcpy(&addr.sin6_addr, &addy, sizeof(insp_inaddr));
+ memcpy(&addr.sin6_addr, &addy, sizeof(addy));
addr.sin6_port = htons(this->port);
#else
addr.sin_family = AF_FAMILY;
addr.sin_port = htons(this->port);
#endif
- int flags;
- flags = fcntl(this->fd, F_GETFL, 0);
+ int 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->Instance->Log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno));
this->OnError(I_ERR_CONNECT);
this->Close();
this->state = I_ERROR;
}
this->SetQueues(this->fd);
}
- this->Instance->Log(DEBUG,"Returning true from InspSocket::DoConnect");
return true;
}
void InspSocket::Close()
{
+ /* Save this, so we dont lose it,
+ * otherise on failure, error messages
+ * might be inaccurate.
+ */
+ int save = errno;
if (this->fd > -1)
{
+ if (this->IsIOHooked && Instance->Config->GetIOHook(this))
+ {
+ try
+ {
+ Instance->Config->GetIOHook(this)->OnRawSocketClose(this->fd);
+ }
+ catch (CoreException& modexcept)
+ {
+ Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ }
+ }
this->OnClose();
shutdown(this->fd,2);
close(this->fd);
}
+ errno = save;
}
std::string InspSocket::GetIP()
{
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
return NULL;
- int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);
+
+ int n = 0;
+
+ if (this->IsIOHooked)
+ {
+ int result2 = 0;
+ int MOD_RESULT = 0;
+ try
+ {
+ MOD_RESULT = Instance->Config->GetIOHook(this)->OnRawSocketRead(this->fd,this->ibuf,sizeof(this->ibuf),result2);
+ }
+ catch (CoreException& modexcept)
+ {
+ Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ }
+ if (MOD_RESULT < 0)
+ {
+ n = -1;
+ errno = EAGAIN;
+ }
+ else
+ {
+ n = result2;
+ }
+ }
+ else
+ {
+ n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);
+ }
+
if ((n > 0) && (n <= (int)sizeof(this->ibuf)))
{
ibuf[n] = 0;
{
int err = errno;
if (err == EAGAIN)
- {
return "";
- }
else
- {
- 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()
{
- this->Instance->Log(DEBUG,"Marked as closed");
}
// There are two possible outcomes to this function.
/* Try and append the data to the back of the queue, and send it on its way
*/
outbuffer.push_back(data);
+ this->Instance->SE->WantWrite(this);
return (!this->FlushWriteBuffer());
}
bool InspSocket::FlushWriteBuffer()
{
+ errno = 0;
if ((this->fd > -1) && (this->state == I_CONNECTED))
{
- if (outbuffer.size())
+ if (this->IsIOHooked)
{
- 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
- */
- outbuffer.pop_front();
+ int result = Instance->Config->GetIOHook(this)->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length());
+ if (result > 0)
+ {
+ if ((unsigned int)result == outbuffer[0].length())
+ {
+ outbuffer.pop_front();
+ }
+ else
+ {
+ std::string temp = outbuffer[0].substr(result);
+ outbuffer[0] = temp;
+ errno = EAGAIN;
+ }
+ }
+ else if (((result == -1) && (errno != EAGAIN)) || (result == 0))
+ {
+ this->OnError(I_ERR_WRITE);
+ this->state = I_ERROR;
+ this->Instance->SE->DelFd(this);
+ this->Close();
+ return true;
+ }
}
- else
+ catch (CoreException& modexcept)
{
- std::string temp = outbuffer[0].substr(result);
- outbuffer[0] = temp;
+ Instance->Log(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))
{
- this->Instance->Log(DEBUG,"Write error on socket: %s",strerror(errno));
- this->OnError(I_ERR_WRITE);
- this->state = I_ERROR;
- return true;
+ /* Send a line */
+ int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
+ 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 == -1) && (errno != EAGAIN))
+ {
+ this->OnError(I_ERR_WRITE);
+ this->state = I_ERROR;
+ this->Instance->SE->DelFd(this);
+ this->Close();
+ return true;
+ }
}
}
}
+
+ if ((errno == EAGAIN) && (fd > -1))
+ {
+ this->Instance->SE->WantWrite(this);
+ }
+
return (fd < 0);
}
void SocketTimeout::Tick(time_t now)
{
if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
- {
- ServerInstance->Log(DEBUG,"No FD or socket ref");
return;
- }
if (this->sock->state == I_CONNECTING)
{
- 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
this->sock->OnTimeout();
this->sock->OnError(I_ERR_TIMEOUT);
this->sock->timeout = true;
- this->sock->state = I_ERROR;
ServerInstance->SE->DelFd(this->sock);
+ /* 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;
this->sock->Close();
delete this->sock;
return;
}
- this->sock->FlushWriteBuffer();
}
bool InspSocket::Poll()
return false;
int incoming = -1;
- bool n = true;
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
return false;
switch (this->state)
{
case I_CONNECTING:
- 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->Instance->SE->AddFd(this))
return false;
}
+ if (Instance->Config->GetIOHook(this))
+ {
+ try
+ {
+ Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd);
+ }
+ catch (CoreException& modexcept)
+ {
+ Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ }
+ }
return this->OnConnected();
break;
case I_LISTENING:
length = sizeof (client);
incoming = accept (this->fd, (sockaddr*)&client,&length);
- this->SetQueues(incoming);
+
#ifdef IPV6
- this->OnIncomingConnection(incoming,(char*)insp_ntoa(client.sin6_addr));
+ this->OnIncomingConnection(incoming, (char*)insp_ntoa(client.sin6_addr));
#else
- this->OnIncomingConnection(incoming,(char*)insp_ntoa(client.sin_addr));
+ this->OnIncomingConnection(incoming, (char*)insp_ntoa(client.sin_addr));
#endif
- return true;
- break;
- case I_CONNECTED:
- if (this->WaitingForWriteEvent)
+ if (this->IsIOHooked)
{
- /* Switch back to read events */
- this->Instance->SE->DelFd(this);
- this->WaitingForWriteEvent = false;
- if (!this->Instance->SE->AddFd(this))
- return false;
-
- /* Trigger the write event */
- n = this->OnWriteReady();
- }
- else
- {
- /* Process the read event */
- n = this->OnDataReady();
+ try
+ {
+#ifdef IPV6
+ Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, insp_ntoa(client.sin6_addr), this->port);
+#else
+ Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, insp_ntoa(client.sin_addr), this->port);
+#endif
+ }
+ catch (CoreException& modexcept)
+ {
+ Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ }
}
- /* 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;
+
+ this->SetQueues(incoming);
+ return true;
+ break;
+ case I_CONNECTED:
+ /* Process the read event */
+ return this->OnDataReady();
break;
default:
break;
void InspSocket::SetState(InspSocketState s)
{
- this->Instance->Log(DEBUG,"Socket state change");
this->state = s;
}
this->Close();
}
-void InspSocket::HandleEvent(EventType et)
+void InspSocket::HandleEvent(EventType et, int errornum)
{
- if (!this->Poll())
+ switch (et)
{
- this->Instance->SE->DelFd(this);
- this->Close();
- delete this;
+ case EVENT_ERROR:
+ this->Instance->SE->DelFd(this);
+ this->Close();
+ delete this;
+ return;
+ break;
+ case EVENT_READ:
+ if (!this->Poll())
+ {
+ this->Instance->SE->DelFd(this);
+ this->Close();
+ delete this;
+ return;
+ }
+ break;
+ case EVENT_WRITE:
+ if (this->WaitingForWriteEvent)
+ {
+ this->WaitingForWriteEvent = false;
+ if (!this->OnWriteReady())
+ {
+ this->Instance->SE->DelFd(this);
+ this->Close();
+ delete this;
+ return;
+ }
+ }
+ 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
+ * InspSocket used to work regarding write buffering in previous
+ * versions of InspIRCd. - Brain
+ */
+ this->HandleEvent(EVENT_READ);
+ return;
+ }
+ else
+ {
+ if (this->FlushWriteBuffer())
+ {
+ this->Instance->SE->DelFd(this);
+ this->Close();
+ delete this;
+ return;
+ }
+ }
+ break;
}
}
projects / user / henk / code / inspircd.git / blobdiff