From: Nick Porter Date: Wed, 14 Feb 2024 11:22:40 +0000 (+0000) Subject: sqlcounter start and end attributes are by default in the control list X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9ddc568029249d014859daf76f9fdec61b017c0;p=thirdparty%2Ffreeradius-server.git sqlcounter start and end attributes are by default in the control list --- diff --git a/raddb/mods-config/sql/counter/mysql/dailycounter.conf b/raddb/mods-config/sql/counter/mysql/dailycounter.conf index 26f2887dda5..0224659f0ea 100644 --- a/raddb/mods-config/sql/counter/mysql/dailycounter.conf +++ b/raddb/mods-config/sql/counter/mysql/dailycounter.conf @@ -5,10 +5,10 @@ # below # query = "\ - SELECT SUM(acctsessiontime - GREATEST((%{dailycounter-reset-start} - UNIX_TIMESTAMP(acctstarttime)), 0)) \ + SELECT SUM(acctsessiontime - GREATEST((%{control.dailycounter-reset-start} - UNIX_TIMESTAMP(acctstarttime)), 0)) \ FROM radacct \ WHERE username = '%{${key}}' \ - AND UNIX_TIMESTAMP(acctstarttime) + acctsessiontime > '%{dailycounter-reset-start}'" + AND UNIX_TIMESTAMP(acctstarttime) + acctsessiontime > '%{control.dailycounter-reset-start}'" # # This query ignores calls that started in a previous @@ -19,15 +19,15 @@ query = "\ # SELECT SUM(acctsessiontime) \ # FROM radacct \ # WHERE username = '%{${key}}' \ -# AND acctstarttime > FROM_UNIXTIME('%{dailycounter-reset-start}')" +# AND acctstarttime > FROM_UNIXTIME('%{control.dailycounter-reset-start}')" # # This query is the same as above, but demonstrates an -# additional counter parameter '%{dailycounter-reset-end}' which is the +# additional counter parameter '%{control.dailycounter-reset-end}' which is the # timestamp for the end of the period # #query = "\ # SELECT SUM(acctsessiontime) \ # FROM radacct \ # WHERE username = '%{${key}}' \ -# AND acctstarttime BETWEEN FROM_UNIXTIME('%{dailycounter-reset-start}') AND FROM_UNIXTIME('%{dailycounter-reset-end}')" +# AND acctstarttime BETWEEN FROM_UNIXTIME('%{control.dailycounter-reset-start}') AND FROM_UNIXTIME('%{control.dailycounter-reset-end}')" diff --git a/raddb/mods-config/sql/counter/mysql/monthlycounter.conf b/raddb/mods-config/sql/counter/mysql/monthlycounter.conf index 0b77ed191ce..c5bbc23c3da 100644 --- a/raddb/mods-config/sql/counter/mysql/monthlycounter.conf +++ b/raddb/mods-config/sql/counter/mysql/monthlycounter.conf @@ -5,10 +5,10 @@ # below # query = "\ - SELECT SUM(acctsessiontime - GREATEST((%{monthlycounter-reset-start} - UNIX_TIMESTAMP(acctstarttime)), 0)) \ + SELECT SUM(acctsessiontime - GREATEST((%{control.monthlycounter-reset-start} - UNIX_TIMESTAMP(acctstarttime)), 0)) \ FROM radacct \ WHERE username='%{${key}}' \ - AND UNIX_TIMESTAMP(acctstarttime) + acctsessiontime > '%{monthlycounter-reset-start}'" + AND UNIX_TIMESTAMP(acctstarttime) + acctsessiontime > '%{control.monthlycounter-reset-start}'" # # This query ignores calls that started in a previous @@ -19,16 +19,16 @@ query = "\ # SELECT SUM(acctsessiontime) \ # FROM radacct\ # WHERE username='%{${key}}' \ -# AND acctstarttime > FROM_UNIXTIME('%{monthlycounter-reset-start}')" +# AND acctstarttime > FROM_UNIXTIME('%{control.monthlycounter-reset-start}')" # # This query is the same as above, but demonstrates an -# additional counter parameter '%{monthlycounter-reset-end}' which is the +# additional counter parameter '%{control.monthlycounter-reset-end}' which is the # timestamp for the end of the period # #query = "\ # SELECT SUM(acctsessiontime) \ # FROM radacct \ # WHERE username='%{${key}}' \ -# AND acctstarttime BETWEEN FROM_UNIXTIME('%{monthlycounter-reset-start}') \ -# AND FROM_UNIXTIME('%{monthlycounter-reset-end}')" +# AND acctstarttime BETWEEN FROM_UNIXTIME('%{control.monthlycounter-reset-start}') \ +# AND FROM_UNIXTIME('%{control.monthlycounter-reset-end}')" diff --git a/raddb/mods-config/sql/counter/postgresql/dailycounter.conf b/raddb/mods-config/sql/counter/postgresql/dailycounter.conf index e0d3cd657fb..6347291cf20 100644 --- a/raddb/mods-config/sql/counter/postgresql/dailycounter.conf +++ b/raddb/mods-config/sql/counter/postgresql/dailycounter.conf @@ -5,10 +5,10 @@ # below # query = "\ - SELECT SUM(AcctSessionTime - GREATEST((%{dailycounter-reset-start} - EXTRACT(epoch FROM AcctStartTime)), 0)) \ + SELECT SUM(AcctSessionTime - GREATEST((%{control.dailycounter-reset-start} - EXTRACT(epoch FROM AcctStartTime)), 0)) \ FROM radacct \ WHERE UserName='%{${key}}' \ - AND EXTRACT(epoch FROM AcctStartTime) + AcctSessionTime > '%{dailycounter-reset-start}'" + AND EXTRACT(epoch FROM AcctStartTime) + AcctSessionTime > '%{control.dailycounter-reset-start}'" # # This query ignores calls that started in a previous @@ -19,16 +19,16 @@ query = "\ # SELECT SUM(AcctSessionTime) \ # FROM radacct \ # WHERE UserName='%{${key}}' \ -# AND EXTRACT(epoch FROM AcctStartTime) > '%{dailycounter-reset-start}'" +# AND EXTRACT(epoch FROM AcctStartTime) > '%{control.dailycounter-reset-start}'" # # This query is the same as above, but demonstrates an -# additional counter parameter '%{dailycounter-reset-end}' which is the +# additional counter parameter '%{control.dailycounter-reset-end}' which is the # timestamp for the end of the period # #query = "\ # SELECT SUM(AcctSessionTime) \ # FROM radacct \ # WHERE UserName='%{${key}}' \ -# AND EXTRACT(epoch FROM AcctStartTime) BETWEEN '%{dailycounter-reset-start}' \ -# AND '%{dailycounter-reset-end}'" +# AND EXTRACT(epoch FROM AcctStartTime) BETWEEN '%{control.dailycounter-reset-start}' \ +# AND '%{control.dailycounter-reset-end}'" diff --git a/raddb/mods-config/sql/counter/postgresql/monthlycounter.conf b/raddb/mods-config/sql/counter/postgresql/monthlycounter.conf index 92afae4dbeb..9f628d8d46f 100644 --- a/raddb/mods-config/sql/counter/postgresql/monthlycounter.conf +++ b/raddb/mods-config/sql/counter/postgresql/monthlycounter.conf @@ -3,10 +3,10 @@ # involves more work for the SQL server than those # below query = "\ - SELECT SUM(AcctSessionTime - GREATEST((%{monthlycounter-reset-start} - EXTRACT(epoch FROM AcctStartTime)), 0)) \ + SELECT SUM(AcctSessionTime - GREATEST((%{control.monthlycounter-reset-start} - EXTRACT(epoch FROM AcctStartTime)), 0)) \ FROM radacct \ WHERE UserName='%{${key}}' \ - AND EXTRACT(epoch FROM AcctStartTime) + AcctSessionTime > '%{monthlycounter-reset-start}'" + AND EXTRACT(epoch FROM AcctStartTime) + AcctSessionTime > '%{control.monthlycounter-reset-start}'" # # This query ignores calls that started in a previous @@ -17,15 +17,15 @@ query = "\ # SELECT SUM(AcctSessionTime) \ # FROM radacct \ # WHERE UserName='%{${key}}' \ -# AND EXTRACT(epoch FROM AcctStartTime) > '%{monthlycounter-reset-start}'" +# AND EXTRACT(epoch FROM AcctStartTime) > '%{control.monthlycounter-reset-start}'" # # This query is the same as above, but demonstrates an -# additional counter parameter '%{monthlycounter-reset-end}' which is the +# additional counter parameter '%{control.monthlycounter-reset-end}' which is the # timestamp for the end of the period # #query = "\ # SELECT SUM(AcctSessionTime) \ # FROM radacct \ # WHERE UserName='%{${key}}' \ -# AND EXTRACT(epoch FROM AcctStartTime) BETWEEN '%{monthlycounter-reset-start}' AND '%{monthlycounter-reset-end}'" +# AND EXTRACT(epoch FROM AcctStartTime) BETWEEN '%{control.monthlycounter-reset-start}' AND '%{control.monthlycounter-reset-end}'" diff --git a/raddb/mods-config/sql/counter/sqlite/dailycounter.conf b/raddb/mods-config/sql/counter/sqlite/dailycounter.conf index 26283d3a97e..e657dce5c3b 100644 --- a/raddb/mods-config/sql/counter/sqlite/dailycounter.conf +++ b/raddb/mods-config/sql/counter/sqlite/dailycounter.conf @@ -5,10 +5,10 @@ # below # query = "\ - SELECT SUM(acctsessiontime - GREATEST((%{dailycounter-reset-start} - strftime('%%s', acctstarttime)), 0)) \ + SELECT SUM(acctsessiontime - GREATEST((%{control.dailycounter-reset-start} - strftime('%%s', acctstarttime)), 0)) \ FROM radacct \ WHERE username = '%{${key}}' \ - AND (strftime('%%s', acctstarttime) + acctsessiontime) > %{dailycounter-reset-start}" + AND (strftime('%%s', acctstarttime) + acctsessiontime) > %{control.dailycounter-reset-start}" # # This query ignores calls that started in a previous @@ -19,15 +19,15 @@ query = "\ # SELECT SUM(acctsessiontime) \ # FROM radacct \ # WHERE \username = '%{${key}}' \ -# AND acctstarttime > %{dailycounter-reset-start}" +# AND acctstarttime > %{control.dailycounter-reset-start}" # # This query is the same as above, but demonstrates an -# additional counter parameter '%{dailycounter-reset-end}' which is the +# additional counter parameter '%{control.dailycounter-reset-end}' which is the # timestamp for the end of the period # #query = "\ # SELECT SUM(acctsessiontime) FROM radacct \ # WHERE username = '%{${key}}' \ -# AND acctstarttime BETWEEN %{dailycounter-reset-start} \ +# AND acctstarttime BETWEEN %{control.dailycounter-reset-start} \ # AND %{dailycounter-reset-end}" diff --git a/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf b/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf index e1a7ca76491..80fd21166cd 100644 --- a/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf +++ b/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf @@ -5,10 +5,10 @@ # below # query = "\ - SELECT SUM(acctsessiontime - GREATEST((%{monthlycounter-reset-start} - strftime('%%s', acctstarttime)), 0)) \ + SELECT SUM(acctsessiontime - GREATEST((%{control.monthlycounter-reset-start} - strftime('%%s', acctstarttime)), 0)) \ FROM radacct \ WHERE username = '%{${key}}' AND \ - (strftime('%%s', acctstarttime) + acctsessiontime) > %{monthlycounter-reset-start}" + (strftime('%%s', acctstarttime) + acctsessiontime) > %{control.monthlycounter-reset-start}" # # This query ignores calls that started in a previous @@ -19,16 +19,16 @@ query = "\ # SELECT SUM(acctsessiontime) \ # FROM radacct \ # WHERE username = '%{${key}}' \ -# AND acctstarttime > %{monthlycounter-reset-start}" +# AND acctstarttime > %{control.monthlycounter-reset-start}" # # This query is the same as above, but demonstrates an -# additional counter parameter '%{monthlycounter-reset-end}' which is the +# additional counter parameter '%{control.monthlycounter-reset-end}' which is the # timestamp for the end of the period # #query = "\ # SELECT SUM(acctsessiontime) \ # FROM radacct \ # WHERE username = '%{${key}}' \ -# AND acctstarttime BETWEEN %{monthlycounter-reset-start} \ -# AND %{monthlycounter-reset-end}" +# AND acctstarttime BETWEEN %{control.monthlycounter-reset-start} \ +# AND %{control.monthlycounter-reset-end}"