From 96e9c81aabe9e14d6ec75c3f238c4ca7389b92a8 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 3 Jun 2021 15:57:07 +0200 Subject: [PATCH 1/2] hostapd: fix radius problem due to invalid attributes The offending commit caused the configuration file to contain: radius_auth_req_attr= radius_acct_req_attr= which cause hostapd to add an ATTR of type 0 into the messages. hostapd: RADIUS message: code=4 (Accounting-Request) identifier=0 length=93 hostapd: Attribute 40 (Acct-Status-Type) length=6 hostapd: Value: 7 hostapd: Attribute 30 (Called-Station-Id) length=28 hostapd: Value: 'C4-41-1E-F5-2D-55:OpenWifi' hostapd: Attribute 61 (NAS-Port-Type) length=6 hostapd: Value: 19 hostapd: Attribute 0 (?Unknown?) length=3 <---------------- hostapd: Attribute 55 (Event-Timestamp) length=6 hostapd: Value: 1622726457 hostapd: Attribute 41 (Acct-Delay-Time) length=6 hostapd: Value: 0 hostapd: Attribute 44 (Acct-Session-Id) length=18 hostapd: Value: '9B5961E7235AAEC6' Fixes: 3bd6c8c728e (hostapd: add additional radius options) Signed-off-by: John Crispin --- package/network/services/hostapd/files/hostapd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 7981f02ed6..1fa22cb69e 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -490,11 +490,11 @@ append_hs20_conn_capab() { } append_radius_acct_req_attr() { - append bss_conf "radius_acct_req_attr=$1" "$N" + [ -n "$1" ] && append bss_conf "radius_acct_req_attr=$1" "$N" } append_radius_auth_req_attr() { - append bss_conf "radius_auth_req_attr=$1" "$N" + [ -n "$1" ] && append bss_conf "radius_auth_req_attr=$1" "$N" } append_airtime_sta_weight() { From 4fd4e9997a116d7bfc6a21bb5b8eadaa30a3a9e7 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Thu, 3 Jun 2021 21:04:16 +0200 Subject: [PATCH 2/2] odhcpd: update to git HEAD a12fcb3 config: log config parse failures to syslog ebd4297 cmake: enforce additonal compiler checks 405da32 odhcpd: fix extra compiler warning Signed-off-by: Hans Dedecker --- package/network/services/odhcpd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index 799a63c23d..9ecae8a919 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git -PKG_SOURCE_DATE:=2021-01-06 -PKG_SOURCE_VERSION:=8d8a8cd35137ff0fa11b6be455fdd596a8d7d2e9 -PKG_MIRROR_HASH:=7149b4a434a35c1e64b20c708c0abbd381e034a2a1b4fbc1b7da0b039568b5b5 +PKG_SOURCE_DATE:=2021-05-15 +PKG_SOURCE_VERSION:=a12fcb3cee2d489b8648a2398812d7bed2f25faa +PKG_MIRROR_HASH:=26a0dd58e29509471bd2be181a59fa1d75541426137d6ca87c98806199751efb PKG_MAINTAINER:=Hans Dedecker PKG_LICENSE:=GPL-2.0