fix some things

1 files changed, 18 insertions, 1 deletions

diff --git a/src/client.c b/src/client.c
index 090ffa1..99b90e7 100644
--- a/src/client.c
+++ b/src/client.c
@@ -53,8 +53,23 @@ void __attribute__((format(printf,1,2))) out(const char *fmt, ...)
 
 static volatile sig_atomic_t request_complete;
 
+static int reqs_since_ts;
+static time_t ts = 0;
+
 void send_master(unsigned char cmd, const void *data, size_t sz)
 {
+    time_t t = time(NULL);
+    if(ts != t)
+    {
+        ts = t;
+        reqs_since_ts = 0;
+    }
+    if(reqs_since_ts++ > 10)
+    {
+        out("Rate limit exceeded.\n");
+        return;
+    }
+
     request_complete = 0;
 
     sigset_t block, old;
@@ -105,6 +120,8 @@ tryagain:
         goto tryagain;
     }
 
+    remove_cruft(buf);
+
     return buf;
 }
 
@@ -484,7 +501,7 @@ auth:
         {
             char buf[MSG_MAX];
             char *what = strtok_r(NULL, "", &save);
-            int len = snprintf(buf, sizeof(buf), "%s says %s", current_user, what);
+            int len = snprintf(buf, sizeof(buf), "%s says %s\n", current_user, what);
 
             send_master(REQ_BCASTMSG, buf, len);
         }