Skip to content

Commit

Permalink
Remaining Packet-* -> Net.*
Browse files Browse the repository at this point in the history
  • Loading branch information
@ndptech
ndptech committed Sep 4, 2023
1 parent 1d41143 commit 658b61b
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion debian/freeradius.logrotate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# There are different detail-rotating strategies you can use. One is
# to write to a single detail file per IP and use the rotate config
# below. Another is to write to a daily detail file per IP with:
# detailfile = ${radacctdir}/%{Packet-Src-IP-Address}/%Y%m%d-detail
# detailfile = ${radacctdir}/%{Net.Src.IP}/%Y%m%d-detail
# (or similar) in radiusd.conf, without rotation. If you go with the
# second technique, you will need another cron job that removes old
# detail files. You do not need to comment out the below for method #2.
Expand Down
2 changes: 1 addition & 1 deletion doc/antora/modules/howto/pages/modules/sqlippool/index.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ where this information is given in the request.

. The `NAS-IP-Address` has been provided. If not then you may need to
reconfigure your NAS to provide this or instantiate this attribute from
`Packet-Src-IP-Address` using an unlang policy in FreeRADIUS. Otherwise when
`Net.Src.IP` using an unlang policy in FreeRADIUS. Otherwise when
the NAS reboots you will not be able to match the affected IP addresses to the
device.

