change now() back to %S as its more accurate when you run funky things like radrelay

diff --git a/raddb/sql/postgresql-dialup.conf b/raddb/sql/postgresql-dialup.conf
index c6a8ea4..5ad0d4c 100644 (file)
--- a/raddb/sql/postgresql-dialup.conf
+++ b/raddb/sql/postgresql-dialup.conf
@@ -161,11 +161,11 @@
        #######################################################################
 
   accounting_onoff_query = "UPDATE ${acct_table1} \
-    SET AcctStopTime = (now() - '%{Acct-Delay-Time:-0}'::interval), \
-    AcctSessionTime = (EXTRACT(EPOCH FROM (now()::timestamp with time zone - AcctStartTime::timestamp with time zone \
+    SET AcctStopTime = ('%S'::timestamp - '%{Acct-Delay-Time:-0}'::interval), \
+    AcctSessionTime = (EXTRACT(EPOCH FROM ('%S'::timestamp with time zone - AcctStartTime::timestamp with time zone \
     - '%{Acct-Delay-Time:-0}'::interval)))::BIGINT, \
     AcctTerminateCause='%{Acct-Terminate-Cause}', AcctStopDelay = '%{Acct-Delay-Time:-0}' \
-    WHERE AcctSessionTime IS NULL AND AcctStopTime IS NULL AND NASIPAddress= '%{NAS-IP-Address}' AND AcctStartTime <= now()"
+    WHERE AcctSessionTime IS NULL AND AcctStopTime IS NULL AND NASIPAddress= '%{NAS-IP-Address}' AND AcctStartTime <= '%S'::timestamp"
 
   accounting_update_query = "UPDATE ${acct_table1} \
     SET FramedIPAddress = NULLIF('%{Framed-IP-Address}', '')::inet, \
@@ -184,7 +184,7 @@
     VALUES('%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', \
     '%{SQL-User-Name}', '%{Realm}', '%{NAS-IP-Address}', \
     %{NAS-Port:-NULL}::integer, '%{NAS-Port-Type}', \
-    (now() - '%{Acct-Delay-Time:-0}'::interval - '%{Acct-Session-Time:-0}'::interval), \
+    ('%S'::timestamp - '%{Acct-Delay-Time:-0}'::interval - '%{Acct-Session-Time:-0}'::interval), \
     '%{Acct-Session-Time}', '%{Acct-Authentic}', \
     (('%{Acct-Input-Gigawords:-0}'::bigint << 32) + '%{Acct-Input-Octets:-0}'::bigint), \
     (('%{Acct-Output-Gigawords:-0}'::bigint << 32) + '%{Acct-Output-Octets:-0}'::bigint), \
@@ -203,7 +203,7 @@
     '%{NAS-IP-Address}', \
     %{NAS-Port:-NULL}::integer, \
     '%{NAS-Port-Type}', \
-    (now() - '%{Acct-Delay-Time:-0}'::interval), \
+    ('%S'::timestamp - '%{Acct-Delay-Time:-0}'::interval), \
     '%{Acct-Authentic}', \
     '%{Connect-Info}', \
     '%{Called-Station-Id}', \
@@ -215,14 +215,14 @@
     '%{X-Ascend-Session-Svr-Key}')"
 
   accounting_start_query_alt  = "UPDATE ${acct_table1} \
-    SET AcctStartTime = (now() - '%{Acct-Delay-Time:-0}'::interval), AcctStartDelay = '%{Acct-Delay-Time:-0}', \
+    SET AcctStartTime = ('%S'::timestamp - '%{Acct-Delay-Time:-0}'::interval), AcctStartDelay = '%{Acct-Delay-Time:-0}', \
     ConnectInfo_start = '%{Connect-Info}' WHERE AcctSessionId = '%{Acct-Session-Id}' AND UserName = '%{SQL-User-Name}' \
     AND NASIPAddress = '%{NAS-IP-Address}' AND AcctStopTime IS NULL"
 
   accounting_stop_query = "UPDATE ${acct_table2} \
-    SET AcctStopTime = (now() - '%{Acct-Delay-Time:-0}'::interval), \
+    SET AcctStopTime = ('%S'::timestamp - '%{Acct-Delay-Time:-0}'::interval), \
     AcctSessionTime = CASE WHEN '%{Acct-Session-Time}' = '' THEN \
-    (EXTRACT(EPOCH FROM (now()::TIMESTAMP WITH TIME ZONE - AcctStartTime::TIMESTAMP WITH TIME ZONE \
+    (EXTRACT(EPOCH FROM ('%S'::TIMESTAMP WITH TIME ZONE - AcctStartTime::TIMESTAMP WITH TIME ZONE \
     - '%{Acct-Delay-Time:-0}'::INTERVAL)))::BIGINT ELSE '%{Acct-Session-Time}' END, \
     AcctInputOctets = (('%{Acct-Input-Gigawords:-0}'::bigint << 32) + '%{Acct-Input-Octets:-0}'::bigint), \
     AcctOutputOctets = (('%{Acct-Output-Gigawords:-0}'::bigint << 32) + '%{Acct-Output-Octets:-0}'::bigint), \
@@ -236,8 +236,8 @@
     AcctSessionTime, AcctAuthentic, ConnectInfo_stop, AcctInputOctets, AcctOutputOctets, CalledStationId, \
     CallingStationId, AcctTerminateCause, ServiceType, FramedProtocol, FramedIPAddress, AcctStopDelay) \
     values('%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', '%{SQL-User-Name}', '%{Realm}', '%{NAS-IP-Address}', \
-    %{NAS-Port:-NULL}::integer, '%{NAS-Port-Type}', (now() - '%{Acct-Delay-Time:-0}'::interval - '%{Acct-Session-Time:-0}'::interval), \
-    (now() - '%{Acct-Delay-Time:-0}'::interval), NULLIF('%{Acct-Session-Time}', '')::bigint, '%{Acct-Authentic}', \
+    %{NAS-Port:-NULL}::integer, '%{NAS-Port-Type}', ('%S'::timestamp - '%{Acct-Delay-Time:-0}'::interval - '%{Acct-Session-Time:-0}'::interval), \
+    ('%S'::timestamp - '%{Acct-Delay-Time:-0}'::interval), NULLIF('%{Acct-Session-Time}', '')::bigint, '%{Acct-Authentic}', \
     '%{Connect-Info}', (('%{Acct-Input-Gigawords:-0}'::bigint << 32) + '%{Acct-Input-Octets:-0}'::bigint), \
     (('%{Acct-Output-Gigawords:-0}'::bigint << 32) + '%{Acct-Output-Octets:-0}'::bigint), '%{Called-Station-Id}', \
     '%{Calling-Station-Id}', '%{Acct-Terminate-Cause}', '%{Service-Type}', '%{Framed-Protocol}', \