hostap: changed nas-port type to ethernet for wired-802.1X

BugzId: 78385

recipes-connectivity/hostapd/files/0001-fix-create-a-versioned-shared-library-libwlan_client.patch

@@ -0,0 +1,26 @@
+From 45bf83dbe2a84f39f09a247445531d890655ea2b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=BCrgen=20Henke?= <juergen.henke@netmodule.com>
+Date: Thu, 11 Nov 2021 09:05:57 +0100
+Subject: [PATCH] fix: create a versioned shared library libwlan_client.so
+
+Otherwise we will run circles around oe's "THOU SHALL NOT USED
+UNVERSIONED LIBRARIES IN THY LORD'S ROOT-FS" feature.
+
+BugzId: 75694
+---
+ wpa_supplicant/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
+index 238e31b0c..58c047543 100644
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -1965,7 +1965,7 @@ libwpa_client.a: $(LIBCTRL)
+ 
+ libwpa_client.so: $(LIBCTRLSO)
+ 	@$(E) "  CC  $@ ($^)"
+-	$(Q)$(CC) $(LDFLAGS) -o $@ $(CFLAGS) -shared -fPIC $^
++	$(Q)$(CC) $(LDFLAGS) -o $@ $(CFLAGS) -shared -Wl,-soname,libwpa_client.so.2.10.0 -fPIC $^
+ 
+ libwpa_test1: libwpa_test.o libwpa_client.a
+ 	$(Q)$(LDO) $(LDFLAGS) -o libwpa_test1 libwpa_test.o libwpa_client.a $(LIBS_c)

recipes-connectivity/hostapd/files/0001-use-nas-port-type-ethernet-for-wired-802.1X.patch

