*/
#include "socket.h"
-#include "configreader.h"
#include "inspstring.h"
#include "socketengine.h"
#include "inspircd.h"
using irc::sockets::OpenTCPSocket;
-using irc::sockets::insp_inaddr;
-using irc::sockets::insp_sockaddr;
bool InspSocket::Readable()
{
InspSocket::InspSocket(InspIRCd* SI)
{
+ this->Timeout = NULL;
this->state = I_DISCONNECTED;
this->fd = -1;
this->WaitingForWriteEvent = false;
InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip)
{
+ this->Timeout = NULL;
this->fd = newfd;
this->state = I_CONNECTED;
strlcpy(this->IP,ip,MAXBUF);
this->Instance->SE->AddFd(this);
}
-InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime)
+InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime, const std::string &connectbindip)
{
+ this->cbindip = connectbindip;
this->fd = -1;
this->Instance = SI;
strlcpy(host,ipaddr.c_str(),MAXBUF);
this->WaitingForWriteEvent = false;
this->IsIOHooked = false;
+ this->Timeout = NULL;
if (listening)
{
- if ((this->fd = OpenTCPSocket()) == ERROR)
+ if ((this->fd = OpenTCPSocket(host)) == ERROR)
{
this->fd = -1;
this->state = I_ERROR;
}
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->Close();
this->fd = -1;
else
{
this->state = I_LISTENING;
+ this->port = aport;
if (this->fd > -1)
{
if (!this->Instance->SE->AddFd(this))
}
return;
}
- }
+ }
}
else
{
strlcpy(this->host,ipaddr.c_str(),MAXBUF);
this->port = aport;
- if (insp_aton(host,&addy) < 1)
+ bool ipvalid = true;
+#ifdef IPV6
+ if (strchr(host,':'))
+ {
+ in6_addr n;
+ if (inet_pton(AF_INET6, host, &n) < 1)
+ ipvalid = false;
+ }
+ else
+#endif
+ {
+ in_addr n;
+ if (inet_aton(host,&n) < 1)
+ ipvalid = false;
+ }
+ if (!ipvalid)
{
this->Instance->Log(DEBUG,"BUG: Hostname passed to InspSocket, rather than an IP address!");
+ this->OnError(I_ERR_CONNECT);
this->Close();
this->fd = -1;
this->state = I_ERROR;
- this->OnError(I_ERR_RESOLVE);
return;
}
else
{
strlcpy(this->IP,host,MAXBUF);
timeout_val = maxtime;
- this->DoConnect();
+ if (!this->DoConnect())
+ {
+ this->OnError(I_ERR_CONNECT);
+ this->Close();
+ this->fd = -1;
+ this->state = I_ERROR;
+ return;
+ }
}
}
}
// 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(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf)) || setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf)))
+ this->Instance->Log(DEFAULT, "Could not increase SO_SNDBUF/SO_RCVBUF for socket %u", GetFd());
}
/* Most irc servers require you to specify the ip you want to bind to.
* This is easier to configure when you have a lot of links and a lot
* of servers to configure.
*/
-bool InspSocket::BindAddr()
+bool InspSocket::BindAddr(const std::string &ip)
{
- insp_inaddr n;
ConfigReader Conf(this->Instance);
- for (int j =0; j < Conf.Enumerate("bind"); j++)
+ socklen_t size = sizeof(sockaddr_in);
+#ifdef IPV6
+ bool v6 = false;
+ /* Are we looking for a binding to fit an ipv6 host? */
+ if ((ip.empty()) || (ip.find(':') != std::string::npos))
+ v6 = true;
+#endif
+ int j = 0;
+ while (j < Conf.Enumerate("bind") || (!ip.empty()))
{
- std::string Type = Conf.ReadValue("bind","type",j);
- std::string IP = Conf.ReadValue("bind","address",j);
- if (Type == "servers")
+ std::string IP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip;
+ if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers")
{
- if ((IP != "*") && (IP != "127.0.0.1") && (IP != "") && (IP != "::1"))
+ if (!ip.empty() || ((IP != "*") && (IP != "127.0.0.1") && (!IP.empty()) && (IP != "::1")))
{
- insp_sockaddr s;
-
- if (insp_aton(IP.c_str(),&n) > 0)
- {
+ /* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */
+ sockaddr* s = new sockaddr[2];
#ifdef IPV6
- memcpy(&s.sin6_addr, &n, sizeof(n));
- s.sin6_family = AF_FAMILY;
-#else
- s.sin_addr = n;
- s.sin_family = AF_FAMILY;
+ if (v6)
+ {
+ in6_addr n;
+ if (inet_pton(AF_INET6, IP.c_str(), &n) > 0)
+ {
+ memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(sockaddr_in6));
+ ((sockaddr_in6*)s)->sin6_port = 0;
+ ((sockaddr_in6*)s)->sin6_family = AF_INET6;
+ size = sizeof(sockaddr_in6);
+ }
+ else
+ {
+ delete[] s;
+ j++;
+ continue;
+ }
+ }
+ else
#endif
- if (bind(this->fd,(struct sockaddr*)&s,sizeof(s)) < 0)
+ {
+ in_addr n;
+ if (inet_aton(IP.c_str(), &n) > 0)
{
- this->state = I_ERROR;
- this->OnError(I_ERR_BIND);
- this->fd = -1;
- return false;
+ ((sockaddr_in*)s)->sin_addr = n;
+ ((sockaddr_in*)s)->sin_port = 0;
+ ((sockaddr_in*)s)->sin_family = AF_INET;
}
- return true;
+ else
+ {
+ delete[] s;
+ j++;
+ continue;
+ }
+ }
+
+ if (Instance->SE->Bind(this->fd, s, size) < 0)
+ {
+ this->state = I_ERROR;
+ this->OnError(I_ERR_BIND);
+ this->fd = -1;
+ delete[] s;
+ return false;
}
+
+ delete[] s;
+ return true;
}
}
+ j++;
}
return true;
}
bool InspSocket::DoConnect()
{
- if ((this->fd = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1)
+ /* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */
+ sockaddr* addr = new sockaddr[2];
+ socklen_t size = sizeof(sockaddr_in);
+#ifdef IPV6
+ bool v6 = false;
+ if ((!*this->host) || strchr(this->host, ':'))
+ v6 = true;
+
+ if (v6)
+ {
+ this->fd = socket(AF_INET6, SOCK_STREAM, 0);
+ if ((this->fd > -1) && ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP)))
+ {
+ if (!this->BindAddr(this->cbindip))
+ {
+ delete[] addr;
+ return false;
+ }
+ }
+ }
+ else
+#endif
+ {
+ this->fd = socket(AF_INET, SOCK_STREAM, 0);
+ if (this->fd > -1)
+ {
+ if (!this->BindAddr(this->cbindip))
+ {
+ delete[] addr;
+ return false;
+ }
+ }
+ }
+
+ if (this->fd == -1)
{
this->state = I_ERROR;
this->OnError(I_ERR_SOCKET);
+ delete[] addr;
return false;
}
- if ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP))
+#ifdef IPV6
+ if (v6)
{
- if (!this->BindAddr())
- return false;
+ in6_addr addy;
+ if (inet_pton(AF_INET6, this->host, &addy) > 0)
+ {
+ ((sockaddr_in6*)addr)->sin6_family = AF_INET6;
+ memcpy(&((sockaddr_in6*)addr)->sin6_addr, &addy, sizeof(addy));
+ ((sockaddr_in6*)addr)->sin6_port = htons(this->port);
+ size = sizeof(sockaddr_in6);
+ }
}
-
- insp_aton(this->IP,&addy);
-#ifdef IPV6
- addr.sin6_family = AF_FAMILY;
- memcpy(&addr.sin6_addr, &addy, sizeof(addy));
- addr.sin6_port = htons(this->port);
-#else
- addr.sin_family = AF_FAMILY;
- addr.sin_addr = addy;
- addr.sin_port = htons(this->port);
+ else
#endif
+ {
+ in_addr addy;
+ if (inet_aton(this->host, &addy) > 0)
+ {
+ ((sockaddr_in*)addr)->sin_family = AF_INET;
+ ((sockaddr_in*)addr)->sin_addr = addy;
+ ((sockaddr_in*)addr)->sin_port = htons(this->port);
+ }
+ }
- int flags = fcntl(this->fd, F_GETFL, 0);
- fcntl(this->fd, F_SETFL, flags | O_NONBLOCK);
+ Instance->SE->NonBlocking(this->fd);
- if (connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
+#ifdef WIN32
+ /* UGH for the LOVE OF ZOMBIE JESUS SOMEONE FIX THIS!!!!!!!!!!! */
+ Instance->SE->Blocking(this->fd);
+#endif
+
+ if (Instance->SE->Connect(this, (sockaddr*)addr, size) == -1)
{
if (errno != EINPROGRESS)
{
this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, timeout_val, this->Instance->Time());
this->Instance->Timers->AddTimer(this->Timeout);
}
+#ifdef WIN32
+ /* CRAQ SMOKING STUFF TO BE FIXED */
+ Instance->SE->NonBlocking(this->fd);
+#endif
this->state = I_CONNECTING;
if (this->fd > -1)
{
int save = errno;
if (this->fd > -1)
{
- if (this->IsIOHooked && Instance->Config->GetIOHook(this))
+ if (this->IsIOHooked && Instance->Config->GetIOHook(this))
{
try
{
Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
}
}
- this->OnClose();
- shutdown(this->fd,2);
- close(this->fd);
+ Instance->SE->Shutdown(this, 2);
+ if (Instance->SE->Close(this) != -1)
+ this->OnClose();
+
+ if (Instance->SocketCull.find(this) == Instance->SocketCull.end())
+ Instance->SocketCull[this] = this;
}
errno = save;
}
char* InspSocket::Read()
{
- if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+ if (!Instance->SE->BoundsCheckFd(this))
return NULL;
int n = 0;
{
try
{
- 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;
- }
+ /* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
+ * implement their own buffering mechanisms
+ */
+ Instance->Config->GetIOHook(this)->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length());
+ outbuffer.pop_front();
}
catch (CoreException& modexcept)
{
while (outbuffer.size() && (errno != EAGAIN))
{
/* Send a line */
- int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
+ int result = Instance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0);
+
if (result > 0)
{
- if ((unsigned int)result == outbuffer[0].length())
+ if ((unsigned int)result >= outbuffer[0].length())
{
/* The whole block was written (usually a line)
* Pop the block off the front of the queue,
errno = EAGAIN;
}
}
+ else if (result == 0)
+ {
+ this->Instance->SE->DelFd(this);
+ this->Close();
+ return true;
+ }
else if ((result == -1) && (errno != EAGAIN))
{
this->OnError(I_ERR_WRITE);
this->sock->OnTimeout();
this->sock->OnError(I_ERR_TIMEOUT);
this->sock->timeout = true;
- 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;
+
+ if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end())
+ ServerInstance->SocketCull[this->sock] = this->sock;
}
+
+ this->sock->Timeout = NULL;
}
bool InspSocket::Poll()
{
- if (this->Instance->SE->GetRef(this->fd) != this)
- return false;
-
int incoming = -1;
- if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+#ifndef WINDOWS
+ if (!Instance->SE->BoundsCheckFd(this))
+ return false;
+#endif
+
+ if (Instance->SE->GetRef(this->fd) != this)
return false;
switch (this->state)
/* 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);
- this->SetState(I_CONNECTED);
if (!this->Instance->SE->AddFd(this))
return false;
}
+#endif
+ this->SetState(I_CONNECTED);
+
if (Instance->Config->GetIOHook(this))
{
+ Instance->Log(DEBUG,"Hook for raw connect");
try
{
Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd);
return this->OnConnected();
break;
case I_LISTENING:
- length = sizeof (client);
- incoming = accept (this->fd, (sockaddr*)&client,&length);
-
+ {
+ /* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */
+ sockaddr* client = new sockaddr[2];
+ length = sizeof (sockaddr_in);
+ std::string recvip;
#ifdef IPV6
- this->OnIncomingConnection(incoming, (char*)insp_ntoa(client.sin6_addr));
-#else
- this->OnIncomingConnection(incoming, (char*)insp_ntoa(client.sin_addr));
+ if ((!*this->host) || strchr(this->host, ':'))
+ length = sizeof(sockaddr_in6);
#endif
+ incoming = Instance->SE->Accept(this, client, &length);
+#ifdef IPV6
+ if ((!*this->host) || strchr(this->host, ':'))
+ {
+ char buf[1024];
+ recvip = inet_ntop(AF_INET6, &((sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
+ }
+ else
+#endif
+ Instance->SE->NonBlocking(incoming);
+
+ recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr);
+ this->OnIncomingConnection(incoming, (char*)recvip.c_str());
if (this->IsIOHooked)
{
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
+ Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, recvip.c_str(), this->port);
}
catch (CoreException& modexcept)
{
}
this->SetQueues(incoming);
+
+ delete[] client;
return true;
+ }
break;
case I_CONNECTED:
/* Process the read event */
InspSocket::~InspSocket()
{
this->Close();
+ if (Timeout)
+ {
+ Instance->Timers->DelTimer(Timeout);
+ Timeout = NULL;
+ }
}
void InspSocket::HandleEvent(EventType et, int errornum)
switch (et)
{
case EVENT_ERROR:
- this->Instance->SE->DelFd(this);
- this->Close();
- delete this;
+ 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->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
+ this->Instance->SocketCull[this] = this;
return;
break;
case EVENT_READ:
if (!this->Poll())
{
- this->Instance->SE->DelFd(this);
- this->Close();
- delete this;
+ if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
+ this->Instance->SocketCull[this] = this;
return;
}
break;
this->WaitingForWriteEvent = false;
if (!this->OnWriteReady())
{
- this->Instance->SE->DelFd(this);
- this->Close();
- delete this;
+ if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
+ this->Instance->SocketCull[this] = this;
return;
}
}
{
if (this->FlushWriteBuffer())
{
- this->Instance->SE->DelFd(this);
- this->Close();
- delete this;
+ if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())
+ this->Instance->SocketCull[this] = this;
return;
}
}
projects / user / henk / code / inspircd.git / blobdiff