From bac7dea75b15323bb678ed56ca54606ee92c0afd Mon Sep 17 00:00:00 2001 From: brain Date: Mon, 23 May 2005 18:28:42 +0000 Subject: Buffer size limits (hard coded to 1mb for now, will allow to raise in config later) git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1478 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/connection.cpp | 5 +++-- src/servers.cpp | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/connection.cpp b/src/connection.cpp index 7d5df66f9..c7221ce74 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -117,7 +117,7 @@ void ircd_connector::SetServerPort(int p) this->port = p; } -void ircd_connector::AddBuffer(std::string a) +bool ircd_connector::AddBuffer(std::string a) { std::string b = ""; for (int i = 0; i < a.length(); i++) @@ -128,6 +128,7 @@ void ircd_connector::AddBuffer(std::string a) stream << b; log(DEBUG,"AddBuffer: %s",b.c_str()); ircdbuffer = stream.str(); + return (ircdbuffer.length() < 1048576); } bool ircd_connector::BufferIsComplete() @@ -170,7 +171,7 @@ bool ircd_connector::AddWriteBuf(std::string data) std::stringstream stream; stream << sendq << data; sendq = stream.str(); - return true; + return (sendq.length() < 1048576); } bool ircd_connector::HasBufferedOutput() diff --git a/src/servers.cpp b/src/servers.cpp index d2ace18e8..15929345f 100644 --- a/src/servers.cpp +++ b/src/servers.cpp @@ -392,7 +392,12 @@ bool serverrec::RecvPacket(std::deque &messages, char* recvhost,std int pushed = 0; if (rcvsize > 0) { - this->connectors[i].AddBuffer(data); + if (!this->connectors[i].AddBuffer(data)) + { + WriteOpers("*** Read buffer for %s exceeds maximum, closing connection!",this->connectors[i].GetServerName().c_str()); + this->connectors[i].CloseConnection(); + this->connectors[i].SetState(STATE_DISCONNECTED); + } if (this->connectors[i].BufferIsComplete()) { while (this->connectors[i].BufferIsComplete()) -- cgit v1.2.3