Expand Down
4 changes: 2 additions & 2 deletions doc/antora/modules/installation/pages/upgrade.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ load-balance {

[source,unlang]
----
load-balance "%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}" {
load-balance "%{Net.Src.IP}" {
home_server_1
home_server_2
home_server_3
Expand All @@ -438,7 +438,7 @@ load-balance "%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}" {

[source,unlang]
----
load-balance "%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}-%{Packet-Src-Port}" {
load-balance "%%{Net.Src.IP}-%{Net.Src.Port}" {
home_server_1
home_server_2
home_server_3
Expand Down
2 changes: 1 addition & 1 deletion doc/antora/modules/raddb/pages/mods-available/detail.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ NOTE: The attributes should be listed one to a line.

```
detail {
filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/detail-%Y-%m-%d
filename = ${radacctdir}/%{Net.Src.IP}/detail-%Y-%m-%d
# filename = ${radacctdir}/detail
escape_filenames = no
permissions = 0600
Expand Down
8 changes: 4 additions & 4 deletions doc/antora/modules/raddb/pages/mods-available/detail.log.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,25 @@ See the example in `raddb/sites-available/default`.

```
detail auth_log {
filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/auth-detail-%Y-%m-%d
filename = ${radacctdir}/%{Net.Src.IP-Address}/auth-detail-%Y-%m-%d
permissions = 0600
suppress {
User-Password
}
}
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
}
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
# suppress {
# User-Password
# }
}
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
}
```
6 changes: 3 additions & 3 deletions doc/antora/modules/raddb/pages/mods-available/linelog.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,9 @@ linelog log_accounting {
Start = "Connect: [%{User-Name}] (did %{Called-Station-Id} cli %{Calling-Station-Id} port %{NAS-Port} ip %{Framed-IP-Address})"
Stop = "Disconnect: [%{User-Name}] (did %{Called-Station-Id} cli %{Calling-Station-Id} port %{NAS-Port} ip %{Framed-IP-Address}) %{Acct-Session-Time} seconds"
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"
unknown = "NAS %{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}} (%{%{NAS-IP-Address}:-%{NAS-IPv6-Address}}) sent unknown Acct-Status-Type %{Acct-Status-Type}"
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"
unknown = "NAS %{Net.Src.IP} (%{%{NAS-IP-Address}:-%{NAS-IPv6-Address}}) sent unknown Acct-Status-Type %{Acct-Status-Type}"
}
}
```
2 changes: 1 addition & 1 deletion doc/antora/modules/raddb/pages/mods-available/redis_ippool.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ redis_ippool {
owner = &Client-Hardware-Address
# owner = "%{%{Client-Identifier}:-%{Client-Hardware-Address}}"
# owner = "%{Vendor-Specific.ADSL-Forum.Agent-Circuit-ID} %{Calling-Station-Id}"
requested_address = "%{%{Requested-IP-Address}:-%{Packet-Src-IP-Address}}"
requested_address = "%{%{Requested-IP-Address}:-%{Net.Src.IP}}"
# ipv4_integer = yes
allocated_address_attr = &reply.Your-IP-Address
range_attr = &reply.IP-Pool.Range
Expand Down
4 changes: 2 additions & 2 deletions doc/antora/modules/raddb/pages/sites-available/dynamic-clients.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,10 @@ server dynamic_clients {
}
new client {
&control += {
&FreeRADIUS-Client-IP-Address = "%{Packet-Src-IP-Address}"
&FreeRADIUS-Client-IP-Address = "%{Net.Src.IP}"
&FreeRADIUS-Client-Require-MA = no
&FreeRADIUS-Client-Secret = "testing123"
&FreeRADIUS-Client-Shortname = "%{Packet-Src-IP-Address}"
&FreeRADIUS-Client-Shortname = "%{Net.Src.IP}"
&FreeRADIUS-Client-NAS-Type = "other"
}
ok
Expand Down
4 changes: 2 additions & 2 deletions doc/antora/modules/reference/pages/man/radmin.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ amount of control over the server.

The following command-line options are accepted by the program.

*-d config_directory*::
*-d config_directory*::
Defaults to _/etc/raddb_. *radmin* looks here for the server
configuration files to find the "listen" section that defines the
control socket filename.
Expand Down Expand Up @@ -109,7 +109,7 @@ prompt for more information.
+
Only one debug condition can be active at a time.

*debug condition '((User-Name == ""bob"") || (Packet-Src-IP-Address == 192.0.2.22))'*::
*debug condition '((User-Name == ""bob"") || (Net.Src.IP == 192.0.2.22))'*::
A more complex condition that enables debugging output for requests
containing User-Name "bob", or requests that originate from source IP
address 192.0.2.22.
Expand Down
2 changes: 1 addition & 1 deletion doc/antora/modules/tutorials/pages/variables.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ has a configuration entry named "filename", which by default has the
following value:

----------------------------------------------------------------
filename = ${radacctdir}/%{Packet-Src-IP-Address}/detail-%Y%m%d
filename = ${radacctdir}/%{Net.Src.IP}/detail-%Y%m%d
----------------------------------------------------------------

The configuration entry is composed of two kinds of variable expansion.
Expand Down
4 changes: 2 additions & 2 deletions man/man8/raddebug.8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Show debug output for the client having the given IPv4 address. This
option is equivalent to using:
.br
.in +0.3i
-c '(Packet-Src-IP-Address == ipv4-address)'
-c '(Net.Src.IP == ipv4-address)'
.in -0.3i
.IP "\-d \fIconfig directory\fP"
The radius configuration directory, usually /etc/raddb. See the
Expand All @@ -80,7 +80,7 @@ Show debug output for the client having the given IPv6 address. This
option is equivalent to using:
.br
.in +0.3i
-c '(Packet-Src-IPv6-Address == ipv6-address)'
-c '(Net.Src.IPv6 == ipv6-address)'
.in -0.3i
.IP \-t\ \fItimeout\fP
Stop printing debug output after "timeout" seconds. The default
Expand Down
2 changes: 1 addition & 1 deletion redhat/freeradius-logrotate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# There are different detail-rotating strategies you can use. One is
# to write to a single detail file per IP and use the rotate config
# below. Another is to write to a daily detail file per IP with:
# detailfile = ${radacctdir}/%{Packet-Src-IP-Address}/%Y%m%d-detail
# detailfile = ${radacctdir}/%{Net.Src.IP}/%Y%m%d-detail
# (or similar) in radiusd.conf, without rotation. If you go with the
# second technique, you will need another cron job that removes old
# detail files. You do not need to comment out the below for method #2.
Expand Down
2 changes: 1 addition & 1 deletion scripts/logrotate/freeradius
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
# There are different detail-rotating strategies you can use. One is
# to write to a single detail file per IP and use the rotate config
# below. Another is to write to a daily detail file per IP with:
# detailfile = ${radacctdir}/%{Packet-Src-IP-Address}/%Y%m%d-detail
# detailfile = ${radacctdir}/%{Net.Src.IP}/%Y%m%d-detail
# (or similar) in radiusd.conf, without rotation. If you go with the
# second technique, you will need another cron job that removes old
# detail files. You do not need to comment out the below for method #2.
Expand Down
4 changes: 2 additions & 2 deletions scripts/util/raddebug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ do
;;
D) extra="$extra -D $OPTARG"
;;
i) x="(Packet-Src-IP-Address == $OPTARG)"
i) x="(Net.Src.IP == $OPTARG)"
if [ "$condition" = "" ]; then
condition="$x"
else
condition="$condition && $x"
fi
;;
I) x="(Packet-Src-IPv6-Address == $OPTARG)"
I) x="(Net.Src.IP == $OPTARG)"
if [ "$condition" = "" ]; then
condition="$x"
else
Expand Down
2 changes: 1 addition & 1 deletion share/dictionary/freeradius/dictionary.freeradius.internal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ ATTRIBUTE Realm 1017 string

ATTRIBUTE Acct-Session-Start-Time 1019 date
ATTRIBUTE Acct-Unique-Session-Id 1020 string
# 1021 was Client-IP-Address. Just use Packet-Src-IP-Address
# 1021 was Client-IP-Address. Just use Net.Src.IP
ATTRIBUTE LDAP-UserDN 1022 string
ATTRIBUTE SQL-User-Name 1023 string

Expand Down

0 comments on commit 658b61b

Please sign in to comment.