Add DYING link state, push error messages on link, and only limit recvq on unauthenti...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12370 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 1bd02762d5db2eb2bef1f05a7c86e40b19d04e98..4438b473d3298a316bfb146eb89b7816cfdd6679 100644 (file)
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -49,10 +49,11 @@
  * WAIT_AUTH_2:        indicates that the socket is inbound
  *                                                     but has not yet sent and received
  *                                                     SERVER strings.
  * WAIT_AUTH_2:        indicates that the socket is inbound
  *                                                     but has not yet sent and received
  *                                                     SERVER strings.

- * CONNECTED:          represents a fully authorized, fully
+ * CONNECTED:   represents a fully authorized, fully

  *                                                     connected server.
  *                                                     connected server.

+ * DYING:       represents a server that has had an error.

  */
  */

-enum ServerState { CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED };
+enum ServerState { CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED, DYING };

 
 struct CapabData
 {
 
 struct CapabData
 {

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 23d1e46cdfa01b8afbf7586cc62e14f1265ea9f0..ea87c615fb9a989bd32f743269d662d06b8db6fc 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -143,6 +143,8 @@ void TreeSocket::OnError(BufferedSocketError e)
 void TreeSocket::SendError(const std::string &errormessage)
 {
        WriteLine("ERROR :"+errormessage);
 void TreeSocket::SendError(const std::string &errormessage)
 {
        WriteLine("ERROR :"+errormessage);

+       DoWrite();
+       LinkState = DYING;

        SetError(errormessage);
 }
 
        SetError(errormessage);
 }
 


@@ -233,7 +235,7 @@ void TreeSocket::OnDataReady()
                if (!getError().empty())
                        break;
        }
                if (!getError().empty())
                        break;
        }

-       if (getError().empty() && recvq.length() > 4096)
+       if (LinkState != CONNECTED && recvq.length() > 4096)

                SendError("RecvQ overrun (line too long)");
        Utils->Creator->loopCall = false;
 }
                SendError("RecvQ overrun (line too long)");
        Utils->Creator->loopCall = false;
 }

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 3f63da03d6c30643abcd1bae61dc9429b6a81504..aacbbc25f68b9a52b5bc576b3b7e6efb90f94a7b 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -219,6 +219,8 @@ void TreeSocket::ProcessLine(std::string &line)
                         */
                        this->ProcessConnectedLine(prefix, command, params);
                break;
                         */
                        this->ProcessConnectedLine(prefix, command, params);
                break;

+               case DYING:
+               break;

        }
 }
 
        }
 }