From bcc3e538236fdccc784f4d37449028315fbbc2f8 Mon Sep 17 00:00:00 2001 From: brain Date: Sun, 15 Jan 2006 12:59:45 +0000 Subject: Made InspSocket::Read return an empty but non-NULL string when it receives EAGAIN (this method didnt know how to cope with EAGAIN before, may be causing random splits?) git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2792 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree.cpp | 6 +++++- src/socket.cpp | 11 +++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index 8071f8828..292c92756 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -1246,7 +1246,8 @@ class TreeSocket : public InspSocket virtual bool OnDataReady() { char* data = this->Read(); - if (data) + /* Check that the data read is a valid pointer and it has some content */ + if (data && *data) { this->in_buffer += data; /* While there is at least one new line in the buffer, @@ -1295,6 +1296,9 @@ class TreeSocket : public InspSocket } } } + /* EAGAIN returns an empty but non-NULL string, so this + * evaluates to TRUE for EAGAIN but to FALSE for EOF. + */ return (data != NULL); } diff --git a/src/socket.cpp b/src/socket.cpp index 7147c263c..c20291453 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -162,8 +162,15 @@ char* InspSocket::Read() } else { - log(DEBUG,"EOF or error on socket"); - return NULL; + if (n == EAGAIN) + { + return ""; + } + else + { + log(DEBUG,"EOF or error on socket"); + return NULL; + } } } -- cgit v1.2.3