Store X-Ascend-Session-Svr-Key in DB

diff --git a/raddb/sql/mssql-dialup.conf b/raddb/sql/mssql-dialup.conf
index a3cfe3b..70d4492 100644 (file)
--- a/raddb/sql/mssql-dialup.conf
+++ b/raddb/sql/mssql-dialup.conf
@@ -75,11 +75,14 @@
 
        accounting_update_query = "UPDATE ${acct_table1} SET FramedIPAddress = '%{Framed-IP-Address}' WHERE AcctSessionId = '%{Acct-Session-Id}' AND UserName = '%{SQL-User-Name}' AND NASIPAddress= '%{NAS-IP-Address}' AND AcctStopTime = 0"
 
-       accounting_update_query_alt = "INSERT into ${acct_table1} (AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, NASPort, NASPortType, AcctSessionTime, AcctAuthentic, ConnectInfo_start, AcctInputOctets, AcctOutputOctets, CalledStationId, CallingStationId, ServiceType, FramedProtocol, FramedIPAddress, AcctStartDelay) values('%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', '%{SQL-User-Name}', '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port-Id}', '%{NAS-Port-Type}', '%{Acct-Session-Time}', '%{Acct-Authentic}', '', '%{Acct-Input-Octets}', '%{Acct-Output-Octets}', '%{Called-Station-Id}', '%{Calling-Station-Id}', '%{Service-Type}', '%{Framed-Protocol}', '%{Framed-IP-Address}', '0')"
+        accounting_update_query_alt = "INSERT into ${acct_table1} (AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, NASPort, NASPortType, AcctSessionTime, AcctAuthentic, ConnectInfo_start, AcctInputOctets, AcctOutputOctets, CalledStationId, CallingStationId, ServiceType, FramedProtocol
+, FramedIPAddress, AcctStartDelay, XAscendSessionSvrKey) \                                          VALUES('%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', '%{SQL-User-Name}', '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port-Id}', '%{NAS-Port-Type}', '%{Acct-Session-Time}', '%{Acct-Authentic}', '',
+ '%{Acct-Input-Octets}', '%{Acct-Output-Octets}', '%{Called-Station-Id}', '%{Calling-Station-Id}', '%{Service-Type}', '%{Framed-Protocol}', '%{Framed-IP-Address}', '0', '%{X-Ascend-Session-Svr-Key}')"
 
        # accounting_start_query: Inserting of RadAcctId and AcctStopTime was
        # removed. These fields are processing by a database
-       accounting_start_query = "INSERT into ${acct_table1} (AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, NASPort, NASPortType, AcctStartTime, AcctSessionTime, AcctAuthentic, ConnectInfo_start, ConnectInfo_stop, AcctInputOctets, AcctOutputOctets, CalledStationId, CallingStationId, AcctTerminateCause, ServiceType, FramedProtocol, FramedIPAddress, AcctStartDelay, AcctStopDelay) values('%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', '%{SQL-User-Name}', '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port-Id}', '%{NAS-Port-Type}', '%S', '0', '%{Acct-Authentic}', '%{Connect-Info}', '', '0', '0', '%{Called-Station-Id}', '%{Calling-Station-Id}', '', '%{Service-Type}', '%{Framed-Protocol}', '%{Framed-IP-Address}', '%{Acct-Delay-Time:-0}', '0')"
+        accounting_start_query = "INSERT into ${acct_table1} (AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, NASPort, NASPortType, AcctStartTime, AcctSessionTime, AcctAuthentic, ConnectInfo_start, ConnectInfo_stop, AcctInputOctets, AcctOutputOctets, CalledStationId, CallingStationId, AcctTerminateCause, ServiceType, FramedProtocol, FramedIPAddress, AcctStartDelay, AcctStopDelay, XAscendSessionSvrKey) \
+ VALUES('%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', '%{SQL-User-Name}', '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port-Id}', '%{NAS-Port-Type}', '%S', '0', '%{Acct-Authentic}', '%{Connect-Info}', '', '0', '0', '%{Called-Station-Id}', '%{Calling-Station-Id}', '', '%{Service-Type}', '%{Framed-Protocol}', '%{Framed-IP-Address}', '%{Acct-Delay-Time}', '0', '%{X-Ascend-Session-Svr-Key}')"
 
        accounting_start_query_alt  = "UPDATE ${acct_table1} SET AcctStartTime = '%S', 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 = 0"
 

diff --git a/raddb/sql/mysql-dialup.conf b/raddb/sql/mysql-dialup.conf
index 6c8e8e0..c8b01dc 100644 (file)
--- a/raddb/sql/mysql-dialup.conf
+++ b/raddb/sql/mysql-dialup.conf
@@ -168,7 +168,7 @@
              AcctAuthentic,    ConnectInfo_start, AcctInputOctets, \
              AcctOutputOctets, CalledStationId,   CallingStationId, \
              ServiceType,      FramedProtocol,    FramedIPAddress, \