@@ -0,0 +1,49 @@
+From 6cb306fef195a430642a2475d72fcc6b375acb11 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=BCrgen=20Henke?= <juergen.henke@netmodule.com>
+Date: Mon, 21 Feb 2022 15:40:04 +0100
+Subject: [PATCH] use nas-port-type ethernet for wired 802.1X
+
+- if the driver is "wired", use nas-port type "ethernet", otherwise
+  use "wirless-802.1X" as before.
+
+BugzId: 78385
+---
+ src/ap/ieee802_1x.c | 9 +++++++--
+ src/radius/radius.h | 1 +
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c
+index 9ee99cff3..8a012a9e4 100644
+--- a/src/ap/ieee802_1x.c
++++ b/src/ap/ieee802_1x.c
+@@ -578,11 +578,16 @@ int add_common_radius_attr(struct hostapd_data *hapd,
+ 		return -1;
+ 	}
+ 
++    int32_t nas_port_type = RADIUS_NAS_PORT_TYPE_IEEE_802_11;
++    if (os_strcmp(hapd->driver->name,"wired") == 0) {
++        // wired ports need a different port type:
++        nas_port_type = RADIUS_NAS_PORT_TYPE_ETHERNET;
++    }
+ 	if (!hostapd_config_get_radius_attr(req_attr,
+ 					    RADIUS_ATTR_NAS_PORT_TYPE) &&
+ 	    !radius_msg_add_attr_int32(msg, RADIUS_ATTR_NAS_PORT_TYPE,
+-				       RADIUS_NAS_PORT_TYPE_IEEE_802_11)) {
+-		wpa_printf(MSG_ERROR, "Could not add NAS-Port-Type");
++				       nas_port_type)) {
++		wpa_printf(MSG_ERROR, "Could not add NAS-Port-Type (%i)", nas_port_type);
+ 		return -1;
+ 	}
+ 
+diff --git a/src/radius/radius.h b/src/radius/radius.h
+index 630c0f9d0..a6056d8bd 100644
+--- a/src/radius/radius.h
++++ b/src/radius/radius.h
+@@ -125,6 +125,7 @@ enum { RADIUS_ATTR_USER_NAME = 1,
+ 
+ /* NAS-Port-Type */
+ #define RADIUS_NAS_PORT_TYPE_IEEE_802_11 19
++#define RADIUS_NAS_PORT_TYPE_ETHERNET    15
+ 
+ /* Acct-Status-Type */
+ #define RADIUS_ACCT_STATUS_TYPE_START 1

recipes-connectivity/hostapd/hostapd.inc

@@ -14,73 +14,75 @@ inherit pkgconfig
 
 PACKAGECONFIG = "openssl"
 
-SRC_URI = "git://w1.fi/hostap.git;protocol=http \
-        file://wpa_supplicant-full.config \
-        file://hostapd-full.config \
-        file://src/utils/build_features.h \
-        file://0001-Add-build-artifact-build_features.h-to-gitignore.patch \
-        file://0002-Use-environment-variable-EXTRA_CFLAGS.patch \
-        file://001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch \
-        file://002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch \
-        file://003-wpa_supplicant-handle-HT40-and-mode-downgrade-in-AP-.patch \
-        file://004-wpa_supplicant-fix-frequency-config-for-non-p2p-vht-.patch \
-        file://005-wpa_supplicant-enable-vht-and-he-in-default-config-p.patch \
-        file://006-hw_features-better-debug-messages-for-some-error-cas.patch \
-        file://007-dfs-use-helper-functions-for-vht-he-parameters.patch \
-        file://008-mesh-use-setup-completion-callback-to-complete-mesh-.patch \
-        file://009-mesh-update-ssid-frequency-as-pri-sec-channel-switch.patch \
-        file://010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch \
-        file://011-mesh-do-not-set-offchanok-on-DFS-channels-in-non-ETS.patch \
-        file://012-mesh-fix-channel-switch-error-during-CAC.patch \
-        file://013-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch \
-        file://014-mesh-fixes-for-mesh-init-deinit.patch \
-        file://015-mesh-fix-DFS-deinit-init.patch \
-        file://016-tests-DFS-test-for-wpa_supplicant-mesh.patch \
-        file://017-mesh-fix-mesh_oom-test.patch \
-        file://018-mesh-move-mesh-freq-setting-to-own-function.patch \
-        file://019-mesh-use-deterministic-channel-on-channel-switch.patch \
-        file://020-ignore-4addr-mode-enabling-error.patch \
-        file://050-mesh-make-forwarding-configurable.patch \
-        file://060-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch \
-        file://100-daemonize_fix.patch \
-        file://110-notify-mgmt-frames.patch \
-        file://110-wolfssl-compile-fix.patch \
-        file://120-reconfigure-wps-credentials.patch \
-        file://200-multicall.patch \
-        file://300-noscan.patch \
-        file://301-mesh-noscan.patch \
-        file://310-rescan_immediately.patch \
-        file://320-optional_rfkill.patch \
-        file://330-nl80211_fix_set_freq.patch \
-        file://340-reload_freq_change.patch \
-        file://341-mesh-ctrl-iface-channel-switch.patch \
-        file://350-nl80211_del_beacon_bss.patch \
-        file://360-ctrl_iface_reload.patch \
-        file://370-ap_sta_support.patch \
-        file://380-disable_ctrl_iface_mib.patch \
-        file://381-hostapd_cli_UNKNOWN-COMMAND.patch \
-        file://390-wpa_ie_cap_workaround.patch \
-        file://400-wps_single_auth_enc_type.patch \
-        file://410-limit_debug_messages.patch \
-        file://420-indicate-features.patch \
-        file://430-hostapd_cli_ifdef.patch \
-        file://431-wpa_cli_ifdef.patch \
-        file://432-missing-typedef.patch \
-        file://450-scan_wait.patch \
-        file://460-wpa_supplicant-add-new-config-params-to-be-used-with.patch \
-        file://461-driver_nl80211-use-new-parameters-during-ibss-join.patch \
-        file://463-add-mcast_rate-to-11s.patch \
-        file://464-fix-mesh-obss-check.patch \
-        file://470-survey_data_fallback.patch \
-        file://500-lto-jobserver-support.patch \
-        file://599-wpa_supplicant-fix-warnings.patch \
-        file://700-wifi-reload.patch \
-        file://800-dfs-enter-DFS-state-if-no-available-channel-is-found.patch \
-        file://801-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch \
-        file://912-iapp-integration.patch \
-        file://913-iapp-improvements.patch \
-        file://914-wlan-acs-srd-channels.patch \
-        "
+SRC_URI = "git://w1.fi/hostap.git;protocol=http;branch=main \
+           file://wpa_supplicant-full.config \
+           file://hostapd-full.config \
+           file://src/utils/build_features.h \
+           file://0001-Add-build-artifact-build_features.h-to-gitignore.patch \
+           file://0002-Use-environment-variable-EXTRA_CFLAGS.patch \
+           file://001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch \
+           file://002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch \
+           file://003-wpa_supplicant-handle-HT40-and-mode-downgrade-in-AP-.patch \
+           file://004-wpa_supplicant-fix-frequency-config-for-non-p2p-vht-.patch \
+           file://005-wpa_supplicant-enable-vht-and-he-in-default-config-p.patch \
+           file://006-hw_features-better-debug-messages-for-some-error-cas.patch \
+           file://007-dfs-use-helper-functions-for-vht-he-parameters.patch \
+           file://008-mesh-use-setup-completion-callback-to-complete-mesh-.patch \
+           file://009-mesh-update-ssid-frequency-as-pri-sec-channel-switch.patch \
+           file://010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch \
+           file://011-mesh-do-not-set-offchanok-on-DFS-channels-in-non-ETS.patch \
+           file://012-mesh-fix-channel-switch-error-during-CAC.patch \
+           file://013-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch \
+           file://014-mesh-fixes-for-mesh-init-deinit.patch \
+           file://015-mesh-fix-DFS-deinit-init.patch \
+           file://016-tests-DFS-test-for-wpa_supplicant-mesh.patch \
+           file://017-mesh-fix-mesh_oom-test.patch \
+           file://018-mesh-move-mesh-freq-setting-to-own-function.patch \
+           file://019-mesh-use-deterministic-channel-on-channel-switch.patch \
+           file://020-ignore-4addr-mode-enabling-error.patch \
+           file://050-mesh-make-forwarding-configurable.patch \
+           file://060-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch \
+           file://100-daemonize_fix.patch \
+           file://110-notify-mgmt-frames.patch \
+           file://110-wolfssl-compile-fix.patch \
+           file://120-reconfigure-wps-credentials.patch \
+           file://200-multicall.patch \
+           file://300-noscan.patch \
+           file://301-mesh-noscan.patch \
+           file://310-rescan_immediately.patch \
+           file://320-optional_rfkill.patch \
+           file://330-nl80211_fix_set_freq.patch \
+           file://340-reload_freq_change.patch \
+           file://341-mesh-ctrl-iface-channel-switch.patch \
+           file://350-nl80211_del_beacon_bss.patch \
+           file://360-ctrl_iface_reload.patch \
+           file://370-ap_sta_support.patch \
+           file://380-disable_ctrl_iface_mib.patch \
+           file://381-hostapd_cli_UNKNOWN-COMMAND.patch \
+           file://390-wpa_ie_cap_workaround.patch \
+           file://400-wps_single_auth_enc_type.patch \
+           file://410-limit_debug_messages.patch \
+           file://420-indicate-features.patch \
+           file://430-hostapd_cli_ifdef.patch \
+           file://431-wpa_cli_ifdef.patch \
+           file://432-missing-typedef.patch \
+           file://450-scan_wait.patch \
+           file://460-wpa_supplicant-add-new-config-params-to-be-used-with.patch \
+           file://461-driver_nl80211-use-new-parameters-during-ibss-join.patch \
+           file://463-add-mcast_rate-to-11s.patch \
+           file://464-fix-mesh-obss-check.patch \
+           file://470-survey_data_fallback.patch \
+           file://500-lto-jobserver-support.patch \
+           file://599-wpa_supplicant-fix-warnings.patch \
+           file://700-wifi-reload.patch \
+           file://800-dfs-enter-DFS-state-if-no-available-channel-is-found.patch \
+           file://801-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch \
+           file://912-iapp-integration.patch \
+           file://913-iapp-improvements.patch \
+           file://914-wlan-acs-srd-channels.patch \
+           file://0001-fix-create-a-versioned-shared-library-libwlan_client.patch \
+           file://0001-use-nas-port-type-ethernet-for-wired-802.1X.patch \
+           "
 
 SRCREV = "5a8b366233f5585e68a4ffbb604fbb4a848eb325"
 SRC_URI[md5sum] = "a68538fb62766f40f890125026c42c10"

recipes-connectivity/hostapd/libwpa-client_2.10.bb

@@ -0,0 +1,27 @@
+SUMMARY = "A library for using the hostapd/wpa_supplicant control interface"
+
+# This is part of wpa_supplicant and defined in the wpa_supplicant Makefile
+TARGET_NAME = "wpa_supplicant"
+
+include hostapd.inc
+
+#PACKAGES_prepend = "libwpa_client"
+
+FILES_${PN} += "${libdir}/*.so"
+RPROVIDES_${PN} = "libwpa_client.so"
+PROVIDES = "libwpa_client.so"
+
+
+do_install () {
+	install -d ${D}${libdir}
+	install -d ${D}${includedir}/wpa_client
+	
+	install -m 755 wpa_supplicant/libwpa_client.so ${D}${libdir}/libwpa_client.so.2.10.0
+	install -m 644 src/common/wpa_ctrl.h ${D}${includedir}/wpa_client
+	ln -sf libwpa_client.so.2.10.0  ${D}${libdir}/libwpa_client.so 
+}
+
+do_compile () {
+	unset CFLAGS CPPFLAGS CXXFLAGS
+	oe_runmake -C ${TARGET_NAME} libwpa_client.so
+}