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), host(ahost)
{
- this->fd = -1;
- this->host = ahost;
- this->Buffer = "";
+ this->outbuffer.clear();
if (listening) {
if ((this->fd = OpenTCPSocket()) == ERROR)
{
}
else
{
- log(DEBUG,"EOF or error on socket");
+ log(DEBUG,"EOF or error on socket: %s",strerror(errno));
return NULL;
}
}
// 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();
+ /* 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()
{
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;
+ outbuffer[0] = outbuffer[0].substr(result + 1,outbuffer[0].length());
}
}
+ 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 true;
+ }
}
}
+ return false;
}
bool InspSocket::Timeout(time_t current)
this->state = I_ERROR;
return true;
}
- this->FlushWriteBuffer();
- return false;
+ return this->FlushWriteBuffer();
}
bool InspSocket::Poll()
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();
}
-