#include <sstream>
#include <iostream>
#include <fstream>
+#include <stdexcept>
#include "socket.h"
#include "inspircd.h"
#include "inspircd_io.h"
{
this->state = I_DISCONNECTED;
this->fd = -1;
+ this->ClosePending = false;
}
InspSocket::InspSocket(int newfd, char* ip)
{
this->fd = newfd;
this->state = I_CONNECTED;
- this->IP = ip;
+ strlcpy(this->IP,ip,MAXBUF);
+ this->ClosePending = false;
ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
socket_ref[this->fd] = this;
}
-InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime)
+InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1)
{
- this->fd = -1;
+ strlcpy(host,ahost.c_str(),MAXBUF);
+ this->ClosePending = false;
if (listening) {
if ((this->fd = OpenTCPSocket()) == ERROR)
{
}
else
{
- if (BindSocket(this->fd,this->client,this->server,port,(char*)host.c_str()) == ERROR)
+ if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()))
{
this->Close();
this->fd = -1;
}
else
{
- this->host = host;
- this->port = port;
+ strlcpy(this->host,ahost.c_str(),MAXBUF);
+ this->port = aport;
- if (!inet_aton(host.c_str(),&addy))
+ if (!inet_aton(host,&addy))
{
- log(DEBUG,"Attempting to resolve %s",this->host.c_str());
+ log(DEBUG,"Attempting to resolve %s",this->host);
/* Its not an ip, spawn the resolver */
this->dns.SetNS(std::string(Config->DNSServer));
this->dns.ForwardLookupWithFD(host,fd);
- timeout_end = time(NULL)+maxtime;
+ timeout_end = time(NULL) + maxtime;
timeout = false;
this->state = I_RESOLVING;
socket_ref[this->fd] = this;
}
else
{
- log(DEBUG,"No need to resolve %s",this->host.c_str());
- this->IP = host;
+ log(DEBUG,"No need to resolve %s",this->host);
+ strlcpy(this->IP,host,MAXBUF);
+ timeout_end = time(NULL) + maxtime;
this->DoConnect();
}
}
if (res_ip != "")
{
log(DEBUG,"Socket result set to %s",res_ip.c_str());
- this->IP = res_ip;
+ strlcpy(this->IP,res_ip.c_str(),MAXBUF);
socket_ref[this->fd] = NULL;
}
else
this->Close();
this->state = I_ERROR;
this->OnError(I_ERR_RESOLVE);
+ this->fd = -1;
return false;
}
return this->DoConnect();
log(DEBUG,"Cant socket()");
this->state = I_ERROR;
this->OnError(I_ERR_SOCKET);
+ this->fd = -1;
return false;
}
- log(DEBUG,"Part 2 DoConnect() %s",this->IP.c_str());
- inet_aton(this->IP.c_str(),&addy);
+ log(DEBUG,"Part 2 DoConnect() %s",this->IP);
+ inet_aton(this->IP,&addy);
addr.sin_family = AF_INET;
addr.sin_addr = addy;
addr.sin_port = htons(this->port);
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 (connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
{
if (errno != EINPROGRESS)
{
this->OnError(I_ERR_CONNECT);
this->state = I_ERROR;
this->Close();
+ this->fd = -1;
return false;
}
}
ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE);
socket_ref[this->fd] = this;
this->SetQueues(this->fd);
+ log(DEBUG,"Returning true from InspSocket::DoConnect");
return true;
}
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
return NULL;
int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);
- if ((n > 0) && (n <= sizeof(this->ibuf)))
+ if ((n > 0) && (n <= (int)sizeof(this->ibuf)))
{
ibuf[n] = 0;
return ibuf;
}
else
{
- log(DEBUG,"EOF or error on socket");
+ log(DEBUG,"EOF or error on socket: %s",strerror(errno));
return NULL;
}
}
}
+void InspSocket::MarkAsClosed()
+{
+ log(DEBUG,"Marked as closed");
+ this->ClosePending = true;
+}
+
// There are two possible outcomes to this function.
// 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(std::string data)
+int InspSocket::Write(const std::string &data)
{
- this->Buffer.append(data);
- return data.length();
+ if (this->ClosePending)
+ return false;
+
+ int result = write(this->fd,data.c_str(),data.length());
+ if (result < 1)
+ return false;
+ return true;
+
+ /* Try and append the data to the back of the queue, and send it on its way
+ */
+ //outbuffer.push_back(data);
+ //return (!this->FlushWriteBuffer());
}
-void InspSocket::FlushWriteBuffer()
+bool InspSocket::FlushWriteBuffer()
{
- int result = 0;
- if (this->Buffer.length())
+ if (this->ClosePending)
+ return true;
+
+ /*if ((this->fd > -1) && (this->state == I_CONNECTED))
{
- result = send(this->fd,this->Buffer.c_str(),this->Buffer.length(),0);
- if (result > 0)
+ if (outbuffer.size())
{
- if (result == (int)this->Buffer.length())
+ log(DEBUG,"Writing %d to socket",outbuffer.size());
+ int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
+ if (result > 0)
{
- this->Buffer = "";
+ log(DEBUG,"Wrote %d to socket",result);
+ if ((unsigned int)result == outbuffer[0].length())
+ {
+ * The whole block was written (usually a line)
+ * Pop the block off the front of the queue
+ *
+ log(DEBUG,"Popping front item, now %d items left",outbuffer.size());
+ outbuffer.pop_front();
+ }
+ else
+ {
+ log(DEBUG,"Cutting front item");
+ std::string temp = outbuffer[0].substr(result);
+ outbuffer[0] = temp;
+ log(DEBUG,"Front item is now: ",outbuffer[0].c_str());
+ }
}
- else
+ else if ((result == -1) && (errno != EAGAIN))
{
- /* If we wrote some, advance the buffer forwards */
- char* n = (char*)this->Buffer.c_str();
- n += result;
- this->Buffer = n;
+ log(DEBUG,"Write error on socket: %s",strerror(errno));
+ this->OnError(I_ERR_WRITE);
+ this->state = I_ERROR;
+ return true;
}
}
- }
+ }*/
+ return false;
}
bool InspSocket::Timeout(time_t current)
{
+ if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
+ {
+ log(DEBUG,"No FD or socket ref");
+ return false;
+ }
+
+ if (this->ClosePending)
+ {
+ log(DEBUG,"Close is pending");
+ return true;
+ }
+
if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end))
{
+ log(DEBUG,"Timed out, current=%lu timeout_end=%lu");
// for non-listening sockets, the timeout can occur
// which causes termination of the connection after
// the given number of seconds without a successful
this->state = I_ERROR;
return true;
}
- this->FlushWriteBuffer();
- return false;
+ return this->FlushWriteBuffer();
}
bool InspSocket::Poll()
{
+ if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd))
+ return false;
+
int incoming = -1;
bool n = true;
-
+
+ if ((fd < 0) || (fd > MAX_DESCRIPTORS) || (this->ClosePending))
+ return false;
+
switch (this->state)
{
case I_RESOLVING:
return this->DoResolve();
break;
case I_CONNECTING:
- log(DEBUG,"State = I_CONNECTED");
+ log(DEBUG,"State = I_CONNECTING");
this->SetState(I_CONNECTED);
/* Our socket was in write-state, so delete it and re-add it
* in read-state.
case I_CONNECTED:
n = this->OnDataReady();
/* Flush any pending, but not till after theyre done with the event
- * so there are less write calls involved. */
- this->FlushWriteBuffer();
- return n;
+ * so there are less write calls involved.
+ * Both FlushWriteBuffer AND the return result of OnDataReady must
+ * return true for this to be ok.
+ */
+ return (n && !this->FlushWriteBuffer());
break;
default:
break;
{
this->Close();
}
-