publish "JSON-RPC" interface

[user/henk/code/inspircd.git] / src / userprocess.cpp

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 52beeb0d57a39ca7a1872bedf4618c78a50c1350..b27844fb6c654917a53fac8e407dae769cf3bb58 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -112,12 +112,12 @@ void InspIRCd::ProcessUser(userrec* cu)
 
                                        current->lines_in++;
 
-                                       if (current->lines_in > current->flood)
+                                       if (current->flood && current->lines_in > current->flood)
                                                FloodQuitUser(current);
                                        else
                                        {
                                                current->WriteServ("NOTICE %s :Your previous line was too long and was not delivered (Over %d chars) Please shorten it.", current->nick, MAXBUF-2);
-                                               current->recvq = "";
+                                               current->recvq.clear();
                                        }
                                }
                                else
@@ -135,7 +135,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                        current->lines_in = 0;
                                }
 
-                               if (++current->lines_in > current->flood)
+                               if (++current->lines_in > current->flood && current->flood)
                                {
                                        FloodQuitUser(current);
                                        return;
@@ -186,7 +186,7 @@ void InspIRCd::ProcessUser(userrec* cu)
        }
        else if (result == 0)
        {
-               cu->SetWriteError("Client exited");
+               cu->SetWriteError("Connection closed");
                return;
        }
 }
@@ -274,9 +274,10 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                        {
                                                /* Everybody loves boobies. */
                                                time_t time = this->Time(false) - (curr->nping - curr->pingmax);
-                                               std::string boobies = "Ping timeout: " + ConvToStr(time) + " second" + (time > 1 ? "s" : "");
+                                               char message[MAXBUF];
+                                               snprintf(message, MAXBUF, "Ping timeout: %ld second%s", time, time > 1 ? "s" : "");
                                                curr->muted = true;
-                                               GlobalCulls.AddItem(curr, boobies);
+                                               GlobalCulls.AddItem(curr, message);
                                                curr->lastping = 1;
                                                curr->nping = TIME+curr->pingmax;
                                                continue;