ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-29 15:44:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

hostapd: ensure that interface name is not null

Browse Source 
Include hotfix suggested by Sebastian Gottschall to fix bug introduced
with APuP patchset

Signed-off-by: Gioacchino Mazzurco <gio@polymathes.cc>
Link: 0c3001a69e
Link: https://github.com/openwrt/openwrt/pull/16298
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Gioacchino Mazzurco 2024-08-31 14:33:52 +02:00 committed by Hauke Mehrtens
parent 527bad0d50
commit d760576132
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/hostapd/Makefile
View File

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd PKG_NAME:=hostapd
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE_URL:=https://w1.fi/hostap.git PKG_SOURCE_URL:=https://w1.fi/hostap.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git

18
package/network/services/hostapd/patches/780-Implement-APuP-Access-Point-Micro-Peering.patch
View File

@ -1,4 +1,4 @@
From 40041ecea334c0106c0e840a32aef92b0cbb004b Mon Sep 17 00:00:00 2001 From 806c84ac8e8f60eaec22772b627f85eb5ac13544 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@polymathes.cc> From: Gioacchino Mazzurco <gio@polymathes.cc>
Date: Mon, 6 May 2024 13:53:48 +0200 Date: Mon, 6 May 2024 13:53:48 +0200
Subject: [PATCH 1/3] Implement APuP Access Point Micro Peering Subject: [PATCH 1/3] Implement APuP Access Point Micro Peering
@ -18,11 +18,14 @@ automatically if wds_bridge is not an empty string), or feeded to a
routing daemon. routing daemon.
Signed-off-by: Gioacchino Mazzurco <gio@polymathes.cc> Signed-off-by: Gioacchino Mazzurco <gio@polymathes.cc>
Reviewed-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-by: Moritz Warning <moritzwarning@web.de>
Hotfix-by: Sebastian Gottschall https://github.com/mirror/dd-wrt/commit/0c3001a69e8d8300569e416de856c96e903ad130
--- ---
hostapd/Makefile | 5 ++ hostapd/Makefile | 5 ++
hostapd/config_file.c | 9 +++ hostapd/config_file.c | 9 +++
src/ap/ap_config.h | 29 +++++++ src/ap/ap_config.h | 29 +++++++
src/ap/ap_drv_ops.c | 26 ++++++ src/ap/ap_drv_ops.c | 28 ++++++-
src/ap/ap_drv_ops.h | 3 + src/ap/ap_drv_ops.h | 3 +
src/ap/apup.c | 152 +++++++++++++++++++++++++++++++++++ src/ap/apup.c | 152 +++++++++++++++++++++++++++++++++++
src/ap/apup.h | 24 ++++++ src/ap/apup.h | 24 ++++++
@ -30,7 +33,7 @@ Signed-off-by: Gioacchino Mazzurco <gio@polymathes.cc>
src/ap/ieee802_11.h | 2 + src/ap/ieee802_11.h | 2 +
src/drivers/driver.h | 2 +- src/drivers/driver.h | 2 +-
src/drivers/driver_nl80211.c | 14 +--- src/drivers/driver_nl80211.c | 14 +---
11 files changed, 264 insertions(+), 16 deletions(-) 11 files changed, 265 insertions(+), 17 deletions(-)
create mode 100644 src/ap/apup.c create mode 100644 src/ap/apup.c
create mode 100644 src/ap/apup.h create mode 100644 src/ap/apup.h
@ -111,10 +114,10 @@ index 0e52a9990d..9102db5ed0 100644
/** /**
diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index e7396d9aea..05460e3d73 100644 index e7396d9aea..0a49ae515e 100644
--- a/src/ap/ap_drv_ops.c --- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c +++ b/src/ap/ap_drv_ops.c
@@ -382,9 +382,35 @@ int hostapd_set_wds_sta(struct hostapd_data *hapd, char *ifname_wds, @@ -382,13 +382,39 @@ int hostapd_set_wds_sta(struct hostapd_data *hapd, char *ifname_wds,
const u8 *addr, int aid, int val) const u8 *addr, int aid, int val)
{ {
const char *bridge = NULL; const char *bridge = NULL;
@ -150,6 +153,11 @@ index e7396d9aea..05460e3d73 100644
if (hapd->conf->wds_bridge[0]) if (hapd->conf->wds_bridge[0])
bridge = hapd->conf->wds_bridge; bridge = hapd->conf->wds_bridge;
return hapd->driver->set_wds_sta(hapd->drv_priv, addr, aid, val, return hapd->driver->set_wds_sta(hapd->drv_priv, addr, aid, val,
- bridge, ifname_wds);
+ bridge, ifName);
}
diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
index fa89d2398e..ab4dc8eb16 100644 index fa89d2398e..ab4dc8eb16 100644
--- a/src/ap/ap_drv_ops.h --- a/src/ap/ap_drv_ops.h

2
package/network/services/hostapd/patches/790-APuP-add-ubus-notification-when-a-peer-comes-up.patch
View File

@ -1,4 +1,4 @@
From 9a265f70b5e4e048c568564aed5f9ac4a4fd76b0 Mon Sep 17 00:00:00 2001 From 5d139e62c018f2ff1ae8b0fc76cb9c79813c61ce Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@polymathes.cc> From: Gioacchino Mazzurco <gio@polymathes.cc>
Date: Tue, 7 May 2024 10:37:54 +0200 Date: Tue, 7 May 2024 10:37:54 +0200
Subject: [PATCH 2/3] APuP add ubus notification when a peer comes up Subject: [PATCH 2/3] APuP add ubus notification when a peer comes up

2
package/network/services/hostapd/patches/800-APuP-add-ucode-hook-for-when-a-peer-comes-up.patch
View File

@ -1,4 +1,4 @@
From aaeb60b39a72774c651187208ec47efd0daeb75b Mon Sep 17 00:00:00 2001 From 484489e41a1ae4b43d9863d057f8afb29f1c41d5 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@polymathes.cc> From: Gioacchino Mazzurco <gio@polymathes.cc>
Date: Tue, 7 May 2024 11:54:23 +0200 Date: Tue, 7 May 2024 11:54:23 +0200
Subject: [PATCH 3/3] APuP add ucode hook for when a peer comes up Subject: [PATCH 3/3] APuP add ucode hook for when a peer comes up