Implement ringWrite

4 files changed, 44 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 9c1e805..4ebdd0c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ LDLIBS = -ltls
 OBJS += bounce.o
 OBJS += client.o
 OBJS += listen.o
+OBJS += ring.o
 OBJS += server.o
 OBJS += state.o
 
diff --git a/bounce.h b/bounce.h
index f63d884..38f86c8 100644
--- a/bounce.h
+++ b/bounce.h
@@ -79,3 +79,5 @@ void clientFormat(struct Client *client, const char *format, ...)
 bool stateReady(void);
 void stateParse(char *line);
 void stateSync(struct Client *client);
+
+void ringWrite(const char *line);
diff --git a/ring.c b/ring.c
new file mode 100644
index 0000000..40fb7df
--- /dev/null
+++ b/ring.c
@@ -0,0 +1,40 @@
+/* Copyright (C) 2019  C. McEnroe <june@causal.agency>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <assert.h>
+#include <err.h>
+#include <stdlib.h>
+#include <sysexits.h>
+#include <time.h>
+
+#include "bounce.h"
+
+enum { RingLen = 4096 };
+static_assert(!(RingLen & (RingLen - 1)), "power of two RingLen");
+
+static struct {
+	char *lines[RingLen];
+	time_t times[RingLen];
+	size_t write;
+} ring;
+
+void ringWrite(const char *line) {
+	size_t i = ring.write++ % RingLen;
+	if (ring.lines[i]) free(ring.lines[i]);
+	ring.times[i] = time(NULL);
+	ring.lines[i] = strdup(line);
+	if (!ring.lines[i]) err(EX_OSERR, "strdup");
+}
diff --git a/server.c b/server.c
index 5e23a71..5bdef6b 100644
--- a/server.c
+++ b/server.c
@@ -185,7 +185,7 @@ void serverRecv(void) {
 			line[1] = 'O';
 			serverFormat("%s\r\n", line);
 		} else {
-			// TODO: Add line to ring if stateReady().
+			if (stateReady()) ringWrite(line);
 			stateParse(line);
 		}