From 6f621b90b12731a46f3ff10292eb7a919c9aaf6e Mon Sep 17 00:00:00 2001
From: Christopher Wellons <wellons@nullprogram.com>
Date: Fri, 12 Apr 2019 18:46:53 -0400
Subject: [PATCH] Tweak SIGUSR1 statistics totals logging

* Don't dynamically allocate the struct since that's not necessary.
* Use a more concise log message.
* Include current clients when counting the time.
* Print final statistics message *after* closing all clients.
* Don't include total connections in ACCEPT.
* Mention SIGUSR1 in the new man page, too.

Adjusts #24.
---
 README.md  |  2 +-
 endlessh.1 |  6 +++---
 endlessh.c | 49 +++++++++++++++++++++++++++----------------------
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index d12e902..d8e43c9 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ write a complete, consistent log.
 
 A SIGHUP signal requests a reload of the configuration file (`-f`).
 
-A SIGUSR1 signal will print connections stats to standard output.
+A SIGUSR1 signal will print connections stats to the log.
 
 ## Sample Configuration File
 
diff --git a/endlessh.1 b/endlessh.1
index 790fadc..70634a0 100644
--- a/endlessh.1
+++ b/endlessh.1
@@ -70,9 +70,9 @@ If
 receives the SIGTERM signal it will gracefully shut
 down the daemon, allowing it to write a complete, consistent log.
 .Pp
-A SIGHUP signal requests
-.Nm
-a reload of its configuration file.
+A SIGHUP signal requests a reload of its configuration file.
+.Pp
+A SIGUSR1 signal will print connections stats to the log.
 .Sh FILES
 .Bl -tag -width /etc/endlessh/config -compact
 .It Pa /etc/endlessh/config
diff --git a/endlessh.c b/endlessh.c
index cbefd0d..c6337f4 100644
--- a/endlessh.c
+++ b/endlessh.c
@@ -67,6 +67,12 @@ logmsg(enum loglevel level, const char *format, ...)
     }
 }
 
+struct {
+    long long connects;
+    long long milliseconds;
+    long long bytes_sent;
+} statistics;
+
 struct client {
     char ipaddr[INET6_ADDRSTRLEN];
     long long connect_time;
@@ -77,14 +83,6 @@ struct client {
     int fd;
 };
 
-struct stats {
-    long long connects;
-    long long bytes_wasted;
-    long long time_wasted;
-};
-
-struct stats *s;
-
 static struct client *
 client_new(int fd, long long send_next)
 {
@@ -138,11 +136,24 @@ client_destroy(struct client *client)
             client->ipaddr, client->port, client->fd,
             dt / 1000, dt % 1000,
             client->bytes_sent);
-    s->time_wasted += dt / 1000;
+    statistics.milliseconds += dt;
     close(client->fd);
     free(client);
 }
 
+static void
+statistics_log_totals(struct client *clients)
+{
+    long long milliseconds = statistics.milliseconds;
+    for (long long now = epochms(); clients; clients = clients->next)
+        milliseconds += now - clients->connect_time;
+    logmsg(LOG_INFO, "TOTALS connects=%lld seconds=%lld.%lld bytes=%lld",
+           statistics.connects,
+           milliseconds / 1000,
+           milliseconds % 1000,
+           statistics.bytes_sent);
+}
+
 struct fifo {
     struct client *head;
     struct client *tail;
@@ -569,7 +580,7 @@ sendline(struct client *client, int max_line_length, unsigned long *rng)
             }
         } else {
             client->bytes_sent += out;
-            s->bytes_wasted += out;
+            statistics.bytes_sent += out;
             return client;
         }
     }
@@ -583,11 +594,6 @@ main(int argc, char **argv)
     const char *config_file = DEFAULT_CONFIG_FILE;
     config_load(&config, config_file, 1);
 
-    s = malloc(sizeof(*s));
-    s->connects = 0;
-    s->bytes_wasted = 0;
-    s->time_wasted = 0;
-
     int option;
     while ((option = getopt(argc, argv, "46d:f:hl:m:p:vV")) != -1) {
         switch (option) {
@@ -682,8 +688,7 @@ main(int argc, char **argv)
         }
         if (dumpstats) {
             /* print stats requested (SIGUSR1) */
-            logmsg(LOG_INFO, "Connections received in total: %lld\tWasted seconds total: %lld\tWasted bytes total: %lld",
-                    s->connects, s->time_wasted, s->bytes_wasted);
+            statistics_log_totals(fifo->head);
             dumpstats = 0;
         }
 
@@ -724,7 +729,7 @@ main(int argc, char **argv)
         if (fds.revents & POLLIN) {
             int fd = accept(server, 0, 0);
             logmsg(LOG_DEBUG, "accept() = %d", fd);
-            s->connects++;
+            statistics.connects++;
             if (fd == -1) {
                 const char *msg = strerror(errno);
                 switch (errno) {
@@ -756,13 +761,13 @@ main(int argc, char **argv)
                     close(fd);
                 }
                 fifo_append(fifo, client);
-                logmsg(LOG_INFO, "ACCEPT host=%s port=%d fd=%d n=%d/%d/%lld",
+                logmsg(LOG_INFO, "ACCEPT host=%s port=%d fd=%d n=%d/%d",
                         client->ipaddr, client->port, client->fd,
-                        fifo->length, config.max_clients, s->connects);
+                        fifo->length, config.max_clients);
             }
         }
     }
-    logmsg(LOG_INFO, "Connections received in total: %lld\tWasted seconds total: %lld\tWasted bytes total: %lld",
-			s->connects, s->time_wasted, s->bytes_wasted);
+
     fifo_destroy(fifo);
+    statistics_log_totals(0);
 }