pppoe: encapsulate statistics counters

Group the PPPoE statistics in struct pppoe_stat_t and keep the storage private to pppoe.c instead of exporting writable counter globals through pppoe.h.  The CLI now reads a snapshot with pppoe_stat_get(), while the packet/control paths update the counters through the PPPoE-owned storage using relaxed atomic operations.

Convert the PPPoE SNMP starting/active scalars from watched raw pointers to scalar handlers.  This removes the old pppoe_get_stat() pointer escape hatch and makes SNMP read the counters through pppoe_stat_starting() and pppoe_stat_active(), so the synchronization policy is applied consistently outside the PPPoE module.

This also fixes the long-standing PPPoE starting counter behavior.  PPPoE used to expose starting in the CLI and ACCEL-PPP-MIB, but never updated it, so it always reported zero.  Track a per-connection ppp_starting state, increment starting when the controller begins channel setup, move the session from starting to active after establish_ppp() succeeds, and decrement starting on setup failure before PPP becomes active.  This matches the state accounting used by the other PPP controllers.

Signed-off-by: Denys Fedoryshchenko <denys.f@collabora.com>

1 files changed, 13 insertions, 9 deletions

diff --git a/accel-pppd/ctrl/pppoe/cli.c b/accel-pppd/ctrl/pppoe/cli.c
index d8399543..453c0cf3 100644
--- a/accel-pppd/ctrl/pppoe/cli.c
+++ b/accel-pppd/ctrl/pppoe/cli.c
@@ -88,16 +88,20 @@ help:
 
 static int show_stat_exec(const char *cmd, char * const *fields, int fields_cnt, void *client)
 {
+	struct pppoe_stat_t stat;
+
+	pppoe_stat_get(&stat);
+
 	cli_send(client, "pppoe:\r\n");
-	cli_sendv(client, "  starting: %u\r\n", stat_starting);
-	cli_sendv(client, "  active: %u\r\n", stat_active);
-	cli_sendv(client, "  delayed PADO: %u\r\n", stat_delayed_pado);
-	cli_sendv(client, "  recv PADI: %lu\r\n", stat_PADI_recv);
-	cli_sendv(client, "  drop PADI: %lu\r\n", stat_PADI_drop);
-	cli_sendv(client, "  sent PADO: %lu\r\n", stat_PADO_sent);
-	cli_sendv(client, "  recv PADR(dup): %lu(%lu)\r\n", stat_PADR_recv, stat_PADR_dup_recv);
-	cli_sendv(client, "  sent PADS: %lu\r\n", stat_PADS_sent);
-	cli_sendv(client, "  filtered: %lu\r\n", stat_filtered);
+	cli_sendv(client, "  starting: %u\r\n", stat.starting);
+	cli_sendv(client, "  active: %u\r\n", stat.active);
+	cli_sendv(client, "  delayed PADO: %u\r\n", stat.delayed_PADO);
+	cli_sendv(client, "  recv PADI: %lu\r\n", stat.PADI_recv);
+	cli_sendv(client, "  drop PADI: %lu\r\n", stat.PADI_drop);
+	cli_sendv(client, "  sent PADO: %lu\r\n", stat.PADO_sent);
+	cli_sendv(client, "  recv PADR(dup): %lu(%lu)\r\n", stat.PADR_recv, stat.PADR_dup_recv);
+	cli_sendv(client, "  sent PADS: %lu\r\n", stat.PADS_sent);
+	cli_sendv(client, "  filtered: %lu\r\n", stat.filtered);
 
 	return CLI_CMD_OK;
 }