Thibaut VARÈNE
4c272fe5f5
uspot: accounting: setup interim only when needed
...
There is no point in setting up the interim timer if the relevant radius
data is not available. Furthermore, the return value check would only
fail if the client was unknown to spotfilter at the query time, which
isn't a failure to *send* data.
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
45def78972
uspot: accounting: coalesce radius stop requests
...
Define constants for terminate causes, see:
https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-12
Use "Lost Carrier" for disconnected client (matching Chilli).
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
f1c4a39540
uspot: accounting: correctly handle ipv4/v6 conntrack
...
Only run conntrack deletion on defined client IP(s) and process both
IPv4 and IPv6.
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
a9df4b8549
uspot: accounting: use variables instead of function calls
...
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
4d8bc3c5bd
uspot: accounting: client timeouts are always defined
...
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
245b062db8
uspot: accounting: fix loop logic
...
When looping through known clients:
- removal of client in spotfilter list is checked first
- checks for known client existence are redundant by construction
Also format the max_total check similarly to the timeout one
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
c6d07ca178
uspot: accounting: use explicit variable names
...
And avoid enumerating unused values in k,v pairs
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
60c708dce9
uspot: accounting: s/radius_stop/client_kick/
...
radius_stop() had nothing to do with RADIUS.
Simplify the function prototype by handling spotfilter args internally.
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
dfdf25834c
uspot: accounting: remove redundant function
...
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
1e82a24192
uspot: accounting: radius_stop(): reduce args redundancy
...
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
ce20be0b3b
uspot: accounting: config[interface] is always defined
...
By construction:
- interface is one of clients[] keys
- clients[] is built from config uspot 'interface'
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
3e483bd524
uspot: accounting: avoid redundant assignments
...
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
1cded2e983
uspot: radius: regroup redundant checks
...
Clarifies intent.
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
3219fceb48
uspot: move RADIUS NAS_PORT_TYPE to portal.uc
...
Currently still hardcoded to "19" aka Wireless.
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
78c7a3cbfa
uspot: handler-uam: improve auth-client()
...
Simplify the query string parsing logic, allow empty password.
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
0a390bea0b
uspot: rename common.uc -> portal.uc
...
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
cad21f394e
ucentral-tools: remove dictionary.CoovaChilli
...
This dictionary uses vendor 14122, which is the WISPr vendor code. The
first few attributes defined in this dictionary as integers masked their
WISPr string counterparts, resulting in truncated attributes in RADIUS
requests.
From a quick Google Search, there is no CoovaChilli RADIUS vendor ID, it
seems to use the ChilliSpot ones:
https://support.ignitenet.com/portal/en/kb/articles/what-are-the-supported-radius-attributes-in-coovachilli-captive-portal
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
3384986bef
uspot: support ChilliSpot radius ratelimits
...
This commit introduces a helper function "ratelimit_client()", invoked
from allow_client(), which parses the radius reply for known
ratelimiting attributes:
- WISPr-Bandwidth-Max-{Up,Down}
- ChilliSpot-Bandwidth-Max-{Up,Down}
WISPr attributes are expressed in bits/s, ChilliSpot in kbits/s.
If none of the attributes are present, the function is a NOP.
If any of the -Up or -Down is missing, the corresponding limit is not
set. NB: ratelimit currently does not support setting only up OR down
ratelimiting if defaults are not set.
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
Thibaut VARÈNE
23073a8ae5
uspot: captive: restart(): include uspot accounting
...
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org >
2023-06-05 13:19:19 +02:00
John Crispin
3ab700de32
ipq807x: fix yuncore fap655 filename
...
Signed-off-by: John Crispin <john@phrozen.org >
2023-06-04 18:04:41 +02:00
John Crispin
454856e5c2
ipq807x: always power on phys when an interface is started
...
Fixes: WIFI-12648
Signed-off-by: John Crispin <john@phrozen.org >
2023-06-04 17:14:18 +02:00
John Crispin
7e4030c0bc
ipq807x: add yuncore fap655 support
...
Signed-off-by: John Crispin <john@phrozen.org >
2023-06-04 12:36:46 +02:00
John Crispin
1deab06c09
ucentral-schema: update to latest HEAD
...
1279e7c fix section names for swconfig devices
Signed-off-by: John Crispin <john@phrozen.org >
2023-06-04 12:34:24 +02:00
John Crispin
a4bc2913e1
ipq807x: add edgecore OAP101e support
...
Fixes: WIFI-12617
Signed-off-by: tanya.singh <tanya.singh@4ipnet.com >
2023-06-01 10:06:39 +02:00
Ken
87dbd3e289
ipq807x: various improvements for CIG-WF-186w
...
1. Using rtl8367c.c file for rtl8367S switch driver to support vlan
2. Configure eth0.1 as WAN and eth0.2 as LAN
3. Add mdio read/write in smi driver followed 5.4 kernel driver
4. add mido clock setting followed 5.4 kernel driver for 186w board
5. Add eth and wifi mac address allocation based of BaseMacAddress
6. Update new bdf for 2G radio
Fixes: WIFI-12650
Signed-off-by: Ken <xshi@actiontec.com >
2023-06-01 08:58:14 +02:00
John Crispin
3f79bc76ac
ucentral-schema: update to latest HEAD
...
137615d add vlan_id to uci sections
Signed-off-by: John Crispin <john@phrozen.org >
2023-06-01 08:58:14 +02:00
John Crispin
4820218fc2
netifd: backport 2 status fixes
...
Fixes: WIFI-12513
Signed-off-by: John Crispin <john@phrozen.org >
2023-06-01 08:58:14 +02:00
John Crispin
b30bcf501a
ramips: fix fap640 mac addresses
...
Signed-off-by: John Crispin <john@phrozen.org >
2023-06-01 08:58:14 +02:00
John Crispin
d9e62da73d
ucentral-client: update to latest HEAD
...
feadd83 handle configuration load/parse error
Fixes: WIFI-12380
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
404a3a4813
ucentral-schema: add strict-isolation example
...
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
e9f5aec955
ucentral-schema: update to latest HEAD
...
c3d8380 add new dhcp-relay render code
a39410a remove old dhcp-relay code
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
9eada6166c
ucentral-event: add dhcp-relay support
...
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
e8875a7375
ucode: backport uci.foreach fix
...
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
33c4c732c9
dnsmasq: drop old option 82 patch
...
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
2c8e736fa8
ucentral-schema: update to latest HEAD
...
84f53b2 add strict_isolation support
Fixes: WIFI-12577
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
e18d485bdc
ucentral-schema: update to latest HEAD
...
11d7374 always set the developer mode flag when generating capabilities
Fixes: WIFI-12270
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
a1678619be
ucentral-client: update to latest HEAD
...
ffd9d6f indicate crashlog inside the connect reason
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
eec945417d
ucentral-schema: upodate to latest HEAD
...
3afde47 fix generation of bridger block list
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
cd3fb41eb0
ipq807x: update wf196ca 6G BDF file
...
Fixes: WIFI-12538
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
0445caf2b8
ipa807x: various fixes for wf186
...
Fixes: WIFI-12616
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
Venkat Chimata
3bb4304fe4
cybertan: Specify correct images in cybertan profiles
...
Signed-off-by: Venkat Chimata <venkata@shasta.cloud >
2023-05-30 07:56:09 +02:00
Venkat Chimata
2edf5d750c
cybertan: Fix build issues with Cybertan APs
...
Signed-off-by: Venkat Chimata <venkata@shasta.cloud >
2023-05-30 07:56:09 +02:00
John Crispin
89d1213f39
ucentral-client: update to latest HEAD
...
cb5030f crashlog->rebootlog
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
3eb13481c9
ucentral-schema: update to latest HEAD
...
27b1d45 cmd_upgrade: create /ucentral.upgrade
7109e62 add captive portal devices to the bridger block list
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
e2ffc6650c
bridger: re-enable inside default images
...
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
42be849af8
generic: use latest kernel headers when building eBPF tools
...
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
Felix Fietkau
d9adc8f7a1
hostapd: fix double free in coa-multi patch
...
Fixes: WIFI-12586
Signed-off-by: Felix Fietkau <nbd@nbd.name >
2023-05-30 07:56:09 +02:00
John Crispin
399f862bb9
ipq807x: various cig,wf660a improvements
...
* fix wifi macs
* reset button had the wrong polarity
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
John Crispin
e73633402c
ipq807x: whitespace cleanup
...
Signed-off-by: John Crispin <john@phrozen.org >
2023-05-30 07:56:09 +02:00
Felix Fietkau
acc3d67cff
wifi-ax: fix mac80211 crash when dealing with AP vlans
...
Signed-off-by: Felix Fietkau <nbd@nbd.name >
2023-05-30 07:56:09 +02:00