hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2015-11-02 15:53:01 +01:00
commit 4889abb64e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/socket.cpp
View file

@ -70,6 +70,7 @@ void Socket::Buffer::append(const char * newdata, const unsigned int newdatasize
} }
} }
if (i != j) { if (i != j) {
DONTEVEN_MSG("Adding a block of size %d", j-i);
data.push_front(std::string(newdata + i, (size_t)(j - i))); data.push_front(std::string(newdata + i, (size_t)(j - i)));
i = j; i = j;
} else { } else {
@ -77,7 +78,7 @@ void Socket::Buffer::append(const char * newdata, const unsigned int newdatasize
} }
} }
if (data.size() > 5000) { if (data.size() > 5000) {
DEBUG_MSG(DLVL_WARN, "Warning: After %d new bytes, buffer has %d parts!", newdatasize, (int)data.size()); DEBUG_MSG(DLVL_WARN, "Warning: After %d new bytes, buffer has %d parts containing over %u bytes!", newdatasize, (int)data.size(), bytes(9000));
} }
} }
@ -95,6 +96,7 @@ void Socket::Buffer::prepend(const char * newdata, const unsigned int newdatasiz
/// Returns true if at least count bytes are available in this buffer. /// Returns true if at least count bytes are available in this buffer.
bool Socket::Buffer::available(unsigned int count) { bool Socket::Buffer::available(unsigned int count) {
size();
unsigned int i = 0; unsigned int i = 0;
for (std::deque<std::string>::iterator it = data.begin(); it != data.end(); ++it) { for (std::deque<std::string>::iterator it = data.begin(); it != data.end(); ++it) {
i += (*it).size(); i += (*it).size();
@ -108,6 +110,7 @@ bool Socket::Buffer::available(unsigned int count) {
/// Removes count bytes from the buffer, returning them by value. /// Removes count bytes from the buffer, returning them by value.
/// Returns an empty string if not all count bytes are available. /// Returns an empty string if not all count bytes are available.
std::string Socket::Buffer::remove(unsigned int count) { std::string Socket::Buffer::remove(unsigned int count) {
size();
if (!available(count)) { if (!available(count)) {
return ""; return "";
} }
@ -131,6 +134,7 @@ std::string Socket::Buffer::remove(unsigned int count) {
/// Copies count bytes from the buffer, returning them by value. /// Copies count bytes from the buffer, returning them by value.
/// Returns an empty string if not all count bytes are available. /// Returns an empty string if not all count bytes are available.
std::string Socket::Buffer::copy(unsigned int count) { std::string Socket::Buffer::copy(unsigned int count) {
size();
if (!available(count)) { if (!available(count)) {
return ""; return "";
} }
@ -151,6 +155,7 @@ std::string Socket::Buffer::copy(unsigned int count) {
/// Gets a reference to the back of the internal std::deque of std::string objects. /// Gets a reference to the back of the internal std::deque of std::string objects.
std::string & Socket::Buffer::get() { std::string & Socket::Buffer::get() {
size();
static std::string empty; static std::string empty;
if (data.size() > 0) { if (data.size() > 0) {
return data.back(); return data.back();