{
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 ahost, int aport, bool listening, unsigned long maxtime)
+InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1)
{
- this->fd = -1;
- this->host = ahost;
- this->Buffer = "";
+ strlcpy(host,ahost.c_str(),MAXBUF);
+ this->ClosePending = false;
if (listening) {
if ((this->fd = OpenTCPSocket()) == ERROR)
{
this->fd = -1;
this->state = I_ERROR;
this->OnError(I_ERR_SOCKET);
+ this->ClosePending = true;
log(DEBUG,"OpenTCPSocket() error");
return;
}
else
{
- if (BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()) == ERROR)
+ if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str()))
{
this->Close();
this->fd = -1;
this->state = I_ERROR;
this->OnError(I_ERR_BIND);
+ this->ClosePending = true;
log(DEBUG,"BindSocket() error %s",strerror(errno));
return;
}
}
else
{
- this->host = ahost;
+ 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);
}
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;
+ this->ClosePending = true;
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);
{
log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno));
this->OnError(I_ERR_CONNECT);
- this->state = I_ERROR;
this->Close();
+ this->state = I_ERROR;
+ this->fd = -1;
+ this->ClosePending = true;
return false;
}
}
shutdown(this->fd,2);
close(this->fd);
socket_ref[this->fd] = NULL;
+ this->ClosePending = true;
this->fd = -1;
}
}
}
}
+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)
{
- try
- {
- if ((data != "") && (this->Buffer.length() + data.length() < this->Buffer.max_size()))
- this->Buffer.append(data);
- }
- catch (std::length_error)
- {
- log(DEBUG,"std::length_error exception caught while appending to socket buffer!");
- return 0;
- }
- 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());
}
bool InspSocket::FlushWriteBuffer()
{
+ if (this->ClosePending)
+ return true;
+
if ((this->fd > -1) && (this->state == I_CONNECTED))
{
- int result = 0, v = 0;
- const char* n = Buffer.c_str();
- v = Buffer.length();
- if (v > 0)
+ if (outbuffer.size())
{
- result = write(this->fd,n,v);
+ int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
if (result > 0)
{
- if (result == v)
+ if ((unsigned int)result == outbuffer[0].length())
{
- Buffer = "";
+ /* The whole block was written (usually a line)
+ * Pop the block off the front of the queue
+ */
+ outbuffer.pop_front();
}
else
{
- /* If we wrote some, advance the buffer forwards */
- n += result;
- Buffer = n;
+ std::string temp = outbuffer[0].substr(result);
+ outbuffer[0] = temp;
}
}
- else if (result == -1)
+ else if ((result == -1) && (errno != EAGAIN))
{
log(DEBUG,"Write error on socket: %s",strerror(errno));
this->OnError(I_ERR_WRITE);
this->state = I_ERROR;
- return false;
+ return true;
}
}
}
- 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");
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:
* Both FlushWriteBuffer AND the return result of OnDataReady must
* return true for this to be ok.
*/
- return (n && this->FlushWriteBuffer());
+ return (n && !this->FlushWriteBuffer());
break;
default:
break;
{
this->Close();
}
-
projects / user / henk / code / inspircd.git / blobdiff