Consistently use NAT-Port-ID then NAS-Port in queries

diff --git a/raddb/mods-config/sql/main/mssql/queries.conf b/raddb/mods-config/sql/main/mssql/queries.conf
index cee1d00..cf0800c 100644 (file)
--- a/raddb/mods-config/sql/main/mssql/queries.conf
+++ b/raddb/mods-config/sql/main/mssql/queries.conf
@@ -138,7 +138,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        '%{Realm}', \
                                        '%{NAS-IP-Address}', \
-                                       '%{NAS-Port-Id}', \
+                                       '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
                                        '%{NAS-Port-Type}', \
                                        '%S', \
                                        '0', \
@@ -194,7 +194,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        '%{Realm}', \
                                        '%{NAS-IP-Address}', \
-                                       '%{NAS-Port-Id}', \
+                                       '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
                                        '%{NAS-Port-Type}', \
                                        '%{Acct-Session-Time}', \
                                        '%{Acct-Authentic}', \
@@ -242,7 +242,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        '%{Realm}', \
                                        '%{NAS-IP-Address}', \
-                                       '%{NAS-Port-Id}', \
+                                       '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
                                        '%{NAS-Port-Type}', \
                                        '%S', \
                                        '%{Acct-Session-Time}', \

diff --git a/raddb/mods-config/sql/main/mysql/queries.conf b/raddb/mods-config/sql/main/mysql/queries.conf
index 2a11d4f..f2c9b70 100644 (file)
--- a/raddb/mods-config/sql/main/mysql/queries.conf
+++ b/raddb/mods-config/sql/main/mysql/queries.conf
@@ -246,7 +246,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        '%{Realm}', \
                                        '%{NAS-IP-Address}', \
-                                       '%{NAS-Port}', \
+                                       '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
                                        '%{NAS-Port-Type}', \
                                        FROM_UNIXTIME(%{integer:Event-Timestamp}), \
                                        FROM_UNIXTIME(%{integer:Event-Timestamp}), \
@@ -315,7 +315,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        '%{Realm}', \
                                        '%{NAS-IP-Address}', \
-                                       '%{NAS-Port}', \
+                                       '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
                                        '%{NAS-Port-Type}', \
                                        FROM_UNIXTIME(%{integer:Event-Timestamp} - %{%{Acct-Session-Time}:-0}), \
                                        FROM_UNIXTIME(%{integer:Event-Timestamp}), \
@@ -366,7 +366,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        '%{Realm}', \
                                        '%{NAS-IP-Address}', \
-                                       '%{NAS-Port}', \
+                                       '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
                                        '%{NAS-Port-Type}', \
                                        FROM_UNIXTIME(%{integer:Event-Timestamp} - %{%{Acct-Session-Time}:-0}), \
                                        FROM_UNIXTIME(%{integer:Event-Timestamp}), \

diff --git a/raddb/mods-config/sql/main/oracle/queries.conf b/raddb/mods-config/sql/main/oracle/queries.conf
index e50f389..479d7a8 100644 (file)
--- a/raddb/mods-config/sql/main/oracle/queries.conf
+++ b/raddb/mods-config/sql/main/oracle/queries.conf
@@ -219,7 +219,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        '%{Realm}', \
                                        '%{NAS-IP-Address}', \
-                                       '%{NAS-Port-Id}', \
+                                       '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
                                        '%{NAS-Port-Type}', \
                                        TO_DATE('%S','yyyy-mm-dd hh24:mi:ss'), \
                                        NULL, \
@@ -282,7 +282,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        '%{Realm}', \
                                        '%{NAS-IP-Address}', \
-                                       '%{NAS-Port-Id}', \
+                                       '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
                                        '%{NAS-Port-Type}', \
                                        NULL, \
                                        '%{Acct-Session-Time}', \
@@ -336,7 +336,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        '%{Realm}', \
                                        '%{NAS-IP-Address}', \
-                                       '%{NAS-Port-Id}', \
+                                       '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
                                        '%{NAS-Port-Type}', \
                                        NULL, \
                                        TO_DATE('%S','yyyy-mm-dd hh24:mi:ss'), \

diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index 242665e..0c6e489 100644 (file)
--- a/raddb/mods-config/sql/main/postgresql/queries.conf
+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
@@ -269,7 +269,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        NULLIF('%{Realm}', ''), \
                                        '%{%{NAS-IPv6-Address}:-%{NAS-IP-Address}}', \
-                                       %{%{NAS-Port}:-NULL}, \
+                                       NULLIF('%{%{NAS-Port-ID}:-%{NAS-Port}}', ''), \
                                        '%{NAS-Port-Type}', \
                                        TO_TIMESTAMP(%{integer:Event-Timestamp}), \
                                        TO_TIMESTAMP(%{integer:Event-Timestamp}), \
@@ -330,7 +330,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        NULLIF('%{Realm}', ''), \
                                        '%{%{NAS-IPv6-Address}:-%{NAS-IP-Address}}', \
-                                       %{%{NAS-Port}:-NULL}, \
+                                       NULLIF('%{%{NAS-Port-ID}:-%{NAS-Port}}', ''), \
                                        '%{NAS-Port-Type}', \
                                        TO_TIMESTAMP(%{integer:Event-Timestamp}), \
                                        TO_TIMESTAMP(%{integer:Event-Timestamp}), \
@@ -378,7 +378,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        NULLIF('%{Realm}', ''), \
                                        '%{%{NAS-IPv6-Address}:-%{NAS-IP-Address}}', \
-                                       %{%{NAS-Port}:-NULL}, \
+                                       NULLIF('%{%{NAS-Port-ID}:-%{NAS-Port}}', ''), \
                                        '%{NAS-Port-Type}', \
                                        TO_TIMESTAMP(%{integer:Event-Timestamp} - %{%{Acct-Session-Time}:-0}), \
                                        TO_TIMESTAMP(%{integer:Event-Timestamp}), \

diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf
index cc62673..bd8b57b 100644 (file)
--- a/raddb/mods-config/sql/main/sqlite/queries.conf
+++ b/raddb/mods-config/sql/main/sqlite/queries.conf
@@ -234,7 +234,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        '%{Realm}', \
                                        '%{NAS-IP-Address}', \
-                                       '%{NAS-Port}', \
+                                       '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
                                        '%{NAS-Port-Type}', \
                                        %{%{integer:Event-Timestamp}:-date('now')}, \
                                        %{%{integer:Event-Timestamp}:-date('now')}, \
@@ -300,7 +300,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        '%{Realm}', \
                                        '%{NAS-IP-Address}', \
-                                       '%{NAS-Port}', \
+                                       '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
                                        '%{NAS-Port-Type}', \
                                        (%{%{integer:Event-Timestamp}:-strftime('%%s', 'now')} - %{%{Acct-Session-Time}:-0}), \
                                        %{%{integer:Event-Timestamp}:-date('now')}, \
@@ -352,7 +352,7 @@ accounting {
                                        '%{SQL-User-Name}', \
                                        '%{Realm}', \
                                        '%{NAS-IP-Address}', \
-                                       '%{NAS-Port}', \
+                                       '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
                                        '%{NAS-Port-Type}', \
                                        (%{%{integer:Event-Timestamp}:-strftime('%%s', 'now')} - %{%{Acct-Session-Time}:-0}), \
                                        %{%{integer:Event-Timestamp}:-date('now')}, \