From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 23 Jul 2012 10:58:15 +0000 (+0100)
Subject: Should use integer:Event-Timestamp for Unix timestamp format
X-Git-Tag: release_3_0_0_beta0~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a52ddecec03db3124ccd01ed987533ae7e9f0060;p=thirdparty%2Ffreeradius-server.git

Should use integer:Event-Timestamp for Unix timestamp format
---

diff --git a/raddb/sql/mysql/dialup.conf b/raddb/sql/mysql/dialup.conf
index 28900fd190f..b9416e5b3f0 100644
--- a/raddb/sql/mysql/dialup.conf
+++ b/raddb/sql/mysql/dialup.conf
@@ -162,8 +162,8 @@
 	accounting_onoff_query = " \
 	UPDATE ${acct_table1} \
 	SET \
-		acctstoptime	= FROM_UNIXTIME(%{Event-Timestamp}), \
-		acctsessiontime	= '%{Event-Timestamp}' \
+		acctstoptime	= FROM_UNIXTIME(%{integer:Event-Timestamp}), \
+		acctsessiontime	= '%{integer:Event-Timestamp}' \
 			- UNIX_TIMESTAMP(acctstarttime), \
 		acctterminatecause = '%{Acct-Terminate-Cause}', \
 	WHERE acctstoptime IS NULL \
@@ -174,9 +174,9 @@
 	UPDATE ${acct_table1} \
 	SET \
 		acctupdatetime  = (@acctupdatetime_old:=acctupdatetime), \
-		acctupdatetime	= FROM_UNIXTIME(%{Event-Timestamp}), \
+		acctupdatetime	= FROM_UNIXTIME(%{integer:Event-Timestamp}), \
 		acctinterval	= \
-			%{Event-Timestamp} - UNIX_TIMESTAMP(@acctupdatetime_old), \
+			%{integer:Event-Timestamp} - UNIX_TIMESTAMP(@acctupdatetime_old), \
 		framedipaddress = '%{Framed-IP-Address}', \
 		acctsessiontime	= '%{Acct-Session-Time}', \
 		acctinputoctets	= '%{%{Acct-Input-Gigawords}:-0}' << 32 | \
@@ -201,9 +201,9 @@
 		'%{SQL-User-Name}', \
 		'%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port}', \
 		'%{NAS-Port-Type}', \
-		FROM_UNIXTIME(%{Event-Timestamp} - \
+		FROM_UNIXTIME(%{integer:Event-Timestamp} - \
 			%{%{Acct-Session-Time}:-0}), \
-		FROM_UNIXTIME(%{Event-Timestamp}), \
+		FROM_UNIXTIME(%{integer:Event-Timestamp}), \
 		'%{Acct-Session-Time}', \
 		'%{Acct-Authentic}', '', \
 		'%{%{Acct-Input-Gigawords}:-0}' << 32 | \
@@ -229,8 +229,8 @@
 		'%{SQL-User-Name}', \
 		'%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port}', \
 		'%{NAS-Port-Type}', \
-		FROM_UNIXTIME(%{Event-Timestamp}), \
-		FROM_UNIXTIME(%{Event-Timestamp}), \
+		FROM_UNIXTIME(%{integer:Event-Timestamp}), \
+		FROM_UNIXTIME(%{integer:Event-Timestamp}), \
 		NULL, '0', '%{Acct-Authentic}', \
 		'%{Connect-Info}', '', '0', \
 		'0', '%{Called-Station-Id}', '%{Calling-Station-Id}', \
@@ -239,8 +239,8 @@
 
 	accounting_start_query_alt = " \
 	UPDATE ${acct_table1} SET \
-		acctstarttime	= FROM_UNIXTIME(%{Event-Timestamp}), \
-		acctupdatetime	= FROM_UNIXTIME(%{Event-Timestamp}), \
+		acctstarttime	= FROM_UNIXTIME(%{integer:Event-Timestamp}), \
+		acctupdatetime	= FROM_UNIXTIME(%{integer:Event-Timestamp}), \
 		connectinfo_start = '%{Connect-Info}' \
 	WHERE acctsessionid 	= '%{Acct-Session-Id}' \
 	AND username		= '%{SQL-User-Name}' \
@@ -248,7 +248,7 @@
 
 	accounting_stop_query = " \
 	UPDATE ${acct_table2} SET \
-		acctstoptime	= FROM_UNIXTIME(%{Event-Timestamp}), \
+		acctstoptime	= FROM_UNIXTIME(%{integer:Event-Timestamp}), \
 		acctsessiontime	= '%{Acct-Session-Time}', \
 		acctinputoctets	= '%{%{Acct-Input-Gigawords}:-0}' << 32 | \
 			'%{%{Acct-Input-Octets}:-0}', \
@@ -275,10 +275,10 @@
 		'%{SQL-User-Name}', \
 		'%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port}', \
 		'%{NAS-Port-Type}', \
-		FROM_UNIXTIME(%{Event-Timestamp} - \
+		FROM_UNIXTIME(%{integer:Event-Timestamp} - \
 			%{%{Acct-Session-Time}:-0}), \
-		FROM_UNIXTIME(%{Event-Timestamp}), \
-		FROM_UNIXTIME(%{Event-Timestamp}), \
+		FROM_UNIXTIME(%{integer:Event-Timestamp}), \
+		FROM_UNIXTIME(%{integer:Event-Timestamp}), \
 		'%{Acct-Session-Time}', '%{Acct-Authentic}', '', \
 		'%{Connect-Info}', \
 		'%{%{Acct-Input-Gigawords}:-0}' << 32 | \