diff options
| -rw-r--r-- | include/socket.h | 3 | ||||
| -rw-r--r-- | src/socket.cpp | 35 | ||||
| -rw-r--r-- | src/socketengine.cpp | 6 |
3 files changed, 18 insertions, 26 deletions
diff --git a/include/socket.h b/include/socket.h index 861d4be79..584c37b93 100644 --- a/include/socket.h +++ b/include/socket.h @@ -23,6 +23,7 @@ #include <sstream> #include <string> #include "dns.h" +#include <deque> /** * States which a socket may be in @@ -114,7 +115,7 @@ private: /** * The output buffer for this socket */ - std::string Buffer; + std::deque<std::string> outbuffer; /** * The IP address being connected diff --git a/src/socket.cpp b/src/socket.cpp index 6ea91a83f..923ca5848 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -63,7 +63,7 @@ InspSocket::InspSocket(std::string ahost, int aport, bool listening, unsigned lo { this->fd = -1; this->host = ahost; - this->Buffer = ""; + this->outbuffer.clear(); if (listening) { if ((this->fd = OpenTCPSocket()) == ERROR) { @@ -244,40 +244,31 @@ char* InspSocket::Read() // and should be aborted. int InspSocket::Write(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()); } 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)) diff --git a/src/socketengine.cpp b/src/socketengine.cpp index cec51c5d3..3df9c2135 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -201,7 +201,7 @@ int SocketEngine::Wait(int* fdlist) } tval.tv_sec = 0; - tval.tv_usec = 100L; + tval.tv_usec = 50L; sresult = select(FD_SETSIZE, &rfdset, &wfdset, NULL, &tval); if (sresult > 0) { @@ -213,14 +213,14 @@ int SocketEngine::Wait(int* fdlist) } #endif #ifdef USE_KQUEUE - ts.tv_nsec = 10000L; + ts.tv_nsec = 5000L; ts.tv_sec = 0; int i = kevent(EngineHandle, NULL, 0, &ke_list[0], MAX_DESCRIPTORS, &ts); for (int j = 0; j < i; j++) fdlist[result++] = ke_list[j].ident; #endif #ifdef USE_EPOLL - int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 100); + int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 50); for (int j = 0; j < i; j++) fdlist[result++] = events[j].data.fd; #endif |