* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
BufferedSocketError BufferedSocket::BeginConnect(const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip)
{
irc::sockets::sockaddrs addr, bind;
- if (!irc::sockets::aptosa(ipaddr, aport, &addr))
+ if (!irc::sockets::aptosa(ipaddr, aport, addr))
{
ServerInstance->Logs->Log("SOCKET", DEBUG, "BUG: Hostname passed to BufferedSocket, rather than an IP address!");
return I_ERR_CONNECT;
bind.sa.sa_family = 0;
if (!connectbindip.empty())
{
- if (!irc::sockets::aptosa(connectbindip, 0, &bind))
+ if (!irc::sockets::aptosa(connectbindip, 0, bind))
{
return I_ERR_BIND;
}
if (bind.sa.sa_family != 0)
{
- if (ServerInstance->SE->Bind(fd, &bind.sa, sa_size(bind)) < 0)
+ if (ServerInstance->SE->Bind(fd, bind) < 0)
return I_ERR_BIND;
}
errno = save;
}
-bool StreamSocket::cull()
+CullResult StreamSocket::cull()
{
Close();
- return true;
+ return EventHandler::cull();
}
bool StreamSocket::GetNextLine(std::string& line, char delim)
std::string::size_type i = recvq.find(delim);
if (i == std::string::npos)
return false;
- line = recvq.substr(0, i - 1);
+ line = recvq.substr(0, i);
// TODO is this the most efficient way to split?
recvq = recvq.substr(i + 1);
return true;
else if (rv > 0)
{
// Partial write. Clean out strings from the sendq
+ if (rv < rv_max)
+ {
+ // it's going to block now
+ eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
+ }
sendq_len -= rv;
while (rv > 0 && !sendq.empty())
{
rv = 0;
}
}
- if (rv < rv_max)
- {
- // it's going to block now
- eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
- }
}
else if (rv == 0)
{
else if (errno == EINTR)
{
// restart interrupted syscall
+ errno = 0;
}
else
{
if (!error.empty())
return;
BufferedSocketError errcode = I_ERR_OTHER;
- switch (et)
- {
- case EVENT_ERROR:
+ try {
+ switch (et)
{
- if (errornum == 0)
- SetError("Connection closed");
- else
- SetError(strerror(errornum));
- switch (errornum)
+ case EVENT_ERROR:
{
- case ETIMEDOUT:
- errcode = I_ERR_TIMEOUT;
- break;
- case ECONNREFUSED:
- case 0:
- errcode = I_ERR_CONNECT;
- break;
- case EADDRINUSE:
- errcode = I_ERR_BIND;
- break;
- case EPIPE:
- case EIO:
- errcode = I_ERR_WRITE;
- break;
+ if (errornum == 0)
+ SetError("Connection closed");
+ else
+ SetError(strerror(errornum));
+ switch (errornum)
+ {
+ case ETIMEDOUT:
+ errcode = I_ERR_TIMEOUT;
+ break;
+ case ECONNREFUSED:
+ case 0:
+ errcode = I_ERR_CONNECT;
+ break;
+ case EADDRINUSE:
+ errcode = I_ERR_BIND;
+ break;
+ case EPIPE:
+ case EIO:
+ errcode = I_ERR_WRITE;
+ break;
+ }
+ break;
+ }
+ case EVENT_READ:
+ {
+ DoRead();
+ break;
+ }
+ case EVENT_WRITE:
+ {
+ DoWrite();
+ break;
}
- break;
- }
- case EVENT_READ:
- {
- DoRead();
- break;
- }
- case EVENT_WRITE:
- {
- DoWrite();
- break;
}
}
+ catch (CoreException& ex)
+ {
+ ServerInstance->Logs->Log("SOCKET", ERROR, "Caught exception in socket processing on FD %d - '%s'",
+ fd, ex.GetReason());
+ SetError(ex.GetReason());
+ }
if (!error.empty())
{
ServerInstance->Logs->Log("SOCKET", DEBUG, "Error on FD %d - '%s'", fd, error.c_str());
OnError(errcode);
- ServerInstance->GlobalCulls.AddItem(this);
}
}