-             AcctStartDelay) \
+             AcctStartDelay,   XAscendSessionSvrKey) \
           VALUES \
             ('%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', \
              '%{SQL-User-Name}', \
@@ -186,7 +186,7 @@
              '%{Called-Station-Id}', '%{Calling-Station-Id}', \
              '%{Service-Type}', '%{Framed-Protocol}', \
              '%{Framed-IP-Address}', \
-             '0')"
+             '0', '%{X-Ascend-Session-Svr-Key}')"
 
        accounting_start_query = " \
           INSERT INTO ${acct_table1} \
@@ -197,7 +197,7 @@
              ConnectInfo_stop, AcctInputOctets,  AcctOutputOctets, \
              CalledStationId,  CallingStationId, AcctTerminateCause, \
              ServiceType,      FramedProtocol,   FramedIPAddress, \
-             AcctStartDelay,   AcctStopDelay) \
+             AcctStartDelay,   AcctStopDelay,    XAscendSessionSvrKey) \
           VALUES \
             ('%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', \
              '%{SQL-User-Name}', \
@@ -207,7 +207,7 @@
              '', '0', '0', \
              '%{Called-Station-Id}', '%{Calling-Station-Id}', '', \
              '%{Service-Type}', '%{Framed-Protocol}', '%{Framed-IP-Address}', \
-             '%{%{Acct-Delay-Time}:-0}', '0')"
+             '%{%{Acct-Delay-Time}:-0}', '0', '%{X-Ascend-Session-Svr-Key}')"
 
        accounting_start_query_alt  = " \
           UPDATE ${acct_table1} SET \

diff --git a/raddb/sql/oracle-dialup.conf b/raddb/sql/oracle-dialup.conf
index 35ffe6d..b63e574 100644 (file)
--- a/raddb/sql/oracle-dialup.conf
+++ b/raddb/sql/oracle-dialup.conf
@@ -106,17 +106,27 @@
 accounting_update_query = "UPDATE ${acct_table1} \
     SET FramedIPAddress = NULLIF('%{Framed-IP-Address}', ''), \
     AcctSessionTime = '%{Acct-Session-Time}', \
-    AcctInputOctets = '%{Acct-Input-Octets}', \
-    AcctOutputOctets = '%{Acct-Output-Octets}' \
+    AcctInputOctets     = '%{%{Acct-Input-Gigawords}:-0}'  << 32 | \
+                          '%{%{Acct-Input-Octets}:-0}', \
+    AcctOutputOctets    = '%{%{Acct-Output-Gigawords}:-0}' << 32 | \
+                          '%{%{Acct-Output-Octets}:-0}' \
     WHERE \
     AcctSessionId = '%{Acct-Session-Id}' AND \
     UserName = '%{SQL-User-Name}' AND \
     NASIPAddress= '%{NAS-IP-Address}' AND \
     AcctStopTime IS NULL" 
 
-       accounting_update_query_alt = "INSERT into ${acct_table1} (RadAcctId, AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, NASPortId, NASPortType, AcctStartTime, AcctSessionTime, AcctAuthentic, ConnectInfo_start, AcctInputOctets, AcctOutputOctets, CalledStationId, CallingStationId, ServiceType, FramedProtocol, FramedIPAddress, AcctStartDelay) values('', '%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', '%{SQL-User-Name}', '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port-Id}', '%{NAS-Port-Type}', NULL, '%{Acct-Session-Time}', '%{Acct-Authentic}', '', '%{Acct-Input-Octets}', '%{Acct-Output-Octets}', '%{Called-Station-Id}', '%{Calling-Station-Id}', '%{Service-Type}', '%{Framed-Protocol}', '%{Framed-IP-Address}', '0')"
-
-       accounting_start_query = "INSERT into ${acct_table1} (RadAcctId, AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, NASPortId, NASPortType, AcctStartTime, AcctStopTime, AcctSessionTime, AcctAuthentic, ConnectInfo_start, ConnectInfo_stop, AcctInputOctets, AcctOutputOctets, CalledStationId, CallingStationId, AcctTerminateCause, ServiceType, FramedProtocol, FramedIPAddress, AcctStartDelay, AcctStopDelay) values('', '%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', '%{SQL-User-Name}', '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port-Id}', '%{NAS-Port-Type}', TO_DATE('%S','yyyy-mm-dd hh24:mi:ss'), NULL, '0', '%{Acct-Authentic}', '%{Connect-Info}', '', '0', '0', '%{Called-Station-Id}', '%{Calling-Station-Id}', '', '%{Service-Type}', '%{Framed-Protocol}', '%{Framed-IP-Address}', '%{Acct-Delay-Time:-0}', '0')"
+accounting_update_query_alt = "INSERT into ${acct_table1} (RadAcctId, AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, NASPortId, NASPortType, AcctStartTime, AcctSessionTime, AcctAuthentic, ConnectInfo_start, AcctInputOctets, AcctOutputOctets, CalledStationId, CallingStationId, ServiceType, FramedProtocol, FramedIPAddress, AcctStartDelay, XAscendSessionSvrKey) \
+    VALUES('', '%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', \
+    '%{SQL-User-Name}', '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port-Id}', \
+    '%{NAS-Port-Type}', NULL, '%{Acct-Session-Time}', '%{Acct-Authentic}', '', \
+    '%{%{Acct-Input-Gigawords}:-0}' << 32 | '%{%{Acct-Input-Octets}:-0}', \
+    '%{%{Acct-Output-Gigawords}:-0}' << 32 | '%{%{Acct-Output-Octets}:-0}', \
+    '%{Called-Station-Id}', '%{Calling-Station-Id}', '%{Service-Type}', \
+    '%{Framed-Protocol}', '%{Framed-IP-Address}', '0', '%{X-Ascend-Session-Svr-Key}')"
+
+        accounting_start_query = "INSERT into ${acct_table1} (RadAcctId, AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, NASPortId, NASPortType, AcctStartTime, AcctStopTime, AcctSessionTime, AcctAuthentic, ConnectInfo_start, ConnectInfo_stop, AcctInputOctets, AcctOutputOctets, CalledStationId, CallingStationId, AcctTerminateCause, ServiceType, FramedProtocol, FramedIPAddress, AcctStartDelay, AcctStopDelay, XAscendSessionSvrKey) \
+ VALUES('', '%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', '%{SQL-User-Name}', '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port-Id}', '%{NAS-Port-Type}', TO_DATE('%S','yyyy-mm-dd hh24:mi:ss'), NULL, '0', '%{Acct-Authentic}', '%{Connect-Info}', '', '0', '0', '%{Called-Station-Id}', '%{Calling-Station-Id}', '', '%{Service-Type}', '%{Framed-Protocol}', '%{Framed-IP-Address}', '%{Acct-Delay-Time}', '0', '%{X-Ascend-Session-Svr-Key}')"
 
        accounting_start_query_alt  = "UPDATE ${acct_table1} SET AcctStartTime = TO_DATE('%S','yyyy-mm-dd hh24:mi:ss'), 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"
 

