From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 15 Sep 2023 12:33:51 +0000 (-0400)
Subject: clean up handling of Acct-Delay-Time
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa6e8056aeb0a33657fc3cb64ac31b7ccf6a4d58;p=thirdparty%2Ffreeradius-server.git

clean up handling of Acct-Delay-Time

use new edit expressions, and check for sane Event-Timestamp
---

diff --git a/raddb/sites-available/detail b/raddb/sites-available/detail
index e922e4bb95f..68b6852af44 100644
--- a/raddb/sites-available/detail
+++ b/raddb/sites-available/detail
@@ -235,7 +235,13 @@ server detail {
 #  The detail file reader runs the normal RADIUS / DHCP / etc. processing sections.
 #
 recv Accounting-Request {
-	&request.Acct-Delay-Time := "%{expr:%{%{Acct-Delay-Time}:-0} + %c - %(integer:%{%{Event-Timestamp}:-%{Packet-Original-Timestamp}})}"
+	if (!&Event-Timestamp) {
+		&Event-Timestamp := &Packet-Original-Timestamp
+	}
+
+	if (&Event-Timestamp < %c) {
+		&request.Acct-Delay-Time += %c - &Event-Timestamp
+	}
 
 	#
 	#  We handled the packet successfully.  Run the "send ok" section.