From: Alan T. DeKok Date: Sun, 2 Aug 2020 12:49:50 +0000 (-0400) Subject: remove stats from old listeners X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa05c9f2eafef60f1d0515586ecbe1f0dedb0d8d;p=thirdparty%2Ffreeradius-server.git remove stats from old listeners since the old listeners are completely unused, this is fine. these changes are part of the general "clean up the server" fixes --- diff --git a/src/lib/server/listen.h b/src/lib/server/listen.h index 6cc6eaa7925..1d6db9cc36c 100644 --- a/src/lib/server/listen.h +++ b/src/lib/server/listen.h @@ -103,10 +103,6 @@ struct rad_listen { CONF_SECTION const *cs; void *data; - -#ifdef WITH_STATS - fr_stats_t stats; -#endif }; #ifdef HAVE_LIBPCAP diff --git a/src/lib/server/stats.c b/src/lib/server/stats.c index 634294c7bc3..5838c3521ae 100644 --- a/src/lib/server/stats.c +++ b/src/lib/server/stats.c @@ -67,10 +67,10 @@ void request_stats_final(REQUEST *request) return; #undef INC_AUTH -#define INC_AUTH(_x) radius_auth_stats._x++;request->listener->stats._x++;request->client->auth._x++; +#define INC_AUTH(_x) radius_auth_stats._x++;request->client->auth._x++; #undef INC_ACCT -#define INC_ACCT(_x) radius_acct_stats._x++;request->listener->stats._x++;request->client->acct._x++ +#define INC_ACCT(_x) radius_acct_stats._x++;request->client->acct._x++ /* * Update the statistics. @@ -96,9 +96,6 @@ void request_stats_final(REQUEST *request) fr_stats_bins(&request->client->auth, request->packet->timestamp, request->reply->timestamp); - fr_stats_bins(&request->listener->stats, - request->packet->timestamp, - request->reply->timestamp); break; case FR_CODE_ACCESS_REJECT: @@ -114,9 +111,6 @@ void request_stats_final(REQUEST *request) fr_stats_bins(&radius_acct_stats, request->packet->timestamp, request->reply->timestamp); - fr_stats_bins(&request->client->acct, - request->packet->timestamp, - request->reply->timestamp); break; /*