diff --git a/raddb/sql/postgresql-dialup.conf b/raddb/sql/postgresql-dialup.conf
index b58e062..c6a8ea4 100644 (file)
--- a/raddb/sql/postgresql-dialup.conf
+++ b/raddb/sql/postgresql-dialup.conf
@@ -176,23 +176,43 @@
     AND NASIPAddress= '%{NAS-IP-Address}' AND AcctStopTime IS NULL"
 
   accounting_update_query_alt = "INSERT INTO ${acct_table1} \
-    (AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, NASPortId, NASPortType, AcctStartTime, \
-    AcctSessionTime, AcctAuthentic, AcctInputOctets, AcctOutputOctets, CalledStationId, CallingStationId, \
-    ServiceType, FramedProtocol, FramedIPAddress) \
-    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), \
+    (AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, \
+    NASPortId, NASPortType, AcctStartTime, \
+    AcctSessionTime, AcctAuthentic, AcctInputOctets, \
+    AcctOutputOctets, CalledStationId, CallingStationId, \
+    ServiceType, FramedProtocol, FramedIPAddress, XAscendSessionSvrKey) \
+    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), \
     '%{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), '%{Called-Station-Id}', \
-    '%{Calling-Station-Id}', '%{Service-Type}', '%{Framed-Protocol}', NULLIF('%{Framed-IP-Address}', '')::inet)"
+    (('%{Acct-Output-Gigawords:-0}'::bigint << 32) + '%{Acct-Output-Octets:-0}'::bigint), \
+    '%{Called-Station-Id}', \
+    '%{Calling-Station-Id}', '%{Service-Type}', '%{Framed-Protocol}', \
+    NULLIF('%{Framed-IP-Address}', '')::inet, '%{X-Ascend-Session-Svr-Key}')"
 
   accounting_start_query = "INSERT INTO ${acct_table1} \
-    (AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, NASPortId, NASPortType, AcctStartTime, AcctAuthentic, \
-    ConnectInfo_start, CalledStationId, CallingStationId, ServiceType, FramedProtocol, FramedIPAddress, AcctStartDelay) \
-    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-Authentic}', \
-    '%{Connect-Info}', '%{Called-Station-Id}', '%{Calling-Station-Id}', '%{Service-Type}', '%{Framed-Protocol}', \
-    NULLIF('%{Framed-IP-Address}', '')::inet, '%{Acct-Delay-Time:-0}')"
+    (AcctSessionId, AcctUniqueId, UserName, Realm, NASIPAddress, \
+     NASPortId, NASPortType, AcctStartTime, AcctAuthentic, \
+    ConnectInfo_start, CalledStationId, CallingStationId, ServiceType, \
+    FramedProtocol, FramedIPAddress, AcctStartDelay, XAscendSessionSvrKey) \
+    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-Authentic}', \
+    '%{Connect-Info}', \
+    '%{Called-Station-Id}', \
+    '%{Calling-Station-Id}', \
+    '%{Service-Type}', \
+    '%{Framed-Protocol}', \
+    NULLIF('%{Framed-IP-Address}', '')::inet, \
+    '%{Acct-Delay-Time:-0}', \
+    '%{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}', \