[l2tpns-devel] Small patch to include number of throttled users via uptime command

[Steve C. <sc...@wc...>]

Hi all,

The patch below changes the output of the uptime CLI command to include
the number of throttled sessions in brackets after the total number of
users like this:

14:18:18 up 9 days, 23:29, 4188(132) users, load average: 0.45, 0.44,
0.38
Bandwidth: UDP-ETH:20/18  ETH-UDP:117/105  TOTAL:260.3   IN:10049
OUT:19440

We use the two figures to produce a stacked rrdtool graph of our cluster
showing active users.

Regards,

Steve.
--

--- cli.c.orig  2006-08-16 11:03:08.000000000 +1000
+++ cli.c       2006-08-16 11:09:50.000000000 +1000
@@ -1783,7 +1783,7 @@
 {
        FILE *fh;
        char buf[100], *p =3D buf, *loads[3];
-       int i, num_sessions =3D 0;
+       int i, num_sessions =3D 0, num_throttled_sessions =3D 0;

        if (CLI_HELP_REQUESTED)
                return CLI_HELP_NO_ARGS;
@@ -1798,13 +1798,15 @@
        time(&time_now);
        strftime(buf, 99, "%H:%M:%S", localtime(&time_now));

-       for (i =3D 1; i < MAXSESSION; i++)
+       for (i =3D 1; i < MAXSESSION; i++) {
                if (session[i].opened) num_sessions++;
+               if (session[i].throttle_out) num_throttled_sessions++;
+       }

-       cli_print(cli, "%s up %s, %d users, load average: %s, %s, %s",
+       cli_print(cli, "%s up %s, %d(%d) users, load average: %s, %s,
%s",
                        buf,
                        duration(time_now - config->start_time),
-                       num_sessions,
+                       num_sessions, num_throttled_sessions,
                        loads[0], loads[1], loads[2]
        );
        for (i =3D 0; i < 3; i++)=20