* ---------------------------------------------------
*/
+/* $Core: libIRCDinspsocket */
+
#include "socket.h"
-#include "configreader.h"
#include "inspstring.h"
#include "socketengine.h"
#include "inspircd.h"
using irc::sockets::OpenTCPSocket;
-bool InspSocket::Readable()
+bool BufferedSocket::Readable()
{
return ((this->state != I_CONNECTING) && (this->WaitingForWriteEvent == false));
}
-InspSocket::InspSocket(InspIRCd* SI)
+BufferedSocket::BufferedSocket(InspIRCd* SI)
{
this->Timeout = NULL;
this->state = I_DISCONNECTED;
this->IsIOHooked = false;
}
-InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip)
+BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip)
{
this->Timeout = NULL;
this->fd = newfd;
this->Instance->SE->AddFd(this);
}
-InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime, const std::string &connectbindip)
+BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime, const std::string &connectbindip)
{
this->cbindip = connectbindip;
this->fd = -1;
else
{
this->state = I_LISTENING;
+ this->port = aport;
if (this->fd > -1)
{
if (!this->Instance->SE->AddFd(this))
ipvalid = false;
}
else
+#endif
{
in_addr n;
if (inet_aton(host,&n) < 1)
ipvalid = false;
}
-#else
- in_addr n;
- if (inet_aton(host,&n) < 1)
- ipvalid = false;
-#endif
if (!ipvalid)
{
- this->Instance->Log(DEBUG,"BUG: Hostname passed to InspSocket, rather than an IP address!");
+ this->Instance->Log(DEBUG,"BUG: Hostname passed to BufferedSocket, 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
timeout_val = maxtime;
if (!this->DoConnect())
{
+ this->OnError(I_ERR_CONNECT);
this->Close();
this->fd = -1;
this->state = I_ERROR;
- this->OnError(I_ERR_CONNECT);
return;
}
}
}
}
-void InspSocket::WantWrite()
+void BufferedSocket::WantWrite()
{
this->Instance->SE->WantWrite(this);
this->WaitingForWriteEvent = true;
}
-void InspSocket::SetQueues(int nfd)
+void BufferedSocket::SetQueues(int nfd)
{
// 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(const std::string &ip)
+bool BufferedSocket::BindAddr(const std::string &ip)
{
ConfigReader Conf(this->Instance);
socklen_t size = sizeof(sockaddr_in);
std::string IP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip;
if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers")
{
- if (!ip.empty() || ((IP != "*") && (IP != "127.0.0.1") && (IP != "") && (IP != "::1")))
+ if (!ip.empty() || ((IP != "*") && (IP != "127.0.0.1") && (!IP.empty()) && (IP != "::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* s = new sockaddr[2];
#ifdef IPV6
if (v6)
in6_addr n;
if (inet_pton(AF_INET6, IP.c_str(), &n) > 0)
{
- memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(n));
+ 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
+#endif
{
in_addr n;
if (inet_aton(IP.c_str(), &n) > 0)
continue;
}
}
-#else
- in_addr n;
- if (insp_aton(IP.c_str(), &n) > 0)
- {
- ((sockaddr_in*)s)->sin_addr = n;
- ((sockaddr_in*)s)->sin_port = 0;
- ((sockaddr_in*)s)->sin_family = AF_INET;
- }
- else
- {
- delete[] s;
- j++;
- continue;
- }
-#endif
- if (bind(this->fd, s, size) < 0)
+ if (Instance->SE->Bind(this->fd, s, size) < 0)
{
this->state = I_ERROR;
this->OnError(I_ERR_BIND);
return true;
}
-bool InspSocket::DoConnect()
+bool BufferedSocket::DoConnect()
{
+ /* 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
}
}
else
+#endif
{
this->fd = socket(AF_INET, SOCK_STREAM, 0);
if (this->fd > -1)
}
}
}
-#else
- this->fd = socket(AF_INET, SOCK_STREAM, 0);
- if (this->fd > -1)
- {
- if (!this->BindAddr(this->cbindip))
- {
- delete[] addr;
- return false;
- }
- }
-#endif
if (this->fd == -1)
{
}
}
else
+#endif
{
in_addr addy;
if (inet_aton(this->host, &addy) > 0)
((sockaddr_in*)addr)->sin_port = htons(this->port);
}
}
-#else
- 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);
- }
-#endif
- 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*)addr, size) == -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)
{
}
-void InspSocket::Close()
+void BufferedSocket::Close()
{
/* Save this, so we dont lose it,
* otherise on failure, error messages
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;
}
-std::string InspSocket::GetIP()
+std::string BufferedSocket::GetIP()
{
return this->IP;
}
-char* InspSocket::Read()
+char* BufferedSocket::Read()
{
- if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+ if (!Instance->SE->BoundsCheckFd(this))
return NULL;
int n = 0;
}
}
-void InspSocket::MarkAsClosed()
+void BufferedSocket::MarkAsClosed()
{
}
// It will either write all of the data, or an undefined amount.
// If an undefined amount is written the connection has failed
// and should be aborted.
-int InspSocket::Write(const std::string &data)
+int BufferedSocket::Write(const std::string &data)
{
/* Try and append the data to the back of the queue, and send it on its way
*/
return (!this->FlushWriteBuffer());
}
-bool InspSocket::FlushWriteBuffer()
+bool BufferedSocket::FlushWriteBuffer()
{
errno = 0;
if ((this->fd > -1) && (this->state == I_CONNECTED))
{
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())
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->Timeout = NULL;
}
-bool InspSocket::Poll()
+bool BufferedSocket::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);
break;
case I_LISTENING:
{
+ /* 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;
if ((!*this->host) || strchr(this->host, ':'))
length = sizeof(sockaddr_in6);
#endif
- incoming = accept (this->fd, client, &length);
+ incoming = Instance->SE->Accept(this, client, &length);
#ifdef IPV6
if ((!*this->host) || strchr(this->host, ':'))
{
recvip = inet_ntop(AF_INET6, &((sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
}
else
- {
- recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr);
- }
-#else
- recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr);
#endif
+ Instance->SE->NonBlocking(incoming);
+
+ recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr);
this->OnIncomingConnection(incoming, (char*)recvip.c_str());
if (this->IsIOHooked)
return true;
}
-void InspSocket::SetState(InspSocketState s)
+void BufferedSocket::SetState(BufferedSocketState s)
{
this->state = s;
}
-InspSocketState InspSocket::GetState()
+BufferedSocketState BufferedSocket::GetState()
{
return this->state;
}
-int InspSocket::GetFd()
+int BufferedSocket::GetFd()
{
return this->fd;
}
-bool InspSocket::OnConnected() { return true; }
-void InspSocket::OnError(InspSocketError e) { return; }
-int InspSocket::OnDisconnect() { return 0; }
-int InspSocket::OnIncomingConnection(int newfd, char* ip) { return 0; }
-bool InspSocket::OnDataReady() { return true; }
-bool InspSocket::OnWriteReady() { return true; }
-void InspSocket::OnTimeout() { return; }
-void InspSocket::OnClose() { return; }
+bool BufferedSocket::OnConnected() { return true; }
+void BufferedSocket::OnError(BufferedSocketError e) { return; }
+int BufferedSocket::OnDisconnect() { return 0; }
+int BufferedSocket::OnIncomingConnection(int newfd, char* ip) { return 0; }
+bool BufferedSocket::OnDataReady() { return true; }
+bool BufferedSocket::OnWriteReady() { return true; }
+void BufferedSocket::OnTimeout() { return; }
+void BufferedSocket::OnClose() { return; }
-InspSocket::~InspSocket()
+BufferedSocket::~BufferedSocket()
{
this->Close();
if (Timeout)
}
}
-void InspSocket::HandleEvent(EventType et, int errornum)
+void BufferedSocket::HandleEvent(EventType et, int errornum)
{
switch (et)
{
case EVENT_ERROR:
+ 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;
/* 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
+ * BufferedSocket used to work regarding write buffering in previous
* versions of InspIRCd. - Brain
*/
this->HandleEvent(EVENT_READ);
projects / user / henk / code / inspircd.git / blobdiff