move to using Net.* instead of Packet-*

diff --git a/raddb/mods-available/detail b/raddb/mods-available/detail
index 1dd51e8d81a3df7ce6b060fb8ad16a8df3bd8f6e..a2771989057baeba2830013ab4522015c3a3dbaa 100644 (file)
--- a/raddb/mods-available/detail
+++ b/raddb/mods-available/detail
@@ -46,7 +46,7 @@ detail {
        #  That is, only *one* `listen { ... }` section can read
        #  detail files from a particular directory.
        #
-       filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/detail-%Y-%m-%d
+       filename = ${radacctdir}/%{Net.Src.IP}/detail-%Y-%m-%d
 
        #
        #  NOTE: If you are using `radrelay`, delete the above line for `file`,

diff --git a/raddb/mods-available/detail.log b/raddb/mods-available/detail.log
index bee1bc3f77da9dba6d1099f7a1e302a704263e47..bb46e61cc5490cd225575f0b127c31f35be78cab 100644 (file)
--- a/raddb/mods-available/detail.log
+++ b/raddb/mods-available/detail.log
@@ -27,7 +27,7 @@
 #  `recv Access-Request` section of `raddb/sites-enabled/default`.
 #
 detail auth_log {
-       filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/auth-detail-%Y-%m-%d
+       filename = ${radacctdir}/%{Net.Src.IP}/auth-detail-%Y-%m-%d
 
        permissions = 0600
 
@@ -49,7 +49,7 @@ detail auth_log {
 #  `send Access-Accept` section of `raddb/sites-enabled/default`.
 #
 detail reply_log {
-       filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/reply-detail-%Y-%m-%d
+       filename = ${radacctdir}/%{Net.Src.IP}/reply-detail-%Y-%m-%d
 
        permissions = 0600
 }
@@ -63,7 +63,7 @@ detail reply_log {
 #  proxying. See the example in `raddb/sites-available/default`.
 #
 detail pre_proxy_log {
-       filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/pre-proxy-detail-%Y-%m-%d
+       filename = ${radacctdir}/%{Net.Src.IP}/pre-proxy-detail-%Y-%m-%d
 
        permissions = 0600
 
@@ -81,7 +81,7 @@ detail pre_proxy_log {
 #  See the example in `raddb/sites-available/default`.
 #
 detail post_proxy_log {
-       filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/post-proxy-detail-%Y-%m-%d
+       filename = ${radacctdir}/%{Net.Src.IP}/post-proxy-detail-%Y-%m-%d
 
        permissions = 0600
 }

diff --git a/raddb/mods-available/linelog b/raddb/mods-available/linelog
index 631b87e66dd71823f96f23ae7c6b8a02e084fd1b..32e8aaab844c180b3e0f9b2da7e799c992d6d930 100644 (file)
--- a/raddb/mods-available/linelog
+++ b/raddb/mods-available/linelog
@@ -404,10 +404,10 @@ linelog log_accounting {
                #  Don't log anything for these packets.
                Interim-Update = ""
 
-               Accounting-On = "NAS %{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}} (%{%{NAS-IP-Address}:-%{NAS-IPv6-Address}}) just came online"
-               Accounting-Off = "NAS %{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}} (%{%{NAS-IP-Address}:-%{NAS-IPv6-Address}}) just went offline"
+               Accounting-On = "NAS %{Net.Src.IP} (%{%{NAS-IP-Address}:-%{NAS-IPv6-Address}}) just came online"
+               Accounting-Off = "NAS %{Net.Src.IP} (%{%{NAS-IP-Address}:-%{NAS-IPv6-Address}}) just went offline"
 
                #  Don't log anything for other `Acct-Status-Type` 's.
-               unknown = "NAS %{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}} (%{%{NAS-IP-Address}:-%{NAS-IPv6-Address}}) sent unknown Acct-Status-Type %{Acct-Status-Type}"
+               unknown = "NAS %{Net.Src.IP} (%{%{NAS-IP-Address}:-%{NAS-IPv6-Address}}) sent unknown Acct-Status-Type %{Acct-Status-Type}"
        }
 }

diff --git a/raddb/mods-available/redis_ippool b/raddb/mods-available/redis_ippool
index c69ba8b90161a7a24cf651d69621bbf5b158b20f..0c526b8089b831dea022b8ad758149a077152186 100644 (file)
--- a/raddb/mods-available/redis_ippool
+++ b/raddb/mods-available/redis_ippool
@@ -102,7 +102,7 @@ redis_ippool {
        #
        #  requested_address:: The IP address being renewed or released.
        #
-       requested_address = "%{%{Requested-IP-Address}:-%{Packet-Src-IP-Address}}"
+       requested_address = "%{%{Requested-IP-Address}:-%{Net.Src.IP}}"
 
        #
        #  ipv4_integer:: Whether IPv4 addresses should be cast to integers, for renew operations.